[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/, sys-apps/flatpak/, sys-devel/automake/, ...
commit: 24579fc8ca4ef3bed96481e5aff2c3d21c51682c
Author: Michał Górny gentoo org>
AuthorDate: Sun Jan 14 20:22:41 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jan 15 15:58:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24579fc8
Move {sys-devel → dev-build}/automake
Signed-off-by: Michał Górny gentoo.org>
{sys-devel => dev-build}/automake/Manifest| 0
{sys-devel => dev-build}/automake/automake-1.11.6-r4.ebuild | 0
{sys-devel => dev-build}/automake/automake-1.16.5-r1.ebuild | 0
{sys-devel => dev-build}/automake/automake-.ebuild| 0
.../automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch | 0
.../automake/files/automake-1.11.6-perl-5.16.patch| 0
.../files/automake-1.11.6-perl-escape-curly-bracket-r1.patch | 0
.../automake/files/automake-1.16.5-apostrophe-in-tests.patch | 0
.../files/automake-1.16.5-fix-instmany-python.sh-test.patch | 0
.../files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch| 0
.../automake/files/automake-1.16.5-parallel-build.patch | 0
.../automake/files/automake-1.16.5-py3-compile.patch | 0
{sys-devel => dev-build}/automake/metadata.xml| 0
dev-util/autoproject/autoproject-0.20_p5.ebuild | 2 +-
dev-util/poke/poke-2.4-r1.ebuild | 2 +-
dev-util/poke/poke-2.90.1.ebuild | 2 +-
dev-util/poke/poke-3.0.ebuild | 2 +-
dev-util/poke/poke-3.1.ebuild | 2 +-
dev-util/poke/poke-3.2.ebuild | 2 +-
dev-util/poke/poke-3.3.ebuild | 2 +-
dev-util/poke/poke-.ebuild| 2 +-
eclass/autotools.eclass | 8
net-proxy/squidguard/squidguard-1.6.0-r1.ebuild | 4 ++--
profiles/default/linux/packages.build | 2 +-
profiles/info_pkgs| 2 +-
profiles/package.mask | 4 ++--
profiles/updates/1Q-2024 | 1 +
sys-apps/flatpak/flatpak-1.12.8.ebuild| 4 ++--
sys-apps/flatpak/flatpak-1.14.4-r3.ebuild | 4 ++--
sys-apps/flatpak/flatpak-1.14.5.ebuild| 2 +-
sys-apps/texinfo/texinfo-7.0.3.ebuild | 2 +-
sys-apps/texinfo/texinfo-7.1-r1.ebuild| 2 +-
sys-apps/texinfo/texinfo-.ebuild | 2 +-
sys-devel/libtool/libtool-2.4.7-r1.ebuild | 2 +-
sys-devel/libtool/libtool-2.4.7-r2.ebuild | 2 +-
sys-devel/libtool/libtool-.ebuild | 2 +-
sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild| 2 +-
sys-kernel/genkernel/genkernel-4.3.3.ebuild | 2 +-
sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild| 2 +-
sys-kernel/genkernel/genkernel-4.3.5.ebuild | 2 +-
sys-kernel/genkernel/genkernel-4.3.6.ebuild | 2 +-
sys-kernel/genkernel/genkernel-4.3.7.ebuild | 2 +-
sys-kernel/genkernel/genkernel-4.3.8.ebuild | 2 +-
sys-kernel/genkernel/genkernel-.ebuild| 2 +-
44 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/sys-devel/automake/Manifest b/dev-build/automake/Manifest
similarity index 100%
rename from sys-devel/automake/Manifest
rename to dev-build/automake/Manifest
diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild
b/dev-build/automake/automake-1.11.6-r4.ebuild
similarity index 100%
rename from sys-devel/automake/automake-1.11.6-r4.ebuild
rename to dev-build/automake/automake-1.11.6-r4.ebuild
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild
b/dev-build/automake/automake-1.16.5-r1.ebuild
similarity index 100%
rename from sys-devel/automake/automake-1.16.5-r1.ebuild
rename to dev-build/automake/automake-1.16.5-r1.ebuild
diff --git a/sys-devel/automake/automake-.ebuild
b/dev-build/automake/automake-.ebuild
similarity index 100%
rename from sys-devel/automake/automake-.ebuild
rename to dev-build/automake/automake-.ebuild
diff --git
a/sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
b/dev-build/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
similarity index 100%
rename from
sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
rename to
dev-build/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
diff --git a/sys-devel/automake/files/automake-1.11.6-perl-5.1
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/, net-proxy/squidguard/files/
commit: bfb379b65e263532855151e6fbe754c2c54bcfaf
Author: Sergey Popov gentoo org>
AuthorDate: Thu Dec 15 07:48:47 2022 +
Commit: Sergey Popov gentoo org>
CommitDate: Thu Dec 15 07:48:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfb379b6
net-proxy/squidguard: attemp to handle build failure
Bug: https://bugs.gentoo.org/871228
Signed-off-by: Sergey Popov gentoo.org>
.../squidguard/files/squidguard-1.6.0-stdlib.patch | 22 ++
net-proxy/squidguard/squidguard-1.6.0-r1.ebuild| 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
b/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
new file mode 100644
index ..51489b32de5e
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
@@ -0,0 +1,22 @@
+--- 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 @@
+ LIBS="$LIBS -ldb"
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include
++#ifdef HAVE_STDLIB_H
++#include
++#endif
+ int main()
+ {
+ int major, minor, patch;
+@@ -377,6 +378,9 @@
+
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include
++#ifdef HAVE_STDLIB_H
++#include
++#endif
+ int main()
+ {
+ int major, minor, patch;
diff --git a/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
b/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
index 6d7d3b3886d4..0491a0e5c9de 100644
--- a/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
@@ -45,7 +45,8 @@ suitable_db_version() {
src_prepare() {
eapply \
"${FILESDIR}/${P}-gentoo.patch" \
- "${FILESDIR}/${P}-gcc-10.patch"
+ "${FILESDIR}/${P}-gcc-10.patch" \
+ "${FILESDIR}/${P}-stdlib.patch"
# Link only with specific BerkDB versions
# Do not inject default paths for library searching
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: 8135845b8bc6721e7537e46f7033537cf9ac30f6
Author: Sergey Popov gentoo org>
AuthorDate: Tue Dec 8 12:45:34 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Tue Dec 8 12:49:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8135845b
net-proxy/squidguard: fix building with clang
Also correct build-time dependencies
Reported-by: Agostino Sarubbo gentoo.org>
Closes: https://bugs.gentoo.org/731680
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergey Popov gentoo.org>
net-proxy/squidguard/squidguard-1.6.0.ebuild | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index c4bce1009a7..a811dda736c 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -24,9 +24,12 @@ RDEPEND="
)
ldap? ( net-nds/openldap:0 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
sys-devel/bison:0
- sys-devel/flex:0"
+ sys-devel/flex:0
+"
suitable_db_version() {
local tested_slots="5.3 4.8"
@@ -45,8 +48,12 @@ src_prepare() {
"${FILESDIR}/${P}-gcc-10.patch"
# 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})/"
configure.ac || die
+ sed -i \
+ -e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" \
+ -e '/$LDFLAGS $db_lib $ldap_lib/d' \
+ configure.ac || die
eapply_user
eautoreconf
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/files/, net-proxy/squidguard/
commit: b5009e568eb238903189fbdd2cbbf58793e0ebe3
Author: Sergey Popov gentoo org>
AuthorDate: Tue Jul 7 13:58:28 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Tue Jul 7 13:58:37 2020 +
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 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..000
--- 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.in2008-05-17 18:36:44.0 +
-+++ squidGuard-1.4/Makefile.in 2009-01-10 13:02:14.0 +
-@@ -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.in2009-01-03 20:05:39.0
+
-+++ squidGuard-1.4/src/Makefile.in 2009-01-10 13:02:14.0 +
-@@ -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..000
--- 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.c2013-12-12 11:47:31.0
+1300
-+++ squidGuard-1.5-beta/src/main.c 2013-12-12 11:50:38.0 +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("");
-+
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: 7c57eab8e6cb22618206675222b5bcd70814e98a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 9 12:48:26 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 9 12:48:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c57eab8
net-proxy/squidguard: x86 stable wrt bug #711882
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-proxy/squidguard/squidguard-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index bc969571ec4..c4bce1009a7 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/s/squidguard/${PN}_${PV}.orig.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86"
IUSE="ldap"
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: e5e3704c9af385deac3fd21893628329ae220c23
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 9 12:42:39 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 9 12:42:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e3704c
net-proxy/squidguard: ppc64 stable wrt bug #711882
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-proxy/squidguard/squidguard-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index 57488838be0..bc969571ec4 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/s/squidguard/${PN}_${PV}.orig.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc ~x86"
IUSE="ldap"
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: cff5c75db51eb4367c411f9ad763387cd3a6c0de
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 9 12:37:49 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 9 12:37:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff5c75d
net-proxy/squidguard: amd64 stable wrt bug #711882
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-proxy/squidguard/squidguard-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index c155025aaab..57488838be0 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/s/squidguard/${PN}_${PV}.orig.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc ~x86"
IUSE="ldap"
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: de4368774f14034c6906a69a4d79c1f6f48b2440
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Mar 9 11:17:22 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Mar 9 11:17:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de436877
net-proxy/squidguard: ppc stable wrt bug #711882
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-proxy/squidguard/squidguard-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index 2b3d62ad4af..c155025aaab 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -11,7 +11,7 @@
SRC_URI="mirror://debian/pool/main/s/squidguard/${PN}_${PV}.orig.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~ppc64 ~sparc ~x86"
IUSE="ldap"
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/, net-proxy/squidguard/files/
commit: f66de12b306604b21464672b1d477c9d92e82618
Author: Sergey Popov gentoo org>
AuthorDate: Sun Mar 8 17:23:26 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Sun Mar 8 17:24:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66de12b
net-proxy/squidguard-1.6.0: fix building with -fno-common
Closes: https://bugs.gentoo.org/708420
Signed-off-by: Sergey Popov gentoo.org>
Package-Manager: Portage-2.3.89, Repoman-2.3.11
.../squidguard/files/squidguard-1.6.0-gcc-10.patch | 54 ++
net-proxy/squidguard/squidguard-1.6.0.ebuild | 3 +-
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch
b/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch
new file mode 100644
index 000..650153f2801
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch
@@ -0,0 +1,54 @@
+--- a/src/y.tab.c.bison2020-03-08 20:05:00.75000 +0300
b/src/y.tab.c.bison2020-03-08 20:04:42.16000 +0300
+@@ -217,7 +217,7 @@
+
+ #include "sgEx.h"
+
+-FILE *yyin, *yyout;
++extern FILE *yyin, *yyout;
+ char *configFile;
+
+ int numTimeElements;
+--- a/src/sg.h.in 2020-03-08 20:02:46.9 +0300
b/src/sg.h.in 2020-03-08 20:03:22.11000 +0300
+@@ -115,7 +115,7 @@
+ #define REDIRECT_PERMANENT "301:"
+ #define REDIRECT_TEMPORARILY "302:"
+
+-char *progname;
++extern char *progname;
+
+ struct LogFileStat {
+ char *name;
+@@ -337,7 +337,7 @@
+ struct AclDest *next;
+ };
+
+-int lineno;
++extern int lineno;
+
+ char *sgParseRedirect __P((char *, struct SquidInfo *, struct Acl *,
struct AclDest *));
+ char *sgAclAccess __P((struct Source *, struct Acl *, struct SquidInfo *));
+--- a/src/main.c.in2020-03-08 20:10:55.65000 +0300
b/src/main.c.in2020-03-08 20:11:13.59000 +0300
+@@ -21,6 +21,9 @@
+ #include
+ #endif
+
++char *progname;
++int lineno;
++
+ struct Setting *lastSetting = NULL;
+ struct Setting *Setting = NULL;/* linked list, Calloc
*/
+
+--- a/src/sg.y.in 2020-03-08 20:14:46.18000 +0300
b/src/sg.y.in 2020-03-08 20:14:57.11000 +0300
+@@ -35,7 +35,7 @@
+
+ #include "sgEx.h"
+
+-FILE *yyin, *yyout;
++extern FILE *yyin, *yyout;
+ char *configFile;
+
+ int numTimeElements;
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index 066fb4c6048..2b3d62ad4af 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -41,7 +41,8 @@ suitable_db_version() {
src_prepare() {
eapply \
- "${FILESDIR}/${P}-gentoo.patch"
+ "${FILESDIR}/${P}-gentoo.patch" \
+ "${FILESDIR}/${P}-gcc-10.patch"
# Link only with specific BerkDB versions
db_version="$(suitable_db_version)"
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: c97a98e020135b01cd2509701a752b3f761371ff
Author: Sergey Popov gentoo org>
AuthorDate: Sun Mar 8 16:56:47 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Sun Mar 8 16:57:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97a98e0
net-proxy/squidguard-1.6.0: migrate from user eclass
Signed-off-by: Sergey Popov gentoo.org>
Package-Manager: Portage-2.3.89, Repoman-2.3.11
net-proxy/squidguard/squidguard-1.6.0.ebuild | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index 30193a1ef08..066fb4c6048 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools db-use user
+inherit autotools db-use
DESCRIPTION="Combined filter, redirector and access controller plugin for
Squid"
HOMEPAGE="http://www.squidguard.org";
@@ -15,7 +15,10 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="ldap"
-RDEPEND="|| (
+RDEPEND="
+ acct-group/squid
+ acct-user/squid
+ || (
sys-libs/db:5.3
sys-libs/db:4.8
)
@@ -36,11 +39,6 @@ suitable_db_version() {
die "No suitable BerkDB versions found, aborting"
}
-pkg_setup() {
- enewgroup squid
- enewuser squid -1 -1 /var/cache/squid squid
-}
-
src_prepare() {
eapply \
"${FILESDIR}/${P}-gentoo.patch"
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: badc3b9ce78ad3d67d43d217c1a328d71af82f26
Author: Sergey Popov gentoo org>
AuthorDate: Wed Jan 22 11:39:16 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Wed Jan 22 11:56:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badc3b9c
net-proxy/squidguard: fix QA issue with automake call in src_prepare
Closes: https://bugs.gentoo.org/705374
Reported-by: Toralf Förster gentoo.org>
Signed-off-by: Michał Górny gentoo.org>
Signed-off-by: Sergey Popov gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.11
net-proxy/squidguard/squidguard-1.6.0.ebuild | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index b826299c377..30193a1ef08 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -51,9 +51,11 @@ src_prepare() {
eapply_user
eautoreconf
- # eautomake does not work because of borked source code of squidguard
buildsystem
- # only needed to create install-sh and other missing stuff
- automake --no-force --add-missing --copy
+
+ # Workaround for missing install-sh, bug #705374
+ local amver=$(best_version sys-devel/automake)
+ amver=$(ver_cut 1-2 "${amver#sys-devel/automake-}")
+ cp -p "${BROOT}/usr/share/automake-${amver}/install-sh" . || die
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/, net-proxy/squidguard/files/
commit: 4bc402ef0b43502e8ceea658b3eb91517fde717c
Author: Sergey Popov gentoo org>
AuthorDate: Mon Jan 13 17:30:45 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Mon Jan 13 17:34:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc402ef
net-proxy/squidguard: version bump to 1.6.0
Signed-off-by: Sergey Popov gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
net-proxy/squidguard/Manifest | 1 +
.../squidguard/files/squidguard-1.6.0-gentoo.patch | 33
net-proxy/squidguard/squidguard-1.6.0.ebuild | 92 ++
3 files changed, 126 insertions(+)
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 42063dcb795..c54a3bc2dce 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -1 +1,2 @@
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.6.0-gentoo.patch
b/net-proxy/squidguard/files/squidguard-1.6.0-gentoo.patch
new file mode 100644
index 000..1a2ca8218f4
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.6.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- squidGuard-1.6.orig/Makefile.in2020-01-09 18:36:44.0 +
squidGuard-1.6/Makefile.in 2020-01-10 13:02:14.0 +
+@@ -43,7 +43,7 @@
+ # Dependencies for installing
+ #
+
+-install: install-build install-conf
++install: install-build
+
+ install-conf:
+ @echo Installing configuration file ;
+--- squidGuard-1.6.orig/src/Makefile.in2020-01-03 12:05:39.0
+
squidGuard-1.6/src/Makefile.in 2020-01-10 13:02:14.0 +
+@@ -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) "$(DESTDIR)"/$(bindir) "$(DESTDIR)"/$(logdir)
"$(DESTDIR)"/$(cfgdir)
++ $(INSTALL_PROGRAM) squidGuard "$(DESTDIR)"/$(bindir)/squidGuard
+
+ uninstall.bin::
+ @echo making $@ in `basename \`pwd\``
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild
b/net-proxy/squidguard/squidguard-1.6.0.ebuild
new file mode 100644
index 000..b826299c377
--- /dev/null
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use user
+
+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="|| (
+ sys-libs/db:5.3
+ sys-libs/db:4.8
+ )
+ ldap? ( net-nds/openldap:0 )"
+
+DEPEND="${RDEPEND}
+ sys-devel/bison:0
+ sys-devel/flex: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"
+}
+
+pkg_setup() {
+ enewgroup squid
+ enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+ eapply \
+ "${FILESDIR}/${P}-gentoo.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
+ # eautomake does not work because of borked source code of squidguard
buildsystem
+ # only needed to create install-sh and other missing stuff
+ automake --no-force --add-missing --copy
+}
+
+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() {
+
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: e5d53d7d4b90920f3b30a88536a4fa65694aca62
Author: Sergey Popov gentoo org>
AuthorDate: Fri May 12 09:19:24 2017 +
Commit: Sergey Popov gentoo org>
CommitDate: Fri May 12 09:20:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d53d7d
net-proxy/squidguard: revision bump
Bump EAPI to 6, restrict linking with unsupported versions of sys-libs/db
Committing straight to stable
Gentoo-Bug: 528858
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --force
...eta-r1.ebuild => squidguard-1.5_beta-r2.ebuild} | 37 ++
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
b/net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild
similarity index 67%
rename from net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
rename to net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild
index 408711ab997..235a6ac00ed 100644
--- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
WANT_AUTOMAKE=none
-inherit eutils autotools user
+inherit autotools db-use eutils user
MY_P="squidGuard-${PV/_/-}"
@@ -19,7 +19,15 @@ KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
IUSE="ldap"
-RDEPEND=">=sys-libs/db-2:*
+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}
@@ -28,6 +36,17 @@ DEPEND="${RDEPEND}
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
@@ -39,13 +58,18 @@ src_prepare() {
"${FILESDIR}/${P}-gentoo.patch" \
"${FILESDIR}/${P}-protocol.patch"
- epatch_user
+ # 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
}
@@ -62,7 +86,8 @@ src_install() {
doins "${FILESDIR}"/blockedsites
dodoc ANNOUNCE CHANGELOG README
- dohtml doc/*.html
+ docinto html
+ dodoc doc/*.html
docinto text
dodoc doc/*.txt
}
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/files/, net-proxy/squidguard/
commit: 34cabded1facfd9aa06d1b6b4de0bbe4ebc7842e
Author: Sergey Popov gentoo org>
AuthorDate: Thu Jul 7 19:33:15 2016 +
Commit: Sergey Popov gentoo org>
CommitDate: Thu Jul 7 20:50:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34cabded
net-proxy/squidguard: drop old vulnerable version
Gentoo-Bug: 586668
Package-Manager: portage-2.3.0_rc1
net-proxy/squidguard/Manifest | 1 -
.../files/squidguard-1.4-autoheader.patch | 61 --
.../files/squidguard-1.4-cross-compile.patch | 51 ---
.../squidguard/files/squidguard-1.4-gentoo.patch | 74 --
.../files/squidguard-1.4-upstream-fixes.patch | 24 ---
.../files/squidguard-1.4-vsnprintf.patch | 44 -
net-proxy/squidguard/squidguard-1.4-r4.ebuild | 73 -
7 files changed, 328 deletions(-)
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 4987384..f43eed6 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -1,2 +1 @@
-DIST squidGuard-1.4.tar.gz 1968492 SHA256
0711ce60b8e2bbba107b980fed446a88df35e1584b39f079c0cae54a172c5141 SHA512
6d55bda4c6b597ff52fed95ec336ca2d0b028359332217a552e645a3ac76d6d812926cd837e77cb5e046109c3c6291d52b92f3f7ac987dbf1b6fd17d68f1413d
WHIRLPOOL
0c1e5813f4ac0d84303ec420a811f9ed3691aba3a7785591ab440aa5e768a50e54e77846e8a5df4364bd5a8bdb1d6de0813b35ef3fe8536730e372d3b98db533
DIST squidGuard-1.5-beta.tar.gz 1983030 SHA256
ba4b79cd193bd3095f3fd27a6e2fc1b36effc2e12a33e17159d4a51993fb3c8e SHA512
37ddc2ac82596e9d24aac6a610763f2eeb7c15b3a2d7babb85948e1da912aebb1dc85309766f7d8c3d7c22713e24a51f4cdef4520117a03d839662ef2494b6e7
WHIRLPOOL
6f65c6a9b23396a7c4a10f344a20cb4824e0abae451fb95a1b563084d0c9755b20f67a74d991b76a54d239ad3dbc6ba468d3c687fdbd80c31567608a927154fc
diff --git a/net-proxy/squidguard/files/squidguard-1.4-autoheader.patch
b/net-proxy/squidguard/files/squidguard-1.4-autoheader.patch
deleted file mode 100644
index af97d8e..000
--- a/net-proxy/squidguard/files/squidguard-1.4-autoheader.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in
squidGuard-1.4.orig/configure.in 2009-01-03 20:04:30.0 +
-+++ squidGuard-1.4/configure.in2009-01-10 13:08:49.0 +
-@@ -93,18 +93,18 @@
-squiduser=$withval)
-
- if test -n "$sg_config"; then
-- AC_DEFINE(ACCONFIG)
-+ AC_DEFINE(ACCONFIG, 1, [Defined if you supply --with-sg-config])
- changequote(, )dnl
- sg_cfgdir=`echo $sg_config|sed "s%/[^/][^/]*$%%"`
- changequote([, ])dnl
- fi
-
- if test -n "$sg_logdir"; then
-- AC_DEFINE(ACLOGDIR)
-+ AC_DEFINE(ACLOGDIR, 1, [Defined if you supply --with-sg-logdir])
- fi
-
- if test -n "$sg_dbhome"; then
-- AC_DEFINE(ACDBHOME)
-+ AC_DEFINE(ACDBHOME, 1, [Defined if you supply --with-sg-dbhome])
- fi
-
- CFLAGS="$CFLAGS $db_inc"
-@@ -186,7 +186,7 @@
- YACCLINE=""
- fi
- if test "$with_ldap" = "yes"; then
-- AC_DEFINE(HAVE_LIBLDAP)
-+ AC_DEFINE(HAVE_LIBLDAP, 1, [Define if LDAP support should be compiled])
-AC_RUN_IFELSE([
-
-#include
-@@ -277,7 +277,7 @@
- CPPFLAGS="${CPPFLAGS} -I${MYSQL_INC_DIR}"
- AC_CHECK_LIB(z, compress)
- LIBS="-lmysqlclient ${LIBS}"
-- AC_DEFINE(HAVE_MYSQL)
-+ AC_DEFINE(HAVE_MYSQL, 1, [Define if MySQL support should be compiled])
- fi
- fi
- else
-@@ -380,7 +380,7 @@
- ], dbg2_ok_version=yes, dbg2_ok_version=no, dbg2_ok_version=no)
-
- if test $dbg2_ok_version = yes; then
-- AC_DEFINE(DB_VERSION_GT2)
-+ AC_DEFINE(DB_VERSION_GT2, 1, [Define if you have dbversion greater than
3.2])
- fi
-
- AC_RUN_IFELSE([
-@@ -404,7 +404,7 @@
- ], dbg3_ok_version=yes, dbg3_ok_version=no, dbg3_ok_version=no)
-
- if test $dbg3_ok_version = yes; then
--AC_DEFINE(DB_VERSION_GT3)
-+AC_DEFINE(DB_VERSION_GT3, 1, [Define if you have dbversion greater
than 4.0])
- fi
-
-
diff --git a/net-proxy/squidguard/files/squidguard-1.4-cross-compile.patch
b/net-proxy/squidguard/files/squidguard-1.4-cross-compile.patch
deleted file mode 100644
index ad397fe..000
--- a/net-proxy/squidguard/files/squidguard-1.4-cross-compile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in
squidGuard-1.4.orig/configure.in 2009-01-03 20:04:30.0 +
-+++ squidGuard-1.4/configure.in2009-04-25 09:53:49.0 +
-@@ -201,7 +201,9 @@
-echo "Unable to link to LDAP library."
-echo
-exit 1
-- ],)
-+ ],[
-+ ac_status=0
-+ ])
- fi
-
- dnl
-@@ -314,7 +316,8 @@
- exit (0);
- exit (1);
- }
-- ], db_ok_version=yes, db_ok_version=no, db_ok_version=no)
-+ ], db_ok_version=y
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: b742d03f6ee1b45be6935aaa6058f54dc90ab1fe Author: Jeroen Roovers gentoo org> AuthorDate: Tue Jul 5 15:23:42 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Jul 5 15:26:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b742d03f net-proxy/squidguard: Remove short . Package-Manager: portage-2.3.0 net-proxy/squidguard/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/net-proxy/squidguard/metadata.xml b/net-proxy/squidguard/metadata.xml index e9dc8d4..5b159fb 100644 --- a/net-proxy/squidguard/metadata.xml +++ b/net-proxy/squidguard/metadata.xml @@ -5,5 +5,4 @@ pinkb...@gentoo.org Sergey Popov - Combined filter, redirector and access controller plugin for Squid
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: c626479ffbeeb99da46070e7c05f5a5406944fba
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Nov 13 09:42:03 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Nov 13 09:42:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c626479f
net-proxy/squidguard: ppc64 stable wrt bug #542472
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc64"
net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
index c30997f..cc0aad3 100644
--- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
@@ -16,7 +16,7 @@
SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
IUSE="ldap"
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: fdecafe4ff8f8f595a0faebe64f273289ddb6434 Author: Sergey Popov gentoo org> AuthorDate: Mon Oct 12 13:29:07 2015 + Commit: Sergey Popov gentoo org> CommitDate: Mon Oct 12 13:31:19 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdecafe4 net-proxy/squidguard: took maintainership Package-Manager: portage-2.2.22 net-proxy/squidguard/metadata.xml | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net-proxy/squidguard/metadata.xml b/net-proxy/squidguard/metadata.xml index 19dd2fb..8de62f5 100644 --- a/net-proxy/squidguard/metadata.xml +++ b/net-proxy/squidguard/metadata.xml @@ -1,6 +1,9 @@ http://www.gentoo.org/dtd/metadata.dtd";> -maintainer-nee...@gentoo.org -Combined filter, redirector and access controller plugin for Squid + + pinkb...@gentoo.org + Sergey Popov + + Combined filter, redirector and access controller plugin for Squid
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
commit: c0174797bdee5f98ce633ad8cac666b89979bcfe
Author: Sergey Popov gentoo org>
AuthorDate: Mon Oct 12 13:31:03 2015 +
Commit: Sergey Popov gentoo org>
CommitDate: Mon Oct 12 13:31:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0174797
net-proxy/squidguard: add subslot operator to sys-libs/db dependency, drop old
revision
Package-Manager: portage-2.2.22
net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild | 2 +-
net-proxy/squidguard/squidguard-1.5_beta.ebuild| 74 --
2 files changed, 1 insertion(+), 75 deletions(-)
diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
index 917df47..4fbf1b3 100644
--- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="ldap"
-RDEPEND=">=sys-libs/db-2
+RDEPEND=">=sys-libs/db-2:*
ldap? ( net-nds/openldap:0 )"
DEPEND="${RDEPEND}
diff --git a/net-proxy/squidguard/squidguard-1.5_beta.ebuild
b/net-proxy/squidguard/squidguard-1.5_beta.ebuild
deleted file mode 100644
index 1e6d391..000
--- a/net-proxy/squidguard/squidguard-1.5_beta.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_AUTOMAKE=none
-
-inherit eutils autotools 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-2
- ldap? ( net-nds/openldap:0 )"
-
-DEPEND="${RDEPEND}
- sys-devel/bison:0
- sys-devel/flex:0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup squid
- enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with ldap) \
- --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
- dohtml 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/"
-}
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/, net-proxy/squidguard/files/
commit: f4799d94d2e95a1c0303375b4bfe068481e5386a
Author: Sergey Popov gentoo org>
AuthorDate: Tue Sep 29 10:31:00 2015 +
Commit: Sergey Popov gentoo org>
CommitDate: Tue Sep 29 10:31:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4799d94
net-proxy/squidguard: revision bump
Add patch to work correctly with Squid 3.4 and above
Add support for user patches
Package-Manager: portage-2.2.20
.../files/squidguard-1.5_beta-protocol.patch | 130 +
net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild | 78 +
2 files changed, 208 insertions(+)
diff --git a/net-proxy/squidguard/files/squidguard-1.5_beta-protocol.patch
b/net-proxy/squidguard/files/squidguard-1.5_beta-protocol.patch
new file mode 100644
index 000..289fc75
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.5_beta-protocol.patch
@@ -0,0 +1,130 @@
+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.c2013-12-12 11:47:31.0
+1300
squidGuard-1.5-beta/src/main.c 2013-12-12 11:50:38.0 +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.0
+1300
squidGuard-1.5-beta/src/main.c.in 2013-12-12 11:53:18.0 +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;
+
