Updated patch, thanks again to ovaron2 :)

Package-Manager: portage-2.1.2-r1

diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index 1862b8b03618291acd826be93fd88f5fdca433e8..a6a487a1e34a7cd495eff09883398895a569c35a 100644 (file)
--- a/mail-filter/assp/ChangeLog
+++ b/mail-filter/assp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/assp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.8 2007/01/14 18:16:20 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.9 2007/01/20 18:03:21 wltjr Exp $
+
+*assp-1.2.6-r1 (20 Jan 2007)
+
+  20 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/assp-1.2.6.patch, -assp-1.2.6.ebuild, +assp-1.2.6-r1.ebuild:
+  Updated patch, thanks again to ovaron2 :)
 
 *assp-1.2.6 (14 Jan 2007)
 

diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 96297fd2c5a16fcf44bde3e8a0a61627c5f5870e..3090a34de3e4ea014848101b92185f7ec7e57de4 100644 (file)
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -2,10 +2,10 @@ AUX assp-1.2.5.patch 11949 RMD160 d55dd566ea2af6fd7ee2f24226b1cb4cb1995335 SHA1
 MD5 ad064d8872bf51d35074350d0f4a663c files/assp-1.2.5.patch 11949
 RMD160 d55dd566ea2af6fd7ee2f24226b1cb4cb1995335 files/assp-1.2.5.patch 11949
 SHA256 5471e110974fceb3c4429f7570c8d024510985c684f399ece76a9012dde0da58 files/assp-1.2.5.patch 11949
-AUX assp-1.2.6.patch 16401 RMD160 7ea2e37d6cff8b40cda604e400f3d85a745a86ac SHA1 7cee8a6b41f68f17c8466f083a66cee6d35810a7 SHA256 f4dcd2c0a5aa5c66d9a2f23a56c7bcba931c3ffe0c747c257f90b2c58736e185
-MD5 f33ecf1d9d1d11ea8bcdb2319c77066c files/assp-1.2.6.patch 16401
-RMD160 7ea2e37d6cff8b40cda604e400f3d85a745a86ac files/assp-1.2.6.patch 16401
-SHA256 f4dcd2c0a5aa5c66d9a2f23a56c7bcba931c3ffe0c747c257f90b2c58736e185 files/assp-1.2.6.patch 16401
+AUX assp-1.2.6.patch 16745 RMD160 dfb9dcdaf1c8b30a368e580feac3a0c3ac1cff73 SHA1 43b6ead7ed9f50d204766d32e5df832925228cd8 SHA256 6af72bb88fe7b52d09135b4cff85c726dd5443f262c490966897092ac70b336f
+MD5 c4e2d9ff4e63e13776487324246b4d2a files/assp-1.2.6.patch 16745
+RMD160 dfb9dcdaf1c8b30a368e580feac3a0c3ac1cff73 files/assp-1.2.6.patch 16745
+SHA256 6af72bb88fe7b52d09135b4cff85c726dd5443f262c490966897092ac70b336f files/assp-1.2.6.patch 16745
 AUX asspd.init 657 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e SHA1 218b1d1d566d7a1f3d340c3a2266c38457878d88 SHA256 4ec543f7c2f006d80dcb592d50f44a41e8aa2cd449f65a6e1cd53996e67b2fde
 MD5 67bc4fa59ed71fe1f93e2fb365ed74ab files/asspd.init 657
 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e files/asspd.init 657
@@ -16,14 +16,14 @@ EBUILD assp-1.2.5-r5.ebuild 2661 RMD160 061d67742dd60173de66b2f3b33233def996652f
 MD5 51f0b20f95b2d36a43f1947e89593e36 assp-1.2.5-r5.ebuild 2661
 RMD160 061d67742dd60173de66b2f3b33233def996652f assp-1.2.5-r5.ebuild 2661
 SHA256 ee0c7d57f09836d72949ad54324c607cf9f15c824304b6f69caf09b60cc19376 assp-1.2.5-r5.ebuild 2661
-EBUILD assp-1.2.6.ebuild 2704 RMD160 11c5cffb74ac4d60f9b14b42effed3a1814a8690 SHA1 156cccb8e1e58f903781d559a7b0cb50b7898cf4 SHA256 da05516e909c3a9835e4666e363764466990ba802fda938aff73e77afe73ce71
-MD5 7a547228ac1660a8b9ca129b89efdbf2 assp-1.2.6.ebuild 2704
-RMD160 11c5cffb74ac4d60f9b14b42effed3a1814a8690 assp-1.2.6.ebuild 2704
-SHA256 da05516e909c3a9835e4666e363764466990ba802fda938aff73e77afe73ce71 assp-1.2.6.ebuild 2704
-MISC ChangeLog 2253 RMD160 06ec6dfd74625923bd2009e57cbca63ab9835b00 SHA1 a43355096cc829aae91343e0c97e3002f78f4fa6 SHA256 949d929c6b001e4ce676e5b29f36cc8ce87b3b90224c23339f6287dd2674edf6
-MD5 b1e7675c5122dee8f53fde4482c9c444 ChangeLog 2253
-RMD160 06ec6dfd74625923bd2009e57cbca63ab9835b00 ChangeLog 2253
-SHA256 949d929c6b001e4ce676e5b29f36cc8ce87b3b90224c23339f6287dd2674edf6 ChangeLog 2253
+EBUILD assp-1.2.6-r1.ebuild 2707 RMD160 8e9d40c50a22c6617bdd273d47ffabbd9b50c937 SHA1 e730b066e40d37248d32aaef33a45accaef3ff38 SHA256 4a83f041fc4e592649b777c28926eba8feb7e681ae954e4dd1e3c53b5e77b2d6
+MD5 d150fb5f35896a2493e710a6c0a28dab assp-1.2.6-r1.ebuild 2707
+RMD160 8e9d40c50a22c6617bdd273d47ffabbd9b50c937 assp-1.2.6-r1.ebuild 2707
+SHA256 4a83f041fc4e592649b777c28926eba8feb7e681ae954e4dd1e3c53b5e77b2d6 assp-1.2.6-r1.ebuild 2707
+MISC ChangeLog 2454 RMD160 641fdd79c806fecd96c922155643423bc367570c SHA1 8bec22062b72c6569e932d79ac242df6a144ce8c SHA256 9d8dc9bc523ef56dc5cd3a63c45f3ed2735a31bc5b72782a55d6d48568003304
+MD5 c37f758ce4a54a2a95a412c322df6dcf ChangeLog 2454
+RMD160 641fdd79c806fecd96c922155643423bc367570c ChangeLog 2454
+SHA256 9d8dc9bc523ef56dc5cd3a63c45f3ed2735a31bc5b72782a55d6d48568003304 ChangeLog 2454
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808
 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808
@@ -31,6 +31,6 @@ SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 metadata
 MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5-r5 247
 RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5-r5 247
 SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5-r5 247
-MD5 397e3a17bf5a7aa227a56ae5b949e5a1 files/digest-assp-1.2.6 247
-RMD160 62ff070b13b038c5bfaf31b579a0e64e585d79da files/digest-assp-1.2.6 247
-SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/digest-assp-1.2.6 247
+MD5 397e3a17bf5a7aa227a56ae5b949e5a1 files/digest-assp-1.2.6-r1 247
+RMD160 62ff070b13b038c5bfaf31b579a0e64e585d79da files/digest-assp-1.2.6-r1 247
+SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/digest-assp-1.2.6-r1 247

diff --git a/mail-filter/assp/assp-1.2.6.ebuild b/mail-filter/assp/assp-1.2.6-r1.ebuild
similarity index 95%
rename from mail-filter/assp/assp-1.2.6.ebuild
rename to mail-filter/assp/assp-1.2.6-r1.ebuild
index 9eb05d2c9d887b66f3381d8fad29c7b204f52477..798ae03d5c2a7bdad9f924100e083794e94ccbef 100644 (file)
--- a/mail-filter/assp/assp-1.2.6.ebuild
+++ b/mail-filter/assp/assp-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.6.ebuild,v 1.1 2007/01/14 18:16:20 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.6-r1.ebuild,v 1.1 2007/01/20 18:03:21 wltjr Exp $
 
 inherit eutils
 

diff --git a/mail-filter/assp/files/assp-1.2.6.patch b/mail-filter/assp/files/assp-1.2.6.patch
index e985bbe7ced99fc276710a630862123b7b86c8c3..106c682c71faad84c55a77e5de1b1668ff6f8034 100644 (file)
--- a/mail-filter/assp/files/assp-1.2.6.patch
+++ b/mail-filter/assp/files/assp-1.2.6.patch
@@ -1,6 +1,6 @@
-diff -Naur assporg/ASSP/assp.pl x/ASSP/assp.pl
---- assporg/ASSP/assp.pl       2007-01-13 13:17:58.000000000 +0100
-+++ x/ASSP/assp.pl     2007-01-13 15:01:24.000000000 +0100
+diff -Naur assporg/ASSP/assp.pl asspmod/ASSP/assp.pl
+--- assporg/ASSP/assp.pl       2007-01-18 23:12:20.000000000 +0100
++++ asspmod/ASSP/assp.pl       2007-01-18 23:15:13.000000000 +0100
 @@ -52,13 +52,10 @@
  if($ARGV[0]) {
   $base=$ARGV[0];
@@ -272,6 +272,15 @@ diff -Naur assporg/ASSP/assp.pl x/ASSP/assp.pl
    };
    local $/;
    my @s = stat($fil);
+@@ -8789,7 +8786,7 @@
+ sub fileUpdated {
+  my $fil=shift;
+ 
+- $fil="$base/$fil" if $fil!~/^(([a-z]:)?[\/\\]|\Q$base\E)/;
++ $fil="/etc/assp/$fil" if $fil!~/^(([a-z]:)?[\/\\]|\Q\/etc\/assp\/\E)/;
+  #$fil="$base/$fil" if $fil!~/^\Q$base\E/i;
+  return 1 unless $FileUpdate{$fil};
+  my @s=stat($fil);
 @@ -8891,7 +8888,7 @@
  sub ConfigChangeLogfile {my ($name, $old, $new)=@_;
   close LOG if $logfile;
@@ -299,9 +308,9 @@ diff -Naur assporg/ASSP/assp.pl x/ASSP/assp.pl
    print LOG "Logfile reopened on HUP\n";
  }
  
-diff -Naur assporg/ASSP/move2num.pl x/ASSP/move2num.pl
---- assporg/ASSP/move2num.pl   2007-01-13 13:17:58.000000000 +0100
-+++ x/ASSP/move2num.pl 2007-01-13 13:07:36.000000000 +0100
+diff -Naur assporg/ASSP/move2num.pl asspmod/ASSP/move2num.pl
+--- assporg/ASSP/move2num.pl   2007-01-18 23:12:20.000000000 +0100
++++ asspmod/ASSP/move2num.pl   2007-01-18 23:14:09.000000000 +0100
 @@ -3,7 +3,7 @@
  # renames files to numbers
  # (c) John Hanna, John Calvi 2003 under the terms of the GPL
@@ -311,9 +320,9 @@ diff -Naur assporg/ASSP/move2num.pl x/ASSP/move2num.pl
  $spamlog=$Config{spamlog} && "$Config{base}/$Config{spamlog}" || 'spam';
  $notspamlog=$Config{notspamlog} && "$Config{base}/$Config{notspamlog}" || 'notspam';
  $MaxFiles=$Config{MaxFiles} || 14003;
-diff -Naur assporg/ASSP/rebuildspamdb.pl x/ASSP/rebuildspamdb.pl
---- assporg/ASSP/rebuildspamdb.pl      2007-01-13 13:17:58.000000000 +0100
-+++ x/ASSP/rebuildspamdb.pl    2007-01-13 13:07:36.000000000 +0100
+diff -Naur assporg/ASSP/rebuildspamdb.pl asspmod/ASSP/rebuildspamdb.pl
+--- assporg/ASSP/rebuildspamdb.pl      2007-01-18 23:12:20.000000000 +0100
++++ asspmod/ASSP/rebuildspamdb.pl      2007-01-18 23:14:09.000000000 +0100
 @@ -4,7 +4,7 @@
  # (c) John Hanna 2003 under the terms of the GPL
   # Updated July 2004 for simple proxy support.
@@ -332,9 +341,9 @@ diff -Naur assporg/ASSP/rebuildspamdb.pl x/ASSP/rebuildspamdb.pl
  $whiteRE=$Config{whiteRE};
  $KeepWhitelistedSpam=$Config{KeepWhitelistedSpam};
  $proxyserver=$Config{proxyserver};
-diff -Naur assporg/ASSP/stats.sh x/ASSP/stats.sh
---- assporg/ASSP/stats.sh      2007-01-13 16:49:03.000000000 +0100
-+++ x/ASSP/stats.sh    2007-01-13 16:49:31.000000000 +0100
+diff -Naur assporg/ASSP/stats.sh asspmod/ASSP/stats.sh
+--- assporg/ASSP/stats.sh      2007-01-18 23:12:23.000000000 +0100
++++ asspmod/ASSP/stats.sh      2007-01-18 23:14:09.000000000 +0100
 @@ -52,7 +52,7 @@
  #  your system's 'newsyslog' functionality. You can send a SIGHUP to
  #  ASSP when you roll the log so it starts afresh..KRL

diff --git a/mail-filter/assp/files/digest-assp-1.2.6 b/mail-filter/assp/files/digest-assp-1.2.6-r1
similarity index 100%
rename from mail-filter/assp/files/digest-assp-1.2.6
rename to mail-filter/assp/files/digest-assp-1.2.6-r1