Patch check-updates.pl script to set correct for placing updates in. Bug #103847...
authorAndrej Kacian <ticho@gentoo.org>
Fri, 26 Aug 2005 22:38:40 +0000 (22:38 +0000)
committerAndrej Kacian <ticho@gentoo.org>
Fri, 26 Aug 2005 22:38:40 +0000 (22:38 +0000)
Package-Manager: portage-2.0.51.22-r2

app-antivirus/f-prot/ChangeLog
app-antivirus/f-prot/Manifest
app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild [moved from app-antivirus/f-prot/f-prot-4.6.0.ebuild with 87% similarity]
app-antivirus/f-prot/files/check-updates.pl.diff [new file with mode: 0644]
app-antivirus/f-prot/files/digest-f-prot-4.6.0-r2 [moved from app-antivirus/f-prot/files/digest-f-prot-4.6.0 with 100% similarity]

index d28cec70b327aa2713884d4253cfae37322c9fae..d199a6aab175ae9e54cbb32ffdf61cea49f58748 100644 (file)
@@ -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)
 
index 4193ac8a7b5cd99eedcaa348f5415cab5cb33253..2d18e213c5a63eaac624e1e3a75b95c830c6fca3 100644 (file)
@@ -3,17 +3,18 @@ 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 32091a2665bde9d064dd4afea1fa136d ChangeLog 9288
 MD5 3bf44a2cd492aedb8f27a23f2fe357ff metadata.xml 261
-MD5 c0075e0b3eeeaf1ebb478a49c4b9d7f9 files/digest-f-prot-4.6.0 70
+MD5 20150e043f914ef7c9b7b95f607731cc f-prot-4.6.0-r2.ebuild 2019
 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
+iD8DBQFDD5n+QlM6RnzZP+IRAqAQAKCNIBtibVHruPNPBpOSrgmBYqmE2gCdEfdB
+KNb5GK1D6/wy9DMjb7lc0aY=
+=BFUQ
 -----END PGP SIGNATURE-----
similarity index 87%
rename from app-antivirus/f-prot/f-prot-4.6.0.ebuild
rename to app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild
index 763f50a0f1fc0d8580a757ddc8c92a96040b50f1..cd3828dbed2c4df771d6405ca01d3a90815b89c8 100644 (file)
@@ -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 (file)
index 0000000..d4ea1aa
--- /dev/null
@@ -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";