versin bump

5 files changed, 108 insertions, 3 deletions

diff --git a/net-www/dansguardian/ChangeLog b/net-www/dansguardian/ChangeLog
index defb5575c8c7..028eb75a37f3 100644
--- a/net-www/dansguardian/ChangeLog
+++ b/net-www/dansguardian/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/dansguardian
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/ChangeLog,v 1.4 2003/11/19 19:08:35 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/ChangeLog,v 1.5 2003/12/05 20:25:07 method Exp $
+
+*dansguardian-2.7.6 (05 Dec 2003)
+
+  05 Dec 2003; Joshua Brindle <method@gentoo.org> dansguardian-2.7.6.ebuild,
+  files/dansguardian-xnaughty-2.7.6-1.diff:
+  version bump, took squid out of DEPEND since you can use any proxy
+  (particularly lighter weight ones), added my patch to add an X-Naughty header
+  to naughty pages but otherwise leave them alone (for better control upstream)
 
 *dansguardian-2.7.5 (19 Nov 2003)
 
diff --git a/net-www/dansguardian/Manifest b/net-www/dansguardian/Manifest
index 6d5492f6e1f4..3d8089884af7 100644
--- a/net-www/dansguardian/Manifest
+++ b/net-www/dansguardian/Manifest
@@ -1,9 +1,9 @@
-MD5 32381cd3db6ed69617c7d123481d34a0 dansguardian-2.7.6.ebuild 1257
+MD5 8dfbbe3a4d67b48ab8e188e0cb1e9456 dansguardian-2.7.6.ebuild 1235
 MD5 805fe94ba24944ca69175de328843b54 dansguardian-2.7.1.ebuild 1115
 MD5 c8fc8af79df2d50e331d168cd8d755c4 dansguardian-2.6.0.ebuild 1029
 MD5 14dcf9f2c296e0a0e646564a4c196d35 dansguardian-2.7.5.ebuild 1118
 MD5 a0d624c80310ed103c9e752fe2cc4e42 dansguardian-2.7.2.ebuild 1118
-MD5 49e557e2cf3f33404a4f80a85a3efc48 ChangeLog 1066
+MD5 e52203890912e20f5b6b5b3b4ee76106 ChangeLog 1452
 MD5 95792c82d4f04787601f3c549e0fcb1f files/dansguardian.init 463
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 MD5 d71889ed3033ea2ffe3b2342e47657b3 files/digest-dansguardian-2.6.0 79
diff --git a/net-www/dansguardian/dansguardian-2.7.6.ebuild b/net-www/dansguardian/dansguardian-2.7.6.ebuild
new file mode 100644
index 000000000000..4d5d25c72079
--- /dev/null
+++ b/net-www/dansguardian/dansguardian-2.7.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/dansguardian-2.7.6.ebuild,v 1.1 2003/12/05 20:25:07 method Exp $
+
+DESCRIPTION="Web content filtering via proxy"
+HOMEPAGE="http://dansguardian.org"
+P="DansGuardian-${PV}"
+SRC_URI="http://mirror.dansguardian.org/downloads/2/Alpha/${P}-1.source.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+#DEPEND="net-www/squid"
+DEPEND=""
+RDEPEND=""
+S=${WORKDIR}/${P}-1
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
+}
+
+src_compile() {
+	./configure \
+		--prefix= \
+		--installprefix=${D} \
+		--mandir=/usr/share/man/ || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	if [ -d "/etc/logrotate.d" ]; then mkdir -p ${D}/etc/logrotate.d; fi
+	make install || die
+
+	dodir /etc/init.d
+	cp ${FILESDIR}/dansguardian.init ${D}/etc/init.d/dansguardian
+
+	rm -rf ${D}/etc/rc.d
+
+	einfo "Fixing location of initscript"
+	sed 's/rc.d\///' ${D}/etc/dansguardian/logrotation > ${D}/etc/dansguardian/logrotation.fixed
+	mv -f ${D}/etc/dansguardian/logrotation.fixed ${D}/etc/dansguardian/logrotation
+
+	dodoc INSTALL README LICENSE
+}
diff --git a/net-www/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff b/net-www/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff
new file mode 100644
index 000000000000..d1e097ce0b08
--- /dev/null
+++ b/net-www/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff
@@ -0,0 +1,50 @@
+diff -ur DansGuardian-2.7.6-1/ConnectionHandler.cpp DansGuardian-2.7.6-1-new/ConnectionHandler.cpp
+--- DansGuardian-2.7.6-1/ConnectionHandler.cpp	2003-12-03 16:04:18.000000000 -0600
++++ DansGuardian-2.7.6-1-new/ConnectionHandler.cpp	2003-12-03 17:43:36.000000000 -0600
+@@ -990,6 +990,11 @@
+         else if (o.reporting_level == -1) {  // stealth
+             (*checkme).isItNaughty = false;  // dont block
+         }
++	else if (o.reporting_level == -2) { // just add a header
++		(*docheader).addXNaughty("true", (*checkme).whatIsNaughty.c_str(), (*url).toCharArray());
++		(*checkme).isItNaughty = false;  // dont block
++	}
++                       
+     } catch (exception& e) {}
+     if ((*checkme).isItNaughty) { // not stealth mode then
+         try {
+Only in DansGuardian-2.7.6-1-new/: ConnectionHandler.cpp.orig
+diff -ur DansGuardian-2.7.6-1/HTTPHeader.cpp DansGuardian-2.7.6-1-new/HTTPHeader.cpp
+--- DansGuardian-2.7.6-1/HTTPHeader.cpp	2003-12-03 16:04:18.000000000 -0600
++++ DansGuardian-2.7.6-1-new/HTTPHeader.cpp	2003-12-03 17:38:09.000000000 -0600
+@@ -456,6 +456,17 @@
+     header.push_back(String(line.c_str()));
+ }
+ 
++void HTTPHeader::addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty) {
++    std::string line;
++
++    line = "X-Naughty: " + naughty + "\r";
++    header.push_back(String(line.c_str()));
++    line = "X-Naughty-Why: " + whatIsNaughty + "\r";
++    header.push_back(String(line.c_str()));
++    line = "X-Naughty-Where: " + whereIsNaughty + "\r";
++    header.push_back(String(line.c_str()));
++}
++
+ void HTTPHeader::setTimeout(int t) {
+     timeout = t;
+ }
+Only in DansGuardian-2.7.6-1-new/: HTTPHeader.cpp.orig
+diff -ur DansGuardian-2.7.6-1/HTTPHeader.hpp DansGuardian-2.7.6-1-new/HTTPHeader.hpp
+--- DansGuardian-2.7.6-1/HTTPHeader.hpp	2003-12-03 16:04:18.000000000 -0600
++++ DansGuardian-2.7.6-1-new/HTTPHeader.hpp	2003-12-03 17:38:09.000000000 -0600
+@@ -43,6 +43,7 @@
+         std::string getXForwardedForIP();
+         void setTimeout(int t);
+         void addXForwardedFor(std::string clientip);
++        void addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty);
+         bool isCompressed();
+         String contentEncoding();
+         void removeEncoding(int newlen);
+Only in DansGuardian-2.7.6-1-new/: HTTPHeader.hpp.orig
diff --git a/net-www/dansguardian/files/digest-dansguardian-2.7.6 b/net-www/dansguardian/files/digest-dansguardian-2.7.6
new file mode 100644
index 000000000000..19671a0d8c9f
--- /dev/null
+++ b/net-www/dansguardian/files/digest-dansguardian-2.7.6
@@ -0,0 +1 @@
+MD5 e7438f09ac146caf013358df840c5cb8 DansGuardian-2.7.6-1.source.tar.gz 173295