Patch check-updates.pl script to set correct for placing updates in. Bug #103847, reported by Michael Cramer <bigmichi1 at bigmichi1.dyndns.org>.

(Portage version: 2.0.51.22-r2)

5 files changed, 40 insertions, 17 deletions

diff --git a/app-antivirus/f-prot/ChangeLog b/app-antivirus/f-prot/ChangeLog
index d28cec70b327..d199a6aab175 100644
--- a/app-antivirus/f-prot/ChangeLog
+++ b/app-antivirus/f-prot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-antivirus/f-prot
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/ChangeLog,v 1.36 2005/08/15 00:50:46 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/ChangeLog,v 1.37 2005/08/26 22:38:40 ticho Exp $
+
+*f-prot-4.6.0-r2 (26 Aug 2005)
+
+  26 Aug 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/check-updates.pl.diff, -f-prot-4.6.0.ebuild,
+  +f-prot-4.6.0-r2.ebuild:
+  Patch check-updates.pl script to set correct for placing updates in. Bug
+  #103847, reported by Michael Cramer <bigmichi1 at bigmichi1.dyndns.org>.
+  Remove faulty 4.6.0 ebuild.
 
 *f-prot-4.6.0-r1 (15 Aug 2005)
 
diff --git a/app-antivirus/f-prot/Manifest b/app-antivirus/f-prot/Manifest
index 4193ac8a7b5c..94b15a49369b 100644
--- a/app-antivirus/f-prot/Manifest
+++ b/app-antivirus/f-prot/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 886e2c224cbc555a71f3a3510b12c29f f-prot-4.5.4-r1.ebuild 1877
 MD5 84082bf24b21de874305c8d1ece7a27e f-prot-4.6.0-r1.ebuild 1898
 MD5 5ffef451fdeadb27e1770d8feb3b5304 f-prot-4.6.0.ebuild 1848
 MD5 2f815b76240525cd488797a29632ade4 ChangeLog 8946
 MD5 3bf44a2cd492aedb8f27a23f2fe357ff metadata.xml 261
+MD5 8e157d17feb4066bab8800e153b53d1e f-prot-4.6.0-r2.ebuild 1915
 MD5 c0075e0b3eeeaf1ebb478a49c4b9d7f9 files/digest-f-prot-4.6.0 70
 MD5 f3be9aa98602afac91eca0dceca62edd files/digest-f-prot-4.5.4-r1 70
 MD5 c0075e0b3eeeaf1ebb478a49c4b9d7f9 files/digest-f-prot-4.6.0-r1 70
+MD5 c0075e0b3eeeaf1ebb478a49c4b9d7f9 files/digest-f-prot-4.6.0-r2 70
+MD5 98949d262752c6e02ac3e64f8c13aa59 files/check-updates.pl.diff 568
 MD5 c07e3b0148a64826500324924b3d71f8 files/f-prot.sh 122
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC/+b4QlM6RnzZP+IRAuy1AKCArDzs2jj+izJLBtsM5mvl0mxmjgCcDddm
-uOFN25yU1P7eEl+Kb3YB4ic=
-=ycyQ
------END PGP SIGNATURE-----
diff --git a/app-antivirus/f-prot/f-prot-4.6.0.ebuild b/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild
index 763f50a0f1fc..cd3828dbed2c 100644
--- a/app-antivirus/f-prot/f-prot-4.6.0.ebuild
+++ b/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/f-prot-4.6.0.ebuild,v 1.1 2005/08/13 17:32:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild,v 1.1 2005/08/26 22:38:40 ticho Exp $
+
+inherit eutils
 
 IUSE="emul-linux-x86"
 
@@ -22,8 +24,14 @@ SLOT="0"
 LICENSE="F-PROT"
 KEYWORDS="~x86 -ppc -sparc ~amd64"
 
-src_install ()
-{
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/check-updates.pl.diff || die "epatch failed"
+}
+
+src_install() {
 	cd ${S}
 
 	dobin ${FILESDIR}/f-prot.sh
@@ -32,11 +40,13 @@ src_install ()
 	dodir /opt/f-prot/tools /var/tmp/f-prot
 	keepdir /var/tmp/f-prot
 
-	insinto /etc
-	newins etc/f-prot.conf.default f-prot.conf
-
 	insinto /opt/f-prot
 	insopts -m 755
+
+	newins etc/f-prot.conf.default f-prot.conf
+	dodir /etc
+	dosym /opt/f-prot/f-prot.conf /etc/f-prot.conf
+
 	doins f-prot
 	insopts -m 644
 	doins *.DEF ENGLISH.TX0
diff --git a/app-antivirus/f-prot/files/check-updates.pl.diff b/app-antivirus/f-prot/files/check-updates.pl.diff
new file mode 100644
index 000000000000..d4ea1aaf39ee
--- /dev/null
+++ b/app-antivirus/f-prot/files/check-updates.pl.diff
@@ -0,0 +1,11 @@
+--- tools/check-updates.pl	2005-08-27 00:26:26.000000000 +0200
++++ tools/check-updates.pl.correct	2005-08-27 00:26:21.000000000 +0200
+@@ -55,7 +55,7 @@
+ if ( -e "/etc/f-prot.conf" && -l "/etc/f-prot.conf" ){ 
+ 	$signatureDirectory = readlink("/etc/f-prot.conf");
+ 	$signatureDirectory =~ s/(.+)\/.+/$1/; # throw away the last slash and everything after it
+-	$signatureDirectory =~ s/(.+\/).+/$1/; # throw away everything after the last slash 
++#	$signatureDirectory =~ s/(.+\/).+/$1/; # throw away everything after the last slash 
+ }
+ 
+ print "$signatureDirectory\n";
diff --git a/app-antivirus/f-prot/files/digest-f-prot-4.6.0 b/app-antivirus/f-prot/files/digest-f-prot-4.6.0-r2
index 733ed69009e9..733ed69009e9 100644
--- a/app-antivirus/f-prot/files/digest-f-prot-4.6.0
+++ b/app-antivirus/f-prot/files/digest-f-prot-4.6.0-r2