* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2015-10-12 13:31 Sergey Popov
0 siblings, 0 replies; 12+ messages in thread
From: Sergey Popov @ 2015-10-12 13:31 UTC (permalink / raw
To: gentoo-commits
commit: fdecafe4ff8f8f595a0faebe64f273289ddb6434
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 13:29:07 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 13:31:19 2015 +0000
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-<longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription>
+ <maintainer>
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2015-10-12 13:31 Sergey Popov
0 siblings, 0 replies; 12+ messages in thread
From: Sergey Popov @ 2015-10-12 13:31 UTC (permalink / raw
To: gentoo-commits
commit: c0174797bdee5f98ce633ad8cac666b89979bcfe
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 13:31:03 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 13:31:21 2015 +0000
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..0000000
--- 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/"
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2015-11-13 9:42 Agostino Sarubbo
0 siblings, 0 replies; 12+ messages in thread
From: Agostino Sarubbo @ 2015-11-13 9:42 UTC (permalink / raw
To: gentoo-commits
commit: c626479ffbeeb99da46070e7c05f5a5406944fba
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 09:42:03 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 09:42:03 2015 +0000
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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2016-07-05 15:27 Jeroen Roovers
0 siblings, 0 replies; 12+ messages in thread
From: Jeroen Roovers @ 2016-07-05 15:27 UTC (permalink / raw
To: gentoo-commits
commit: b742d03f6ee1b45be6935aaa6058f54dc90ab1fe
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 15:23:42 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 15:26:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b742d03f
net-proxy/squidguard: Remove short <longdescription />.
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 @@
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
- <longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2017-05-12 9:20 Sergey Popov
0 siblings, 0 replies; 12+ messages in thread
From: Sergey Popov @ 2017-05-12 9:20 UTC (permalink / raw
To: gentoo-commits
commit: e5d53d7d4b90920f3b30a88536a4fa65694aca62
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 09:19:24 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri May 12 09:20:46 2017 +0000
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
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2020-01-22 11:57 Sergey Popov
0 siblings, 0 replies; 12+ messages in thread
From: Sergey Popov @ 2020-01-22 11:57 UTC (permalink / raw
To: gentoo-commits
commit: badc3b9ce78ad3d67d43d217c1a328d71af82f26
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 11:39:16 2020 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 11:56:51 2020 +0000
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 <toralf <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Sergey Popov <pinkbyte <AT> 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() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2020-03-08 16:58 Sergey Popov
0 siblings, 0 replies; 12+ messages in thread
From: Sergey Popov @ 2020-03-08 16:58 UTC (permalink / raw
To: gentoo-commits
commit: c97a98e020135b01cd2509701a752b3f761371ff
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 8 16:56:47 2020 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sun Mar 8 16:57:56 2020 +0000
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 <pinkbyte <AT> 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2020-03-09 11:17 Agostino Sarubbo
0 siblings, 0 replies; 12+ messages in thread
From: Agostino Sarubbo @ 2020-03-09 11:17 UTC (permalink / raw
To: gentoo-commits
commit: de4368774f14034c6906a69a4d79c1f6f48b2440
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 11:17:22 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 11:17:22 2020 +0000
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 <ago <AT> 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2020-03-09 12:39 Agostino Sarubbo
0 siblings, 0 replies; 12+ messages in thread
From: Agostino Sarubbo @ 2020-03-09 12:39 UTC (permalink / raw
To: gentoo-commits
commit: cff5c75db51eb4367c411f9ad763387cd3a6c0de
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 12:37:49 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 12:37:49 2020 +0000
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 <ago <AT> 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2020-03-09 12:42 Agostino Sarubbo
0 siblings, 0 replies; 12+ messages in thread
From: Agostino Sarubbo @ 2020-03-09 12:42 UTC (permalink / raw
To: gentoo-commits
commit: e5e3704c9af385deac3fd21893628329ae220c23
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 12:42:39 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 12:42:39 2020 +0000
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 <ago <AT> 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2020-03-09 12:48 Agostino Sarubbo
0 siblings, 0 replies; 12+ messages in thread
From: Agostino Sarubbo @ 2020-03-09 12:48 UTC (permalink / raw
To: gentoo-commits
commit: 7c57eab8e6cb22618206675222b5bcd70814e98a
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 9 12:48:26 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 9 12:48:26 2020 +0000
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 <ago <AT> 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"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
@ 2020-12-08 12:49 Sergey Popov
0 siblings, 0 replies; 12+ messages in thread
From: Sergey Popov @ 2020-12-08 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 8135845b8bc6721e7537e46f7033537cf9ac30f6
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 12:45:34 2020 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 12:49:03 2020 +0000
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 <ago <AT> gentoo.org>
Closes: https://bugs.gentoo.org/731680
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergey Popov <pinkbyte <AT> 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-12-08 12:49 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-09 11:17 [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/ Agostino Sarubbo
-- strict thread matches above, loose matches on Subject: below --
2020-12-08 12:49 Sergey Popov
2020-03-09 12:48 Agostino Sarubbo
2020-03-09 12:42 Agostino Sarubbo
2020-03-09 12:39 Agostino Sarubbo
2020-03-08 16:58 Sergey Popov
2020-01-22 11:57 Sergey Popov
2017-05-12 9:20 Sergey Popov
2016-07-05 15:27 Jeroen Roovers
2015-11-13 9:42 Agostino Sarubbo
2015-10-12 13:31 Sergey Popov
2015-10-12 13:31 Sergey Popov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox