commit: b5009e568eb238903189fbdd2cbbf58793e0ebe3 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Tue Jul 7 13:58:28 2020 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Tue Jul 7 13:58:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5009e56
net-proxy/squidguard: drop old version Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> net-proxy/squidguard/Manifest | 1 - .../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, 283 deletions(-) diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest index c54a3bc2dce..7deddebc437 100644 --- a/net-proxy/squidguard/Manifest +++ b/net-proxy/squidguard/Manifest @@ -1,2 +1 @@ -DIST squidGuard-1.5-beta.tar.gz 1983030 BLAKE2B 60405e097babb15eb099649d4ffe23a798207c6d3ac490b8c0c7da777a0136fecb867537214aa90c58ff246a86a0cf7ce59b021e29071ecc43ad002f3a0e3def SHA512 37ddc2ac82596e9d24aac6a610763f2eeb7c15b3a2d7babb85948e1da912aebb1dc85309766f7d8c3d7c22713e24a51f4cdef4520117a03d839662ef2494b6e7 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e 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 814079764a3..00000000000 --- 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 289fc7563b7..00000000000 --- 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 235a6ac00ed..00000000000 --- 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/" -}
