[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/, 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/, 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/, 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,) != 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,)) == 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], [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,) != 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,)) == 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], [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
