summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-11-02 15:54:11 +0000
committerAlin Năstac <mrness@gentoo.org>2007-11-02 15:54:11 +0000
commitfc5fc2696fd4f3044ee8b2cf172dafe4e74b4e7a (patch)
treeccd72203b921aa834e4cbafe7e6af1d09396bff8 /net-proxy
parentVersion bump to 0.10.5, fixing bug #191601. Added user patch to fix bug #196422. (diff)
downloadhistorical-fc5fc2696fd4f3044ee8b2cf172dafe4e74b4e7a.tar.gz
historical-fc5fc2696fd4f3044ee8b2cf172dafe4e74b4e7a.tar.bz2
historical-fc5fc2696fd4f3044ee8b2cf172dafe4e74b4e7a.zip
Remove obsolete version.
Package-Manager: portage-2.1.2.12
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/squidguard/ChangeLog6
-rw-r--r--net-proxy/squidguard/Manifest26
-rw-r--r--net-proxy/squidguard/files/digest-squidguard-1.2.0-r13
-rw-r--r--net-proxy/squidguard/files/squidguard-1.2.0-db4.patch51
-rw-r--r--net-proxy/squidguard/squidguard-1.2.0-r1.ebuild70
5 files changed, 12 insertions, 144 deletions
diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index b603bb85f85f..8c7d9ca53471 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-proxy/squidguard
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.16 2007/09/25 11:52:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.17 2007/11/02 15:54:11 mrness Exp $
+
+ 02 Nov 2007; Alin Năstac <mrness@gentoo.org>
+ -files/squidguard-1.2.0-db4.patch, -squidguard-1.2.0-r1.ebuild:
+ Remove obsolete version.
*squidguard-1.2.1-r2 (25 Sep 2007)
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 8ce5465bfcd1..ebb5d1e2caed 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -13,10 +13,6 @@ AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b S
MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61
RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b files/squidGuard.conf.minimal 61
SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df files/squidGuard.conf.minimal 61
-AUX squidguard-1.2.0-db4.patch 1756 RMD160 363f3299f83ae318719618a8aa6167b882976f49 SHA1 00d7f25d50bc381001a1a3d8ebbb2b1e8c719c47 SHA256 bb8c327ee367d656c8a598bda57a3b253dcb9320871ac8e90829337f4c8e82e8
-MD5 2934b894c1c9934e4e1ededec79c6bfa files/squidguard-1.2.0-db4.patch 1756
-RMD160 363f3299f83ae318719618a8aa6167b882976f49 files/squidguard-1.2.0-db4.patch 1756
-SHA256 bb8c327ee367d656c8a598bda57a3b253dcb9320871ac8e90829337f4c8e82e8 files/squidguard-1.2.0-db4.patch 1756
AUX squidguard-1.2.1-gentoo.patch 4137 RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 SHA1 727e2f15144fedeb68e52acdbd5871d31704940a SHA256 8ea7540586a974cba4afb3a9149c3436e8d3d59355f3e532de2cbfbbdc08344b
MD5 2213fd1eaf683ff05edbed2bb8ba5ea0 files/squidguard-1.2.1-gentoo.patch 4137
RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 files/squidguard-1.2.1-gentoo.patch 4137
@@ -29,34 +25,26 @@ AUX squidguard-1.2.1-tests.patch 3188 RMD160 7af54751b7e39b5cd01afe60c6c0901e0a3
MD5 d8f1ff0e64ff0c8c68c5c87059a0c20e files/squidguard-1.2.1-tests.patch 3188
RMD160 7af54751b7e39b5cd01afe60c6c0901e0a34a7dd files/squidguard-1.2.1-tests.patch 3188
SHA256 15cf16bb5cbb0066a9e3087bd512a3c8582301178df15ed2f8be5080f841d4fc files/squidguard-1.2.1-tests.patch 3188
-DIST squidGuard-1.2.0.tar.gz 1852737 RMD160 7c8d0f612b4e6bf459bf367fa56f309ce5cfe6e3 SHA1 8eb27b6eb85a3f8ed073b12a593a2c9ad97d7478 SHA256 6e88025d2906d635d170c53bf6ae7cc13e06839dfa2a6e5d92b5e6bb38e6ec6d
DIST squidGuard-1.2.1.tar.gz 1947273 RMD160 0b998792a3612db28adb795c9fb0ea9b70118af3 SHA1 f8134ad0627ce61659f0d79a4a0bcf60e8b25796 SHA256 bc658e9bbadde5d5424caddc6a592c6fcd3346230269b0233092985e4b773592
-EBUILD squidguard-1.2.0-r1.ebuild 1793 RMD160 c9344daf319fd05efeec726cde7bd224febab215 SHA1 62c094af1503e4b26d241734dec0813af08bd376 SHA256 af86fdfc14c709843de3738956880b66e753ad9b1819c620517ceb409d373c56
-MD5 7c3f31e9d9779d3a39ac2e1bdfb17a0b squidguard-1.2.0-r1.ebuild 1793
-RMD160 c9344daf319fd05efeec726cde7bd224febab215 squidguard-1.2.0-r1.ebuild 1793
-SHA256 af86fdfc14c709843de3738956880b66e753ad9b1819c620517ceb409d373c56 squidguard-1.2.0-r1.ebuild 1793
EBUILD squidguard-1.2.1-r2.ebuild 1770 RMD160 2a4fd5c47eef6b013194b35ec981ee4ed9b3ed92 SHA1 8614a391d3dc68b59cec4c7bb9b1eb03239fe064 SHA256 250a254dfaab12ee8e8f5a4eeec9192327fe0535e354b3b0181371ca61515ec8
MD5 704f2bb723fc581c05556545da9b1c19 squidguard-1.2.1-r2.ebuild 1770
RMD160 2a4fd5c47eef6b013194b35ec981ee4ed9b3ed92 squidguard-1.2.1-r2.ebuild 1770
SHA256 250a254dfaab12ee8e8f5a4eeec9192327fe0535e354b3b0181371ca61515ec8 squidguard-1.2.1-r2.ebuild 1770
-MISC ChangeLog 4876 RMD160 d1ffa3ff551683a3d47e7378a38193d77d0840dc SHA1 7ffbf0d349a4a9468d882fe6247feba7b32fd07a SHA256 6020344b64ac00dfcd7bf73cd8938a96d9e07b28edd1c829c3770c6ca3ef0bcc
-MD5 fc5f1447a7fb6b713f798e904b8a6d55 ChangeLog 4876
-RMD160 d1ffa3ff551683a3d47e7378a38193d77d0840dc ChangeLog 4876
-SHA256 6020344b64ac00dfcd7bf73cd8938a96d9e07b28edd1c829c3770c6ca3ef0bcc ChangeLog 4876
+MISC ChangeLog 5018 RMD160 c79fec3f6308c8dd549e0398b978940e503c116d SHA1 cd0a2c98ceb74b716d45fac2af9df67dfad02b7c SHA256 b00fc3aaa61272aa396da545feee839eb18229908f1cb1aafde905b40a47fd99
+MD5 168cc051e8924dd2c86283f21ee4ef7a ChangeLog 5018
+RMD160 c79fec3f6308c8dd549e0398b978940e503c116d ChangeLog 5018
+SHA256 b00fc3aaa61272aa396da545feee839eb18229908f1cb1aafde905b40a47fd99 ChangeLog 5018
MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264
RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264
SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 metadata.xml 264
-MD5 ec8ea45f424d2c3340cf2d1ea2d81317 files/digest-squidguard-1.2.0-r1 253
-RMD160 8b9dcfec3a88a47c69bbb818dab89778cb3657a9 files/digest-squidguard-1.2.0-r1 253
-SHA256 8dece5394be00ae9f361a1cfc8f6ab43ad2f8c03cd499810f55038ca4821f435 files/digest-squidguard-1.2.0-r1 253
MD5 7c40dfc7cc8a264fc15132ad35c92a7d files/digest-squidguard-1.2.1-r2 253
RMD160 47e20f3ef4c4988bc954e45c6c312be0a18a7e87 files/digest-squidguard-1.2.1-r2 253
SHA256 70a44707f5483a735541fc3f8230ad36a9e41213455be81c7e655e4c2ca37193 files/digest-squidguard-1.2.1-r2 253
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.5 (GNU/Linux)
-iD8DBQFG+PcbVSA5X31g7/gRAuW/AKCMa3O4PfeAWD1Zg4sVVP/Nr4/JQgCfTBUv
-i4BYc7sxlnH4p22a2HZxzcM=
-=tqdP
+iD8DBQFHK0guVSA5X31g7/gRApqnAJ9gQm1VIBuYTrP4Tnyov5D/uPmT4gCfZmTY
++3W05kJxhUdM9F+zF5Q0gEc=
+=IOEo
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/digest-squidguard-1.2.0-r1 b/net-proxy/squidguard/files/digest-squidguard-1.2.0-r1
deleted file mode 100644
index 96e5c2d7ecec..000000000000
--- a/net-proxy/squidguard/files/digest-squidguard-1.2.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c6e2e9112fdbda0602656f94c1ce31fd squidGuard-1.2.0.tar.gz 1852737
-RMD160 7c8d0f612b4e6bf459bf367fa56f309ce5cfe6e3 squidGuard-1.2.0.tar.gz 1852737
-SHA256 6e88025d2906d635d170c53bf6ae7cc13e06839dfa2a6e5d92b5e6bb38e6ec6d squidGuard-1.2.0.tar.gz 1852737
diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch
deleted file mode 100644
index 1519a3bbb536..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nru squidGuard-1.2.0.orig/configure.in squidGuard-1.2.0/configure.in
---- squidGuard-1.2.0.orig/configure.in 2006-09-17 20:52:13.000000000 +0300
-+++ squidGuard-1.2.0/configure.in 2006-09-17 20:52:52.219168250 +0300
-@@ -65,21 +65,7 @@
- AC_DEFINE(ACDBHOME)
- fi
-
--CFLAGS="$CFLAGS $db_inc"
--CPPFLAGS="$CPPFLAGS $db_inc"
--LDFLAGS="$LDFLAGS $db_lib"
--
--dnl Checks for libraries.
--
--AC_CHECK_LIB(db,db_version,,[
-- echo
-- echo "** The Berkley DB library is required for squidGuard"
-- echo " to compile. Get it from http://www.sleepycat.com"
-- echo " use --with-db=DIR or --with-db-lib=DIR to specify"
-- echo " its location. (default is $dbprefix/BerkeleyDB)"
-- echo
-- exit 1
-- ])
-+LIBS="$LIBS -ldb"
-
- dnl Checks for header files.
- AC_HEADER_STDC
-diff -Nru squidGuard-1.2.0.orig/src/sgDb.c squidGuard-1.2.0/src/sgDb.c
---- squidGuard-1.2.0.orig/src/sgDb.c 2006-09-17 20:52:13.000000000 +0300
-+++ squidGuard-1.2.0/src/sgDb.c 2006-09-17 20:52:25.685510000 +0300
-@@ -98,13 +98,21 @@
- if(createdb)
- flag = flag | DB_TRUNCATE;
- if ((ret =
-+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
-+#else
- Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
-+#endif
- (void) Db->dbp->close(Db->dbp, 0);
- sgLogFatalError("Error db_open: %s", strerror(ret));
- }
- } else {
- if ((ret =
-+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
-+#else
- Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
-+#endif
- sgLogFatalError("Error db_open: %s", strerror(ret));
- }
- }
diff --git a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
deleted file mode 100644
index 04eba016be50..000000000000
--- a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.9 2007/04/11 13:41:55 mrness Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://ftp.teledanmark.no/pub/www/proxy/squidGuard/squidGuard-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="net-proxy/squid
- >=sys-libs/db-2"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-S="${WORKDIR}/squidGuard-${PV}"
-
-src_unpack() {
- unpack ${A} || die "unpack problem"
-
- cd "${S}"
- epatch "${FILESDIR}/${P}-db4.patch"
- eautoconf
-}
-
-src_compile() {
- econf \
- --with-sg-config=/etc/squidGuard/squidGuard.conf \
- --with-sg-logdir=/var/log/squidGuard \
- || die "configure problem"
-
- sed -i \
- -e "s|logdir\t= /var/log/squidGuard|logdir\t= ${D}/var/log/squidGuard|" \
- -e "s|cfgdir\t= /etc/squidGuard|cfgdir\t= ${D}/etc/squidGuard|" \
- src/Makefile
-
- emake || die "compile problem"
-}
-
-src_install() {
- make prefix="${D}/usr" install
-
- dodir /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/"
-}