From 66daea9d6bcdda92f6756a5437ab7c651545574f Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 27 Jun 2021 11:44:36 +0000 Subject: [PATCH 01/47] berkleydb: Update from version 6.2.23 to 6.2.32 --- cross/berkeleydb/Makefile | 3 ++- cross/berkeleydb/PLIST | 1 + cross/berkeleydb/digests | 6 +++--- .../patches/001-cross-compile.patch | 21 ------------------- 4 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 cross/berkeleydb/patches/001-cross-compile.patch diff --git a/cross/berkeleydb/Makefile b/cross/berkeleydb/Makefile index ad85ec5af91..943e657e244 100644 --- a/cross/berkeleydb/Makefile +++ b/cross/berkeleydb/Makefile @@ -1,5 +1,5 @@ PKG_NAME = db -PKG_VERS = 6.2.23 +PKG_VERS = 6.2.32 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://download.oracle.com/berkeley-db @@ -13,6 +13,7 @@ COMMENT = Berkeley DB is a family of embedded key-value database libraries prov LICENSE = AGPLv3 CONFIGURE_TARGET = db_configure +CONFIGURE_ARGS = --enable-compat185 --enable-dbm --disable-static --enable-cxx include ../../mk/spksrc.cross-cc.mk diff --git a/cross/berkeleydb/PLIST b/cross/berkeleydb/PLIST index f3cc1a98ad7..78910ec4aa1 100644 --- a/cross/berkeleydb/PLIST +++ b/cross/berkeleydb/PLIST @@ -1,5 +1,6 @@ bin:bin/db_archive bin:bin/db_checkpoint +bin:bin/db_convert bin:bin/db_deadlock bin:bin/db_dump bin:bin/db_hotbackup diff --git a/cross/berkeleydb/digests b/cross/berkeleydb/digests index 11c1b429909..770c73946aa 100644 --- a/cross/berkeleydb/digests +++ b/cross/berkeleydb/digests @@ -1,3 +1,3 @@ -db-6.2.23.tar.gz SHA1 646c57b99799dc300207976e2270cdaca1a2f198 -db-6.2.23.tar.gz SHA256 47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7 -db-6.2.23.tar.gz MD5 9da126afb937a48171ff1e569ce67cf1 +db-6.2.32.tar.gz SHA1 51824cee0a59cdcfb11413ac4558c851dda24551 +db-6.2.32.tar.gz SHA256 a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb +db-6.2.32.tar.gz MD5 33491b4756cb44b91c3318b727e71023 diff --git a/cross/berkeleydb/patches/001-cross-compile.patch b/cross/berkeleydb/patches/001-cross-compile.patch deleted file mode 100644 index 577a2d21d18..00000000000 --- a/cross/berkeleydb/patches/001-cross-compile.patch +++ /dev/null @@ -1,21 +0,0 @@ -# Fix x64 compile issue ---- dist/configure.orig 2016-11-30 17:10:08.635975082 +0100 -+++ dist/configure 2016-11-30 17:10:01.635975176 +0100 -@@ -22787,7 +22787,7 @@ - fi - - if test "$db_cv_atomic" = no; then -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = maybe; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run test program while cross compiling -@@ -22826,7 +22826,7 @@ - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = maybe; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run test program while cross compiling From 0f9a8adecebd07f69a8e7c3e1b96acf7e7e63bdc Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 27 Jun 2021 11:47:01 +0000 Subject: [PATCH 02/47] c_icap: Udpate from 0.2.2 to 0.5.8 and enable extra features --- cross/c_icap/Makefile | 8 +-- cross/c_icap/PLIST | 11 ++- cross/c_icap/digests | 6 +- ...akefile.in.patch => 001-Makefile.in.patch} | 0 cross/c_icap/patches/001-configure.in.patch | 72 ------------------- 5 files changed, 15 insertions(+), 82 deletions(-) rename cross/c_icap/patches/{002-Makefile.in.patch => 001-Makefile.in.patch} (100%) delete mode 100644 cross/c_icap/patches/001-configure.in.patch diff --git a/cross/c_icap/Makefile b/cross/c_icap/Makefile index a41ead795b4..1fb3133bd47 100644 --- a/cross/c_icap/Makefile +++ b/cross/c_icap/Makefile @@ -1,11 +1,11 @@ PKG_NAME = c_icap -PKG_VERS = 0.2.2 +PKG_VERS = 0.5.8 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://downloads.sourceforge.net/project/c-icap/c-icap/0.2.x +PKG_DIST_SITE = https://downloads.sourceforge.net/project/c-icap/c-icap/0.5.x PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = +DEPENDS = cross/zlib cross/bzip2 cross/openssl cross/pcre cross/berkeleydb HOMEPAGE = http://c-icap.sourceforge.net/ COMMENT = c-icap is an implementation of an ICAP server. It can be used with HTTP proxies that support the ICAP protocol to implement content adaptation and filtering services. @@ -13,7 +13,7 @@ LICENSE = LGPLv2.1 PRE_CONFIGURE_TARGET = c_icap_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --enable-large-files --with-zlib=$(INSTALL_DIR)/$(INSTALL_PREFIX)/lib -C +CONFIGURE_ARGS = --enable-large-files --disable-static --with-zlib=$(INSTALL_DIR)/$(INSTALL_PREFIX)/lib -C include ../../mk/spksrc.cross-cc.mk diff --git a/cross/c_icap/PLIST b/cross/c_icap/PLIST index dfb592a8b70..3760b9e2206 100644 --- a/cross/c_icap/PLIST +++ b/cross/c_icap/PLIST @@ -3,11 +3,16 @@ bin:bin/c-icap-client bin:bin/c-icap-config bin:bin/c-icap-libicapapi-config bin:bin/c-icap-stretch +rsc:etc/c-icap.conf +rsc:etc/c-icap.conf.default rsc:etc/c-icap.magic +rsc:etc/c-icap.magic.default +lnk:lib/libicapapi.so +lnk:lib/libicapapi.so.5 +lib:lib/libicapapi.so.5.0.8 +lib:lib/c_icap/bdb_tables.so lib:lib/c_icap/dnsbl_tables.so +lib:lib/c_icap/shared_cache.so lib:lib/c_icap/srv_echo.so lib:lib/c_icap/srv_ex206.so lib:lib/c_icap/sys_logger.so -lnk:lib/libicapapi.so -lnk:lib/libicapapi.so.2 -lib:lib/libicapapi.so.2.0.2 diff --git a/cross/c_icap/digests b/cross/c_icap/digests index 36fc02d9d5f..4392ee33514 100644 --- a/cross/c_icap/digests +++ b/cross/c_icap/digests @@ -1,3 +1,3 @@ -c_icap-0.2.2.tar.gz SHA1 104be659978e56bc50f04c9cde60253175d59464 -c_icap-0.2.2.tar.gz SHA256 3236fb63b7cb08df46f591d4a5b0cd6c3806fcd8a9831aa01915acc9435f6ed1 -c_icap-0.2.2.tar.gz MD5 ac8c8462fc456aa0e1ab130ecfa68311 +c_icap-0.5.8.tar.gz SHA1 b5c78b7e48a4f7b14a159db13ff6d91133d48eb5 +c_icap-0.5.8.tar.gz SHA256 11d8163f89d8e4ef5e7e959d0bc6ce6434607451c16e12ff38b9b7eb08a8c761 +c_icap-0.5.8.tar.gz MD5 30fbbd21c3fda3fd82eaf42feeac3897 diff --git a/cross/c_icap/patches/002-Makefile.in.patch b/cross/c_icap/patches/001-Makefile.in.patch similarity index 100% rename from cross/c_icap/patches/002-Makefile.in.patch rename to cross/c_icap/patches/001-Makefile.in.patch diff --git a/cross/c_icap/patches/001-configure.in.patch b/cross/c_icap/patches/001-configure.in.patch deleted file mode 100644 index 5783a513631..00000000000 --- a/cross/c_icap/patches/001-configure.in.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- configure.in.ori 2010-12-21 17:50:08.000000000 +0100 -+++ configure.in 2011-06-10 00:24:06.000000000 +0200 -@@ -557,10 +557,8 @@ - ) - - dnl Checking if interprocess posix semaphores works.... --POSIX_SEMAPHORES="0" --AC_MSG_CHECKING(if posix 1003.1b interprocess semaphores works) --AC_TRY_RUN( --[ -+AC_CACHE_CHECK([if posix 1003.1b interprocess semaphores works], ac_cv_10031b_ipc_sem, -+[AC_TRY_RUN([ - #include - #include - -@@ -586,18 +484,24 @@ - exit(0); - } - ], --AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works]) --POSIX_SEMAPHORES="1" --AC_MSG_RESULT(yes), --AC_MSG_RESULT(no) -+ac_cv_10031b_ipc_sem=yes, -+ac_cv_10031b_ipc_sem=no, -+[AC_MSG_ERROR([cross-compiling, -+ presetting ac_cv_10031b_ipc_sem=(yes|no) will help])] - ) -+]) -+AS_IF( -+ [test $ac_cv_10031b_ipc_sem = yes], -+ [AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works]) -+ POSIX_SEMAPHORES="1" -+ ],[ -+ POSIX_SEMAPHORES="0" -+ ]) - AC_SUBST(POSIX_SEMAPHORES) - - dnl Checking for file locking --POSIX_FILE_LOCK="0" --AC_MSG_CHECKING(if fcntl file locking works) --AC_TRY_RUN( --[ -+AC_CACHE_CHECK([if fcntl file locking works], ac_cv_fcntl, -+[AC_TRY_RUN([ - #include - #include - -@@ -621,11 +625,19 @@ - return 0; - } - ], --AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works]) --POSIX_FILE_LOCK="1" --AC_MSG_RESULT(yes), --AC_MSG_RESULT(no) -+ac_cv_fcntl=yes, -+ac_cv_fcntl=no, -+[AC_MSG_ERROR([cross-compiling, -+ presetting ac_cv_fcntl=(yes|no) will help])] - ) -+]) -+AS_IF( -+ [test $ac_cv_fcntl = yes], -+ [AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works]) -+ POSIX_FILE_LOCK="1" -+ ],[ -+ POSIX_FILE_LOCK="0" -+ ]) - AC_SUBST(POSIX_FILE_LOCK) - - #pthread_rwlock From 65cf47cccfb0a4afa120dadac5e4f5b5f83b6ffb Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 27 Jun 2021 11:55:51 +0000 Subject: [PATCH 03/47] squidclamav: Update from version 6.10 to 7.1 --- cross/squidclamav/Makefile | 4 ++-- cross/squidclamav/digests | 3 +++ .../patches/001-add-destdir-flags.patch | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 cross/squidclamav/digests diff --git a/cross/squidclamav/Makefile b/cross/squidclamav/Makefile index 1beed135483..5178ede4ba5 100644 --- a/cross/squidclamav/Makefile +++ b/cross/squidclamav/Makefile @@ -1,11 +1,11 @@ PKG_NAME = squidclamav -PKG_VERS = 6.10 +PKG_VERS = 7.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://downloads.sourceforge.net/project/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERS) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = +DEPENDS = cross/c_icap HOMEPAGE = https://squidclamav.darold.net/ COMMENT = SquidClamav is an antivirus for Squid proxy based on the Awards winnings ClamAv anti-virus toolkit. diff --git a/cross/squidclamav/digests b/cross/squidclamav/digests new file mode 100644 index 00000000000..e3f35e675cc --- /dev/null +++ b/cross/squidclamav/digests @@ -0,0 +1,3 @@ +squidclamav-7.1.tar.gz SHA1 b09e5d5ec8eabc768b5adb32ae5d6dbfc9a00822 +squidclamav-7.1.tar.gz SHA256 3b72d2de85bfddf480eb0031697b4684ecdff15eb0402a9d819bac6bd089046c +squidclamav-7.1.tar.gz MD5 b29e6e10718eca736730482178a67320 diff --git a/cross/squidclamav/patches/001-add-destdir-flags.patch b/cross/squidclamav/patches/001-add-destdir-flags.patch index 70b99f10a85..b242227715f 100644 --- a/cross/squidclamav/patches/001-add-destdir-flags.patch +++ b/cross/squidclamav/patches/001-add-destdir-flags.patch @@ -1,20 +1,20 @@ --- etc/Makefile.in.orig 2012-10-04 11:58:03.000000000 +0200 +++ etc/Makefile.in 2012-10-04 12:02:05.000000000 +0200 -@@ -168,6 +168,7 @@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = squidclamav.conf +@@ -176,6 +176,7 @@ CONFS = squidclamav.conf + cicapdatadir = @DATADIR@ + CONFIGDIR = @CONFDIR@ CFGINST = @CFGDIR@ +DESTDIR = $(prefix) + TMPLS = templates/en/MALWARE_FOUND + EXTRA_DIST = squidclamav.conf $(TMPLS) all: all-am - - .SUFFIXES: --- src/Makefile.in.orig 2012-10-04 12:06:28.000000000 +0200 +++ src/Makefile.in 2012-10-04 12:07:15.000000000 +0200 -@@ -198,6 +198,7 @@ +@@ -225,6 +225,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir) CONFIGDIR = @CONFDIR@ +DESTDIR = $(prefix)/../../../ + cicapdatadir = @DATADIR@ cicapmoduledir = @MODSDIR@ cicapmodule_LTLIBRARIES = squidclamav.la - squidclamav_la_LIBADD = @MODULES_LIBADD@ From cf69bc5197b4500493535e54ffdf4f92a2a45e90 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 27 Jun 2021 12:50:03 +0000 Subject: [PATCH 04/47] squidguard: Update from version 1.5-beta to 1.6.0 from Debian src --- cross/squidguard/Makefile | 21 +++-- cross/squidguard/PLIST | 152 ------------------------------------ cross/squidguard/PLIST.auto | 0 cross/squidguard/digests | 6 +- 4 files changed, 19 insertions(+), 160 deletions(-) delete mode 100644 cross/squidguard/PLIST create mode 100644 cross/squidguard/PLIST.auto diff --git a/cross/squidguard/Makefile b/cross/squidguard/Makefile index e99fe63b89b..fb434546b61 100644 --- a/cross/squidguard/Makefile +++ b/cross/squidguard/Makefile @@ -1,8 +1,8 @@ -PKG_NAME = squidGuard -PKG_VERS = 1.5-beta +PKG_NAME = squidguard +PKG_VERS = 1.6.0 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://fossies.org/linux/www/ +PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).orig.$(PKG_EXT) +PKG_DIST_SITE = http://deb.debian.org/debian/pool/main/s/squidguard PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DB_FILE= ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz DEPENDS = @@ -17,12 +17,15 @@ LICENSE = GPL DESTDIR = $(INSTALL_DIR) GNU_CONFIGURE = 1 +PRE_CONFIGURE_TARGET = squidguard_pre_configure +INSTALL_TARGET = squidguard_install POST_INSTALL_TARGET = squidguard_post_install include ../../mk/spksrc.cross-cc.mk CONFIGURE_ARGS = --with-db=$(INSTALL_DIR)/$(INSTALL_PREFIX) -CONFIGURE_ARGS += --exec-prefix=$(INSTALL_DIR)/$(INSTALL_PREFIX) +#CONFIGURE_ARGS += --exec-prefix=$(INSTALL_DIR)/$(INSTALL_PREFIX) +CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) CONFIGURE_ARGS += -with-sg-dbhome=$(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db CONFIGURE_ARGS += --with-sg-config=$(INSTALL_DIR)/$(INSTALL_PREFIX)/etc/squidguard.conf CONFIGURE_ARGS += --with-sg-logdir=$(INSTALL_DIR)/$(INSTALL_PREFIX)/var/logs @@ -30,6 +33,14 @@ CONFIGURE_ARGS += --with-squiduser=$(USER) CONFIGURE_ARGS += -with-mysql=no CONFIGURE_ARGS += --with-ldap-inc=no +.PHONY: squidguard_pre_configure +squidguard_pre_configure: + $(RUN) NOCONFIGURE=1 ./autogen.sh + +.PHONY: squidguard_install +squidguard_install: + $(RUN) DESTDIR=$(INSTALL_DIR) $(MAKE) install + .PHONY: squidguard_post_install squidguard_post_install: @$(RUN) install -m 755 -d $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db diff --git a/cross/squidguard/PLIST b/cross/squidguard/PLIST deleted file mode 100644 index 243ed291eb3..00000000000 --- a/cross/squidguard/PLIST +++ /dev/null @@ -1,152 +0,0 @@ -bin:bin/squidGuard -rsc:share/www/squidguardmgr/squidGuard.cgi -rsc:share/www/squidguardmgr/babel.en -rsc:share/www/squidguardmgr/babel.fr -rsc:share/www/squidguardmgr/babel.de -rsc:share/www/squidguardmgr/babel.es -rsc:share/www/squidguardmgr/babel.nl -rsc:share/www/squidguardmgr/babel.no -rsc:share/www/squidguardmgr/babel.ru -lnk:var/db/ads -rsc:var/db/adult/domains -rsc:var/db/adult/expressions -rsc:var/db/adult/urls -rsc:var/db/adult/usage -rsc:var/db/adult/very_restrictive_expression -lnk:var/db/aggressive -rsc:var/db/agressif/domains -rsc:var/db/agressif/expressions -rsc:var/db/agressif/urls -rsc:var/db/agressif/usage -rsc:var/db/arjel/domains -rsc:var/db/astrology/domains -rsc:var/db/astrology/urls -rsc:var/db/astrology/usage -rsc:var/db/audio-video/domains -rsc:var/db/audio-video/urls -rsc:var/db/audio-video/usage -rsc:var/db/bank/domains -rsc:var/db/blog/domains -rsc:var/db/blog/urls -rsc:var/db/blog/usage -rsc:var/db/celebrity/domains -rsc:var/db/celebrity/urls -rsc:var/db/celebrity/usage -rsc:var/db/chat/domains -rsc:var/db/chat/urls -rsc:var/db/child/domains -rsc:var/db/child/urls -rsc:var/db/child/usage -rsc:var/db/cleaning/domains -rsc:var/db/cleaning/urls -rsc:var/db/cleaning/usage -rsc:var/db/cooking/domains -rsc:var/db/dangerous_material/domains -rsc:var/db/dangerous_material/urls -rsc:var/db/dangerous_material/usage -rsc:var/db/dating/domains -rsc:var/db/dating/urls -rsc:var/db/dating/usage -rsc:var/db/drogue/domains -rsc:var/db/drogue/urls -rsc:var/db/drogue/usage -lnk:var/db/drugs -rsc:var/db/filehosting/domains -rsc:var/db/filehosting/urls -rsc:var/db/filehosting/usage -rsc:var/db/financial/domains -rsc:var/db/financial/urls -rsc:var/db/financial/usage -rsc:var/db/forums/domains -rsc:var/db/forums/expressions -rsc:var/db/forums/urls -rsc:var/db/forums/usage -rsc:var/db/gambling/domains -rsc:var/db/gambling/urls -rsc:var/db/gambling/usage -rsc:var/db/games/domains -rsc:var/db/games/urls -rsc:var/db/games/usage -rsc:var/db/global_usage -rsc:var/db/hacking/domains -rsc:var/db/hacking/urls -rsc:var/db/hacking/usage -rsc:var/db/jobsearch/domains -rsc:var/db/lingerie/domains -rsc:var/db/liste_bu/domains -rsc:var/db/liste_bu/urls -rsc:var/db/liste_bu/usage -lnk:var/db/mail -rsc:var/db/malware/domains -rsc:var/db/malware/expressions -rsc:var/db/malware/urls -rsc:var/db/malware/usage -rsc:var/db/manga/domains -rsc:var/db/manga/urls -rsc:var/db/manga/usage -rsc:var/db/marketingware/domains -rsc:var/db/marketingware/urls -rsc:var/db/marketingware/usage -rsc:var/db/mixed_adult/domains -rsc:var/db/mixed_adult/urls -rsc:var/db/mixed_adult/usage -rsc:var/db/mobile-phone/domains -rsc:var/db/mobile-phone/urls -rsc:var/db/mobile-phone/usage -rsc:var/db/phishing/domains -rsc:var/db/phishing/urls -rsc:var/db/phishing/usage -lnk:var/db/porn -rsc:var/db/press/domains -rsc:var/db/press/urls -rsc:var/db/press/usage -lnk:var/db/proxy -rsc:var/db/publicite/domains -rsc:var/db/publicite/expressions -rsc:var/db/publicite/urls -rsc:var/db/publicite/usage -rsc:var/db/radio/domains -rsc:var/db/radio/urls -rsc:var/db/radio/usage -rsc:var/db/README -rsc:var/db/reaffected/domains -rsc:var/db/reaffected/urls -rsc:var/db/reaffected/usage -rsc:var/db/redirector/domains -rsc:var/db/redirector/expressions -rsc:var/db/redirector/urls -rsc:var/db/redirector/usage -rsc:var/db/remote-control/domains -rsc:var/db/remote-control/urls -rsc:var/db/sect/domains -rsc:var/db/sect/urls -rsc:var/db/sect/usage -rsc:var/db/sexual_education/domains -rsc:var/db/sexual_education/urls -rsc:var/db/sexual_education/usage -rsc:var/db/shopping/domains -rsc:var/db/shopping/urls -rsc:var/db/shopping/usage -rsc:var/db/social_networks/domains -rsc:var/db/social_networks/urls -rsc:var/db/sports/domains -rsc:var/db/strict_redirector/domains -rsc:var/db/strict_redirector/expressions -rsc:var/db/strict_redirector/urls -rsc:var/db/strict_redirector/usage -rsc:var/db/strong_redirector/domains -rsc:var/db/strong_redirector/expressions -rsc:var/db/strong_redirector/urls -rsc:var/db/strong_redirector/usage -rsc:var/db/tricheur/domains -rsc:var/db/tricheur/urls -rsc:var/db/tricheur/usage -lnk:var/db/violence -rsc:var/db/warez/domains -rsc:var/db/warez/expressions -rsc:var/db/warez/urls -rsc:var/db/warez/usage -rsc:var/db/webmail/domains -rsc:var/db/webmail/urls -rsc:var/db/webmail/usage - diff --git a/cross/squidguard/PLIST.auto b/cross/squidguard/PLIST.auto new file mode 100644 index 00000000000..e69de29bb2d diff --git a/cross/squidguard/digests b/cross/squidguard/digests index af803b03582..c09f202db0c 100644 --- a/cross/squidguard/digests +++ b/cross/squidguard/digests @@ -1,3 +1,3 @@ -squidGuard-1.5-beta.tar.gz SHA1 e7d5c2a563a9a38551139daebe21c805f85322ee -squidGuard-1.5-beta.tar.gz SHA256 3dd40e2a94231cc85707094b8088534f4dde5c17ba94da836d1c66d50a04e580 -squidGuard-1.5-beta.tar.gz MD5 85216992d14acb29d6f345608f21f268 +squidguard_1.6.0.orig.tar.gz SHA1 e271b5bf2c7608be81f3fab5086d307105aadf1e +squidguard_1.6.0.orig.tar.gz SHA256 3de0d64b7f1b4b69de16d3168a438c8df28419041e0fdaf9446e7a4599e612b5 +squidguard_1.6.0.orig.tar.gz MD5 ebf207accc6da4ad07de2db6e71ce8dc From 71f19f58863732b55579701431abb7332d374d5a Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 27 Jun 2021 12:51:17 +0000 Subject: [PATCH 05/47] squidguard: Remove duplicate dependencies --- spk/squidguard/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index f117eff9435..66ec8cbd0a8 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -4,7 +4,7 @@ SPK_REV = 1 SPK_ICON = src/squidguard.png BETA = 1 -DEPENDS = cross/zlib cross/c_icap cross/busybox cross/unrar cross/squidclamav cross/berkeleydb cross/squidguard cross/squid cross/squidguardmanager +DEPENDS = cross/busybox cross/unrar cross/squidclamav cross/squidguard cross/squid cross/squidguardmanager SPK_DEPENDS = "AntiVirus>1.2" From b0e6ec46ede3d891ed38a1791c188abefd953448 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 27 Jun 2021 13:09:58 +0000 Subject: [PATCH 06/47] native/squid: Update from 3.1.22 to 5.0.4 --- native/squid/Makefile | 13 +++++++++---- native/squid/digests | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/native/squid/Makefile b/native/squid/Makefile index b4451e49965..ca5efc7c8bf 100644 --- a/native/squid/Makefile +++ b/native/squid/Makefile @@ -1,9 +1,9 @@ PKG_NAME = squid -PKG_VERS = 3.1.22 +PKG_VERS = 5.0.4 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = http://www.squid-cache.org/Versions/v$(word 1,$(subst ., ,$(PKG_VERS)))/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS))) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) +PKG_DIST_NAME = $(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/squid-cache/squid/archive +PKG_DIR = $(PKG_NAME)-$(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)) DEPENDS = @@ -14,11 +14,16 @@ LICENSE = GPLv2 GNU_CONFIGURE = 1 CONFIGURE_ARGS = $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_PREFIX) --enable-icap-client --disable-strict-error-checking +PRE_CONFIGURE_TARGET = squid_native_pre_configure COMPILE_TARGET = squid_native_compile INSTALL_TARGET = nop include ../../mk/spksrc.native-cc.mk +.PHONY: squid_native_pre_configure +squid_native_pre_configure: + $(RUN) ./bootstrap.sh + .PHONY: squid_native_compile squid_native_compile: $(RUN) ;cd src;$(MAKE) cf_gen_defines.cci cf_gen diff --git a/native/squid/digests b/native/squid/digests index 21706a2a8e9..8ad1b018dc3 100644 --- a/native/squid/digests +++ b/native/squid/digests @@ -1,3 +1,3 @@ -squid-3.1.22.tar.gz SHA1 3cd1c8079bee0da770cdd9a7edad4fc2592cf38e -squid-3.1.22.tar.gz SHA256 59764791cc030779f764fa077f2668bd0c8ebd25ce2f72c6526728de3c82369f -squid-3.1.22.tar.gz MD5 18ced59880b5ce8351a6b250f7e26ee8 +SQUID_5_0_4.tar.gz SHA1 b2421623928a07f8af51f3c2a8b1728cfca5431b +SQUID_5_0_4.tar.gz SHA256 55be1c98d9fe0fee3a6b629e8b7c1661f6f50a0975a0d9b25b3e2f6cc8bfdb7c +SQUID_5_0_4.tar.gz MD5 729f520093dd9f9060a5570cb26e24e7 From 406a0b3d557d0868386ffcafbe0488963aae6f31 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 27 Jun 2021 20:02:32 +0000 Subject: [PATCH 07/47] squid: Update from version 3.1.22 to 5.0.4 --- cross/squid/Makefile | 44 ++-- cross/squid/PLIST | 476 ----------------------------------------- cross/squid/PLIST.auto | 0 cross/squid/digests | 6 +- native/squid/Makefile | 29 --- native/squid/PLIST | 1 - native/squid/digests | 3 - 7 files changed, 30 insertions(+), 529 deletions(-) delete mode 100644 cross/squid/PLIST create mode 100644 cross/squid/PLIST.auto delete mode 100644 native/squid/Makefile delete mode 100644 native/squid/PLIST delete mode 100644 native/squid/digests diff --git a/cross/squid/Makefile b/cross/squid/Makefile index 1ba960d8593..dad505bcb1f 100644 --- a/cross/squid/Makefile +++ b/cross/squid/Makefile @@ -1,28 +1,38 @@ PKG_NAME = squid -PKG_VERS = 3.1.22 +PKG_VERS = 5.0.4 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = http://www.squid-cache.org/Versions/v3/3.1/ -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) +PKG_DIST_NAME = $(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/squid-cache/squid/archive +PKG_DIR = $(PKG_NAME)-$(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)) -DEPENDS = native/$(PKG_NAME) +DEPENDS = cross/openssl HOMEPAGE = http://www.squid-cache.org/ COMMENT = Squid is a fully-featured HTTP/1.0 proxy which is almost HTTP/1.1 compliant. -LICENSE = +LICENSE = GPLv2 GNU_CONFIGURE = 1 - -CONFIGURE_ARGS = $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_PREFIX) --enable-icap-client --disable-strict-error-checking - -HOSTCFGEN_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/$(PKG_DIR)/src/cf_gen -HOSTCFGEN = $(WORK_DIR)/$(PKG_DIR)/src/cf_gen - -# Compile -PRE_COMPILE_TARGET = squid_pre_compile +CONFIGURE_ARGS = $(TC_CONFIGURE_ARGS) +CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) +CONFIGURE_ARGS += --enable-icap-client +CONFIGURE_ARGS += --disable-strict-error-checking +CONFIGURE_ARGS += --enable-ssl +CONFIGURE_ARGS += --enable-arp-acl +CONFIGURE_ARGS += --enable-delay-pools +CONFIGURE_ARGS += squid_cv_check_marchnative=yes + +# Toolchains lacking c++11 in conjunction with +# march=native compiler are not supported +UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) +ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) +UNSUPPORTED_ARCHS += $(PPC_ARCHS) +UNSUPPORTED_ARCHS += $(ARM_ARCHS) +endif + +PRE_CONFIGURE_TARGET = squid_pre_configure include ../../mk/spksrc.cross-cc.mk -.PHONY: squid_pre_compile -squid_pre_compile: - cp $(HOSTCFGEN_NATIVE) $(HOSTCFGEN) +.PHONY: squid_pre_configure +squid_pre_configure: + $(RUN) ./bootstrap.sh diff --git a/cross/squid/PLIST b/cross/squid/PLIST deleted file mode 100644 index 5e9f516cbe9..00000000000 --- a/cross/squid/PLIST +++ /dev/null @@ -1,476 +0,0 @@ -bin:sbin/squid -rsc:etc/cachemgr.conf -rsc:etc/cachemgr.conf.default -rsc:etc/errorpage.css -rsc:etc/errorpage.css.default -rsc:etc/mime.conf -rsc:etc/mime.conf.default -rsc:etc/msntauth.conf -rsc:etc/msntauth.conf.default -rsc:etc/squid.conf -rsc:etc/squid.conf.default -rsc:etc/squid.conf.documented -rsc:libexec/cachemgr.cgi -bin:libexec/digest_pw_auth -bin:libexec/diskd -bin:libexec/fakeauth_auth -bin:libexec/getpwname_auth -bin:libexec/msnt_auth -bin:libexec/ncsa_auth -rsc:libexec/no_check.pl -bin:libexec/ntlm_smb_lm_auth -rsc:libexec/pop3.pl -bin:libexec/smb_auth -rsc:libexec/smb_auth.pl -rsc:libexec/smb_auth.sh -rsc:libexec/squid_db_auth -bin:libexec/squid_radius_auth -bin:libexec/squid_unix_group -bin:libexec/unlinkd -rsc:libexec/wbinfo_group.pl -bin:libexec/yp_auth -rsc:share/errors/templates/ERR_ACCESS_DENIED -rsc:share/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/templates/ERR_AGENT_CONFIGURE -rsc:share/errors/templates/ERR_AGENT_WPAD -rsc:share/errors/templates/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/templates/ERR_CANNOT_FORWARD -rsc:share/errors/templates/ERR_CONNECT_FAIL -rsc:share/errors/templates/ERR_DIR_LISTING -rsc:share/errors/templates/ERR_DNS_FAIL -rsc:share/errors/templates/ERR_ESI -rsc:share/errors/templates/ERR_FORWARDING_DENIED -rsc:share/errors/templates/ERR_FTP_DISABLED -rsc:share/errors/templates/ERR_FTP_FAILURE -rsc:share/errors/templates/ERR_FTP_FORBIDDEN -rsc:share/errors/templates/ERR_FTP_NOT_FOUND -rsc:share/errors/templates/ERR_FTP_PUT_CREATED -rsc:share/errors/templates/ERR_FTP_PUT_ERROR -rsc:share/errors/templates/ERR_FTP_PUT_MODIFIED -rsc:share/errors/templates/ERR_FTP_UNAVAILABLE -rsc:share/errors/templates/ERR_GATEWAY_FAILURE -rsc:share/errors/templates/ERR_ICAP_FAILURE -rsc:share/errors/templates/ERR_INVALID_REQ -rsc:share/errors/templates/ERR_INVALID_RESP -rsc:share/errors/templates/ERR_INVALID_URL -rsc:share/errors/templates/ERR_LIFETIME_EXP -rsc:share/errors/templates/ERR_NO_RELAY -rsc:share/errors/templates/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/templates/error-details.txt -rsc:share/errors/templates/ERR_PRECONDITION_FAILED -rsc:share/errors/templates/ERR_READ_ERROR -rsc:share/errors/templates/ERR_READ_TIMEOUT -rsc:share/errors/templates/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/templates/ERR_SHUTTING_DOWN -rsc:share/errors/templates/ERR_SOCKET_FAILURE -rsc:share/errors/templates/ERR_TOO_BIG -rsc:share/errors/templates/ERR_UNSUP_HTTPVERSION -rsc:share/errors/templates/ERR_UNSUP_REQ -rsc:share/errors/templates/ERR_URN_RESOLVE -rsc:share/errors/templates/ERR_WRITE_ERROR -rsc:share/errors/templates/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/de-at -rsc:share/errors/de-ch -rsc:share/errors/de-de -rsc:share/errors/de/ERR_ACCESS_DENIED -rsc:share/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/de/ERR_AGENT_CONFIGURE -rsc:share/errors/de/ERR_AGENT_WPAD -rsc:share/errors/de/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/de/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/de/ERR_CANNOT_FORWARD -rsc:share/errors/de/ERR_CONNECT_FAIL -rsc:share/errors/de/ERR_DIR_LISTING -rsc:share/errors/de/ERR_DNS_FAIL -rsc:share/errors/de/ERR_ESI -rsc:share/errors/de/ERR_FORWARDING_DENIED -rsc:share/errors/de/ERR_FTP_DISABLED -rsc:share/errors/de/ERR_FTP_FAILURE -rsc:share/errors/de/ERR_FTP_FORBIDDEN -rsc:share/errors/de/ERR_FTP_NOT_FOUND -rsc:share/errors/de/ERR_FTP_PUT_CREATED -rsc:share/errors/de/ERR_FTP_PUT_ERROR -rsc:share/errors/de/ERR_FTP_PUT_MODIFIED -rsc:share/errors/de/ERR_FTP_UNAVAILABLE -rsc:share/errors/de/ERR_GATEWAY_FAILURE -rsc:share/errors/de/ERR_ICAP_FAILURE -rsc:share/errors/de/ERR_INVALID_REQ -rsc:share/errors/de/ERR_INVALID_RESP -rsc:share/errors/de/ERR_INVALID_URL -rsc:share/errors/de/ERR_LIFETIME_EXP -rsc:share/errors/de/ERR_NO_RELAY -rsc:share/errors/de/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/de/error-details.txt -rsc:share/errors/de/ERR_PRECONDITION_FAILED -rsc:share/errors/de/ERR_READ_ERROR -rsc:share/errors/de/ERR_READ_TIMEOUT -rsc:share/errors/de/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/de/ERR_SHUTTING_DOWN -rsc:share/errors/de/ERR_SOCKET_FAILURE -rsc:share/errors/de/ERR_TOO_BIG -rsc:share/errors/de/ERR_UNSUP_HTTPVERSION -rsc:share/errors/de/ERR_UNSUP_REQ -rsc:share/errors/de/ERR_URN_RESOLVE -rsc:share/errors/de/ERR_WRITE_ERROR -rsc:share/errors/de/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/de-li -rsc:share/errors/de-lu -rsc:share/errors/en-au -rsc:share/errors/en-bz -rsc:share/errors/en-ca -rsc:share/errors/en/ERR_ACCESS_DENIED -rsc:share/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/en/ERR_AGENT_CONFIGURE -rsc:share/errors/en/ERR_AGENT_WPAD -rsc:share/errors/en/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/en/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/en/ERR_CANNOT_FORWARD -rsc:share/errors/en/ERR_CONNECT_FAIL -rsc:share/errors/en/ERR_DIR_LISTING -rsc:share/errors/en/ERR_DNS_FAIL -rsc:share/errors/en/ERR_ESI -rsc:share/errors/en/ERR_FORWARDING_DENIED -rsc:share/errors/en/ERR_FTP_DISABLED -rsc:share/errors/en/ERR_FTP_FAILURE -rsc:share/errors/en/ERR_FTP_FORBIDDEN -rsc:share/errors/en/ERR_FTP_NOT_FOUND -rsc:share/errors/en/ERR_FTP_PUT_CREATED -rsc:share/errors/en/ERR_FTP_PUT_ERROR -rsc:share/errors/en/ERR_FTP_PUT_MODIFIED -rsc:share/errors/en/ERR_FTP_UNAVAILABLE -rsc:share/errors/en/ERR_GATEWAY_FAILURE -rsc:share/errors/en/ERR_ICAP_FAILURE -rsc:share/errors/en/ERR_INVALID_REQ -rsc:share/errors/en/ERR_INVALID_RESP -rsc:share/errors/en/ERR_INVALID_URL -rsc:share/errors/en/ERR_LIFETIME_EXP -rsc:share/errors/en/ERR_NO_RELAY -rsc:share/errors/en/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/en/error-details.txt -rsc:share/errors/en/ERR_PRECONDITION_FAILED -rsc:share/errors/en/ERR_READ_ERROR -rsc:share/errors/en/ERR_READ_TIMEOUT -rsc:share/errors/en/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/en/ERR_SHUTTING_DOWN -rsc:share/errors/en/ERR_SOCKET_FAILURE -rsc:share/errors/en/ERR_TOO_BIG -rsc:share/errors/en/ERR_UNSUP_HTTPVERSION -rsc:share/errors/en/ERR_UNSUP_REQ -rsc:share/errors/en/ERR_URN_RESOLVE -rsc:share/errors/en/ERR_WRITE_ERROR -rsc:share/errors/en/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/en-gb -rsc:share/errors/en-ie -rsc:share/errors/en-in -rsc:share/errors/en-jm -rsc:share/errors/en-nz -rsc:share/errors/en-ph -rsc:share/errors/en-sg -rsc:share/errors/en-tt -rsc:share/errors/en-uk -rsc:share/errors/en-us -rsc:share/errors/en-za -rsc:share/errors/en-zw -rsc:share/errors/es-ar -rsc:share/errors/es-bo -rsc:share/errors/es-cl -rsc:share/errors/es-co -rsc:share/errors/es-cr -rsc:share/errors/es-do -rsc:share/errors/es-ec -rsc:share/errors/es/ERR_ACCESS_DENIED -rsc:share/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/es/ERR_AGENT_CONFIGURE -rsc:share/errors/es/ERR_AGENT_WPAD -rsc:share/errors/es/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/es/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/es/ERR_CANNOT_FORWARD -rsc:share/errors/es/ERR_CONNECT_FAIL -rsc:share/errors/es/ERR_DIR_LISTING -rsc:share/errors/es/ERR_DNS_FAIL -rsc:share/errors/es/ERR_ESI -rsc:share/errors/es/ERR_FORWARDING_DENIED -rsc:share/errors/es/ERR_FTP_DISABLED -rsc:share/errors/es/ERR_FTP_FAILURE -rsc:share/errors/es/ERR_FTP_FORBIDDEN -rsc:share/errors/es/ERR_FTP_NOT_FOUND -rsc:share/errors/es/ERR_FTP_PUT_CREATED -rsc:share/errors/es/ERR_FTP_PUT_ERROR -rsc:share/errors/es/ERR_FTP_PUT_MODIFIED -rsc:share/errors/es/ERR_FTP_UNAVAILABLE -rsc:share/errors/es/ERR_GATEWAY_FAILURE -rsc:share/errors/es/ERR_ICAP_FAILURE -rsc:share/errors/es/ERR_INVALID_REQ -rsc:share/errors/es/ERR_INVALID_RESP -rsc:share/errors/es/ERR_INVALID_URL -rsc:share/errors/es/ERR_LIFETIME_EXP -rsc:share/errors/es/ERR_NO_RELAY -rsc:share/errors/es/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/es/error-details.txt -rsc:share/errors/es/ERR_PRECONDITION_FAILED -rsc:share/errors/es/ERR_READ_ERROR -rsc:share/errors/es/ERR_READ_TIMEOUT -rsc:share/errors/es/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/es/ERR_SHUTTING_DOWN -rsc:share/errors/es/ERR_SOCKET_FAILURE -rsc:share/errors/es/ERR_TOO_BIG -rsc:share/errors/es/ERR_UNSUP_HTTPVERSION -rsc:share/errors/es/ERR_UNSUP_REQ -rsc:share/errors/es/ERR_URN_RESOLVE -rsc:share/errors/es/ERR_WRITE_ERROR -rsc:share/errors/es/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/es-es -rsc:share/errors/es-gt -rsc:share/errors/es-hn -rsc:share/errors/es-mx -rsc:share/errors/es-ni -rsc:share/errors/es-pa -rsc:share/errors/es-pe -rsc:share/errors/es-pr -rsc:share/errors/es-py -rsc:share/errors/es-sv -rsc:share/errors/es-uy -rsc:share/errors/es-ve -rsc:share/errors/fr-be -rsc:share/errors/fr-ca -rsc:share/errors/fr-ch -rsc:share/errors/fr/ERR_ACCESS_DENIED -rsc:share/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/fr/ERR_AGENT_CONFIGURE -rsc:share/errors/fr/ERR_AGENT_WPAD -rsc:share/errors/fr/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/fr/ERR_CANNOT_FORWARD -rsc:share/errors/fr/ERR_CONNECT_FAIL -rsc:share/errors/fr/ERR_DIR_LISTING -rsc:share/errors/fr/ERR_DNS_FAIL -rsc:share/errors/fr/ERR_ESI -rsc:share/errors/fr/ERR_FORWARDING_DENIED -rsc:share/errors/fr/ERR_FTP_DISABLED -rsc:share/errors/fr/ERR_FTP_FAILURE -rsc:share/errors/fr/ERR_FTP_FORBIDDEN -rsc:share/errors/fr/ERR_FTP_NOT_FOUND -rsc:share/errors/fr/ERR_FTP_PUT_CREATED -rsc:share/errors/fr/ERR_FTP_PUT_ERROR -rsc:share/errors/fr/ERR_FTP_PUT_MODIFIED -rsc:share/errors/fr/ERR_FTP_UNAVAILABLE -rsc:share/errors/fr/ERR_GATEWAY_FAILURE -rsc:share/errors/fr/ERR_ICAP_FAILURE -rsc:share/errors/fr/ERR_INVALID_REQ -rsc:share/errors/fr/ERR_INVALID_RESP -rsc:share/errors/fr/ERR_INVALID_URL -rsc:share/errors/fr/ERR_LIFETIME_EXP -rsc:share/errors/fr/ERR_NO_RELAY -rsc:share/errors/fr/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/fr/error-details.txt -rsc:share/errors/fr/ERR_PRECONDITION_FAILED -rsc:share/errors/fr/ERR_READ_ERROR -rsc:share/errors/fr/ERR_READ_TIMEOUT -rsc:share/errors/fr/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/fr/ERR_SHUTTING_DOWN -rsc:share/errors/fr/ERR_SOCKET_FAILURE -rsc:share/errors/fr/ERR_TOO_BIG -rsc:share/errors/fr/ERR_UNSUP_HTTPVERSION -rsc:share/errors/fr/ERR_UNSUP_REQ -rsc:share/errors/fr/ERR_URN_RESOLVE -rsc:share/errors/fr/ERR_WRITE_ERROR -rsc:share/errors/fr/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/fr-fr -rsc:share/errors/fr-lu -rsc:share/errors/fr-mc -rsc:share/errors/it-ch -rsc:share/errors/it/ERR_ACCESS_DENIED -rsc:share/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/it/ERR_AGENT_CONFIGURE -rsc:share/errors/it/ERR_AGENT_WPAD -rsc:share/errors/it/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/it/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/it/ERR_CANNOT_FORWARD -rsc:share/errors/it/ERR_CONNECT_FAIL -rsc:share/errors/it/ERR_DIR_LISTING -rsc:share/errors/it/ERR_DNS_FAIL -rsc:share/errors/it/ERR_ESI -rsc:share/errors/it/ERR_FORWARDING_DENIED -rsc:share/errors/it/ERR_FTP_DISABLED -rsc:share/errors/it/ERR_FTP_FAILURE -rsc:share/errors/it/ERR_FTP_FORBIDDEN -rsc:share/errors/it/ERR_FTP_NOT_FOUND -rsc:share/errors/it/ERR_FTP_PUT_CREATED -rsc:share/errors/it/ERR_FTP_PUT_ERROR -rsc:share/errors/it/ERR_FTP_PUT_MODIFIED -rsc:share/errors/it/ERR_FTP_UNAVAILABLE -rsc:share/errors/it/ERR_GATEWAY_FAILURE -rsc:share/errors/it/ERR_ICAP_FAILURE -rsc:share/errors/it/ERR_INVALID_REQ -rsc:share/errors/it/ERR_INVALID_RESP -rsc:share/errors/it/ERR_INVALID_URL -rsc:share/errors/it/ERR_LIFETIME_EXP -rsc:share/errors/it/ERR_NO_RELAY -rsc:share/errors/it/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/it/error-details.txt -rsc:share/errors/it/ERR_PRECONDITION_FAILED -rsc:share/errors/it/ERR_READ_ERROR -rsc:share/errors/it/ERR_READ_TIMEOUT -rsc:share/errors/it/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/it/ERR_SHUTTING_DOWN -rsc:share/errors/it/ERR_SOCKET_FAILURE -rsc:share/errors/it/ERR_TOO_BIG -rsc:share/errors/it/ERR_UNSUP_HTTPVERSION -rsc:share/errors/it/ERR_UNSUP_REQ -rsc:share/errors/it/ERR_URN_RESOLVE -rsc:share/errors/it/ERR_WRITE_ERROR -rsc:share/errors/it/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/it-it -rsc:share/errors/nl/ERR_ACCESS_DENIED -rsc:share/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/nl/ERR_AGENT_CONFIGURE -rsc:share/errors/nl/ERR_AGENT_WPAD -rsc:share/errors/nl/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/nl/ERR_CANNOT_FORWARD -rsc:share/errors/nl/ERR_CONNECT_FAIL -rsc:share/errors/nl/ERR_DIR_LISTING -rsc:share/errors/nl/ERR_DNS_FAIL -rsc:share/errors/nl/ERR_ESI -rsc:share/errors/nl/ERR_FORWARDING_DENIED -rsc:share/errors/nl/ERR_FTP_DISABLED -rsc:share/errors/nl/ERR_FTP_FAILURE -rsc:share/errors/nl/ERR_FTP_FORBIDDEN -rsc:share/errors/nl/ERR_FTP_NOT_FOUND -rsc:share/errors/nl/ERR_FTP_PUT_CREATED -rsc:share/errors/nl/ERR_FTP_PUT_ERROR -rsc:share/errors/nl/ERR_FTP_PUT_MODIFIED -rsc:share/errors/nl/ERR_FTP_UNAVAILABLE -rsc:share/errors/nl/ERR_GATEWAY_FAILURE -rsc:share/errors/nl/ERR_ICAP_FAILURE -rsc:share/errors/nl/ERR_INVALID_REQ -rsc:share/errors/nl/ERR_INVALID_RESP -rsc:share/errors/nl/ERR_INVALID_URL -rsc:share/errors/nl/ERR_LIFETIME_EXP -rsc:share/errors/nl/ERR_NO_RELAY -rsc:share/errors/nl/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/nl/error-details.txt -rsc:share/errors/nl/ERR_PRECONDITION_FAILED -rsc:share/errors/nl/ERR_READ_ERROR -rsc:share/errors/nl/ERR_READ_TIMEOUT -rsc:share/errors/nl/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/nl/ERR_SHUTTING_DOWN -rsc:share/errors/nl/ERR_SOCKET_FAILURE -rsc:share/errors/nl/ERR_TOO_BIG -rsc:share/errors/nl/ERR_UNSUP_HTTPVERSION -rsc:share/errors/nl/ERR_UNSUP_REQ -rsc:share/errors/nl/ERR_URN_RESOLVE -rsc:share/errors/nl/ERR_WRITE_ERROR -rsc:share/errors/nl/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/nl-nl -rsc:share/errors/pt-br/ERR_ACCESS_DENIED -rsc:share/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/pt-br/ERR_AGENT_CONFIGURE -rsc:share/errors/pt-br/ERR_AGENT_WPAD -rsc:share/errors/pt-br/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/pt-br/ERR_CANNOT_FORWARD -rsc:share/errors/pt-br/ERR_CONNECT_FAIL -rsc:share/errors/pt-br/ERR_DIR_LISTING -rsc:share/errors/pt-br/ERR_DNS_FAIL -rsc:share/errors/pt-br/ERR_ESI -rsc:share/errors/pt-br/ERR_FORWARDING_DENIED -rsc:share/errors/pt-br/ERR_FTP_DISABLED -rsc:share/errors/pt-br/ERR_FTP_FAILURE -rsc:share/errors/pt-br/ERR_FTP_FORBIDDEN -rsc:share/errors/pt-br/ERR_FTP_NOT_FOUND -rsc:share/errors/pt-br/ERR_FTP_PUT_CREATED -rsc:share/errors/pt-br/ERR_FTP_PUT_ERROR -rsc:share/errors/pt-br/ERR_FTP_PUT_MODIFIED -rsc:share/errors/pt-br/ERR_FTP_UNAVAILABLE -rsc:share/errors/pt-br/ERR_GATEWAY_FAILURE -rsc:share/errors/pt-br/ERR_ICAP_FAILURE -rsc:share/errors/pt-br/ERR_INVALID_REQ -rsc:share/errors/pt-br/ERR_INVALID_RESP -rsc:share/errors/pt-br/ERR_INVALID_URL -rsc:share/errors/pt-br/ERR_LIFETIME_EXP -rsc:share/errors/pt-br/ERR_NO_RELAY -rsc:share/errors/pt-br/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/pt-br/error-details.txt -rsc:share/errors/pt-br/ERR_PRECONDITION_FAILED -rsc:share/errors/pt-br/ERR_READ_ERROR -rsc:share/errors/pt-br/ERR_READ_TIMEOUT -rsc:share/errors/pt-br/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/pt-br/ERR_SHUTTING_DOWN -rsc:share/errors/pt-br/ERR_SOCKET_FAILURE -rsc:share/errors/pt-br/ERR_TOO_BIG -rsc:share/errors/pt-br/ERR_UNSUP_HTTPVERSION -rsc:share/errors/pt-br/ERR_UNSUP_REQ -rsc:share/errors/pt-br/ERR_URN_RESOLVE -rsc:share/errors/pt-br/ERR_WRITE_ERROR -rsc:share/errors/pt-br/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/pt/ERR_ACCESS_DENIED -rsc:share/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED -rsc:share/errors/pt/ERR_AGENT_CONFIGURE -rsc:share/errors/pt/ERR_AGENT_WPAD -rsc:share/errors/pt/ERR_CACHE_ACCESS_DENIED -rsc:share/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED -rsc:share/errors/pt/ERR_CANNOT_FORWARD -rsc:share/errors/pt/ERR_CONNECT_FAIL -rsc:share/errors/pt/ERR_DIR_LISTING -rsc:share/errors/pt/ERR_DNS_FAIL -rsc:share/errors/pt/ERR_ESI -rsc:share/errors/pt/ERR_FORWARDING_DENIED -rsc:share/errors/pt/ERR_FTP_DISABLED -rsc:share/errors/pt/ERR_FTP_FAILURE -rsc:share/errors/pt/ERR_FTP_FORBIDDEN -rsc:share/errors/pt/ERR_FTP_NOT_FOUND -rsc:share/errors/pt/ERR_FTP_PUT_CREATED -rsc:share/errors/pt/ERR_FTP_PUT_ERROR -rsc:share/errors/pt/ERR_FTP_PUT_MODIFIED -rsc:share/errors/pt/ERR_FTP_UNAVAILABLE -rsc:share/errors/pt/ERR_GATEWAY_FAILURE -rsc:share/errors/pt/ERR_ICAP_FAILURE -rsc:share/errors/pt/ERR_INVALID_REQ -rsc:share/errors/pt/ERR_INVALID_RESP -rsc:share/errors/pt/ERR_INVALID_URL -rsc:share/errors/pt/ERR_LIFETIME_EXP -rsc:share/errors/pt/ERR_NO_RELAY -rsc:share/errors/pt/ERR_ONLY_IF_CACHED_MISS -rsc:share/errors/pt/error-details.txt -rsc:share/errors/pt/ERR_PRECONDITION_FAILED -rsc:share/errors/pt/ERR_READ_ERROR -rsc:share/errors/pt/ERR_READ_TIMEOUT -rsc:share/errors/pt/ERR_SECURE_CONNECT_FAIL -rsc:share/errors/pt/ERR_SHUTTING_DOWN -rsc:share/errors/pt/ERR_SOCKET_FAILURE -rsc:share/errors/pt/ERR_TOO_BIG -rsc:share/errors/pt/ERR_UNSUP_HTTPVERSION -rsc:share/errors/pt/ERR_UNSUP_REQ -rsc:share/errors/pt/ERR_URN_RESOLVE -rsc:share/errors/pt/ERR_WRITE_ERROR -rsc:share/errors/pt/ERR_ZERO_SIZE_OBJECT -rsc:share/errors/pt-pt -rsc:share/icons/anthony-binhex.gif -rsc:share/icons/anthony-bomb.gif -rsc:share/icons/anthony-box2.gif -rsc:share/icons/anthony-box.gif -rsc:share/icons/anthony-c.gif -rsc:share/icons/anthony-compressed.gif -rsc:share/icons/anthony-dir.gif -rsc:share/icons/anthony-dirup.gif -rsc:share/icons/anthony-dvi.gif -rsc:share/icons/anthony-f.gif -rsc:share/icons/anthony-image2.gif -rsc:share/icons/anthony-image.gif -rsc:share/icons/anthony-layout.gif -rsc:share/icons/anthony-link.gif -rsc:share/icons/anthony-movie.gif -rsc:share/icons/anthony-pdf.gif -rsc:share/icons/anthony-portal.gif -rsc:share/icons/anthony-ps.gif -rsc:share/icons/anthony-quill.gif -rsc:share/icons/anthony-script.gif -rsc:share/icons/anthony-sound.gif -rsc:share/icons/anthony-tar.gif -rsc:share/icons/anthony-tex.gif -rsc:share/icons/anthony-text.gif -rsc:share/icons/anthony-unknown.gif -rsc:share/icons/anthony-xbm.gif -rsc:share/icons/anthony-xpm.gif diff --git a/cross/squid/PLIST.auto b/cross/squid/PLIST.auto new file mode 100644 index 00000000000..e69de29bb2d diff --git a/cross/squid/digests b/cross/squid/digests index 21706a2a8e9..8ad1b018dc3 100644 --- a/cross/squid/digests +++ b/cross/squid/digests @@ -1,3 +1,3 @@ -squid-3.1.22.tar.gz SHA1 3cd1c8079bee0da770cdd9a7edad4fc2592cf38e -squid-3.1.22.tar.gz SHA256 59764791cc030779f764fa077f2668bd0c8ebd25ce2f72c6526728de3c82369f -squid-3.1.22.tar.gz MD5 18ced59880b5ce8351a6b250f7e26ee8 +SQUID_5_0_4.tar.gz SHA1 b2421623928a07f8af51f3c2a8b1728cfca5431b +SQUID_5_0_4.tar.gz SHA256 55be1c98d9fe0fee3a6b629e8b7c1661f6f50a0975a0d9b25b3e2f6cc8bfdb7c +SQUID_5_0_4.tar.gz MD5 729f520093dd9f9060a5570cb26e24e7 diff --git a/native/squid/Makefile b/native/squid/Makefile deleted file mode 100644 index ca5efc7c8bf..00000000000 --- a/native/squid/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -PKG_NAME = squid -PKG_VERS = 5.0.4 -PKG_EXT = tar.gz -PKG_DIST_NAME = $(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/squid-cache/squid/archive -PKG_DIR = $(PKG_NAME)-$(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)) - -DEPENDS = - -HOMEPAGE = http://www.squid-cache.org -COMMENT = Squid is a fully-featured HTTP/1.0 proxy which is almost HTTP/1.1 compliant. -LICENSE = GPLv2 - -GNU_CONFIGURE = 1 -CONFIGURE_ARGS = $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_PREFIX) --enable-icap-client --disable-strict-error-checking - -PRE_CONFIGURE_TARGET = squid_native_pre_configure -COMPILE_TARGET = squid_native_compile -INSTALL_TARGET = nop - -include ../../mk/spksrc.native-cc.mk - -.PHONY: squid_native_pre_configure -squid_native_pre_configure: - $(RUN) ./bootstrap.sh - -.PHONY: squid_native_compile -squid_native_compile: - $(RUN) ;cd src;$(MAKE) cf_gen_defines.cci cf_gen diff --git a/native/squid/PLIST b/native/squid/PLIST deleted file mode 100644 index 8b137891791..00000000000 --- a/native/squid/PLIST +++ /dev/null @@ -1 +0,0 @@ - diff --git a/native/squid/digests b/native/squid/digests deleted file mode 100644 index 8ad1b018dc3..00000000000 --- a/native/squid/digests +++ /dev/null @@ -1,3 +0,0 @@ -SQUID_5_0_4.tar.gz SHA1 b2421623928a07f8af51f3c2a8b1728cfca5431b -SQUID_5_0_4.tar.gz SHA256 55be1c98d9fe0fee3a6b629e8b7c1661f6f50a0975a0d9b25b3e2f6cc8bfdb7c -SQUID_5_0_4.tar.gz MD5 729f520093dd9f9060a5570cb26e24e7 From 496ce0fec8e771bd59390c7a1017c231d535fec4 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 28 Jun 2021 11:18:24 +0000 Subject: [PATCH 08/47] squidguard: Use newer and supported URL for blacklists --- cross/squidguard/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cross/squidguard/Makefile b/cross/squidguard/Makefile index fb434546b61..0453f86e99c 100644 --- a/cross/squidguard/Makefile +++ b/cross/squidguard/Makefile @@ -4,13 +4,10 @@ PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).orig.$(PKG_EXT) PKG_DIST_SITE = http://deb.debian.org/debian/pool/main/s/squidguard PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DB_FILE= ftp://ftp.univ-tlse1.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz +# http://dsi.ut-capitole.fr/blacklists/index_en.php +DB_FILE= ftp://ftp.ut-capitole.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz DEPENDS = -# original url: http://www.squidguard.org/Downloads/Devel/squidGuard-1.5-beta.tar.gz -# squidguard.org is not reachable anymore! alternate mirrors (as of 2019.03.): -# https://fossies.org/linux/www/squidGuard-1.5-beta.tar.gz - HOMEPAGE = http://www.squidguard.org/ COMMENT = SquidGuard is a URL redirector used to use blacklists with the proxysoftware Squid. LICENSE = GPL From bb04274bba23c350237f6a3dd0861fc5a1bda025 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 28 Jun 2021 11:19:05 +0000 Subject: [PATCH 09/47] squidguard: Bump version and add unsupported archs --- spk/squidguard/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index 66ec8cbd0a8..095b5eeaa2f 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -1,6 +1,6 @@ SPK_NAME = squidguard -SPK_VERS = 1.5 -SPK_REV = 1 +SPK_VERS = 1.6 +SPK_REV = 2 SPK_ICON = src/squidguard.png BETA = 1 @@ -17,6 +17,14 @@ DISPLAY_NAME = SquidGuard HOMEPAGE = http://www.squidguard.org/ LICENSE = GPL - Copyright © 1990,2007 Oracle. All rights reserved for berkeley db library. See LICENSE file. +# Toolchains lacking c++11 in conjunction with +# march=native compiler are not supported +UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) +ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) +UNSUPPORTED_ARCHS += $(PPC_ARCHS) +UNSUPPORTED_ARCHS += $(ARM_ARCHS) +endif + INSTALLER_SCRIPT = src/installer.sh SSS_SCRIPT = src/dsm-control.sh FWPORTS = src/${SPK_NAME}.sc From d419678039b37188aa91f391d095bc7c33e62f61 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 28 Jun 2021 23:38:27 +0000 Subject: [PATCH 10/47] squid+squidguard: Fix incompatible arch mgmnt --- cross/squid/Makefile | 1 + spk/squidguard/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/cross/squid/Makefile b/cross/squid/Makefile index dad505bcb1f..4d33bf0e341 100644 --- a/cross/squid/Makefile +++ b/cross/squid/Makefile @@ -23,6 +23,7 @@ CONFIGURE_ARGS += squid_cv_check_marchnative=yes # Toolchains lacking c++11 in conjunction with # march=native compiler are not supported +include ../../mk/spksrc.common.mk UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) UNSUPPORTED_ARCHS += $(PPC_ARCHS) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index 095b5eeaa2f..961f2738be9 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -19,6 +19,7 @@ LICENSE = GPL - Copyright © 1990,2007 Oracle. All rights reserved for berkele # Toolchains lacking c++11 in conjunction with # march=native compiler are not supported +include ../../mk/spksrc.common.mk UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) UNSUPPORTED_ARCHS += $(PPC_ARCHS) From ff5a5ff44a00f430ff4f5b4c1b77d7085043e629 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 28 Jun 2021 23:39:34 +0000 Subject: [PATCH 11/47] squidguard: Fix blacklists.tar.gz source URL --- cross/squidguard/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cross/squidguard/Makefile b/cross/squidguard/Makefile index 0453f86e99c..e587066cc61 100644 --- a/cross/squidguard/Makefile +++ b/cross/squidguard/Makefile @@ -5,7 +5,8 @@ PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).orig.$(PKG_EXT) PKG_DIST_SITE = http://deb.debian.org/debian/pool/main/s/squidguard PKG_DIR = $(PKG_NAME)-$(PKG_VERS) # http://dsi.ut-capitole.fr/blacklists/index_en.php -DB_FILE= ftp://ftp.ut-capitole.fr/pub/reseau/cache/squidguard_contrib/blacklists.tar.gz +# repository: http://dsi.ut-capitole.fr/blacklists/download/ +DB_FILE= http://dsi.ut-capitole.fr/blacklists/download/blacklists.tar.gz DEPENDS = HOMEPAGE = http://www.squidguard.org/ From 696580c7c3965c8611078594820a331c1444c7c7 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 28 Jun 2021 23:52:58 +0000 Subject: [PATCH 12/47] squidguardmanager: Update from version 1.11 to 1.14 --- cross/squidguardmanager/Makefile | 2 +- cross/squidguardmanager/PLIST | 46 ------------------- cross/squidguardmanager/PLIST.auto | 0 cross/squidguardmanager/digests | 6 +-- ...ch => 001-squidguardmgr.cgi.patch-DISABLE} | 0 .../patches/002-fix-squid-path.patch | 4 +- 6 files changed, 6 insertions(+), 52 deletions(-) delete mode 100644 cross/squidguardmanager/PLIST create mode 100644 cross/squidguardmanager/PLIST.auto rename cross/squidguardmanager/patches/{001-squidguardmgr.cgi.patch => 001-squidguardmgr.cgi.patch-DISABLE} (100%) diff --git a/cross/squidguardmanager/Makefile b/cross/squidguardmanager/Makefile index fdf10191663..e765a70e62e 100644 --- a/cross/squidguardmanager/Makefile +++ b/cross/squidguardmanager/Makefile @@ -1,5 +1,5 @@ PKG_NAME = squidguardmgr -PKG_VERS = 1.11 +PKG_VERS = 1.14 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://downloads.sourceforge.net/project/$(PKG_NAME)/$(PKG_VERS) diff --git a/cross/squidguardmanager/PLIST b/cross/squidguardmanager/PLIST deleted file mode 100644 index 17e88e822b8..00000000000 --- a/cross/squidguardmanager/PLIST +++ /dev/null @@ -1,46 +0,0 @@ -rsc:share/www/squidguardmgr/images/checked.png -rsc:share/www/squidguardmgr/images/edit.png -rsc:share/www/squidguardmgr/images/log.png -rsc:share/www/squidguardmgr/images/new.png -rsc:share/www/squidguardmgr/images/noremove.png -rsc:share/www/squidguardmgr/images/notrash.png -rsc:share/www/squidguardmgr/images/rebuild.png -rsc:share/www/squidguardmgr/images/redirect.png -rsc:share/www/squidguardmgr/images/remove.png -rsc:share/www/squidguardmgr/images/squidguardmgr-logo.png -rsc:share/www/squidguardmgr/images/trash.png -rsc:share/www/squidguardmgr/lang/en_US/acl.html -rsc:share/www/squidguardmgr/lang/en_US/blacklists.html -rsc:share/www/squidguardmgr/lang/en_US/bledit.html -rsc:share/www/squidguardmgr/lang/en_US/categories.html -rsc:share/www/squidguardmgr/lang/en_US/globals.html -rsc:share/www/squidguardmgr/lang/en_US/index.html -rsc:share/www/squidguardmgr/lang/en_US/logs.html -rsc:share/www/squidguardmgr/lang/en_US/rewrites.html -rsc:share/www/squidguardmgr/lang/en_US/sc_aborts.html -rsc:share/www/squidguardmgr/lang/en_US/schedules.html -rsc:share/www/squidguardmgr/lang/en_US/sc_index.html -rsc:share/www/squidguardmgr/lang/en_US/sc_trustclients.html -rsc:share/www/squidguardmgr/lang/en_US/sc_trustusers.html -rsc:share/www/squidguardmgr/lang/en_US/sc_whitelists.html -rsc:share/www/squidguardmgr/lang/en_US/sources.html -rsc:share/www/squidguardmgr/lang/fr_FR/acl.html -rsc:share/www/squidguardmgr/lang/fr_FR/blacklists.html -rsc:share/www/squidguardmgr/lang/fr_FR/bledit.html -rsc:share/www/squidguardmgr/lang/fr_FR/categories.html -rsc:share/www/squidguardmgr/lang/fr_FR/globals.html -rsc:share/www/squidguardmgr/lang/fr_FR/index.html -rsc:share/www/squidguardmgr/lang/fr_FR/logs.html -rsc:share/www/squidguardmgr/lang/fr_FR/menu.dat -rsc:share/www/squidguardmgr/lang/fr_FR/rewrites.html -rsc:share/www/squidguardmgr/lang/fr_FR/sc_aborts.html -rsc:share/www/squidguardmgr/lang/fr_FR/schedules.html -rsc:share/www/squidguardmgr/lang/fr_FR/sc_index.html -rsc:share/www/squidguardmgr/lang/fr_FR/sc_trustclients.html -rsc:share/www/squidguardmgr/lang/fr_FR/sc_trustusers.html -rsc:share/www/squidguardmgr/lang/fr_FR/sc_whitelists.html -rsc:share/www/squidguardmgr/lang/fr_FR/sources.html -rsc:share/www/squidguardmgr/squidguardmgr.cgi -rsc:share/www/squidguardmgr/squidguardmgr.css -rsc:share/www/squidguardmgr/squidguardmgr.js -bin:share/www/squidguardmgr/squid_wrapper diff --git a/cross/squidguardmanager/PLIST.auto b/cross/squidguardmanager/PLIST.auto new file mode 100644 index 00000000000..e69de29bb2d diff --git a/cross/squidguardmanager/digests b/cross/squidguardmanager/digests index 7548832c846..47291a5dc55 100644 --- a/cross/squidguardmanager/digests +++ b/cross/squidguardmanager/digests @@ -1,3 +1,3 @@ -squidguardmgr-1.11.tar.gz SHA1 2c6f59b576608c64350f81b575de92d5e9fbdbc2 -squidguardmgr-1.11.tar.gz SHA256 377382e59b4232c77e9680dba782bbc2e8678027e55f877ebd6c5205cbf8cd2c -squidguardmgr-1.11.tar.gz MD5 b663c699dc26dec14000d9def4c49280 +squidguardmgr-1.14.tar.gz SHA1 0e942315eccb7ad442be3a64ebdec88a83ab9f87 +squidguardmgr-1.14.tar.gz SHA256 ed93b553ec7983ebeedb082edb0c517dc92adc386d999e3f608ca936fc211341 +squidguardmgr-1.14.tar.gz MD5 bdba482b3ed7f2106bb569a81707b272 diff --git a/cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch b/cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch-DISABLE similarity index 100% rename from cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch rename to cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch-DISABLE diff --git a/cross/squidguardmanager/patches/002-fix-squid-path.patch b/cross/squidguardmanager/patches/002-fix-squid-path.patch index 15f4e3c0a34..8f4846f99ee 100644 --- a/cross/squidguardmanager/patches/002-fix-squid-path.patch +++ b/cross/squidguardmanager/patches/002-fix-squid-path.patch @@ -4,8 +4,8 @@ #include #include --#define SQUID_BINARY "/usr/sbin/squid3" -+#define SQUID_BINARY "/usr/local/squid/sbin/squid" +-#define SQUID_BINARY "/usr/sbin/squid" ++#define SQUID_BINARY "/var/packages/squidguard/sbin/squid" int main(int argc, char **argv, char **envp) { char *squidprog[] = { SQUID_BINARY, "-k", "reconfigure", NULL }; From b49ca3045aaae9b97425cbe1d8cc5811958ff76a Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 29 Jun 2021 11:28:48 +0000 Subject: [PATCH 13/47] squid: Fix cross-compiling for some archs --- cross/squid/Makefile | 16 +++++++++++----- spk/squidguard/Makefile | 7 ++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cross/squid/Makefile b/cross/squid/Makefile index 4d33bf0e341..09f65487550 100644 --- a/cross/squid/Makefile +++ b/cross/squid/Makefile @@ -19,17 +19,23 @@ CONFIGURE_ARGS += --disable-strict-error-checking CONFIGURE_ARGS += --enable-ssl CONFIGURE_ARGS += --enable-arp-acl CONFIGURE_ARGS += --enable-delay-pools -CONFIGURE_ARGS += squid_cv_check_marchnative=yes + +include ../../mk/spksrc.common.mk # Toolchains lacking c++11 in conjunction with # march=native compiler are not supported -include ../../mk/spksrc.common.mk UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) -ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) -UNSUPPORTED_ARCHS += $(PPC_ARCHS) -UNSUPPORTED_ARCHS += $(ARM_ARCHS) + +ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS)),$(ARCH)) +ADDITIONAL_CXXFLAGS = -mfloat-abi=hard +ADDITIONAL_CXXFLAGS += -mfpu=neon endif +# Use native g++ compiler to build a +# host compatible working cf_gen binary +ENV += BUILDCXX=g++ +ENV += BUILDCXXFLAGS=-march=native + PRE_CONFIGURE_TARGET = squid_pre_configure include ../../mk/spksrc.cross-cc.mk diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index 961f2738be9..5f3232d11c5 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -17,14 +17,11 @@ DISPLAY_NAME = SquidGuard HOMEPAGE = http://www.squidguard.org/ LICENSE = GPL - Copyright © 1990,2007 Oracle. All rights reserved for berkeley db library. See LICENSE file. +include ../../mk/spksrc.common.mk + # Toolchains lacking c++11 in conjunction with # march=native compiler are not supported -include ../../mk/spksrc.common.mk UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) -ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) -UNSUPPORTED_ARCHS += $(PPC_ARCHS) -UNSUPPORTED_ARCHS += $(ARM_ARCHS) -endif INSTALLER_SCRIPT = src/installer.sh SSS_SCRIPT = src/dsm-control.sh From 1f4b1131dec4484aefd824d45fd16ee4057671ba Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 4 Jul 2021 07:53:41 -0400 Subject: [PATCH 14/47] Update spk/squidguard/Makefile Co-authored-by: hgy59 --- spk/squidguard/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index 5f3232d11c5..db18d80ca67 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -17,8 +17,6 @@ DISPLAY_NAME = SquidGuard HOMEPAGE = http://www.squidguard.org/ LICENSE = GPL - Copyright © 1990,2007 Oracle. All rights reserved for berkeley db library. See LICENSE file. -include ../../mk/spksrc.common.mk - # Toolchains lacking c++11 in conjunction with # march=native compiler are not supported UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) @@ -62,4 +60,3 @@ xz-compress: $(STAGING_DIR)/share/www/squidguardmgr/images/icon$${size}.png ; \ done chmod 644 $(STAGING_DIR)/share/www/squidguardmgr/images/i*.png - From e0ce52fb85085abe57a6f6f33921abbd850db783 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 4 Jul 2021 11:54:14 +0000 Subject: [PATCH 15/47] libev: Update from version 4.22 to 4.33 --- cross/libev/Makefile | 2 +- cross/libev/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross/libev/Makefile b/cross/libev/Makefile index 63a69c751a5..3f8b0860fe5 100644 --- a/cross/libev/Makefile +++ b/cross/libev/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libev -PKG_VERS = 4.22 +PKG_VERS = 4.33 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://dist.schmorp.de/$(PKG_NAME)/Attic diff --git a/cross/libev/digests b/cross/libev/digests index b71fc39ed0f..e417f8522bc 100644 --- a/cross/libev/digests +++ b/cross/libev/digests @@ -1,3 +1,3 @@ -libev-4.22.tar.gz SHA1 4affcba78dc17239f2ccd84d6e3e6dec2bd1f8ba -libev-4.22.tar.gz SHA256 736079e8ac543c74d59af73f9c52737b3bfec9601f020bf25a87a4f4d0f01bd6 -libev-4.22.tar.gz MD5 bf0007e37240103d3c2be80ca9bee3f9 +libev-4.33.tar.gz SHA1 133587b89c34dba0b3a2d2a90ba59f6748f6c368 +libev-4.33.tar.gz SHA256 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea +libev-4.33.tar.gz MD5 a3433f23583167081bf4acdd5b01b34f From d9da4aec3ebaa5950e19e0649fe38d40b4561025 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 4 Jul 2021 11:55:00 +0000 Subject: [PATCH 16/47] gevent: Update from version 1.2.2 to 21.1.2 --- cross/gevent/Makefile | 9 +-------- cross/gevent/digests | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/cross/gevent/Makefile b/cross/gevent/Makefile index f9a818787e3..94470c05658 100644 --- a/cross/gevent/Makefile +++ b/cross/gevent/Makefile @@ -1,5 +1,5 @@ PKG_NAME = gevent -PKG_VERS = 1.2.2 +PKG_VERS = 21.1.2 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/$(PKG_NAME)/$(PKG_NAME)/archive @@ -12,11 +12,4 @@ HOMEPAGE = https://www.gevent.org COMMENT = gevent is a coroutine-based Python networking library that uses greenlet to provide a high-level synchronous API on top of the libev event loop LICENSE = MIT -INSTALL_TARGET = gevent_install - include ../../mk/spksrc.python-wheel.mk - -.PHONY: gevent_install -gevent_install: - @$(RUN) LIBEV_EMBED=FALSE CARES_EMBED=FALSE PYTHONPATH=$(PYTHONPATH) $(HOSTPYTHON) -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" bdist_wheel -d $(WORK_DIR)/wheelhouse - @rename -f 's/linux_i686/any/g' $(WORK_DIR)/wheelhouse/*.whl diff --git a/cross/gevent/digests b/cross/gevent/digests index 22628d9abf2..5507f642290 100644 --- a/cross/gevent/digests +++ b/cross/gevent/digests @@ -1,3 +1,3 @@ -gevent-1.2.2.tar.gz SHA1 6494cbb2660538fef476b80a071ef680c6cb8455 -gevent-1.2.2.tar.gz SHA256 c59072a2bac1829c6e0f19814b4b9fe726f9162a1762831a0c316ae27fa69eb2 -gevent-1.2.2.tar.gz MD5 594c1d2cb679fafaa3e5f6116907bc20 +gevent-21.1.2.tar.gz SHA1 c3d16606d4c02f96b4f4412d470f5df36208b580 +gevent-21.1.2.tar.gz SHA256 1fc6579fee04c0bc348cb1dcbc10f822129e6af7dcf2c52c24f1497cea3bd45c +gevent-21.1.2.tar.gz MD5 71256d68b02106481c584e24628ac26a From e2074e95e35e23623fe9c06ce2dc8d099307217e Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 4 Jul 2021 12:01:25 +0000 Subject: [PATCH 17/47] gevent: Do not use embed c-ares and libev (like previously) --- cross/gevent/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cross/gevent/Makefile b/cross/gevent/Makefile index 94470c05658..3141f4b6a3e 100644 --- a/cross/gevent/Makefile +++ b/cross/gevent/Makefile @@ -12,4 +12,7 @@ HOMEPAGE = https://www.gevent.org COMMENT = gevent is a coroutine-based Python networking library that uses greenlet to provide a high-level synchronous API on top of the libev event loop LICENSE = MIT +ENV += GEVENTSETUP_EMBED_CARES=FALSE +ENV += GEVENTSETUP_EMBED_LIBEV=FALSE + include ../../mk/spksrc.python-wheel.mk From ef0ac09fff1c90c7eb379ce741a1ae669f67e0c4 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 19 Sep 2021 12:55:29 +0000 Subject: [PATCH 18/47] gevent: Update to version 21.8.0 --- cross/gevent/Makefile | 2 +- cross/gevent/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross/gevent/Makefile b/cross/gevent/Makefile index 3141f4b6a3e..7430f46c396 100644 --- a/cross/gevent/Makefile +++ b/cross/gevent/Makefile @@ -1,5 +1,5 @@ PKG_NAME = gevent -PKG_VERS = 21.1.2 +PKG_VERS = 21.8.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/$(PKG_NAME)/$(PKG_NAME)/archive diff --git a/cross/gevent/digests b/cross/gevent/digests index 5507f642290..d1285573546 100644 --- a/cross/gevent/digests +++ b/cross/gevent/digests @@ -1,3 +1,3 @@ -gevent-21.1.2.tar.gz SHA1 c3d16606d4c02f96b4f4412d470f5df36208b580 -gevent-21.1.2.tar.gz SHA256 1fc6579fee04c0bc348cb1dcbc10f822129e6af7dcf2c52c24f1497cea3bd45c -gevent-21.1.2.tar.gz MD5 71256d68b02106481c584e24628ac26a +gevent-21.8.0.tar.gz SHA1 f9f2ced913625d51b3cb929fb210cc749e3dcad8 +gevent-21.8.0.tar.gz SHA256 17c677d8aa89774ec17facef0f6b841bcf2df538234decbf9cb7cd135775f010 +gevent-21.8.0.tar.gz MD5 e9c591532b74d13afa3bdd036cc32706 From 32407595b53b8cddf2f0d8be190c5238e0610992 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 19 Sep 2021 12:55:55 +0000 Subject: [PATCH 19/47] squidguard: Add python38 to the build depends and depends --- spk/squidguard/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index db18d80ca67..ee999e6e8a6 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -4,9 +4,10 @@ SPK_REV = 2 SPK_ICON = src/squidguard.png BETA = 1 +BUILD_DEPENDS = cross/python38 DEPENDS = cross/busybox cross/unrar cross/squidclamav cross/squidguard cross/squid cross/squidguardmanager -SPK_DEPENDS = "AntiVirus>1.2" +SPK_DEPENDS = "AntiVirus>1.2:python38" MAINTAINER = SynoCommunity DESCRIPTION = SquidGuard is a URL redirector used to use blacklists with the proxysoftware Squid. This package also includes SquidClamav for viruses protection and SquidGuard Manager. From 2766b1e49f9a5fbfa35c6d7f67fd27ea3fbce5ce Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 19 Sep 2021 14:43:33 +0000 Subject: [PATCH 20/47] squidguard: Revert python38 --- spk/squidguard/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index ee999e6e8a6..db18d80ca67 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -4,10 +4,9 @@ SPK_REV = 2 SPK_ICON = src/squidguard.png BETA = 1 -BUILD_DEPENDS = cross/python38 DEPENDS = cross/busybox cross/unrar cross/squidclamav cross/squidguard cross/squid cross/squidguardmanager -SPK_DEPENDS = "AntiVirus>1.2:python38" +SPK_DEPENDS = "AntiVirus>1.2" MAINTAINER = SynoCommunity DESCRIPTION = SquidGuard is a URL redirector used to use blacklists with the proxysoftware Squid. This package also includes SquidClamav for viruses protection and SquidGuard Manager. From ad6d608a6b8a89b3419377e0ec69550def4060ec Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 20 Sep 2021 21:12:27 +0000 Subject: [PATCH 21/47] pip_py2: Update to latest python2 compatible version --- cross/pip_py2/Makefile | 2 +- cross/pip_py2/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross/pip_py2/Makefile b/cross/pip_py2/Makefile index e9ab80e3ea5..b893cdb83f6 100644 --- a/cross/pip_py2/Makefile +++ b/cross/pip_py2/Makefile @@ -1,6 +1,6 @@ PKG_NAME = pip # only pip<21.0 is compatible with python2 -PKG_VERS = 20.2.4 +PKG_VERS = 20.3.4 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/p/$(PKG_NAME) diff --git a/cross/pip_py2/digests b/cross/pip_py2/digests index 3846d99e3d8..e8227cca8d0 100644 --- a/cross/pip_py2/digests +++ b/cross/pip_py2/digests @@ -1,3 +1,3 @@ -pip-20.2.4.tar.gz SHA1 feff6f85f624602444600c4de8e55abea9d96bc9 -pip-20.2.4.tar.gz SHA256 85c99a857ea0fb0aedf23833d9be5c40cf253fe24443f0829c7b472e23c364a1 -pip-20.2.4.tar.gz MD5 ff2a91a3ad7206e5a65422c1c4b48655 +pip-20.3.4.tar.gz SHA1 6b9b6f5e507773c592606f304ff8727c86cc7290 +pip-20.3.4.tar.gz SHA256 6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc +pip-20.3.4.tar.gz MD5 577a375b66ec109e0ac6a4c4aa99bbd0 From 3485425410829af7699292d888b6c93a9330c925 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 21 Sep 2021 01:48:57 +0000 Subject: [PATCH 22/47] gevent: Change package download source (github not recommended) --- cross/gevent/Makefile | 5 ++--- cross/gevent/digests | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cross/gevent/Makefile b/cross/gevent/Makefile index 7430f46c396..eb8c510d3a4 100644 --- a/cross/gevent/Makefile +++ b/cross/gevent/Makefile @@ -1,9 +1,8 @@ PKG_NAME = gevent PKG_VERS = 21.8.0 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/$(PKG_NAME)/$(PKG_NAME)/archive -PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/g/$(PKG_NAME) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/libev cross/c-ares diff --git a/cross/gevent/digests b/cross/gevent/digests index d1285573546..cfea8e09a6e 100644 --- a/cross/gevent/digests +++ b/cross/gevent/digests @@ -1,3 +1,3 @@ -gevent-21.8.0.tar.gz SHA1 f9f2ced913625d51b3cb929fb210cc749e3dcad8 -gevent-21.8.0.tar.gz SHA256 17c677d8aa89774ec17facef0f6b841bcf2df538234decbf9cb7cd135775f010 -gevent-21.8.0.tar.gz MD5 e9c591532b74d13afa3bdd036cc32706 +gevent-21.8.0.tar.gz SHA1 0aad0632ab8a0b7fd9f9858b196f1d9663de5441 +gevent-21.8.0.tar.gz SHA256 43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575 +gevent-21.8.0.tar.gz MD5 cd15fb75e67892514fbba2111af5cd50 From cf01c132a27b230095eaa1c7170446503802f199 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 21 Sep 2021 01:49:37 +0000 Subject: [PATCH 23/47] greenlet: Update to version 1.1.1 and use .tar.gz extension --- cross/greenlet/Makefile | 4 ++-- cross/greenlet/digests | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cross/greenlet/Makefile b/cross/greenlet/Makefile index 0be9325bb79..5b913848cbd 100644 --- a/cross/greenlet/Makefile +++ b/cross/greenlet/Makefile @@ -1,6 +1,6 @@ PKG_NAME = greenlet -PKG_VERS = 0.4.5 -PKG_EXT = zip +PKG_VERS = 1.1.1 +PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/g/${PKG_NAME} PKG_DIR = $(PKG_NAME)-$(PKG_VERS) diff --git a/cross/greenlet/digests b/cross/greenlet/digests index 7e3ee9cea69..8501ba25741 100644 --- a/cross/greenlet/digests +++ b/cross/greenlet/digests @@ -1,3 +1,3 @@ -greenlet-0.4.5.zip SHA1 97f18d651595bd30243ad2f4702764791e57fa6e -greenlet-0.4.5.zip SHA256 b990f00f120c4cfb6672eec2acd32210990a2c7b70b815c034d1d8cbf08e2dbe -greenlet-0.4.5.zip MD5 ce383f6475e6311cf8932ea779938703 +greenlet-1.1.1.tar.gz SHA1 b4b03918da4bc5e50d3afc539151118e4a9e0550 +greenlet-1.1.1.tar.gz SHA256 c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481 +greenlet-1.1.1.tar.gz MD5 a3fbf41851a6b5e1e823e8c18905877c From 34d7f943c3b71e1462a40fb6dd20310727cd0c67 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 21 Sep 2021 01:50:35 +0000 Subject: [PATCH 24/47] ffsync: Add cffi dependency but must be after gevent --- spk/ffsync/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spk/ffsync/Makefile b/spk/ffsync/Makefile index cb832d52593..82b59c4f1ca 100644 --- a/spk/ffsync/Makefile +++ b/spk/ffsync/Makefile @@ -5,7 +5,7 @@ SPK_ICON = src/ffsync.png BETA = 1 BUILD_DEPENDS = cross/python2 cross/setuptools_py2 cross/pip_py2 cross/wheel -BUILD_DEPENDS += cross/gevent cross/greenlet +BUILD_DEPENDS += cross/gevent cross/greenlet cross/cffi DEPENDS = cross/busybox WHEELS = src/requirements.txt From 6e8dc0269f91521dc9e6a5925c375c5c23e827b7 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 21 Sep 2021 01:51:18 +0000 Subject: [PATCH 25/47] ffsync: Import requirements from PR #3849 (thnx @ymartin59) --- spk/ffsync/src/requirements.txt | 182 +++++++++++--------------------- 1 file changed, 64 insertions(+), 118 deletions(-) diff --git a/spk/ffsync/src/requirements.txt b/spk/ffsync/src/requirements.txt index f0c616e4cba..995df7d7573 100644 --- a/spk/ffsync/src/requirements.txt +++ b/spk/ffsync/src/requirements.txt @@ -1,121 +1,67 @@ -# Requirements for mozservices -#pyramid>=1.5 -#pyramid_debugtoolbar -#simplejson -cef -#unittest2 -#WebTest -#WSGIProxy -#pyramid_hawkauth -#tokenlib -#hawkauthlib -#umemcache -#gunicorn -#gevent -#konfig +# to enforce cross-compiled versions +setuptools==44.1.0 +wheel==0.33.6 -# Requirements for tokenserver - -alembic==0.6.7 -boto==2.34 -Chameleon==2.16 -chardet==2.3 -cornice==0.17 -#coverage==3.7.1 -docutils==0.12 -# gevent==1.0.1 Built via DEPENDS -# greenlet==0.4.5 Built via DEPENDS -#hawkauthlib==0.1.1 -Jinja2==2.7.3 -#konfig==0.9 -Mako==1.0 -#MarkupSafe==0.23 -#mozsvc==0.8 -ordereddict==1.1 -#Paste==1.7.5.1 -#PasteDeploy==1.5.2 -PasteScript==1.7.5 -#PyBrowserID==0.9.2 -Pygments==2.0rc1 -#PyMySQL==0.6.2 -#pymysql_sa==1.0 -#pyramid==1.5.1 -pyramid_debugtoolbar==2.2 -pyramid_jinja2==2.3.3 -#repoze.lru==0.6 -#requests==2.4.3 -#simplejson==3.6.5 -Sphinx==1.3b1 -#SQLAlchemy==0.9.8 -#testfixtures==4.1 -#tokenlib==0.3.1 -#translationstring==1.1 -#umemcache==1.6.3 -#unittest2==0.6 -#venusian==1.0 -#WebOb==1.4 -#WebTest==2.0.16 -wsgi_intercept==0.8.1 -zope.component==4.2.1 -#zope.deprecation==4.1.1 -zope.event==4.0.3 -#zope.interface==4.1.1 - -#Requirements for server-syncstorage -Paste==1.7.5.1 -PasteDeploy==1.5.2 -PyBrowserID==0.9.2 -PyMySQL==0.6.2 -#SQLAlchemy==0.9.8 -WSGIProxy==0.2.2 -WebOb==1.4 -WebTest==2.0.16 -argparse==1.2.1 -beautifulsoup4==4.3.2 -#configparser==3.3.0r2 -#cornice==0.17 -flake8==2.2.5 -#gevent==1.0.1 -#greenlet==0.4.5 -gunicorn==19.1.1 -hawkauthlib==0.1.1 -konfig==0.9 -mccabe==0.2.1 -#mozsvc==0.8 -nose==1.3.4 -pep8==1.5.7 -pyflakes==0.8.1 +alembic==1.4.2 +appdirs==1.4.3 +boto==2.49.0 +CacheControl==0.12.6 +certifi==2019.11.28 +cffi==1.14.1 +chardet==3.0.4 +colorama==0.4.3 +configparser==3.5.0 +contextlib2==0.6.0 +cornice==0.16.2 +#cryptography==2.9 +#distlib==0.3.0 +distro==1.4.0 +gunicorn==19.6.0 +hawkauthlib==2.0.0 +html5lib==1.0.1 +#idna==2.8 +konfig==1.1 +linecache2==1.0.0 +lockfile==0.12.2 +Mako==1.1.2 +MarkupSafe==1.1.1 +mozsvc==0.9 +msgpack==0.6.2 +packaging==20.3 +Paste==3.4.0 +PasteDeploy==2.1.0 +progress==1.5 +PyBrowserID==0.14.0 +pycparser==2.20 +PyFxA==0.7.3 +PyMySQL==0.9.3 pymysql-sa==1.0 -pyramid==1.5.1 -pyramid-hawkauth==0.1.0 -repoze.lru==0.6 -#requests==2.4.3 -simplejson==3.6.5 -six==1.8 -testfixtures==4.1.0 -tokenlib==0.3.1 -translationstring==1.1 -umemcache==1.6.3 -unittest2==0.6 -venusian==1.0 -waitress==0.8.9 -wsgiref==0.1.2 -zope.deprecation==4.1.1 -#zope.interface==4.1.1 - - -# Requirements for syncserver -#cornice==0.16.2 -#gunicorn==19.1.1 -#pyramid==1.5 -requests==2.7 -#simplejson==3.4 -#SQLAlchemy==0.9.4 -#unittest2==0.5.1 -#zope.component==4.2.1 -configparser==3.5.0b2 -https://github.com/mozilla-services/mozservices/archive/e00e1b68130423ad98d0f6185655bde650443da8.zip -https://github.com/mozilla-services/tokenserver/archive/d7e513e8a4f5c588b70d685a8df1d2e508c341c0.zip -https://github.com/mozilla-services/server-syncstorage/archive/1.5.5.zip -https://github.com/mozilla-services/syncserver/archive/1.5.2.tar.gz +pyparsing==2.4.6 +pyramid==1.5 +pyramid_hawkauth==0.1.0 +python-dateutil==2.8.1 +python-editor==1.0.4 +pytoml==0.1.21 +repoze.lru==0.7 +requests==2.13.0 +retrying==1.3.3 +simplejson==3.10.0 +#six==1.14.0 +#SQLAlchemy==1.1.5 +#testfixtures==6.14.0 +tokenlib==2.0.0 +traceback2==1.4.0 +translationstring==1.3 +#unittest2==1.1.0 +urllib3==1.25.8 +venusian==2.1.0 +webencodings==0.5.1 +WebOb==1.4.1 +zope.component==4.2.1 +zope.deprecation==4.4.0 +zope.event==4.4 +zope.interface==5.1.0 +https://github.com/mozilla-services/tokenserver/archive/1.5.11.tar.gz +https://github.com/mozilla-services/server-syncstorage/archive/1.8.0.tar.gz +https://github.com/mozilla-services/syncserver/archive/1.9.1.tar.gz From 225ebf4b13ef778a0588126e296e23836000bd63 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 21 Sep 2021 11:33:29 +0000 Subject: [PATCH 26/47] libtorrent: Fix DSM6 gcc49 build issue by adding -std=c++11 --- cross/libtorrent/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cross/libtorrent/Makefile b/cross/libtorrent/Makefile index 8196661515d..2a70cf5167f 100644 --- a/cross/libtorrent/Makefile +++ b/cross/libtorrent/Makefile @@ -23,6 +23,8 @@ CONFIGURE_TARGET = configure_target COMPILE_TARGET = compile_target build_python_wheel INSTALL_TARGET = install_destdir_target install_python_wheel +include ../../mk/spksrc.common.mk + GNU_CONFIGURE = 1 -include $(WORK_DIR)/python-cc.mk CONFIGURE_ARGS = --enable-python-binding --with-libiconv @@ -32,7 +34,11 @@ CONFIGURE_ARGS += PYTHON=$(WORK_DIR)/../../../native/python2/work-native/install CONFIGURE_ARGS += LIB=-L/$(STAGING_INSTALL_PREFIX)/$(PYTHON_LIB_DIR) CONFIGURE_ARGS += PYTHON_CPPFLAGS=-I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) ADDITIONAL_CFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) -ADDITIONAL_CXXFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) +ADDITIONAL_CXXFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) +# Required for DSM-6 using gcc-4.9 +ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) +ADDITIONAL_CXXFLAGS += -std=c++11 +endif ADDITIONAL_LDFLAGS = "-Wl,-Bsymbolic" BOOST_LIBRARIES += system python chrono random From 735be6f209703a373f75101847b811f9197e7bcf Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 22 Sep 2021 23:52:09 +0000 Subject: [PATCH 27/47] squid: Remove shell call for file & directory name --- cross/squid/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cross/squid/Makefile b/cross/squid/Makefile index 09f65487550..6e605fe23a0 100644 --- a/cross/squid/Makefile +++ b/cross/squid/Makefile @@ -1,9 +1,9 @@ PKG_NAME = squid PKG_VERS = 5.0.4 PKG_EXT = tar.gz -PKG_DIST_NAME = $(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)).$(PKG_EXT) +PKG_DIST_NAME = SQUID_$(subst .,_,$(PKG_VERS)).$(PKG_EXT) PKG_DIST_SITE = https://github.com/squid-cache/squid/archive -PKG_DIR = $(PKG_NAME)-$(shell echo '$(PKG_NAME)' | tr '[:lower:]' '[:upper:]')_$(subst .,_,$(PKG_VERS)) +PKG_DIR = $(PKG_NAME)-SQUID_$(subst .,_,$(PKG_VERS)) DEPENDS = cross/openssl From 359da0d7b01d4353e2a0c363b8a2767ddb18d7fd Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 22 Sep 2021 23:52:54 +0000 Subject: [PATCH 28/47] squidguard: Use default installation path (e.g. target) --- spk/squidguard/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index db18d80ca67..450a546229c 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -26,7 +26,6 @@ SSS_SCRIPT = src/dsm-control.sh FWPORTS = src/${SPK_NAME}.sc CONF_DIR = src/conf/ -INSTALL_PREFIX = /usr/local/$(SPK_NAME) POST_STRIP_TARGET = xz-compress BUSYBOX_CONFIG = usrmng From 9199bae0c7e87c563e4169fcb19a3efffb16952e Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 22 Sep 2021 23:53:32 +0000 Subject: [PATCH 29/47] squidguard: Fix installation path and remove redundant prefix --- cross/squidguard/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/cross/squidguard/Makefile b/cross/squidguard/Makefile index e587066cc61..9f8e992006b 100644 --- a/cross/squidguard/Makefile +++ b/cross/squidguard/Makefile @@ -13,20 +13,17 @@ HOMEPAGE = http://www.squidguard.org/ COMMENT = SquidGuard is a URL redirector used to use blacklists with the proxysoftware Squid. LICENSE = GPL -DESTDIR = $(INSTALL_DIR) GNU_CONFIGURE = 1 PRE_CONFIGURE_TARGET = squidguard_pre_configure -INSTALL_TARGET = squidguard_install POST_INSTALL_TARGET = squidguard_post_install include ../../mk/spksrc.cross-cc.mk -CONFIGURE_ARGS = --with-db=$(INSTALL_DIR)/$(INSTALL_PREFIX) -#CONFIGURE_ARGS += --exec-prefix=$(INSTALL_DIR)/$(INSTALL_PREFIX) +CONFIGURE_ARGS = --with-db=$(INSTALL_PREFIX) CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) -CONFIGURE_ARGS += -with-sg-dbhome=$(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db -CONFIGURE_ARGS += --with-sg-config=$(INSTALL_DIR)/$(INSTALL_PREFIX)/etc/squidguard.conf -CONFIGURE_ARGS += --with-sg-logdir=$(INSTALL_DIR)/$(INSTALL_PREFIX)/var/logs +CONFIGURE_ARGS += --with-sg-dbhome=$(INSTALL_PREFIX)/var/db +CONFIGURE_ARGS += --with-sg-config=$(INSTALL_PREFIX)/etc/squidguard.conf +CONFIGURE_ARGS += --with-sg-logdir=$(INSTALL_PREFIX)/var/logs CONFIGURE_ARGS += --with-squiduser=$(USER) CONFIGURE_ARGS += -with-mysql=no CONFIGURE_ARGS += --with-ldap-inc=no @@ -35,10 +32,6 @@ CONFIGURE_ARGS += --with-ldap-inc=no squidguard_pre_configure: $(RUN) NOCONFIGURE=1 ./autogen.sh -.PHONY: squidguard_install -squidguard_install: - $(RUN) DESTDIR=$(INSTALL_DIR) $(MAKE) install - .PHONY: squidguard_post_install squidguard_post_install: @$(RUN) install -m 755 -d $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db From b5eee82edcfc664c043cd02dddaa44e03ac409e4 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 22 Sep 2021 23:54:25 +0000 Subject: [PATCH 30/47] squidguard: Remove unecessary patch now that path issue is solved --- .../squidguard/patches/001-update-paths.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 cross/squidguard/patches/001-update-paths.patch diff --git a/cross/squidguard/patches/001-update-paths.patch b/cross/squidguard/patches/001-update-paths.patch deleted file mode 100644 index b13fbc9df2a..00000000000 --- a/cross/squidguard/patches/001-update-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ./src/sg.h.in.old 2012-07-19 14:16:05.899697937 +0200 -+++ ./src/sg.h.in 2012-07-19 14:17:19.935763168 +0200 -@@ -87,17 +87,17 @@ - - #ifdef ACCONFIG - #undef DEFAULT_CONFIGFILE --#define DEFAULT_CONFIGFILE "@sg_config@" -+#define DEFAULT_CONFIGFILE "@prefix@/etc/squidguard.conf" - #endif - - #ifdef ACLOGDIR - #undef DEFAULT_LOGDIR --#define DEFAULT_LOGDIR "@sg_logdir@" -+#define DEFAULT_LOGDIR "@prefix@/var/logs" - #endif - - #ifdef ACDBHOME - #undef DEFAULT_DBHOME --#define DEFAULT_DBHOME "@sg_dbhome@" -+#define DEFAULT_DBHOME "@prefix@/var/db" - #endif - - #define INVALID_IP_ADDR 1 From 2d29eba65a17fec13c47cea8340d29a1ce48b748 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 22 Sep 2021 23:55:39 +0000 Subject: [PATCH 31/47] squidguardmgr: Remove old patch no longer needed with newer version --- ...id-path.patch => 001-fix-squid-path.patch} | 0 .../001-squidguardmgr.cgi.patch-DISABLE | 69 ------------------- 2 files changed, 69 deletions(-) rename cross/squidguardmanager/patches/{002-fix-squid-path.patch => 001-fix-squid-path.patch} (100%) delete mode 100644 cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch-DISABLE diff --git a/cross/squidguardmanager/patches/002-fix-squid-path.patch b/cross/squidguardmanager/patches/001-fix-squid-path.patch similarity index 100% rename from cross/squidguardmanager/patches/002-fix-squid-path.patch rename to cross/squidguardmanager/patches/001-fix-squid-path.patch diff --git a/cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch-DISABLE b/cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch-DISABLE deleted file mode 100644 index b9196c7c319..00000000000 --- a/cross/squidguardmanager/patches/001-squidguardmgr.cgi.patch-DISABLE +++ /dev/null @@ -1,69 +0,0 @@ ---- cgi-bin/squidguardmgr.cgi.old 2013-01-16 14:52:34.878040714 +0100 -+++ cgi-bin/squidguardmgr.cgi 2013-01-16 16:18:42.973068959 +0100 -@@ -14,6 +14,57 @@ - - use strict qw{vars subs}; - -+my $user; -+my $admin=0; -+if (open (IN,"/usr/syno/synoman/webman/modules/authenticate.cgi|")) { -+ $user=; -+ chop($user); -+ close(IN); -+} -+open GROUP, ") { -+ my ($group,$x,$gid,$list)=split(':',$_); -+ chop($list); -+ if ($group eq "administrators") { -+ my (@users)=split(',',$list); -+ $admin = 1 if (grep {$_ eq $user} @users); -+ } -+} -+# if not admin or no user at all...no authentication...so, bye-bye -+if ($admin == 0) { -+ print "Content-type: text/html\n\n"; -+ print "Login RequiredPlease login as admin first, before using this webpage\n"; -+ die; -+} -+ -+our $LANG = 'en_US'; -+# -+# RETURN THE FIRST SUPPORTED LANGUAGE OF THE BROWSERS PREFERRED OR THE -+# DEFAULT: -+# -+sub getpreferedlang(@) { -+ my @supported = @_; -+ my @languages = split(/\s*,\s*/,$ENV{"HTTP_ACCEPT_LANGUAGE"}) if(defined($ENV{"HTTP_ACCEPT_LANGUAGE"})); -+ my $lang; -+ my $supp; -+ push(@languages,$supported[0]); -+ for $lang (@languages) { -+ $lang =~ s/-/_/; -+ if ($lang =~ /[a-z]{2}_[A-Z]{2}/ ) { -+ for $supp (@supported) { -+ $supp =~ s/\s.*//; -+ return($lang) if ($lang eq $supp); -+ } -+ } -+ } -+} -+our @supported = ( -+ "en_US", -+ "fr_FR" -+ ); -+$LANG = getpreferedlang(@supported); -+ - $VERSION = '1.11', - $AUTHOR = 'Gilles DAROLD '; - $COPYRIGHT = 'Copyright © 2010-2012 Gilles DAROLD, all rights reserved'; -@@ -37,7 +88,6 @@ - our $BLDESC = 'description.dat'; - our $CONF_FILE = '/usr/local/squidGuard/squidguard.conf'; - our $LANGDIR = 'lang'; --our $LANG = 'en_US'; - our $IMG_DIR = 'images'; - our $CSS_FILE = 'squidguardmgr.css'; - our $JS_FILE = 'squidguardmgr.js'; - From 8cc6407cb2d4ce1b1ff84910b9f07ffd39452900 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 22 Sep 2021 23:59:29 +0000 Subject: [PATCH 32/47] squidguardmgr: Fix path to squid sbin --- cross/squidguardmanager/patches/001-fix-squid-path.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/squidguardmanager/patches/001-fix-squid-path.patch b/cross/squidguardmanager/patches/001-fix-squid-path.patch index 8f4846f99ee..a275a9ffee2 100644 --- a/cross/squidguardmanager/patches/001-fix-squid-path.patch +++ b/cross/squidguardmanager/patches/001-fix-squid-path.patch @@ -5,7 +5,7 @@ #include -#define SQUID_BINARY "/usr/sbin/squid" -+#define SQUID_BINARY "/var/packages/squidguard/sbin/squid" ++#define SQUID_BINARY "/var/packages/squidguard/target/sbin/squid" int main(int argc, char **argv, char **envp) { char *squidprog[] = { SQUID_BINARY, "-k", "reconfigure", NULL }; From b962820cda47c751f9604598a1b577d80309f2db Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Thu, 23 Sep 2021 01:14:32 +0000 Subject: [PATCH 33/47] squidguard: Require squidclamav to test-build through cross --- cross/squidguard/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cross/squidguard/Makefile b/cross/squidguard/Makefile index 9f8e992006b..d34b38fb012 100644 --- a/cross/squidguard/Makefile +++ b/cross/squidguard/Makefile @@ -4,10 +4,12 @@ PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).orig.$(PKG_EXT) PKG_DIST_SITE = http://deb.debian.org/debian/pool/main/s/squidguard PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + # http://dsi.ut-capitole.fr/blacklists/index_en.php # repository: http://dsi.ut-capitole.fr/blacklists/download/ DB_FILE= http://dsi.ut-capitole.fr/blacklists/download/blacklists.tar.gz -DEPENDS = + +DEPENDS = cross/squidclamav HOMEPAGE = http://www.squidguard.org/ COMMENT = SquidGuard is a URL redirector used to use blacklists with the proxysoftware Squid. From 611c79b09ffcc05046925ca5bc51fb068b6371d3 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sat, 25 Sep 2021 14:56:13 +0000 Subject: [PATCH 34/47] squidguard: Fix path in cgi and use STAGING_INSTALL_PREFIX --- cross/squidguard/Makefile | 12 ++++++------ cross/squidguardmanager/Makefile | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/cross/squidguard/Makefile b/cross/squidguard/Makefile index d34b38fb012..a81f5814d7f 100644 --- a/cross/squidguard/Makefile +++ b/cross/squidguard/Makefile @@ -36,9 +36,9 @@ squidguard_pre_configure: .PHONY: squidguard_post_install squidguard_post_install: - @$(RUN) install -m 755 -d $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db - @$(RUN) wget $(DB_FILE) -O $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db/blacklists.tar.gz - @$(RUN) tar xvzf $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db/blacklists.tar.gz -C $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db - @$(RUN) cp -R $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db/blacklists/* $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db/ - @$(RUN) rm -Rf $(INSTALL_DIR)/$(INSTALL_PREFIX)/var/db/blacklists* - @$(RUN) install -m 755 -d $(INSTALL_DIR)/$(INSTALL_PREFIX)/share/www/squidguardmgr/ + @$(RUN) install -m 755 -d $(STAGING_INSTALL_PREFIX)/var/db + @$(RUN) wget $(DB_FILE) -O $(STAGING_INSTALL_PREFIX)/var/db/blacklists.tar.gz + @$(RUN) tar xvzf $(STAGING_INSTALL_PREFIX)/var/db/blacklists.tar.gz -C $(STAGING_INSTALL_PREFIX)/var/db + @$(RUN) cp -R $(STAGING_INSTALL_PREFIX)/var/db/blacklists/* $(STAGING_INSTALL_PREFIX)/var/db/ + @$(RUN) rm -Rf $(STAGING_INSTALL_PREFIX)/var/db/blacklists* + @$(RUN) install -m 755 -d $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/ diff --git a/cross/squidguardmanager/Makefile b/cross/squidguardmanager/Makefile index e765a70e62e..f747f500650 100644 --- a/cross/squidguardmanager/Makefile +++ b/cross/squidguardmanager/Makefile @@ -25,9 +25,15 @@ $(SRC_DIR)squid_wrapper/squid_wrapper: .PHONY: squidguardmgr_install squidguardmgr_install: - @$(RUN) mkdir -p $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr - @$(RUN) cp $(SRC_DIR)squid_wrapper/squid_wrapper $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/ - @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/cgi-bin/* $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/ - @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/htdocs/* $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/ - @$(RUN) chmod 775 $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/*cgi - @$(RUN) chmod 755 $(WORK_DIR)/install/$(INSTALL_PREFIX)/share/www/squidguardmgr/squid_wrapper + @$(RUN) mkdir -p $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr + @$(RUN) cp $(SRC_DIR)squid_wrapper/squid_wrapper $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/ + @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/cgi-bin/* $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/ + @$(RUN) cp -R $(WORK_DIR)/$(PKG_DIR)/htdocs/* $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/ + @$(RUN) chmod 775 $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/*cgi + @$(RUN) chmod 755 $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/squid_wrapper + @$(RUN) sed -i 's?/usr/local/bin/squidGuard?$(INSTALL_PREFIX)/bin/squidGuard?' $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/squidguardmgr.cgi + @$(RUN) sed -i 's?/usr/local/squidGuard/squidguard.conf?$(INSTALL_PREFIX)/etc/squidguard.conf?' $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/squidguardmgr.cgi + @$(RUN) sed -i 's?/usr/bin/squidclamav?$(INSTALL_PREFIX)/libexec/squidclamav?' $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/squidguardmgr.cgi + @$(RUN) sed -i 's?/etc/squidclamav.conf?$(INSTALL_PREFIX)/etc/squidclamav.conf?' $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/squidguardmgr.cgi + @$(RUN) sed -i 's?/var/www/squidguardmgr/squid_wrapper?$(INSTALL_PREFIX)/var/www/squidguardmgr/squid_wrapper?' $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/squidguardmgr.cgi + @$(RUN) sed -i 's?/var/run/c-icap/c-icap.ctl?$(INSTALL_PREFIX)/var/run/c-icap/c-icap.ctl?' $(STAGING_INSTALL_PREFIX)/var/www/squidguardmgr/squidguardmgr.cgi From 910ab3ae154f8f09df423ead7efaa82326a9d245 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 12:13:38 +0000 Subject: [PATCH 35/47] squidguard: Image thumbnails now generated by the framework --- spk/squidguard/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index 450a546229c..1b85b14b66b 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -53,9 +53,3 @@ xz-compress: install -m 644 src/app/babel.* $(STAGING_DIR)/share/www/squidguardmgr/ install -m 644 src/app/synocommunity.png $(STAGING_DIR)/share/www/squidguardmgr/ install -m 644 src/app/blocked.gif $(STAGING_DIR)/share/www/squidguardmgr/ - for size in 16 24 32 48 72 ; \ - do \ - convert $(SPK_ICON) -thumbnail $${size}x$${size} -transparent white -strip \ - $(STAGING_DIR)/share/www/squidguardmgr/images/icon$${size}.png ; \ - done - chmod 644 $(STAGING_DIR)/share/www/squidguardmgr/images/i*.png From 8ecddd0cfe3535f8d1c9d39b645e0e2d4f54cb36 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 12:16:22 +0000 Subject: [PATCH 36/47] squidguard: www now located under var --- spk/squidguard/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index 1b85b14b66b..41e9e184f25 100644 --- a/spk/squidguard/Makefile +++ b/spk/squidguard/Makefile @@ -48,8 +48,8 @@ xz-compress: install -m 755 -d $(STAGING_DIR)/var/db install -m 755 src/update_db.sh $(STAGING_DIR)/bin/ install -m 755 src/etc/* $(STAGING_DIR)/etc/ - install -m 644 src/app/config $(STAGING_DIR)/share/www/squidguardmgr/ - install -m 755 src/app/squidGuard.cgi $(STAGING_DIR)/share/www/squidguardmgr/ - install -m 644 src/app/babel.* $(STAGING_DIR)/share/www/squidguardmgr/ - install -m 644 src/app/synocommunity.png $(STAGING_DIR)/share/www/squidguardmgr/ - install -m 644 src/app/blocked.gif $(STAGING_DIR)/share/www/squidguardmgr/ + install -m 644 src/app/config $(STAGING_DIR)/var/www/squidguardmgr/ + install -m 755 src/app/squidGuard.cgi $(STAGING_DIR)/var/www/squidguardmgr/ + install -m 644 src/app/babel.* $(STAGING_DIR)/var/www/squidguardmgr/ + install -m 644 src/app/synocommunity.png $(STAGING_DIR)/var/www/squidguardmgr/ + install -m 644 src/app/blocked.gif $(STAGING_DIR)/var/www/squidguardmgr/ From 673449957c20a891c54143a02218a567a5c9c306 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 12:26:50 +0000 Subject: [PATCH 37/47] c-icap: Dynamically update the default provided conf file --- cross/c_icap/Makefile | 8 + spk/squidguard/src/etc/c-icap.conf | 651 ----------------------------- 2 files changed, 8 insertions(+), 651 deletions(-) delete mode 100644 spk/squidguard/src/etc/c-icap.conf diff --git a/cross/c_icap/Makefile b/cross/c_icap/Makefile index 1fb3133bd47..e491166bfdd 100644 --- a/cross/c_icap/Makefile +++ b/cross/c_icap/Makefile @@ -12,6 +12,8 @@ COMMENT = c-icap is an implementation of an ICAP server. It can be used with HT LICENSE = LGPLv2.1 PRE_CONFIGURE_TARGET = c_icap_pre_configure +POST_INSTALL_TARGET = c_icap_post_install + GNU_CONFIGURE = 1 CONFIGURE_ARGS = --enable-large-files --disable-static --with-zlib=$(INSTALL_DIR)/$(INSTALL_PREFIX)/lib -C @@ -21,3 +23,9 @@ include ../../mk/spksrc.cross-cc.mk c_icap_pre_configure: cp src/config.cache $(WORK_DIR)/$(PKG_DIR) $(RUN) ; autoconf + +.PHONY: c_icap_post_install +c_icap_post_install: + @$(RUN) sed -i 's?^PidFile .*?PidFile $(INSTALL_PREFIX)/var/run/c-icap/c-icap.pid?' $(STAGING_INSTALL_PREFIX)/etc/c-icap.conf + @$(RUN) sed -i 's?^CommandsSocket .*?CommandsSocket $(INSTALL_PREFIX)/var/run/c-icap/c-icap.ctl?' $(STAGING_INSTALL_PREFIX)/etc/c-icap.conf + @$(RUN) sed -i 's?^Port .*?Port 10344?' $(STAGING_INSTALL_PREFIX)/etc/c-icap.conf diff --git a/spk/squidguard/src/etc/c-icap.conf b/spk/squidguard/src/etc/c-icap.conf deleted file mode 100644 index d8b49b660c6..00000000000 --- a/spk/squidguard/src/etc/c-icap.conf +++ /dev/null @@ -1,651 +0,0 @@ -# -# This file contains the default settings for c-icap -# -# - - -# TAG: PidFile -# Format: PidFile pid_file -# Description: -# The file to store the pid of the main process of the c-icap server. -# Default: -# PidFile /var/run/c-icap/c-icap.pid -PidFile /usr/local/squidguard/var/run/c-icap/c-icap.pid - -# TAG: CommandsSocket -# Format: CommandsSocket socket_file -# Description: -# The path of file to use as control socket for c-icap -# Default: -# CommandsSocket /var/run/c-icap/c-icap.ctl -CommandsSocket /usr/local/squidguard/var/run/c-icap/c-icap.ctl - -# TAG: Timeout -# Format: Timeout seconds -# Description: -# The time in seconds after which a connection without activity -# can be cancelled. -# Default: -# Timeout 300 -Timeout 300 - -# TAG: MaxKeepAliveRequests -# Format: MaxKeepAliveRequests number -# Description: -# The maximum number of requests can be served by one connection -# Set it to -1 for no limit -# Default: -# MaxKeepAliveRequests 100 -MaxKeepAliveRequests 100 - -# TAG: KeepAliveTimeout -# Format: KeepAliveTimeout seconds -# Description: -# The maximum time in seconds waiting for a new requests before a -# connection will be closed. -# If the value is set to -1, there is no timeout. -# Default: -# KeepAliveTimeout 600 -KeepAliveTimeout 600 - -# TAG: StartServers -# Format: StartServers number -# Description: -# The initial number of server processes. Each server process -# generates a number of threads, which serve the requests. -# Default: -# StartServers 3 -StartServers 3 - -# TAG: MaxServers -# Format: MaxServers number -# Description: -# The maximum allowed number of server processes. -# Default: -# MaxServers 10 -MaxServers 10 - -# TAG: MinSpareThreads -# Format: MinSpareThreads number -# Description: -# If the number of the available threads is less than number, -# the c-icap server starts a new child. -# Default: -# MinSpareThreads 10 -MinSpareThreads 10 - -# TAG: MaxSpareThreads -# Format: MaxSpareThreads number -# Description: -# If the number of the available threads is more than number then -# the c-icap server kills a child. -# Default: -# MaxSpareThreads 20 -MaxSpareThreads 20 - -# TAG: ThreadsPerChild -# Format: ThreadsPerChild number -# Description: -# The number of threads per child process. -# Default: -# ThreadsPerChild 10 -ThreadsPerChild 10 - -# TAG: MaxRequestsPerChild -# Format: MaxRequestsPerChild number -# Description: -# The maximum number of requests that a child process can serve. -# After this number has been reached, process dies. The goal of this -# parameter is to minimize the risk of memory leaks and increase the -# stability of c-icap. It can be disabled by setting its value to 0. -# Default: -# MaxRequestsPerChild 0 -MaxRequestsPerChild 0 - -# TAG: Port -# Format: Port port -# Description: -# The port number that the c-icap server uses to listen to requests. -# Default: -# Port 1344 -Port 10344 - -# TAG: User -# Format: User username -# Description: -# The user owning c-icap's processes. By default, the owner is the -# user who runs the program. -# Default: -# No value -# Example: -# User wwwrun -User squid - -# TAG: Group -# Format: Group groupname -# Description: -# The group of users owning c-icap's processes, which, by default -# is the group of the current user. -# Default: -# No value -# Example: -# Group nogroup - -# TAG: ServerAdmin -# Format: ServerAdmin admin_mail -# Description: -# The Administrator of this server. Used when displaying information -# about this server (logs, info service, etc) -# Default: -# No value -ServerAdmin you@your.address - -# TAG: ServerName -# Format: ServerName aServerName -# Description: -# A name for this server. Used when displaying information about this -# server (logs, info service, etc) -# Default: -# No value -ServerName YourServerName - -# TAG: TmpDir -# Format: TmpDir dir -# Description: -# dir is the location of temporary files. -# Default: -# TmpDir /var/tmp -TmpDir /var/tmp - -# TAG: MaxMemObject -# Format: MaxMemObject bytes -# Description: -# The maximum memory size in bytes taken by an object which -# is processed by c-icap . If the size of an object's body is -# larger than the maximum size a temporary file is used. -# Default: -# MaxMemObject 131072 -MaxMemObject 131072 - -# TAG: DebugLevel -# Format: DebugLevel level -# Description: -# The level of debugging information to be logged. -# The acceptable range of levels is between 0 and 10. -# Default: -# DebugLevel 1 -DebugLevel 1 - -# TAG: ModulesDir -# Format: ModulesDir dir -# Description: -# The location of modules -# Default: -# ModulesDir /usr/local/squidguard/lib/c_icap -ModulesDir /usr/local/squidguard/lib/c_icap - -# TAG: ServicesDir -# Format: ServicesDir dir -# Description: -# The location of services -# Default: -# ServicesDir /usr/local/squidguard/lib/c_icap -ServicesDir /usr/local/squidguard/lib/c_icap - -# TAG: TemplateDir -# Format: TemplateDir dir -# Description: -# The location of the text templates used by c-icap and its services, -# categorized by language and services/modules -# Default: -# No value -# Example: -TemplateDir /usr/local/squidguard/share/c_icap/templates/ - -# TAG: TemplateDefaultLanguage -# Format: TemplateDefaultLanguage lang -# Description: -# Sets the default language to use for text templates -# Default: -# TemplateDefaultLanguage en -TemplateDefaultLanguage en - -#TemplateReloadTime 360 -#TemplateCacheSize 20 -#TemplateMemBufSize 8192 - -# TAG: LoadMagicFile -# Format: LoadMagicFile path -# Description: -# Load a c-icap magic file. A magic file contains various -# data type definitions. Look inside default c-icap.magic file -# for more informations. -# It can be used more than once to use multiple magic files. -# Default: -# LoadMagicFile /usr/local/squidguard/etc/c-icap.magic -LoadMagicFile /usr/local/squidguard/etc/c-icap.magic - -# TAG: RemoteProxyUsers -# Format: RemoteProxyUsers onoff -# Description: -# Set it to on if you want to use username provided by the proxy server. -# This is the recomended way to use users in c-icap. -# If the RemoteProxyUsers is off and c-icap configured to use users or -# groups the internal authentication mechanism will be used. -# Default: -# RemoteProxyUsers off -RemoteProxyUsers off - -# TAG: RemoteProxyUserHeader -# Format: RemoteProxyUserHeader Header -# Description: -# Used to specify the icap header used by the proxy server to send -# the authenticated client username to c-icap server -# Default: -# RemoteProxyUserHeader X-Authenticated-User -RemoteProxyUserHeader X-Authenticated-User - -# TAG: RemoteProxyUserHeaderEncoded -# Format: RemoteProxyUserHeaderEncoded onoff -# Description: -# Set it to off if the RemoteProxyUserHeader is not base64 encoded -# Default: -# RemoteProxyUserHeaderEncoded on -RemoteProxyUserHeaderEncoded on - -# TAG: AuthMethod -# Format: AuthMethod Method Authenticator -# Description: -# Used to define the internal authentication mechanism to use. This -# feature is not well tested and may cause problems. It is better to use -# RemoteProxyUser configuration. -# Method is the authentication method to use (basic, digest, etc). -# Currently only basic authentication method is implemented as build in -# module -# Authenticator currently can only be "basic_simple_db" -# It can be considered as a user/password store and can be -# implemented as external module. The basic_simple_db is implemented as -# build it module -# Default: -# No set -# Example: -# AuthMethod basic basic_simple_db - -# TAG: basic.Realm -# Format: basic.Realm ARealm -# Description: -# Specify the basic method realm -# Default: -# basic.Realm "Basic authentication" -# Example: -# basic.Realm "c-icap server authentication" - -# TAG: basic_simple_db.UsersDB -# Format: basic_simple_db.UsersDB LookupTable -# Description: -# Specify the lookup table where the usernames/passwords pairs -# are stored. The paswords must be unencrypted -# For more information about c-icap lookup tables read c-icap server -# manual page -# Default: -# No value -# Example: -# basic_simple_db.UsersDB hash:/usr/local/c-icap/etc/c-icap-users.txt - -# TAG: GroupSourceByGroup -# Format: GroupSourceByGroup LookupTable -# Description: -# Defines a lookup table where the groups of users are stored indexed -# by group. It can be used more than once. -# For more information about c-icap lookup tables read c-icap server -# manual page -# Default: -# No set -# Example: -# GroupSourceByGroup hash:/usr/local/c-icap/etc/c-icap-groups.txt - -# TAG: GroupSourceByUser -# Format: GroupSourceByUser LookupTable -# Description: -# Defines a lookup table where the groups of users are stored indexed -# by user. It can be used more than once. -# For more information about c-icap lookup tables read c-icap server -# manual page -# Default: -# No set -# Example: -# GroupSourceByUser hash:/usr/local/c-icap/etc/c-icap-user-groups.txt - -# TAG: acl -# Format: acl name type[{param}] value1 [value2] [...] -# Description: -# Supported acl types are: -# acl aclname service service1 ... -# The servicename -# acl aclname type OPTIONS|RESPMOD|REQMOD ... -# The icap method -# acl aclname port port1 ... -# The icap server port -# acl aclname src ip1/netmask1 ... -# The client ip address -# acl aclname srvip ip1/netmask1 ... -# The c-icap server ip address -# acl aclname icap_header{HeaderName} value1 ... -# Matches the icap header HeaderName with value1 ... -# The values are in regex form: /avalue/ -# acl aclname icap_resp_header{HeaderName} value1 ... -# acl aclname icap_resp_header{HeaderName} value1 ... -# The icap response header -# The values are in regex form: /avalue/ -# acl aclname http_req_header{HeaderName} value1 ... -# The http request header -# The values are in regex form: /avalue/ -# acl aclname http_resp_header{HeaderName} value1 ... -# The http response header -# The values are in regex form: /avalue/ -# acl aclname data_type type1 ... -# The data type as recognized by the internal data type -# recognizer. The types are defined in c-icap.magic file -# acl aclname auth username|* ... -# The authenticated users. Using * instead of username means -# all users. -# acl aclname group group1 ... -# if the user of request belongs to given groups -# Default: -# None set -# Examples: -# acl OPTIONS type OPTIONS -# acl RESPMOD type RESPMOD -# acl REQMOD type REQMOD -# acl ALLREQUESTS type OPTIONS RESPMOD REQMOD -# acl XHEAD icap_header{X-Test} /value/ -# acl ECHO service echo -# acl localnet src 192.168.1.0/255.255.255.0 -# acl localhost src 127.0.0.1/255.255.255.255 -# acl all src 0.0.0.0/0.0.0.0 - -# TAG: icap_access -# Format: icap_access allow|deny [!]acl1 ... -# Description: -# Allowing or denying ICAP access based on defined access lists -# Default: -# None set -# Example: -# icap_access deny XHEAD -# #Allow OPTIONS method for all: -# icap_access allow localnet OPTIONS -# #Require authentication for all users from local network: -# icap_access allow AUTH localnet -# icap_access deny all - -# TAG: client_access -# Format: client_access allow|deny acl1 [acl2] [...] -# Description: -# Allowing or denying connections on c-icap based on -# defined access lists. Only the acl types src, srvip and port -# can be used. -# Default: -# None set -# Example: -# client_access allow all - -# TAG: LogFormat -# Format: LogFormat Name Format -# Description: -# Name is a name for this log format. -# Format is a string with embedded % format codes. % format codes -# has the following form: -# % [-] [width] [{argument}] formatcode -# if - is specified then the output is left aligned -# if width specified then the field is exactly width size -# some formatcodes support arguments given as {argument} -# -# Format codes: -# %a: Remote IP-Address -# %la: Local IP Address -# %lp: Local port -# %>a: Http Client IP Address. Only supported if the proxy -# client supports the "X-Client-IP" header -# %ho: Modified Http request header. Supports header name -# as argument. If no argument given the first line returned -# %huo: Modified Http request url -# %ih: Icap request header. Supports header name -# as argument. If no argument given the first line returned -# % Date: Sun, 26 Sep 2021 12:48:26 +0000 Subject: [PATCH 38/47] squidguard: Fix clamd configuration paths --- spk/squidguard/src/etc/clamd.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spk/squidguard/src/etc/clamd.conf b/spk/squidguard/src/etc/clamd.conf index 84cfbcaa9bc..8dc835134c4 100644 --- a/spk/squidguard/src/etc/clamd.conf +++ b/spk/squidguard/src/etc/clamd.conf @@ -1,7 +1,7 @@ #Automatically Generated by clamav-base postinst #To reconfigure clamd run #dpkg-reconfigure clamav-base #Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /usr/local/squidguard/var/run/clamd/clamd.ctl +LocalSocket /var/packages/squidguard/var/run/clamd/clamd.ctl # TemporaryDirectory is not set to its default /tmp here to make overriding # the default with environment variables TMPDIR/TMP/TEMP possible User squid @@ -19,7 +19,7 @@ LogSyslog true LogFacility LOG_LOCAL6 LogClean false LogVerbose false -PidFile /usr/local/squidguard/var/run/clamd/clamd.pid +PidFile /var/packages/squidguard/var/run/clamd/clamd.pid DatabaseDirectory /var/packages/AntiVirus/target/engine/clamav/var/lib/ SelfCheck 3600 Foreground false @@ -47,7 +47,7 @@ MaxQueue 100 ExtendedDetectionInfo true OLE2BlockMacros false StreamMaxLength 25M -LogFile /usr/local/squidguard/var/logs/clamd.log +LogFile /var/packages/squidguard/var/logs/clamd.log LogTime true LogFileUnlock false LogFileMaxSize 0 @@ -55,4 +55,4 @@ Bytecode true BytecodeSecurity TrustSigned BytecodeTimeout 60000 OfficialDatabaseOnly false -CrossFilesystems true \ No newline at end of file +CrossFilesystems true From dc96492ec1a0271022ac0f22b2c38c838dddb1ca Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 12:50:56 +0000 Subject: [PATCH 39/47] squidguard: Use the now default provided errorpage.css mime.conf --- spk/squidguard/src/etc/errorpage.css | 97 -------------- spk/squidguard/src/etc/mime.conf | 194 --------------------------- 2 files changed, 291 deletions(-) delete mode 100644 spk/squidguard/src/etc/errorpage.css delete mode 100644 spk/squidguard/src/etc/mime.conf diff --git a/spk/squidguard/src/etc/errorpage.css b/spk/squidguard/src/etc/errorpage.css deleted file mode 100644 index 8ecc4c8279b..00000000000 --- a/spk/squidguard/src/etc/errorpage.css +++ /dev/null @@ -1,97 +0,0 @@ -/* - Stylesheet for Squid Error pages - Adapted from design by Free CSS Templates - http://www.freecsstemplates.org - Released for free under a Creative Commons Attribution 2.5 License -*/ - -/* Page basics */ -* { - font-family: verdana, sans-serif; -} - -html body { - margin: 0; - padding: 0; - background: #efefef; - font-size: 12px; - color: #1e1e1e; -} - -/* Page displayed title area */ -#titles { - margin-left: 15px; - padding: 10px; - padding-left: 100px; - background: url('http://www.squid-cache.org/Artwork/SN.png') no-repeat left; -} - -/* initial title */ -#titles h1 { - color: #000000; -} -#titles h2 { - color: #000000; -} - -/* special event: FTP success page titles */ -#titles ftpsuccess { - background-color:#00ff00; - width:100%; -} - -/* Page displayed body content area */ -#content { - padding: 10px; - background: #ffffff; -} - -/* General text */ -p { -} - -/* error brief description */ -#error p { -} - -/* some data which may have caused the problem */ -#data { -} - -/* the error message received from the system or other software */ -#sysmsg { -} - -pre { - font-family:sans-serif; -} - -/* special event: FTP / Gopher directory listing */ -#dirmsg { - font-family: courier; - color: black; - font-size: 10pt; -} -#dirlisting { - margin-left: 2%; - margin-right: 2%; -} -#dirlisting tr.entry td.icon,td.filename,td.size,td.date { - border-bottom: groove; -} -#dirlisting td.size { - width: 50px; - text-align: right; - padding-right: 5px; -} - -/* horizontal lines */ -hr { - margin: 0; -} - -/* page displayed footer area */ -#footer { - font-size: 9px; - padding-left: 10px; -} diff --git a/spk/squidguard/src/etc/mime.conf b/spk/squidguard/src/etc/mime.conf deleted file mode 100644 index 6880c86d33d..00000000000 --- a/spk/squidguard/src/etc/mime.conf +++ /dev/null @@ -1,194 +0,0 @@ -# This file associates filename extensions (for servers or services -# that don't automatically include them - like ftp) with a mime type -# and a graphical icon. -# -# -# This file has the format : -# regex content-type icon content-encoding transfer-mode -#----------------------------------------------------------------------------------- -# -# -# Content-Encodings are taken from section 3.1 of RFC2068 (HTTP/1.1) -# -# -# -# regexp content-type icon encoding mode -#----------------------------------------------------------------------------------- -\.gif$ image/gif anthony-image.gif - image +download -\.mime$ www/mime anthony-text.gif - ascii +download -^internal-dirup$ - anthony-dirup.gif - - -^internal-dir$ - anthony-dir.gif - - -^internal-link$ - anthony-link.gif - - -^internal-menu$ - anthony-dir.gif - - -^internal-text$ - anthony-text.gif - - -^internal-index$ - anthony-dir.gif - - -^internal-image$ - anthony-image.gif - - -^internal-sound$ - anthony-sound.gif - - -^internal-movie$ - anthony-movie.gif - - -^internal-telnet$ - anthony-portal.gif - - -^internal-binary$ - anthony-box.gif - - -^internal-unknown$ - anthony-unknown.gif - - -^internal-view$ - anthony-text.gif - - -^internal-download$ - anthony-box.gif - - -\.bin$ application/macbinary anthony-unknown.gif - image +download -\.oda$ application/oda anthony-unknown.gif - image +download -\.exe$ application/octet-stream anthony-unknown.gif - image +download -\.pdf$ application/pdf anthony-unknown.gif - image +download -\.ai$ application/postscript anthony-ps.gif - image +download +view -\.eps$ application/postscript anthony-ps.gif - image +download +view -\.ps$ application/postscript anthony-ps.gif - image +download +view -\.rtf$ text/rtf anthony-text.gif - ascii +download +view -\.Z$ - anthony-compressed.gif compress image +download -\.gz$ - anthony-compressed.gif gzip image +download -\.bz2$ application/octet-stream anthony-compressed.gif - image +download -\.bz$ application/octet-stream anthony-compressed.gif - image +download -\.tgz$ application/x-tar anthony-tar.gif gzip image +download -\.csh$ application/x-csh anthony-script.gif - ascii +download +view -\.dvi$ application/x-dvi anthony-dvi.gif - image +download -\.hdf$ application/x-hdf anthony-unknown.gif - image +download -\.latex$ application/x-latex anthony-tex.gif - ascii +download +view -\.lsm$ text/plain anthony-text.gif - ascii +download +view -\.nc$ application/x-netcdf anthony-unknown.gif - image +download -\.cdf$ application/x-netcdf anthony-unknown.gif - ascii +download -\.sh$ application/x-sh anthony-script.gif - ascii +download +view -\.tcl$ application/x-tcl anthony-script.gif - ascii +download +view -\.tex$ application/x-tex anthony-tex.gif - ascii +download +view -\.texi$ application/x-texinfo anthony-tex.gif - ascii +download +view -\.texinfo$ application/x-texinfo anthony-tex.gif - ascii +download +view -\.t$ application/x-troff anthony-text.gif - ascii +download +view -\.roff$ application/x-troff anthony-text.gif - ascii +download +view -\.tr$ application/x-troff anthony-text.gif - ascii +download +view -\.man$ application/x-troff-man anthony-text.gif - ascii +download +view -\.me$ application/x-troff-me anthony-text.gif - ascii +download +view -\.ms$ application/x-troff-ms anthony-text.gif - ascii +download +view -\.src$ application/x-wais-source anthony-unknown.gif - ascii +download -\.zip$ application/zip anthony-compressed.gif - image +download -\.bcpio$ application/x-bcpio anthony-box.gif - image +download -\.cpio$ application/x-cpio anthony-box.gif - image +download -\.gtar$ application/x-gtar anthony-tar.gif - image +download -\.rpm$ application/x-rpm anthony-unknown.gif - image +download -\.shar$ application/x-shar anthony-script.gif - image +download +view -\.sv4cpio$ application/x-sv4cpio anthony-box.gif - image +download -\.sv4crc$ application/x-sv4crc anthony-box.gif - image +download -\.tar$ application/x-tar anthony-tar.gif - image +download -\.ustar$ application/x-ustar anthony-tar.gif - image +download -\.au$ audio/basic anthony-sound.gif - image +download -\.snd$ audio/basic anthony-sound.gif - image +download -\.mp2$ audio/mpeg anthony-sound.gif - image +download -\.mp3$ audio/mpeg anthony-sound.gif - image +download -\.mpga$ audio/mpeg anthony-sound.gif - image +download -\.aif$ audio/x-aiff anthony-sound.gif - image +download -\.aiff$ audio/x-aiff anthony-sound.gif - image +download -\.aifc$ audio/x-aiff anthony-sound.gif - image +download -\.wav$ audio/x-wav anthony-sound.gif - image +download -\.bmp$ image/bmp anthony-image.gif - image +download -\.ief$ image/ief anthony-image.gif - image +download -\.jpeg$ image/jpeg anthony-image.gif - image +download -\.jpg$ image/jpeg anthony-image.gif - image +download -\.jpe$ image/jpeg anthony-image.gif - image +download -\.tiff$ image/tiff anthony-image.gif - image +download -\.tif$ image/tiff anthony-image.gif - image +download -\.ras$ image/x-cmu-raster anthony-image.gif - image +download -\.pnm$ image/x-portable-anymap anthony-image.gif - image +download -\.pbm$ image/x-portable-bitmap anthony-image.gif - image +download -\.pgm$ image/x-portable-graymap anthony-image.gif - image +download -\.ppm$ image/x-portable-pixmap anthony-image.gif - image +download -\.rgb$ image/x-rgb anthony-image.gif - image +download -\.xbm$ image/x-xbitmap anthony-xbm.gif - image +download -\.xpm$ image/x-xpixmap anthony-xpm.gif - image +download -\.xwd$ image/x-xwindowdump anthony-image.gif - image +download -\.html$ text/html anthony-text.gif - ascii +download +view -\.htm$ text/html anthony-text.gif - ascii +download +view -\.css$ text/css anthony-script.gif - ascii +download +view -\.js$ application/x-javascript anthony-c.gif - ascii +download +view -\.c$ text/plain anthony-c.gif - ascii +download -\.h$ text/plain anthony-c.gif - ascii +download -\.cc$ text/plain anthony-c.gif - ascii +download -\.cpp$ text/plain anthony-c.gif - ascii +download -\.hh$ text/plain anthony-c.gif - ascii +download -\.m$ text/plain anthony-script.gif - ascii +download -\.f90$ text/plain anthony-f.gif - ascii +download -\.txt$ text/plain anthony-text.gif - ascii +download -\.asc$ text/plain anthony-text.gif - ascii +download -\.rtx$ text/richtext anthony-quill.gif - ascii +download +view -\.tsv$ text/tab-separated-values anthony-script.gif - ascii +download +view -\.etx$ text/x-setext anthony-text.gif - ascii +download +view -\.mpeg$ video/mpeg anthony-movie.gif - image +download -\.mpg$ video/mpeg anthony-movie.gif - image +download -\.mpe$ video/mpeg anthony-movie.gif - image +download -\.qt$ video/quicktime anthony-movie.gif - image +download -\.mov$ video/quicktime anthony-movie.gif - image +download -\.avi$ video/x-msvideo anthony-movie.gif - image +download -\.movie$ video/x-sgi-movie anthony-movie.gif - image +download -\.cpt$ application/mac-compactpro anthony-unknown.gif - image +download -\.hqx$ application/mac-binhex40 anthony-binhex.gif - image +download -\.mwrt$ application/macwriteii anthony-text.gif - image +download -\.msw$ application/msword anthony-script.gif - image +download -\.doc$ application/msword anthony-layout.gif - image +download +view -\.xls$ application/vnd.ms-excel anthony-layout.gif - image +download -\.ppt$ application/vnd.ms-powerpoint anthony-image2.gif - image +download -\.wk[s1234]$ application/vnd.lotus-1-2-3 anthony-script.gif - image +download -\.mif$ application/vnd.mif anthony-unknown.gif - image +download -\.sit$ application/x-stuffit anthony-compressed.gif - image +download -\.pict$ application/pict anthony-image.gif - image +download -\.pic$ application/pict anthony-image.gif - image +download -\.arj$ application/x-arj-compressed anthony-compressed.gif - image +download -\.lzh$ application/x-lha-compressed anthony-compressed.gif - image +download -\.lha$ application/x-lha-compressed anthony-compressed.gif - image +download -\.zlib$ application/x-deflate anthony-compressed.gif deflate image +download -README text/plain anthony-text.gif - ascii +download -^core$ application/octet-stream anthony-bomb.gif - image +download -\.core$ application/octet-stream anthony-bomb.gif - image +download -\.png$ image/png anthony-image.gif - image +download -\.cab$ application/octet-stream anthony-compressed.gif - image +download +view -\.xpi$ application/x-xpinstall anthony-unknown.gif - image +download -\.class$ application/octet-stream anthony-unknown.gif - image +download -\.java$ text/plain anthony-c.gif - ascii +download -\.dcr$ application/x-director anthony-unknown.gif - image +download -\.dir$ application/x-director anthony-unknown.gif - image +download -\.dxr$ application/x-director anthony-unknown.gif - image +download -\.djv$ image/vnd.djvu anthony-image.gif - image +download -\.djvu$ image/vnd.djvu anthony-image.gif - image +download -\.dll$ application/octet-stream anthony-unknown.gif - image +download -\.dms$ application/octet-stream anthony-unknown.gif - image +download -\.ez$ application/andrew-inset anthony-unknown.gif - image +download -\.ice$ x-conference/x-cooltalk anthony-unknown.gif - image +download -\.iges$ model/iges anthony-image.gif - image +download -\.igs$ model/iges anthony-image.gif - image +download -\.kar$ audio/midi anthony-sound.gif - image +download -\.mid$ audio/midi anthony-sound.gif - image +download -\.midi$ audio/midi anthony-sound.gif - image +download -\.mesh$ model/mesh anthony-image.gif - image +download -\.silo$ model/mesh anthony-image.gif - image +download -\.mxu$ video/vnd.mpegurl anthony-movie.gif - image +download -\.pdb$ chemical/x-pdb anthony-unknown.gif - image +download -\.pgn$ application/x-chess-pgn anthony-unknown.gif - image +download -\.ra$ audio/x-realaudio anthony-sound.gif - image +download -\.ram$ audio/x-pn-realaudio anthony-sound.gif - image +download -\.rm$ audio/x-pn-realaudio anthony-sound.gif - image +download -\.sgml$ text/sgml anthony-text.gif - ascii +download -\.sgm$ text/sgml anthony-text.gif - ascii +download -\.skd$ application/x-koan anthony-unknown.gif - image +download -\.skm$ application/x-koan anthony-unknown.gif - image +download -\.skp$ application/x-koan anthony-unknown.gif - image +download -\.skt$ application/x-koan anthony-unknown.gif - image +download -\.smi$ application/smil anthony-unknown.gif - image +download -\.smil$ application/smil anthony-unknown.gif - image +download -\.so$ application/octet-stream anthony-unknown.gif - image +download -\.spl$ application/x-futuresplash anthony-unknown.gif - image +download -\.swf$ application/x-shockwave-flash anthony-unknown.gif - image +download -\.vcd$ application/x-cdlink anthony-unknown.gif - image +download -\.vrml$ model/vrml anthony-image.gif - image +download -\.wbmp$ image/vnd.wap.wbmp anthony-image.gif - image +download -\.wbxml$ application/vnd.wap.wbxml anthony-unknown.gif - image +download -\.wmlc$ application/vnd.wap.wmlc anthony-unknown.gif - image +download -\.wmlsc$ application/vnd.wap.wmlscriptc anthony-script.gif - image +download -\.wmls$ application/vnd.wap.wmlscript anthony-script.gif - image +download -\.xht$ application/xhtml anthony-text.gif - ascii +download -\.xhtml$ application/xhtml anthony-text.gif - ascii +download -\.xml$ text/xml anthony-text.gif - ascii +download -\.xsl$ text/xml anthony-layout.gif - ascii +download -\.xyz$ chemical/x-xyz anthony-unknown.gif - image +download - -# the default -. text/plain anthony-unknown.gif - image +download +view From b7cd623c49ed2f3435aae098603dc09144d91327 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 12:59:30 +0000 Subject: [PATCH 40/47] squidclamav: Use default provided config and fix clamd.ctl --- cross/squidclamav/Makefile | 9 +-- spk/squidguard/src/etc/squidclamav.conf | 79 ------------------------- 2 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 spk/squidguard/src/etc/squidclamav.conf diff --git a/cross/squidclamav/Makefile b/cross/squidclamav/Makefile index 5178ede4ba5..3f55443adda 100644 --- a/cross/squidclamav/Makefile +++ b/cross/squidclamav/Makefile @@ -12,13 +12,14 @@ COMMENT = SquidClamav is an antivirus for Squid proxy based on the Awards winni LICENSE = GPLv3 GNU_CONFIGURE = 1 -PRE_COMPILE_TARGET = squidclamav_pre_compile CONFIGURE_ARGS = --prefix=$(INSTALL_PREFIX) --with-c-icap=$(INSTALL_DIR)/$(INSTALL_PREFIX) ADDITIONAL_CFLAGS = -I$(INSTALL_DIR)/$(INSTALL_PREFIX)/include/c_icap +POST_INSTALL_TARGET = squidclamav_post_install + include ../../mk/spksrc.cross-cc.mk -.PHONY: squidclamav_pre_compile -squidclamav_pre_compile: - sed -i 's/"\/etc\/squidclamav.conf"/"\/usr\/local\/squidguard\/etc\/squidclamav.conf"/' $(WORK_DIR)/$(PKG_DIR)/src/squidclamav.h +.PHONY: squidclamav_post_install +squidclamav_post_install: + @$(RUN) sed -i 's?^clamd_local .*?clamd_local $(INSTALL_PREFIX)/var/run/clamd/clamd.ctl?' $(STAGING_INSTALL_PREFIX)/etc/squidclamav.conf diff --git a/spk/squidguard/src/etc/squidclamav.conf b/spk/squidguard/src/etc/squidclamav.conf deleted file mode 100644 index 9e7132c3a13..00000000000 --- a/spk/squidguard/src/etc/squidclamav.conf +++ /dev/null @@ -1,79 +0,0 @@ -#----------------------------------------------------------------------------- -# SquidClamav default configuration file -# -# To know to customize your configuration file, see squidclamav manpage -# or go to http://squidclamav.darold.net/ -# -#----------------------------------------------------------------------------- -# -# Global configuration -# - -# Maximum size of a file that may be scanned. Any file bigger that this value -# will not be scanned. -maxsize 5000000 - -# When a virus is found then redirect the user to this URL -redirect http://proxy.domain.dom/cgi-bin/clwarn.cgi - -# Path to the squiGuard binary if you want URL filtering, note that you'd better -# use the squid configuration directive 'url_rewrite_program' instead. -#squidguard /usr/local/squidGuard/bin/squidGuard - -# Path to the clamd socket, use clamd_local if you use Unix socket or if clamd -# is listening on an Inet socket, comment clamd_local and set the clamd_ip and -# clamd_port to the corresponding value. -clamd_local /usr/local/squidguard/var/run/clamd/clamd.ctl -#clamd_ip 192.168.1.5,127.0.0.1 -# clamd_port 3310 - -# Set the timeout for clamd connection. Default is 1 second, this is a good -# value but if you have slow service you can increase up to 3. -timeout 1 - -# Force SquidClamav to log all virus detection or squiguard block redirection -# to the c-icap log file. -logredir 0 - -# Enable / disable DNS lookup of client ip address. Default is enabled '1' to -# preserve backward compatibility but you must desactivate this feature if you -# don't use trustclient with hostname in the regexp or if you don't have a DNS -# on your network. Disabling it will also speed up squidclamav. -dnslookup 1 - -# Enable / Disable Clamav Safe Browsing feature. You mus have enabled the -# corresponding behavior in clamd by enabling SafeBrowsing into freshclam.conf -# Enabling it will first make a safe browsing request to clamd and then the -# virus scan request. -safebrowsing 0 - -# -# Here is some defaut regex pattern to have a high speed proxy on system -# with low resources. -# - -# Do not scan images -#abort ^.*\.(ico|gif|png|jpg)$ -#abortcontent ^image\/.*$ - -# Do not scan text files -#abort ^.*\.(css|xml|xsl|js|html|jsp)$ -#abortcontent ^text\/.*$ -#abortcontent ^application\/x-javascript$ - -# Do not scan streamed videos -#abortcontent ^video\/x-flv$ -#abortcontent ^video\/mp4$ - -# Do not scan flash files -#abort ^.*\.swf$ -#abortcontent ^application\/x-shockwave-flash$ - -# Do not scan sequence of framed Microsoft Media Server (MMS) data packets -#abortcontent ^.*application\/x-mms-framed.*$ - -# White list some sites -#whitelist .*\.clamav.net - -# See also 'trustuser' and 'trustclient' configuration directives - From 19509c397446fff7ff2bdfbc3a9f3d1ba5415a13 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 13:05:46 +0000 Subject: [PATCH 41/47] squidguard: Adjust squidguard.conf.tpl paths --- spk/squidguard/src/etc/squidguard.conf.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spk/squidguard/src/etc/squidguard.conf.tpl b/spk/squidguard/src/etc/squidguard.conf.tpl index 2e1c0666807..7c58c7aef47 100644 --- a/spk/squidguard/src/etc/squidguard.conf.tpl +++ b/spk/squidguard/src/etc/squidguard.conf.tpl @@ -3,8 +3,8 @@ # # Global variables -logdir /usr/local/squidguard/var/logs -dbhome /usr/local/squidguard/var/db +logdir /var/packages/squidguard/var/logs +dbhome /var/packages/squidguard/var/db # Time rules # abbrev for weekdays: From b31608717e16834aab709c18f727173668a62390 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 13:11:57 +0000 Subject: [PATCH 42/47] squidguard: Fix squidguardmgr.conf paths --- spk/squidguard/src/etc/squidguardmgr.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spk/squidguard/src/etc/squidguardmgr.conf b/spk/squidguard/src/etc/squidguardmgr.conf index 7dab989ff86..0cfc781e37e 100644 --- a/spk/squidguard/src/etc/squidguardmgr.conf +++ b/spk/squidguard/src/etc/squidguardmgr.conf @@ -20,10 +20,10 @@ RM /bin/rm # Path to the SquidGuard program. You can set it to off to disable the # SquidGuard manager interface and get only the SquidClamav manager. -SQUIDGUARD /usr/local/squidguard/bin/squidGuard +SQUIDGUARD /var/packages/squidguard/target/bin/squidGuard # Path to the SquidGuard configuration file -CONF_FILE /usr/local/squidguard/etc/squidguard.conf +CONF_FILE /var/packages/squidguard/target/etc/squidguard.conf # Path to the SquidClamav program. You can set it to off to disable the # SquidClamav manager interface and get only the SquidGuard manager. @@ -34,10 +34,10 @@ SQUIDCLAMAV c-icap # Path to the c-icap control socket. Used by SquidClamav Manager to reload # c-icap server to apply SquidClamav configuration changes. Used only with # SquidClamav v6.x branch. -C_ICAP_SOCKET /usr/local/squidguard/var/run/c-icap/c-icap.ctl +C_ICAP_SOCKET /var/packages/squidguard/target/var/run/c-icap/c-icap.ctl # Path to the SquidClamav configuration file -SC_CONF_FILE /usr/local/squidguard/etc/squidclamav.conf +SC_CONF_FILE /var/packages/squidguard/target/etc/squidclamav.conf # Used to set the language, default is en_US. # Current translation are: en_US, fr_FR. @@ -46,16 +46,16 @@ SC_CONF_FILE /usr/local/squidguard/etc/squidclamav.conf # Command to reload Squid. You may use the wrapper as squid # can only be reload as root. This wrapper will run the command # /usr/local/squid/sbin/squid -k reconfigure -SQUID_WRAPPER /usr/local/squidguard/share/www/squidguardmgr/squid_wrapper +SQUID_WRAPPER /var/packages/squidguard/target/var/www/squidguardmgr/squid_wrapper # SquidGuardMgr URL base where images are stored -IMG_DIR /webman/3rdparty/squidguard/images +IMG_DIR /squidguard/images # SquidGuardMgr Style Sheet CSS URL -CSS_FILE /webman/3rdparty/squidguard/squidguardmgr.css +CSS_FILE /squidguard/squidguardmgr.css # SquidGuardMgr Javascript URL -JS_FILE /webman/3rdparty/squidguard/squidguardmgr.js +JS_FILE /squidguard/squidguardmgr.js # Comma separated list of DNS Blacklists #DNSBL your.preferred.blacklist.com,other.preferred.blacklist.com From c7c576ffbad6ad3fac6d8fae59e7b512c4727902 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 13:13:36 +0000 Subject: [PATCH 43/47] squid: Fix configuration paths --- spk/squidguard/src/etc/squid.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spk/squidguard/src/etc/squid.conf b/spk/squidguard/src/etc/squid.conf index 5d5dc8ec0e5..705763129f0 100644 --- a/spk/squidguard/src/etc/squid.conf +++ b/spk/squidguard/src/etc/squid.conf @@ -17,7 +17,7 @@ maximum_object_size 15 MB # - Emplacement du cache # - Taille totale du cache en MB # - Nombre de répertoires de niveau 1 et de niveau 2 -cache_dir ufs /usr/local/squidguard/var/cache 200 16 256 +cache_dir ufs /var/packages/squidguard/target/var/cache 200 16 256 # Format des logs : # -> Avec off, squid utilise son propre format de logs, @@ -26,7 +26,7 @@ cache_dir ufs /usr/local/squidguard/var/cache 200 16 256 emulate_httpd_log off # Ces deux lignes permettent d'intégrer le plugin SquidGuard -redirect_program /usr/local/squidguard/bin/squidGuard -c /usr/local/squidguard/etc/squidguard.conf +redirect_program /var/packages/squidguard/target/bin/squidGuard -c /var/packages/squidguard/target/etc/squidguard.conf redirect_children 4 # Pas d'infos sur ces lignes @@ -92,7 +92,7 @@ http_reply_access allow all # Autorise le protocole icp pour tout le monde (par défaut) icp_access allow all -coredump_dir /usr/local/squidguard/var/logs +coredump_dir /var/packages/squidguard/target/var/logs icap_enable on icap_send_client_ip on From f05978eaeab90ea50e53a03ee4f5d2f1c4ebe05a Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 13:16:30 +0000 Subject: [PATCH 44/47] squidguard: Add missing target in path --- spk/squidguard/src/etc/clamd.conf | 6 +++--- spk/squidguard/src/etc/squidguard.conf.tpl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spk/squidguard/src/etc/clamd.conf b/spk/squidguard/src/etc/clamd.conf index 8dc835134c4..bc8d17f3b7a 100644 --- a/spk/squidguard/src/etc/clamd.conf +++ b/spk/squidguard/src/etc/clamd.conf @@ -1,7 +1,7 @@ #Automatically Generated by clamav-base postinst #To reconfigure clamd run #dpkg-reconfigure clamav-base #Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/packages/squidguard/var/run/clamd/clamd.ctl +LocalSocket /var/packages/squidguard/target/var/run/clamd/clamd.ctl # TemporaryDirectory is not set to its default /tmp here to make overriding # the default with environment variables TMPDIR/TMP/TEMP possible User squid @@ -19,7 +19,7 @@ LogSyslog true LogFacility LOG_LOCAL6 LogClean false LogVerbose false -PidFile /var/packages/squidguard/var/run/clamd/clamd.pid +PidFile /var/packages/squidguard/target/var/run/clamd/clamd.pid DatabaseDirectory /var/packages/AntiVirus/target/engine/clamav/var/lib/ SelfCheck 3600 Foreground false @@ -47,7 +47,7 @@ MaxQueue 100 ExtendedDetectionInfo true OLE2BlockMacros false StreamMaxLength 25M -LogFile /var/packages/squidguard/var/logs/clamd.log +LogFile /var/packages/squidguard/target/var/logs/clamd.log LogTime true LogFileUnlock false LogFileMaxSize 0 diff --git a/spk/squidguard/src/etc/squidguard.conf.tpl b/spk/squidguard/src/etc/squidguard.conf.tpl index 7c58c7aef47..60caafdbc17 100644 --- a/spk/squidguard/src/etc/squidguard.conf.tpl +++ b/spk/squidguard/src/etc/squidguard.conf.tpl @@ -3,8 +3,8 @@ # # Global variables -logdir /var/packages/squidguard/var/logs -dbhome /var/packages/squidguard/var/db +logdir /var/packages/squidguard/target/var/logs +dbhome /var/packages/squidguard/target/var/db # Time rules # abbrev for weekdays: From 965337e064966d8a3d0f9856c5f17b5cb3e4b411 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 13:18:20 +0000 Subject: [PATCH 45/47] c-icap: Update from version 0.5.8 to 0.5.9 --- cross/c_icap/Makefile | 2 +- cross/c_icap/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross/c_icap/Makefile b/cross/c_icap/Makefile index e491166bfdd..32680b0e424 100644 --- a/cross/c_icap/Makefile +++ b/cross/c_icap/Makefile @@ -1,5 +1,5 @@ PKG_NAME = c_icap -PKG_VERS = 0.5.8 +PKG_VERS = 0.5.9 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://downloads.sourceforge.net/project/c-icap/c-icap/0.5.x diff --git a/cross/c_icap/digests b/cross/c_icap/digests index 4392ee33514..43816bf0057 100644 --- a/cross/c_icap/digests +++ b/cross/c_icap/digests @@ -1,3 +1,3 @@ -c_icap-0.5.8.tar.gz SHA1 b5c78b7e48a4f7b14a159db13ff6d91133d48eb5 -c_icap-0.5.8.tar.gz SHA256 11d8163f89d8e4ef5e7e959d0bc6ce6434607451c16e12ff38b9b7eb08a8c761 -c_icap-0.5.8.tar.gz MD5 30fbbd21c3fda3fd82eaf42feeac3897 +c_icap-0.5.9.tar.gz SHA1 f6271f367d4e8c44c1da657efc43b7ff7d5765e2 +c_icap-0.5.9.tar.gz SHA256 5137d8b6b79581613b5901c2620c7fed8266f61cc00b3561316e9097e5f0352c +c_icap-0.5.9.tar.gz MD5 de74dbfb023869a9a6424a8f0d650cc6 From 41d4e8cc99e281a158c72c889811121ed9cdc144 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 14:37:57 +0000 Subject: [PATCH 46/47] c-icap: Forgot to update PLIST with new lib version --- cross/c_icap/PLIST | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/c_icap/PLIST b/cross/c_icap/PLIST index 3760b9e2206..470957535a7 100644 --- a/cross/c_icap/PLIST +++ b/cross/c_icap/PLIST @@ -9,7 +9,7 @@ rsc:etc/c-icap.magic rsc:etc/c-icap.magic.default lnk:lib/libicapapi.so lnk:lib/libicapapi.so.5 -lib:lib/libicapapi.so.5.0.8 +lib:lib/libicapapi.so.5.0.9 lib:lib/c_icap/bdb_tables.so lib:lib/c_icap/dnsbl_tables.so lib:lib/c_icap/shared_cache.so From 984c24de0fc359bf6e6d91d7de3113fb80690754 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Sun, 26 Sep 2021 17:11:48 +0000 Subject: [PATCH 47/47] libtorrent: Enable -std=c++11 by default (also fixes comcerto2k) --- cross/libtorrent/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cross/libtorrent/Makefile b/cross/libtorrent/Makefile index 2a70cf5167f..f71899f4b6f 100644 --- a/cross/libtorrent/Makefile +++ b/cross/libtorrent/Makefile @@ -34,13 +34,13 @@ CONFIGURE_ARGS += PYTHON=$(WORK_DIR)/../../../native/python2/work-native/install CONFIGURE_ARGS += LIB=-L/$(STAGING_INSTALL_PREFIX)/$(PYTHON_LIB_DIR) CONFIGURE_ARGS += PYTHON_CPPFLAGS=-I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) ADDITIONAL_CFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) -ADDITIONAL_CXXFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) -# Required for DSM-6 using gcc-4.9 -ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) -ADDITIONAL_CXXFLAGS += -std=c++11 -endif +ADDITIONAL_CXXFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) ADDITIONAL_LDFLAGS = "-Wl,-Bsymbolic" +# Only required for DSM <= 6.* using gcc-4.9 along with comcerto2k-7.0 +# Leaving enabled by default for all as no negative impact +ADDITIONAL_CXXFLAGS += -std=c++11 + BOOST_LIBRARIES += system python chrono random ENV += BOOST_LIBRARIES="$(BOOST_LIBRARIES)"