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

(Portage version: 2.0.51.22-r3)

8 files changed, 86 insertions, 34 deletions

diff --git a/net-proxy/dansguardian-dgav/ChangeLog b/net-proxy/dansguardian-dgav/ChangeLog
index c83d94ac1b16..e8b7f59dcb4d 100644
--- a/net-proxy/dansguardian-dgav/ChangeLog
+++ b/net-proxy/dansguardian-dgav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/dansguardian-dgav
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/ChangeLog,v 1.5 2005/10/04 21:01:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/ChangeLog,v 1.6 2005/12/08 22:39:09 mrness Exp $
+
+*dansguardian-dgav-6.4.3-r1 (08 Dec 2005)
+
+  08 Dec 2005; Alin Nastac <mrness@gentoo.org>
+  +files/dansguardian-dgav-6.4.3-gentoo.patch, files/dansguardian.init,
+  +files/dansguardian.logrotate, -dansguardian-dgav-6.4.2a.ebuild,
+  +dansguardian-dgav-6.4.3-r1.ebuild:
+  Fix init script dependencies (#114511). Improve logrotate file.
 
 *dansguardian-dgav-6.4.3 (04 Oct 2005)
 
diff --git a/net-proxy/dansguardian-dgav/Manifest b/net-proxy/dansguardian-dgav/Manifest
index 954c3270ba27..10c5b98fe656 100644
--- a/net-proxy/dansguardian-dgav/Manifest
+++ b/net-proxy/dansguardian-dgav/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 17d62f8b39efe87d97c7bf185c249fdc dansguardian-dgav-6.4.3.ebuild 1764
-MD5 4a59419e3bb3f25b0b00b05358513238 dansguardian-dgav-6.4.2a.ebuild 1925
+MD5 b6a82efccae8ece4d8d99e0259fcfe20 dansguardian-dgav-6.4.3-r1.ebuild 1621
 MD5 5d08c7f9b88616467d968bf6c5ebd917 ChangeLog 1607
 MD5 775fe3a71382d0807bfddb0235f35f30 metadata.xml 233
-MD5 df46e58e17a1ca38be926736d9e10b70 files/digest-dansguardian-dgav-6.4.2a 177
-MD5 bf8c351940c7a2c26da9395e7a494937 files/dansguardian.init 576
+MD5 3b16f94c2f006a6d45f4221ee7b8d7d4 files/digest-dansguardian-dgav-6.4.3-r1 169
+MD5 6328464c9d6747a4f054f17fb2c4844b files/dansguardian-dgav-6.4.3-gentoo.patch 1291
+MD5 1c73bfc8203761ea5acd10cd34d48031 files/dansguardian.init 832
+MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
 MD5 3b16f94c2f006a6d45f4221ee7b8d7d4 files/digest-dansguardian-dgav-6.4.3 169
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDQu26NSP4Vda7IdsRAmUaAJ9KKbHkqezfp8HGEDF6rOrmghXmkACdHNGn
-JFAbc8N1lzNfUcZ1dCZm4as=
-=I8P8
------END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.2a.ebuild b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.ebuild
index e5d4c855310d..26fe95316038 100644
--- a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.2a.ebuild
+++ b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.2a.ebuild,v 1.2 2005/10/04 21:01:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.ebuild,v 1.1 2005/12/08 22:39:09 mrness Exp $
 
 inherit eutils
 
@@ -11,9 +11,7 @@ DG_PV=2.8.0.6
 DESCRIPTION="DansGuardian with Anti-Virus plugin"
 HOMEPAGE="http://sourceforge.net/projects/dgav/"
 SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${DG_PN}-${DG_PV}.source.tar.gz
-	mirror://gentoo/${DG_PN}-${DG_PV}-antivirus-${PV}-gentoo.patch.bz2"
-#Replace SRC_URI with the following when upstream manage to generate a proper patch
-#	mirror://sourceforge/${AV_PN}/${DG_PN}-${DG_PV}-antivirus-${PV}.patch.bz2
+	mirror://sourceforge/${AV_PN}/${DG_PN}-${DG_PV}-antivirus-${PV}.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,10 +29,8 @@ src_unpack() {
 
 	cd ${S} || die "source dir not found"
 	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
-	epatch ../${DG_PN}-${DG_PV}-antivirus-${PV}-gentoo.patch
-
-	#fix path to gentoo clamd socket
-	sed -i -e "s:clamdsocket *= *'/tmp/clamd':clamdsocket = '/var/run/clamav/clamd.sock':" configure
+	epatch ../${DG_PN}-${DG_PV}-antivirus-${PV}.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
@@ -43,22 +39,21 @@ src_compile() {
 		--installprefix=${D} \
 		--mandir=/usr/share/man/ \
 		--cgidir=/var/www/localhost/cgi-bin/ \
+		--logrotatedir="${D}/etc/logrotate.d" \
 		--with-av-engine=clamdscan \
 		--runas_usr=clamav --runas_grp=clamav || die "./configure failed"
 	emake OPTIMISE="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	if [ -d "/etc/logrotate.d" ]; then
-		dodir /etc/logrotate.d
-	fi
 	make install || die "make install failed"
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dansguardian.init dansguardian
-	rm -rf ${D}/etc/rc.d
-	sed -i -e 's/rc.d\///' ${D}/etc/dansguardian/logrotation #Fixing location of initscript
+	newinitd ${FILESDIR}/dansguardian.init dansguardian
+
+	insinto /etc/logrotate.d
+	newins ${FILESDIR}/dansguardian.logrotate dansguardian
 
+	doman dansguardian.8
 	dodoc README*
 
 	#Create log directory
diff --git a/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.3-gentoo.patch b/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.3-gentoo.patch
new file mode 100644
index 000000000000..bec6cd5f389e
--- /dev/null
+++ b/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.3-gentoo.patch
@@ -0,0 +1,33 @@
+diff -Nru dansguardian-2.8.0.6.orig/configure dansguardian-2.8.0.6/configure
+--- dansguardian-2.8.0.6.orig/configure	2005-12-09 00:22:16.000000000 +0200
++++ dansguardian-2.8.0.6/configure	2005-12-09 00:23:28.429078000 +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'
+@@ -3517,7 +3517,7 @@
+ echo "# Set the name of a local clamd socket (file)">>dansguardian.conf
+ echo "# or the hostname:port of a remote clamd server">>dansguardian.conf
+ echo "# default: '/tmp/clamd'">>dansguardian.conf
+-echo "clamdsocket = '/tmp/clamd'">>dansguardian.conf
++echo "clamdsocket = '/var/run/clamav/clamd.sock'">>dansguardian.conf
+ echo "" >>dansguardian.conf
+ echo "" >>dansguardian.conf
+ 
+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-09 00:23:28.429078000 +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-dgav/files/dansguardian.init b/net-proxy/dansguardian-dgav/files/dansguardian.init
index dff3d21899d1..991321c3eaf5 100644
--- a/net-proxy/dansguardian-dgav/files/dansguardian.init
+++ b/net-proxy/dansguardian-dgav/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-dgav/files/dansguardian.init,v 1.1 2005/04/22 19:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/files/dansguardian.init,v 1.2 2005/12/08 22:39:09 mrness Exp $
+
+opts="${opts} reload"
 
 depend() {
 	need net clamd
-	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-dgav/files/dansguardian.logrotate b/net-proxy/dansguardian-dgav/files/dansguardian.logrotate
new file mode 100644
index 000000000000..2fe8ad51204b
--- /dev/null
+++ b/net-proxy/dansguardian-dgav/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-dgav/files/digest-dansguardian-dgav-6.4.2a b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.2a
deleted file mode 100644
index 78b138fa55dc..000000000000
--- a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.2a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737
-MD5 68a4e26bfe4d8c1be29431eef20304dd dansguardian-2.8.0.6-antivirus-6.4.2a-gentoo.patch.bz2 51535
diff --git a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3-r1 b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3-r1
new file mode 100644
index 000000000000..736adbd2932d
--- /dev/null
+++ b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3-r1
@@ -0,0 +1,2 @@
+MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737
+MD5 18acbbed76c1ce76050067672847e94a dansguardian-2.8.0.6-antivirus-6.4.3.patch.bz2 47773