Fix init script dependencies (#114511). Improve logrotate file.

(Portage version: 2.0.51.22-r3)

7 files changed, 114 insertions, 8 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index d53cbd9dd8c5..f93a163092c6 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.8 2005/10/06 19:04:31 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.9 2005/12/08 22:15:11 mrness Exp $
+
+*dansguardian-2.8.0.6-r1 (08 Dec 2005)
+
+  08 Dec 2005; Alin Nastac <mrness@gentoo.org>
+  +files/dansguardian-2.8.0.6-gentoo.patch, files/dansguardian.init,
+  +files/dansguardian.logrotate, +dansguardian-2.8.0.6-r1.ebuild:
+  Fix init script dependencies (#114511). Improve logrotate file.
 
   06 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
   dansguardian-2.8.0.6.ebuild:
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 998317eb32d7..0ef00e53deb4 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,8 +1,12 @@
-MD5 c32f7c16784fe1aba47a15bbb1ea3262 ChangeLog 4911
+MD5 bdef480c342770921291aa82fd4324f3 dansguardian-2.8.0.6-r1.ebuild 1156
 MD5 66b41ef646913a4fe63153d4e76c4193 dansguardian-2.8.0.4.ebuild 1176
 MD5 887c6bdeabb27180c88519f1403b877b dansguardian-2.8.0.6.ebuild 1179
-MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
-MD5 f4138408fd74e72a62a70abce3c69396 files/dansguardian.init 565
+MD5 1933c27a8412a31e83ca269e52f48274 ChangeLog 5026
+MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
 MD5 579f2cac2dbebe18ff6900fd3aa87f66 files/digest-dansguardian-2.8.0.4 79
 MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6 79
-MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
+MD5 6050c21de4fddecd462cb65b337e2b0e files/dansguardian.init 826
+MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
+MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
+MD5 0cf459b33bd205ff0e5d270cf1db72e0 files/dansguardian-2.8.0.6-gentoo.patch 886
+MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6-r1 79
diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
new file mode 100644
index 000000000000..e4fac9af749e
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild,v 1.1 2005/12/08 22:15:11 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="Web content filtering via proxy"
+HOMEPAGE="http://dansguardian.org"
+SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND="!net-proxy/dansguardian-dgav
+	virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+	./configure \
+		--prefix= \
+		--installprefix="${D}" \
+		--mandir=/usr/share/man/ \
+		--cgidir=/var/www/localhost/cgi-bin/ \
+		--logrotatedir="${D}/etc/logrotate.d" || die "./configure failed"
+	emake OPTIMISE="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make install || die "make install failed"
+
+	newinitd ${FILESDIR}/dansguardian.init dansguardian
+
+	insinto /etc/logrotate.d
+	newins ${FILESDIR}/${PN}.logrotate ${PN}
+
+	doman dansguardian.8
+	dodoc README
+}
diff --git a/net-proxy/dansguardian/files/dansguardian-2.8.0.6-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.8.0.6-gentoo.patch
new file mode 100644
index 000000000000..0728137fd58f
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.8.0.6-gentoo.patch
@@ -0,0 +1,24 @@
+diff -Nru dansguardian-2.8.0.6.orig/configure dansguardian-2.8.0.6/configure
+--- dansguardian-2.8.0.6.orig/configure	2005-08-14 02:47:57.000000000 +0300
++++ dansguardian-2.8.0.6/configure	2005-12-08 23:52:35.449154000 +0200
+@@ -37,7 +37,7 @@
+ prefixdir=''
+ installprefixdir=''
+ sysconfdir='/etc/dansguardian/'
+-sysvdir='/etc/rc.d/init.d/'
++sysvdir='/etc/init.d/'
+ cgidir='/var/www/cgi-bin/'
+ runas_usr='nobody'
+ runas_grp='nobody'
+diff -Nru dansguardian-2.8.0.6.orig/dansguardian.8 dansguardian-2.8.0.6/dansguardian.8
+--- dansguardian-2.8.0.6.orig/dansguardian.8	2005-08-14 02:47:57.000000000 +0300
++++ dansguardian-2.8.0.6/dansguardian.8	2005-12-08 23:52:57.106507500 +0200
+@@ -3,7 +3,7 @@
+ .SH NAME
+ DansGuardian 2
+ .SH SYNOPSIS
+-/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
++/etc/init.d/dansguardian [stop|start|status|restart|reload]
+ .SH DESCRIPTION
+ A Introduction
+ 
diff --git a/net-proxy/dansguardian/files/dansguardian.init b/net-proxy/dansguardian/files/dansguardian.init
index 0c27c771d30f..c7b2438b5c17 100644
--- a/net-proxy/dansguardian/files/dansguardian.init
+++ b/net-proxy/dansguardian/files/dansguardian.init
@@ -1,11 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/files/dansguardian.init,v 1.1 2005/04/22 19:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/files/dansguardian.init,v 1.2 2005/12/08 22:15:11 mrness Exp $
+
+opts="${opts} reload"
 
 depend() {
 	need net
-	after squid
+	use dns \
+		squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
+	#dansguardian could be used in conjuction with any of the above web proxies
 }
 
 start() {
@@ -20,3 +24,9 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile /var/run/dansguardian.pid
 	eend $?
 }
+
+reload() {
+	ebegin "Reloading DansGuardian"
+	/usr/sbin/dansguardian -g
+	eend $?
+}
diff --git a/net-proxy/dansguardian/files/dansguardian.logrotate b/net-proxy/dansguardian/files/dansguardian.logrotate
new file mode 100644
index 000000000000..2fe8ad51204b
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian.logrotate
@@ -0,0 +1,14 @@
+/var/log/dansguardian/access.log {
+  rotate 4
+  weekly
+  missingok
+  notifempty
+  nocreate
+  nocopy
+  nocopytruncate
+  nocompress
+
+  postrotate
+    /usr/sbin/dansguardian -r
+  endscript
+}
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6-r1 b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6-r1
new file mode 100644
index 000000000000..5acffb70cbf4
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6-r1
@@ -0,0 +1 @@
+MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737