Revized patch for bug #379101

Package-Manager: portage-2.1.10.13/cvs/Linux x86_64

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index e81dd9b9111f1223044243bf14998c359f0ac2a8..b944f69c85fcbd0141c0cdf41a397ee0a14e44d5 100644 (file)
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.117 2011/08/31 16:30:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.118 2011/09/05 18:41:45 eras Exp $
+
+  05 Sep 2011; Eray Aslan <eras@gentoo.org>
+  files/maildrop-2.5.4-reformime.patch:
+  Revized patch for bug #379101
 
   31 Aug 2011; Eray Aslan <eras@gentoo.org>
   files/maildrop-2.5.4-reformime.patch:

diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 79c14e105cb9d64cecbffe6b014e87e01afa8192..4a722e94ec63e80f033a5738d1be78702c7df849 100644 (file)
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX maildrop-1.8.1-disable-fam.patch 2511 RMD160 3fc7bf21d425c6e676475458c99a5ed2d4e93469 SHA1 7b6148b485bbc0379fa849a8af2706b93ea22432 SHA256 e4621bbe990d7a90d703e7a8b8cf07bb59655a22a96e62c275352d28c79684a3
 AUX maildrop-2.2.0-db4.patch 2509 RMD160 15d213da460130f30cdfae26686883f127dd20c9 SHA1 2a46020bd957c198306acbb695d9b92ac3c48282 SHA256 d42b04c4d8557d2c82f9dea6f176b3cd935c839bcc2ccc2212f0356cf42edecb
 AUX maildrop-2.5.1-db.patch 2498 RMD160 c39895d8df8cad8fa1a5a82657d115bb950c30af SHA1 1c7f5a3c1eae47186684a6833b3653710119bccb SHA256 9740a68669d31e7b7a234f0ddeec8604bd72dff63006ebd98018e955d94d5f8c
-AUX maildrop-2.5.4-reformime.patch 819 RMD160 38e4de909194b658a06c11ed6027352e5911dc65 SHA1 470006133be3a850eed59150e31803272bfcc9c2 SHA256 ded9cf4e947e9d5551d6e15e7fde1a53f0f805771b0b91b6d1f55700d00d6bcc
+AUX maildrop-2.5.4-reformime.patch 1066 RMD160 789fa7c527e736b4b66fdbaa9299496920317e0c SHA1 eb573520a272b54abfbc100a0c390ee1c426eaf4 SHA256 fc4877c7df306b3fe4df10209a3d4879c05fa4216da998e9f00cb3ec99177e52
 AUX maildrop-testsuite.patch 2141 RMD160 3011d0fcef89cb5ca1b2e566c85b3f95a0daee5b SHA1 b7002eb05132a6dde2e5561f3437f59f5fdd0322 SHA256 ab1fc5d152bf59a1063ea51a3a25e68b0ba096c6a8842fddb7d9f2fd735c3ec2
 AUX maildroprc 58 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 SHA1 a2fd605991606a3bf89296f2d3f3a5f7a7327aba SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b61d00add1
 DIST maildrop-2.4.2.tar.bz2 2413925 RMD160 8f7a93ab242ea83f7c9cc07abd13c0e3acae52f0 SHA1 191f580cc05a4935d9061514017713f025437c73 SHA256 e020bfebb8287ff81f9d8668e871c3c252c0e6f2a7d3c5ec21e8377131635303
@@ -16,22 +16,22 @@ EBUILD maildrop-2.4.2.ebuild 2843 RMD160 949aa62027ded33663700dea267b60c3e9094f3
 EBUILD maildrop-2.5.1.ebuild 2891 RMD160 32c81f58c8a46dc388487c006aeaf3b28e217a65 SHA1 872e7718a1260efb0bee45543fa19a65604f33da SHA256 b7ab48048d48ac1d7988fbe0691aa2aa7891067fc71ecf80c76f51cf1ad456a9
 EBUILD maildrop-2.5.3.ebuild 2978 RMD160 c4f9f698af140adabd1afdc5fab3bac62165535e SHA1 a1ce6c7183da491271316691e0d030d2ff3337af SHA256 9819725773e66a16be7838353fc5abc52a979f2f3e6e35c6309dd912f159e747
 EBUILD maildrop-2.5.4.ebuild 3786 RMD160 36e9acb937e50d4303e9035090b458ce9a3c9e04 SHA1 7df057a5d0a03c903171dd1b6d4a6a0f7fc8f01e SHA256 da2211d569b33d5bdf0ae413bd46be03b2078d4e6c5ad5bc53082859389e23c2
-MISC ChangeLog 22467 RMD160 64cb62bee2e36289422c6e8e0892b48b9583c04b SHA1 7816b6af9745f83b11920cf760770f25c6d35214 SHA256 3c1a891788ecc2ac3863ca61a89337235fc5db2bbf6530d9a29a3a111ce4d6af
+MISC ChangeLog 22584 RMD160 cb0754d8217d8a6d8d7d9f8f5f2ccc198f82066d SHA1 2906862f9b97cb9587d4e3cd990be7ebac2360ea SHA256 7b7ba9a2400f30aaa38a09a675857232bab8fc3ce828b19075282e24b11bd473
 MISC metadata.xml 313 RMD160 a54c7c17c1fb1708ba9987cdad3e1f91bafd5e7e SHA1 c030dc401f831ea71224dbec6685200e34798962 SHA256 8e4845f749808afe7959162a14069b0eb59436401ee3a2ed8661a3bdc18fb5fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOXmG5AAoJEHfx8XVYajsfmwUP/AqNetSHzRCU/5pegy1PSSJC
-y5axBnQRn26HIcqH559oUlGlXrucJz+K8nhWdm1vbwMNtCcTLoMazimedw+chG6c
-ynC3pIrMOMcZinEB3xgAnO7uHpf2DBo8EEEKtDGExUNrLREvwSDw9FCCB8w9EpZB
-GdYOMXroswJIbGBaZUzjAVnLLHCuSWAMwMAx2m03NUSIaY14h2wouGFLctJbr1M4
-HBME6koNHX+CwFIphWoKjYZY19E6VphErouiTAJ2fubAq1Bb52dPyYw3JQalGlob
-j1rrAivij209V/zzIG1n7PIXfWm0TOKAkfLvJoUmM+ppZHef/nm3yAlmPQhwSEt8
-fo5bZIHR5SrQTleoKi4vk4uTJVQyyHqcqP/jkjaiN0WD3qS5BupTDBrb5/IqksgG
-tj929xXutK1Aomj1eCWGwzVRp2QZ2Co5CbxD7wlgRlj3BEPNVzFPinImsRXZVBea
-LNPHgjOH+ayQzkm/dvqyXcOH3DeFQ3k19OESt6SPAs6Cvk0HW8UFDmwKZGp85jPn
-so19sEbU7KOzrOjz4mdXEIbMowOWUcbLSUiui8jA5dh/YvJ9wi4D3bpxQOUN6prm
-cKZXIwoTJEeyZfsxFE9WDPpiHS8pBykXYzH63uG1iAOHY6oD0d4wegxxOVIAkxZE
-ggxbZDVfX/vUiAIXqDim
-=c7pk
+iQIcBAEBCAAGBQJOZRf4AAoJEHfx8XVYajsf6eUP/1V48juWQO2tlEOUxiT5kuBC
+iY8PgLuZn6mJKK9tNIKdxsYea2wCMdbhKnGU3pPtEI+rYCwj5w8lFu/tKKkgxzFh
+yffLs/fVRDZJiTcF5wYqJ0c57rBtmMlfS8oZhsVbA+I94c9WYpfRDWUI4HOrvRxr
+V0fScuGf8weo3SrjmWN07g9L46u19dJJvLLGlV8BENq8ARL81csV0X9Mwp/ZYUa2
+npAC70uMWlQgFGEhQyV0BQgXYaOYntvqQ82Z2yZqhwKybRaHQYacR8tKmlnvbEFE
+ghgAas2mBZUlUjJHZ+ZNgKBLfJJCX5Qbzacpj7QULi9FxEkamk9h4JUcyf+n5Ylo
+ujx01ZxdxexPvZLBpmMBOTPjsDZcm6lK6VaSQW6OwieZ6dMOC6eN8SIrXVlBPt7r
+egZYf4R0/mX7Jj1Bg3vZ9B/dCU3vrP+Qw8PExW9uMZ0v8u9nRW2JssKJjLwbzfbr
+rs7xb07ccZxcO0sCR+xRPZ0IJO4ORKeqh2Pxc6beD+6XO66qcHExdmsLBPDuU2+o
+cc6wm0l+HdjQWKV++TVCOdVi6fNOn+B+A712q0I2PHw9ntCDxOhalYzqtfVdtrX3
+J8iCSQAdIg4bJVKL01uKpQrAbPikHnZvsDZC9XaiJNQZXtN6S+8WY2dKo7Q5aOze
+IZa0IOh4sJsN12RM1cvP
+=O3xJ
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch b/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
index 6e5544399870f5448947d494a88a37b220fb495c..eea8ad9e372ad9be884e07066aec92c7bef0ce74 100644 (file)
--- a/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
+++ b/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
@@ -1,4 +1,4 @@
-some arches put argv into readonly memory - bug #379101
+Fixes segfault on some arches - bug #379101
 Index: rfc2045/reformime.c
 ===================================================================
 --- rfc2045/reformime.c        (revision 102)
@@ -14,9 +14,9 @@ Index: rfc2045/reformime.c
                        doinfo=1;
 Index: rfc2045/reformime.c
 ===================================================================
---- rfc2045/reformime.c        (revision 137)
+--- rfc2045/reformime.c        (revision 141)
 +++ rfc2045/reformime.c        (working copy)
-@@ -1150,7 +1150,7 @@
+@@ -1150,14 +1150,15 @@
  
        if (doinfo)
        {
@@ -25,3 +25,12 @@ Index: rfc2045/reformime.c
                do {
                        print_info(p, mimesection);
                        if (do_extract)
+                               extract_section(p, mimesection,
+                                               extract_filename, argc-argn,
+                                               argv+argn, do_extract);
+-                      mimesection = strtok(NULL,",");
++                      if (mimesection)
++                              mimesection = strtok(NULL,",");
+               } while (mimesection != NULL);
+       }
+       else if (dodecode)