From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- net-proxy/squidguard/Manifest | 4 - .../files/squidguard-1.5_beta-gentoo.patch | 50 -------- .../files/squidguard-1.5_beta-protocol.patch | 130 --------------------- net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild | 102 ---------------- 4 files changed, 286 deletions(-) delete mode 100644 net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch delete mode 100644 net-proxy/squidguard/files/squidguard-1.5_beta-protocol.patch delete mode 100644 net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild (limited to 'net-proxy/squidguard') diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest index 62cbd813b7b1..b13786a94d9f 100644 --- a/net-proxy/squidguard/Manifest +++ b/net-proxy/squidguard/Manifest @@ -1,12 +1,8 @@ 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.5_beta-gentoo.patch 1562 BLAKE2B 38d0623b8f1f621a3522695966ab1aca26bc939d366f2e586962640164391a93d5834d4ba994a9d8d9a6ce8ed0bcfe846dfdb1edd7e2ed050ba5e51c74bb9a67 SHA512 bdeb6b5a526200f290ce39e3e9c7f4142eb168ec3c47cf4ec2c6dc713fd9c5915c92ca4188c9bfc8c6795f6f170ade62bca3ace0ccfa5149addb0ae932064f8a -AUX squidguard-1.5_beta-protocol.patch 4489 BLAKE2B 13b406850f20c41a0cb07c95cf241d7f0b4eb8e879e0afc0abcc62a09c067338c60b9fb44bfdb6053c483b944295abbfde7111d8807af9ad3a9ceeaa6e7e81dc SHA512 f8828d10b7ca55debf5aa80ef7e88741b10e9c566921fc2fd38652080fef025bff91851a14c1ee610fabce2562b1c8ca797dd9ae924a1fcc62ab95cb365ff8b1 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 -DIST squidGuard-1.5-beta.tar.gz 1983030 BLAKE2B 60405e097babb15eb099649d4ffe23a798207c6d3ac490b8c0c7da777a0136fecb867537214aa90c58ff246a86a0cf7ce59b021e29071ecc43ad002f3a0e3def SHA512 37ddc2ac82596e9d24aac6a610763f2eeb7c15b3a2d7babb85948e1da912aebb1dc85309766f7d8c3d7c22713e24a51f4cdef4520117a03d839662ef2494b6e7 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e -EBUILD squidguard-1.5_beta-r2.ebuild 2276 BLAKE2B 10cb29c4b29f3bffe7e9c67a2af09c744ee317b0231fac54f0e577554e47b263014ed4b0f620f46a27be7c191d76447603acb1d885279a52871f9b01879101c5 SHA512 fcfce62692dc0d9cac271cca6cf4a344e4c67d1e9bee780fc508ed46f84ed5ff42098ea929f72b7161f57b4f6165d1e9f45f5ed4ee886861d22e3b82c4ac6391 EBUILD squidguard-1.6.0.ebuild 2237 BLAKE2B b2cd2d511739a44dca912478c9f08990d9a096c4ceefbcf53083c033e9faf630ca56c3e7b9934663bf5661ecdd00693c349e2d8fb23516d309adf0ee0caba228 SHA512 d08aa81e2d95cc3b1d4916b8c7b548df6c3560532b71770b11b4fb558472eeb0968f6838aae1d7a70749c924911ce993aee403fcbc532e551855d7f48fbbe697 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch deleted file mode 100644 index 814079764a3f..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Nru squidGuard-1.4.orig/Makefile.in squidGuard-1.4/Makefile.in ---- squidGuard-1.4.orig/Makefile.in 2008-05-17 18:36:44.000000000 +0000 -+++ squidGuard-1.4/Makefile.in 2009-01-10 13:02:14.000000000 +0000 -@@ -43,7 +43,7 @@ - # Dependencies for installing - # - --install: install-build install-conf -+install: install-build - - install-conf: - @echo Installing configuration file ; -@@ -85,10 +85,10 @@ - - install-build: - @echo Installing squidGuard -- @if [ ! -d $(bindir) ]; then \ -- $(MKINSTALLDIRS) $(bindir) ; \ -+ @if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \ -+ $(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \ - fi ; \ -- cp src/squidGuard $(bindir) || exit 1 ; \ -+ cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ; \ - echo Done. ; - - clean:: -diff -Nru squidGuard-1.4.orig/src/Makefile.in squidGuard-1.4/src/Makefile.in ---- squidGuard-1.4.orig/src/Makefile.in 2009-01-03 20:05:39.000000000 +0000 -+++ squidGuard-1.4/src/Makefile.in 2009-01-10 13:02:14.000000000 +0000 -@@ -110,6 +110,8 @@ - mv -f y.tab.c y.tab.c.bison - mv -f y.tab.h y.tab.h.bison - -+sg.y sg.l: -+ - # - # Dependencies for installing - # -@@ -122,8 +124,8 @@ - - install.bin:: squidGuard - @echo making $@ in `basename \`pwd\`` -- @$(MKDIR) $(bindir) $(logdir) $(cfgdir) -- $(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard -+ @$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir) -+ $(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard - - uninstall.bin:: - @echo making $@ in `basename \`pwd\`` -diff -Nru squidGuard-1.4.orig/src/sgDb.c squidGuard-1.4/src/sgDb.c diff --git a/net-proxy/squidguard/files/squidguard-1.5_beta-protocol.patch b/net-proxy/squidguard/files/squidguard-1.5_beta-protocol.patch deleted file mode 100644 index 289fc7563b72..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.5_beta-protocol.patch +++ /dev/null @@ -1,130 +0,0 @@ -Patch for compatibility with new(>=3.4) Squid helper protocol - -Bugreport: http://bugs.squid-cache.org/show_bug.cgi?id=3978 - -diff -ur squidGuard-1.5-beta.orig/src/main.c squidGuard-1.5-beta/src/main.c ---- squidGuard-1.5-beta.orig/src/main.c 2013-12-12 11:47:31.000000000 +1300 -+++ squidGuard-1.5-beta/src/main.c 2013-12-12 11:50:38.000000000 +1300 -@@ -185,7 +185,7 @@ - sgReloadConfig(); - } - if(failsafe_mode) { -- puts(""); -+ puts("ERR message=\"squidGuard failsafe mode\""); - fflush(stdout); - if(sig_hup){ - sgReloadConfig(); -@@ -194,7 +194,7 @@ - } - if(parseLine(buf,&squidInfo) != 1){ - sgLogError("ERROR: Error parsing squid line: %s",buf); -- puts(""); -+ puts("BH message=\"squidGuard error parsing squid line\""); - } - else { - src = Source; -@@ -206,14 +206,14 @@ - acl = sgAclCheckSource(src); - if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){ - if(src == NULL || src->cont_search == 0){ -- puts(""); -+ puts("ERR"); - break; - } else - if(src->next != NULL){ - src = src->next; - continue; - } else { -- puts(""); -+ puts("ERR"); - break; - } - } else { -@@ -228,6 +228,10 @@ - fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src, - squidInfo.srcDomain,squidInfo.ident, - squidInfo.method); -+ if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') { -+ fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]); -+ } else -+ fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect); - /* sgLogDebug("DEBUG: %s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */ - break; - } -diff -ur squidGuard-1.5-beta.orig/src/main.c.in squidGuard-1.5-beta/src/main.c.in ---- squidGuard-1.5-beta.orig/src/main.c.in 2013-12-12 11:47:31.000000000 +1300 -+++ squidGuard-1.5-beta/src/main.c.in 2013-12-12 11:53:18.000000000 +1300 -@@ -185,7 +185,7 @@ - sgReloadConfig(); - } - if(failsafe_mode) { -- puts(""); -+ puts("ERR message=\"squidGuard failsafe mode\""); - fflush(stdout); - if(sig_hup){ - sgReloadConfig(); -@@ -194,7 +194,7 @@ - } - if(parseLine(buf,&squidInfo) != 1){ - sgLogError("ERROR: Error parsing squid line: %s",buf); -- puts(""); -+ puts("BH message=\"squidGuard error parsing squid line\""); - } - else { - src = Source; -@@ -206,14 +206,14 @@ - acl = sgAclCheckSource(src); - if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){ - if(src == NULL || src->cont_search == 0){ -- puts(""); -+ puts("ERR"); - break; - } else - if(src->next != NULL){ - src = src->next; - continue; - } else { -- puts(""); -+ puts("ERR"); - break; - } - } else { -@@ -225,9 +225,11 @@ - squidInfo.ident[0] = '-'; - squidInfo.ident[1] = '\0'; - } -- fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src, -- squidInfo.srcDomain,squidInfo.ident, -- squidInfo.method); -+ if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') { -+ fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]); -+ } else -+ fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect); -+ - /* sgLogDebug("DEBUG: %s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */ - break; - } -diff -ur squidGuard-1.5-beta.orig/src/sgDiv.c squidGuard-1.5-beta/src/sgDiv.c ---- squidGuard-1.5-beta.orig/src/sgDiv.c 2013-12-12 11:47:31.000000000 +1300 -+++ squidGuard-1.5-beta/src/sgDiv.c 2013-12-12 11:48:36.000000000 +1300 -@@ -782,7 +782,7 @@ - } - sgLogError("ERROR: Going into emergency mode"); - while(fgets(buf, MAX_BUF, stdin) != NULL){ -- puts(""); -+ puts("ERR"); - fflush(stdout); - } - sgLogError("ERROR: Ending emergency mode, stdin empty"); -diff -ur squidGuard-1.5-beta.orig/src/sgDiv.c.in squidGuard-1.5-beta/src/sgDiv.c.in ---- squidGuard-1.5-beta.orig/src/sgDiv.c.in 2013-12-12 11:47:31.000000000 +1300 -+++ squidGuard-1.5-beta/src/sgDiv.c.in 2013-12-12 11:48:36.000000000 +1300 -@@ -782,7 +782,7 @@ - } - sgLogError("ERROR: Going into emergency mode"); - while(fgets(buf, MAX_BUF, stdin) != NULL){ -- puts(""); -+ puts("ERR"); - fflush(stdout); - } - sgLogError("ERROR: Ending emergency mode, stdin empty"); diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild b/net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild deleted file mode 100644 index 235a6ac00ed2..000000000000 --- a/net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WANT_AUTOMAKE=none - -inherit autotools db-use eutils user - -MY_P="squidGuard-${PV/_/-}" - -DESCRIPTION="Combined filter, redirector and access controller plugin for Squid" -HOMEPAGE="http://www.squidguard.org" -SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 sparc x86" - -IUSE="ldap" - -RDEPEND="|| ( - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) - ldap? ( net-nds/openldap:0 )" - -DEPEND="${RDEPEND} - sys-devel/bison:0 - sys-devel/flex:0" - -S="${WORKDIR}/${MY_P}" - -suitable_db_version() { - local tested_slots="4.8 4.7 4.6 4.5 4.4 4.3 4.2" - 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" -} - -pkg_setup() { - enewgroup squid - enewuser squid -1 -1 /var/cache/squid squid -} - -src_prepare() { - mv configure.in configure.ac || die - epatch \ - "${FILESDIR}/${P}-gentoo.patch" \ - "${FILESDIR}/${P}-protocol.patch" - - # Link only with specific BerkDB versions - db_version="$(suitable_db_version)" - sed -i -e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" configure.ac || die - - eapply_user - eautoreconf -} - -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" INSTDIR="${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/" -} -- cgit v1.2.3