gentoo auto-resync : 11:02:2025 - 00:12:37

4 files changed, 180 insertions, 5 deletions

diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index e28be4a3c507..e7b563a193d2 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -1,9 +1,11 @@
 AUX blockedsites 8 BLAKE2B 859fc39a3734eda96cefa9d8997e6a63c74d8166e063b4d8ee0f12f224cb9dd9709fd7c868bd5775d05af2f0c710774742d39393377b4e0a6766089f6ad2bf05 SHA512 5b7ae0ece304235c61be154d285c52a622c82270d8af3447eabb05a3705a1f6987c51cc71a14fe2b75eb48440133674f22e5700630e5a96b3097f8d10ade1479
 AUX squidGuard.conf.blocksites 192 BLAKE2B 0bbb4b05d91bc2ca78a5ba52213967bb5e428c6ffe361b319afe1e9e0dfa81bfb5f56090cb9d4e75a4c159f0fda5afb8642611dc2cae811a9e629de678f8209f SHA512 a6bab8318df1937c68c99de188c095b3deb61ae32cc0e96fe5f5652697bafa8f3591a7a239f93d3c3db84a7dfa2dab3f6c3a4e621c4b1a147bc7f1ec2d34fc19
 AUX squidGuard.conf.minimal 61 BLAKE2B ddc399b51d396868be42a7dd1709e0b2df372dc95696da06916542c12a19ec15a7e596e04aa6454fc81315ee27dc1fddb4bb23fe1d31fcde3ca8c4b42298f85b SHA512 301263fcfaf345c34b5a988ce237bc578fb48f63ab2187b5dd2f146e4cf914bf823fcce49c27f8282e745f3125e32455d9c5a5f425d40ce7785f492663eb959c
+AUX squidguard-1.6.0-C23.patch 1109 BLAKE2B c6315c6b2f94d1baa03a95d243b4c07a1ee552d7f8edd7731dd5e9be54f10d2832f425b06a9e6895ebe4094d60bb00d9c20fe75e3254cd2ef30e40764ff072f5 SHA512 a5fd80deca04241f6468f447b0ca22b4cf4200badaa4efc85224661bca52ec43fa4e5f98d6f9cf5928f505440a975d0cb1a769e7c633ae7bfe00538fe0940d89
 AUX squidguard-1.6.0-gcc-10.patch 1351 BLAKE2B f13224eb35e98fb5ec83d286016404fcbb55976f4616d0dfea52472a29ca2ea8686d5450d32fee99c8198d0d3804bfa07624228c3d843294f34357edf5ddaed7 SHA512 906b8ad819f043115958aac90e88c1c8b17ea1a330d6fd734403bee67b4d7e6bf448ff14cd012df893ae5f5e58e126d8ac31c77e4f1b9447e7317c7cc5f749be
 AUX squidguard-1.6.0-gentoo.patch 982 BLAKE2B 9858c7778fbf52573061fd12d3c3941c4f5b5011c09e7cd54859d6fdd9e969f9e7033abd8cfafa019000309aad50ceac63cc082f5b394ea9ee67c30561376879 SHA512 58b8f9a469fe1ca563f1e9e9425362a594eb7a472f0c019f54d42c06dcee2b6a207ee6dded297c86e06288e78ed62879170b8305b20aa29b37d0b658ef843288
-AUX squidguard-1.6.0-stdlib.patch 531 BLAKE2B 14d62576ff058d542c296073612f8c27d96ec476def77a54adbb26534dc84f5ed172a5b25b080d3380c37d3f0ecd05bf73ac5917f1144381e3ed29d4a72c1ced SHA512 6b352f5ff3bfb93899fe29eaa5f5200f9d9c9e243e0dc6746deffb03cbc543a3f5226b6579bdc3ab30b0b4f0df5e4d760064d65acd8aa962c7cf729fe303e690
+AUX squidguard-1.6.0-stdlib.patch 1296 BLAKE2B 6e5caecc7d2238e7df0e895ab677a170ca8177483ce36226759b06c7ceb16e646c1bd158de2f66f8ca65b22df6ea0a5a3baf4e89c564f755ad51d173f9ad7bc3 SHA512 8488cf3e021c56ac3ce21c945881c9583c61bb6cd3a6b42dea0a6ecb024286ff9f94fc557f40ec0984a3e684ee804e4660ac7fe3e651d7edb3aa61caa64ca62b
 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e
 EBUILD squidguard-1.6.0-r1.ebuild 2398 BLAKE2B 051ac6d30be1f2210fb5e463afde555eb4c6e07b29dfdb0856efa368b27b25df10d1c1b21449472cd01d7799b8a138fbfcda929ae6a2359a5467db73d26eb16d SHA512 93528ed7e83ecfdce6c948a66e0b1a8b64dfe715766bbcf907138e381e48d5e3258704ab3ee5d99cf88d7e079e0bbfd11714a08a3ad61ddcad4f82934235ec88
+EBUILD squidguard-1.6.0-r2.ebuild 2424 BLAKE2B f467a868bb7409bec69052bb974e6c0e1b44c4e8bffa45a8eee61b25963789e27f8f8dca3e0fcd14f16514a6f3ace136833d21fba42ec17739cf734750c0116b SHA512 c715c21c818ab2b873798c2dc2cea47686b532e35c715c2b3cea395289bb1e72556fee1222cf47759bd358e3af968e7f765ec5ee612a613bd379804506fd8c50
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-proxy/squidguard/files/squidguard-1.6.0-C23.patch b/net-proxy/squidguard/files/squidguard-1.6.0-C23.patch
new file mode 100644
index 000000000000..23121819391b
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.6.0-C23.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/898084
+https://bugs.gentoo.org/932312
+nothing defined HAVE_STDLIB_H to permit inclusion of stdlib.h,
+which caused failures to find correct version of db
+also fill the function definitions for C23
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,9 @@
+ AC_INIT(src/main.c.in)
+ AC_CONFIG_HEADER(src/config.h)
+ 
++AC_INCLUDES_DEFAULT
++AC_USE_SYSTEM_EXTENSIONS
++
+ dnl
+ dnl Checks for programs.
+ dnl
+--- a/src/sg.h.in
++++ b/src/sg.h.in
+@@ -360,7 +360,7 @@
+ void   sgEmergency __P(());
+ void   sgReloadConfig __P(());
+ void   sgHandlerSigHUP __P((int));
+-void   sgAlarm __P(());
++void   sgAlarm __P((int signal));
+ int    sgStrRcmp __P((char *, char *));
+ int    sgStrRncmp __P((char *, char *, int));
+ int    sgDomStrRncmp __P((char *, char *, int));
+@@ -431,7 +431,7 @@
+ int    sgRegExpMatch __P((struct sgRegExp *, char *));
+ char   *sgRegExpSubst __P((struct sgRegExp *, char *));
+ 
+-void   sgDbInit __P(());
++void   sgDbInit __P((struct sgDb *Db, char *file));
+ void   sgDbLoadTextFile __P((struct sgDb *, char *, int));
+ void   sgDbUpdate __P((struct sgDb *, char *, char *, size_t));
+ 
diff --git a/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch b/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
index 51489b32de5e..f36a094edfe6 100644
--- a/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
+++ b/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
@@ -1,6 +1,18 @@
---- a/configure.ac	2022-12-15 10:33:13.845801113 +0300
-+++ b/configure.ac	2022-12-15 10:33:39.828949903 +0300
-@@ -342,6 +342,9 @@
+https://bugs.gentoo.org/919449
+patch by joergd <joergd@bitquell.de>
+--- a/configure.ac	2019-02-02 18:00:40.000000000 +0100
++++ b/configure.ac	2025-01-13 12:13:48.087653985 +0100
+@@ -233,6 +233,9 @@
+     AC_DEFINE(HAVE_LIBLDAP, 1, [Define if LDAP support should be compiled])
+     AC_RUN_IFELSE([AC_LANG_SOURCE([[
+         #include <ldap.h>
++        #ifdef HAVE_STDLIB_H
++            #include <stdlib.h>
++        #endif
+         int main()
+         {
+            LDAP *p;
+@@ -342,6 +345,9 @@
  LIBS="$LIBS -ldb"
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
      #include <db.h>
@@ -10,7 +22,27 @@
      int main() 
      {
          int major, minor, patch;
-@@ -377,6 +378,9 @@
+@@ -377,6 +383,9 @@
+ 
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+     #include <db.h>
++    #ifdef HAVE_STDLIB_H
++        #include <stdlib.h>
++    #endif
+     int main() 
+     {
+         int major, minor, patch;
+@@ -413,6 +422,9 @@
+ 
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+     #include <db.h>
++    #ifdef HAVE_STDLIB_H
++        #include <stdlib.h>
++    #endif
+     int main() 
+     {
+         int major, minor, patch;
+@@ -441,6 +453,9 @@
  
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
      #include <db.h>
diff --git a/net-proxy/squidguard/squidguard-1.6.0-r2.ebuild b/net-proxy/squidguard/squidguard-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..c922848a5b42
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.6.0-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools db-use
+
+DESCRIPTION="Combined filter, redirector and access controller plugin for Squid"
+HOMEPAGE="http://www.squidguard.org"
+SRC_URI="mirror://debian/pool/main/s/squidguard/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="ldap"
+
+RDEPEND="
+	acct-group/squid
+	acct-user/squid
+	|| (
+		sys-libs/db:5.3
+		sys-libs/db:4.8
+	)
+	ldap? ( net-nds/openldap:= )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-alternatives/yacc:0
+	app-alternatives/lex:0
+"
+
+suitable_db_version() {
+	local tested_slots="5.3 4.8"
+	for ver in ${tested_slots}; do
+		if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+			echo ${ver}
+			return 0
+		fi
+	done
+	die "No suitable BerkDB versions found, aborting"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.patch"
+	"${FILESDIR}/${P}-gcc-10.patch"
+	"${FILESDIR}/${P}-stdlib.patch"
+	"${FILESDIR}/${P}-C23.patch"
+)
+
+src_prepare() {
+	default
+
+	# Link only with specific BerkDB versions
+	# Do not inject default paths for library searching
+	db_version="$(suitable_db_version)"
+	sed -i \
+		-e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" \
+		-e '/$LDFLAGS $db_lib $ldap_lib/d' \
+		configure.ac || die
+
+	eautoreconf
+
+	# Workaround for missing install-sh, bug #705374
+	local amver=$(best_version dev-build/automake)
+	amver=$(ver_cut 1-2 "${amver#dev-build/automake-}")
+	cp -p "${BROOT}/usr/share/automake-${amver}/install-sh" . || die
+}
+
+src_configure() {
+	econf \
+		$(use_with ldap) \
+		--with-db-inc="$(db_includedir ${db_version})" \
+		--with-sg-config=/etc/squidGuard/squidGuard.conf \
+		--with-sg-logdir=/var/log/squidGuard
+}
+
+src_install() {
+	emake prefix="/usr" DESTDIR="${D}" install
+
+	keepdir /var/log/squidGuard
+	fowners squid:squid /var/log/squidGuard
+
+	insinto /etc/squidGuard/sample
+	doins "${FILESDIR}"/squidGuard.conf.*
+	insinto /etc/squidGuard/sample/db
+	doins "${FILESDIR}"/blockedsites
+
+	dodoc ANNOUNCE CHANGELOG README
+	docinto html
+	dodoc doc/*.html
+	docinto text
+	dodoc doc/*.txt
+}
+
+pkg_postinst() {
+	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
+	einfo "    url_rewrite_program /usr/bin/squidGuard"
+	einfo "    url_rewrite_children 10"
+	einfo ""
+	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
+	einfo "Examples can be found in /etc/squidGuard/sample/"
+}