summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-proxy/dansguardian/ChangeLog12
-rw-r--r--net-proxy/dansguardian/Manifest22
-rw-r--r--net-proxy/dansguardian/dansguardian-2.10-r1.ebuild103
-rw-r--r--net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild10
-rw-r--r--net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild (renamed from net-proxy/dansguardian/dansguardian-2.10-r2.ebuild)22
-rw-r--r--net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch11
-rw-r--r--net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch26
-rw-r--r--net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch37
8 files changed, 112 insertions, 131 deletions
diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 818cc0109da9..23e98b5355f1 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for net-proxy/dansguardian
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.47 2009/04/26 19:25:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.48 2009/07/05 00:04:17 mrness Exp $
+
+*dansguardian-2.10.1.1 (05 Jul 2009)
+
+ 05 Jul 2009; Alin Năstac <mrness@gentoo.org>
+ +files/dansguardian-2.10.0.3-gcc44.patch,
+ +files/dansguardian-2.10.1.1-gcc44.patch,
+ -files/dansguardian-2.10-uclibc++.patch, -dansguardian-2.10-r1.ebuild,
+ -dansguardian-2.10-r2.ebuild, dansguardian-2.10.0.3.ebuild,
+ +dansguardian-2.10.1.1.ebuild:
+ Fix gcc-4.4 errors (#275908). Version bump (#275838).
26 Apr 2009; Brent Baude <ranger@gentoo.org> dansguardian-2.10.0.3.ebuild:
stable ppc, bug 265496
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 8f905c029b1d..bd2cb6fda3fb 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,10 +1,20 @@
-AUX dansguardian-2.10-uclibc++.patch 495 RMD160 0af3b373b6a0966b05b4441a110ea67f4dfe2528 SHA1 8b8581480785e01ecd329f27e6173d1a7f0b2947 SHA256 682f7f8ddd3606867ce4f1652662f5703707e47db2779e63d7ee906312d800f7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dansguardian-2.10.0.3-gcc44.patch 1027 RMD160 a3bab6abef184cdb45bc8de57896084847823078 SHA1 ab7c60dbe683c37935d80f31356a72baa4c5eba9 SHA256 0faa881ab43930c377a134029024c4880094b197a71abcd83351378e27a3e612
+AUX dansguardian-2.10.1.1-gcc44.patch 1472 RMD160 1eb663dcf2e075b81c7d9855d5634377764e82fc SHA1 c95b4b945420b70108d4f07640b348185e8d836a SHA256 7e2069ea67428bc3b81b4e5d0d6ea942810927b600fbd09fb15843e257aff0c0
AUX dansguardian.init 826 RMD160 99f250a3e37b0650a1665923c976ee9e7cdd32c2 SHA1 0f31190c6b4d110044624063e68bede96eb3e873 SHA256 af4252ed5126e7ff1e289107eae1feb5165030077a93e855c575249eb121edb0
AUX dansguardian.logrotate 188 RMD160 c2c433f4209518a83725382f8952141a34d58d25 SHA1 ac914a9a4606d2de3297056ba2f06474f4ed31ba SHA256 124775c1a6dd20652e7b7511bb484c654ac63cc0c0a2baf2357d8ce7086867a2
DIST dansguardian-2.10.0.3.tar.gz 512695 RMD160 437c7996776d491939685ca9024a4a74851d8a0e SHA1 da473d7989da363e21fb347b1a398bd7d2489d51 SHA256 419be86f472ad0a69a8a15857a646271ac9739d29bd836be9159f2d955e5b963
-DIST dansguardian-2.10.tar.gz 512081 RMD160 1ab76ddb6750f3b397a02c498b3ceca252764900 SHA1 2acc768de7652579553ba87ab0cfcb7a56499ef3 SHA256 94e11775a0178c6b5b4284bae6fe759b5df080161ebb20cd3b57db96bd262e48
-EBUILD dansguardian-2.10-r1.ebuild 3054 RMD160 68b102e6087224e6f6068e679b33797744d508d2 SHA1 d4c77fd44e9551859c70aefba71aee047f62eaa5 SHA256 6c949ea32dfb2baf3d9810f454425886afe4816720795bdffa094ffd7ab20cb1
-EBUILD dansguardian-2.10-r2.ebuild 3148 RMD160 ed755d49650bbd938ff5f94c88d8480c76c5458e SHA1 b0d51f82dd60451f38edcbf80962fef192364621 SHA256 2a9130e6175390c9b3413b1272bf36ae57731858628b21f616ea28251af3c926
-EBUILD dansguardian-2.10.0.3.ebuild 3126 RMD160 1349e4db2c4a43afbbfc6329b0e95d54cd05d07b SHA1 0016290dc92340d3d36c2160e83a7f3bbb56bfba SHA256 884081f67111dc0d2dcc783c5979a501f34e1c424836dca7344fe78f255cc17d
-MISC ChangeLog 15013 RMD160 05ffd61abb8627f27f16472f1b53fe6c738b74a5 SHA1 d41ba90bd8ec51e2dd82e3bf3128a71d30ba9378 SHA256 fb6db7401e9ccb3ead8f8755b5c0e2e0d5362ce4c18db71e224dc7d591a3a8ce
+DIST dansguardian-2.10.1.1.tar.gz 516800 RMD160 dc15ca9779a5084c5e4248545c730f25fff241a3 SHA1 ff3012e01130b2269582c21c3eeb4ea013dc9679 SHA256 c245d58cf37f79f8a8e50b684d62b797a9f6ce1bb775e140969002dff7e11f92
+EBUILD dansguardian-2.10.0.3.ebuild 3213 RMD160 13e787ed4f895320acc0301b840d5dd580a4582f SHA1 b322b1a0e9ac301550b29924c6b8f518379822a2 SHA256 d79c6c36b2666574583a0ef98f545b3a70b10a4802c142ba89305cd798f60ce2
+EBUILD dansguardian-2.10.1.1.ebuild 3255 RMD160 97be48f79f6ad486b7df7f10603e56117ffe0be7 SHA1 4c9ca7b118b48cac7d89dc8080469701ec1d38c8 SHA256 d7c4de1b305f634a3ffab5532a7b47bf46be3840113e0ae4b74b410432be818a
+MISC ChangeLog 15412 RMD160 87fabb4501389dd2f26be82ad493944051c436d1 SHA1 12efa169cebda25f2428ba8654d6e344dcf5d15d SHA256 40073a2e109ac37accd1cbe69475dfb46b68a5e80618b00cc4ccf12e4fe2eaf6
MISC metadata.xml 724 RMD160 d04fa5762b6b6fa0e0ed1a112412f3a264289e65 SHA1 e45489153e18f40f7e2a5117799069e71b7bce30 SHA256 81f37aeb683cda10ee3786c455ca121138ed63dea31af9ceea8d967ed02f3b03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpP7g4ACgkQts85UDFmaOVKNACfSbzzAETerSKNBp0Q/PX91WMK
+QpMAn3sbCVWA73RFEjcrQ6dYqc6Qpylq
+=akrZ
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian/dansguardian-2.10-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.10-r1.ebuild
deleted file mode 100644
index edcfaa969f3b..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.10-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10-r1.ebuild,v 1.5 2008/11/13 00:42:15 ranger Exp $
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://dansguardian.org/downloads/2/Stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="clamav kaspersky debug ntlm pcre"
-
-RDEPEND="sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- clamav? ( >=app-antivirus/clamav-0.93 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-pkg_setup() {
- if has_version "<${CATEGORY}/${PN}-2.9" ; then
- ewarn "This version introduces brand new USE flags:"
- ewarn " clamav kaspersky ntlm pcre"
- echo
-
- local f="${ROOT}/etc/dansguardian"
- f=${f//\/\///}
- if [ -d "${f}" ] ; then
- eerror "The structure of ${f} has changed in this version!"
- eerror "For avoiding confusion, you must either move or delete the old ${f},"
- eerror "then continue with the upgrade:"
- eerror " mv '${f}' '${f}.old'"
- eerror " emerge --resume"
- die "Obsolete config files detected"
- fi
- fi
-}
-
-src_compile() {
- local myconf="--with-logdir=/var/log/dansguardian
- --with-piddir=/var/run
- --docdir=/usr/share/doc/${PF}
- --htmldir=/usr/share/doc/${PF}/html
- $(use_enable pcre)
- $(use_enable ntlm)
- --enable-fancydm
- --enable-email"
- if use clamav; then
- myconf="${myconf} --enable-clamd --enable-clamav
- --with-proxyuser=clamav
- --with-proxygroup=clamav"
- fi
- if use kaspersky; then
- myconf="${myconf} --enable-kavd"
- fi
- if use debug; then
- myconf="${myconf} --with-dgdebug=on"
- fi
-
- econf ${myconf} || die "configure failed"
-
- emake OPTIMISE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- make "DESTDIR=${D}" install || die "make install failed"
-
- # Move html documents to html dir
- mkdir "${D}"/usr/share/doc/${PF}/html \
- && mv "${D}"/usr/share/doc/${PF}/*.html "${D}"/usr/share/doc/${PF}/html \
- || die "no html docs found in docdir"
-
- # Copying init script
- newinitd "${FILESDIR}/dansguardian.init" dansguardian
-
- if use clamav; then
- sed -r -i -e 's/[ \t]+use dns/& clamd/' "${D}/etc/init.d/dansguardian"
- sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
- sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' "${D}/etc/dansguardian/contentscanners/clamdscan.conf"
- elif use kaspersky; then
- sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
- fi
-
- # Copying logrotation file
- insinto /etc/logrotate.d
- newins "${FILESDIR}/dansguardian.logrotate" dansguardian
-
- keepdir /var/log/dansguardian
- fperms o-rwx /var/log/dansguardian
-}
-
-pkg_postinst() {
- local runas="nobody:nobody"
- if use clamav ; then
- runas="clamav:clamav"
- fi
- einfo "The dansguardian daemon will run by default as ${runas}"
-
- if [ -d "${ROOT}/var/log/dansguardian" ] ; then
- chown -R ${runas} "${ROOT}/var/log/dansguardian"
- chmod o-rwx "${ROOT}/var/log/dansguardian"
- fi
-}
diff --git a/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild b/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
index e1090a62700e..aa2b49c65b7b 100644
--- a/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild,v 1.5 2009/04/26 19:25:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild,v 1.6 2009/07/05 00:04:17 mrness Exp $
+
+inherit eutils
DESCRIPTION="Web content filtering via proxy"
HOMEPAGE="http://dansguardian.org"
@@ -36,6 +38,12 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+
+ epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
src_compile() {
local myconf="--with-logdir=/var/log/dansguardian
--with-piddir=/var/run
diff --git a/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild b/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild
index f913317207cd..4ebf6a438e96 100644
--- a/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10-r2.ebuild,v 1.2 2008/12/01 21:08:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.1.1.ebuild,v 1.1 2009/07/05 00:04:17 mrness Exp $
+
+EAPI="2"
inherit eutils
@@ -38,23 +40,23 @@ pkg_setup() {
fi
}
-src_unpack() {
- unpack ${A}
-
- epatch "${FILESDIR}"/${P}-uclibc++.patch
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc44.patch
}
-src_compile() {
+src_configure() {
local myconf="--with-logdir=/var/log/dansguardian
--with-piddir=/var/run
--docdir=/usr/share/doc/${PF}
--htmldir=/usr/share/doc/${PF}/html
$(use_enable pcre)
$(use_enable ntlm)
+ --enable-orig-ip
--enable-fancydm
--enable-email"
if use clamav; then
- myconf="${myconf} --enable-clamd --enable-clamav
+ # readd --enable-clamav in the next version if it works with >=clamav-0.95 (#264820)
+ myconf="${myconf} --enable-clamd
--with-proxyuser=clamav
--with-proxygroup=clamav"
fi
@@ -66,12 +68,14 @@ src_compile() {
fi
econf ${myconf} || die "configure failed"
+}
+src_compile() {
emake OPTIMISE="${CFLAGS}" || die "emake failed"
}
src_install() {
- make "DESTDIR=${D}" install || die "make install failed"
+ emake "DESTDIR=${D}" install || die "emake install failed"
# Move html documents to html dir
mkdir "${D}"/usr/share/doc/${PF}/html \
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch
deleted file mode 100644
index 27b4177172aa..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.10-uclibc++.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dansguardian-2.10/src/IPList.cpp.orig 2008-11-19 07:45:54 +0000
-+++ dansguardian-2.10/src/IPList.cpp 2008-11-19 07:46:44 +0000
-@@ -81,7 +81,7 @@
- hostnames.reset(new std::deque<String>);
- hostnames->push_back(*host);
- }
-- for (std::deque<String>::const_iterator i = hostnames->begin(); i != hostnames->end(); ++i)
-+ for (std::deque<String>::iterator i = hostnames->begin(); i != hostnames->end(); ++i)
- {
- if (std::binary_search(hostlist.begin(), hostlist.end(), *i))
- {
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch b/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch
new file mode 100644
index 000000000000..a1ea9a5c1da8
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.10.0.3-gcc44.patch
@@ -0,0 +1,26 @@
+diff -Nru dansguardian-2.10.0.3.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.0.3/src/downloadmanagers/fancy.cpp
+--- dansguardian-2.10.0.3.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100
++++ dansguardian-2.10.0.3/src/downloadmanagers/fancy.cpp 2009-07-05 01:08:17.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "../HTMLTemplate.hpp"
+ #include "../ConnectionHandler.hpp"
+
++#include <stdio.h>
+ #include <syslog.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+diff -Nru dansguardian-2.10.0.3.orig/src/String.cpp dansguardian-2.10.0.3/src/String.cpp
+--- dansguardian-2.10.0.3.orig/src/String.cpp 2009-01-16 11:44:28.000000000 +0100
++++ dansguardian-2.10.0.3/src/String.cpp 2009-07-05 01:10:40.000000000 +0200
+@@ -164,9 +164,9 @@
+ return 0;
+ off_t t = 0;
+ if (sizeof(off_t) == 4)
+- sscanf(this->c_str(), "%d", &t);
++ sscanf(this->c_str(), "%d", (long *)&t);
+ else if (sizeof(off_t) == 8)
+- sscanf(this->c_str(), "%lld", &t);
++ sscanf(this->c_str(), "%lld", (long long*)&t);
+ return t;
+ }
+
diff --git a/net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch b/net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch
new file mode 100644
index 000000000000..4ea4ff9ef621
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.10.1.1-gcc44.patch
@@ -0,0 +1,37 @@
+diff -Nru dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp dansguardian-2.10.1.1/src/ConnectionHandler.cpp
+--- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp 2009-02-25 12:36:22.000000000 +0100
++++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp 2009-07-05 01:15:52.000000000 +0200
+@@ -44,6 +44,7 @@
+ #include <istream>
+
+ #ifdef ENABLE_ORIG_IP
++#include <limits.h>
+ #include <linux/types.h>
+ #include <linux/netfilter_ipv4.h>
+ #endif
+diff -Nru dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp
+--- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100
++++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp 2009-07-05 01:15:12.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "../HTMLTemplate.hpp"
+ #include "../ConnectionHandler.hpp"
+
++#include <stdio.h>
+ #include <syslog.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+diff -Nru dansguardian-2.10.1.1.orig/src/String.cpp dansguardian-2.10.1.1/src/String.cpp
+--- dansguardian-2.10.1.1.orig/src/String.cpp 2009-01-16 11:44:28.000000000 +0100
++++ dansguardian-2.10.1.1/src/String.cpp 2009-07-05 01:15:12.000000000 +0200
+@@ -164,9 +164,9 @@
+ return 0;
+ off_t t = 0;
+ if (sizeof(off_t) == 4)
+- sscanf(this->c_str(), "%d", &t);
++ sscanf(this->c_str(), "%d", (long *)&t);
+ else if (sizeof(off_t) == 8)
+- sscanf(this->c_str(), "%lld", &t);
++ sscanf(this->c_str(), "%lld", (long long*)&t);
+ return t;
+ }
+