deluge, ffsync, rutorrent and squidguard build fixes

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
 

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

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

cross/c_icap/Makefile

@@ -1,23 +1,31 @@
 PKG_NAME = c_icap
-PKG_VERS = 0.2.2
+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.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.
 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 --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
 
 .PHONY: c_icap_pre_configure
 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

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.9
+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

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.9.tar.gz SHA1 f6271f367d4e8c44c1da657efc43b7ff7d5765e2
+c_icap-0.5.9.tar.gz SHA256 5137d8b6b79581613b5901c2620c7fed8266f61cc00b3561316e9097e5f0352c
+c_icap-0.5.9.tar.gz MD5 de74dbfb023869a9a6424a8f0d650cc6

cross/gevent/Makefile

@@ -1,9 +1,8 @@
 PKG_NAME = gevent
-PKG_VERS = 1.2.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
-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
@@ -12,11 +11,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
 
-INSTALL_TARGET = gevent_install
+ENV += GEVENTSETUP_EMBED_CARES=FALSE
+ENV += GEVENTSETUP_EMBED_LIBEV=FALSE
 
 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

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.8.0.tar.gz SHA1 0aad0632ab8a0b7fd9f9858b196f1d9663de5441
+gevent-21.8.0.tar.gz SHA256 43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575
+gevent-21.8.0.tar.gz MD5 cd15fb75e67892514fbba2111af5cd50

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)

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

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

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

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
@@ -35,6 +37,10 @@ ADDITIONAL_CFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)
 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)"
 

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)

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

cross/squid/Makefile

@@ -1,28 +1,45 @@
 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 = SQUID_$(subst .,_,$(PKG_VERS)).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/squid-cache/squid/archive
+PKG_DIR = $(PKG_NAME)-SQUID_$(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)
+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  = $(TC_CONFIGURE_ARGS) --prefix=$(INSTALL_PREFIX) --enable-icap-client --disable-strict-error-checking
+include ../../mk/spksrc.common.mk
 
-HOSTCFGEN_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/$(PKG_DIR)/src/cf_gen
-HOSTCFGEN = $(WORK_DIR)/$(PKG_DIR)/src/cf_gen
+# Toolchains lacking c++11 in conjunction with
+# march=native compiler are not supported
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
 
-# Compile
-PRE_COMPILE_TARGET = squid_pre_compile
+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
 
-.PHONY: squid_pre_compile
-squid_pre_compile:
-	cp $(HOSTCFGEN_NATIVE) $(HOSTCFGEN)
+.PHONY: squid_pre_configure
+squid_pre_configure:
+	$(RUN) ./bootstrap.sh