Fix bad patch file. Bug # 381651

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

diff --git a/media-radio/ax25-tools/ChangeLog b/media-radio/ax25-tools/ChangeLog
index b9739dc4865275024e9bb0202ce20ac4edf5609f..be50a62226ae236c1b974a03ff4d6736ae584a34 100644 (file)
--- a/media-radio/ax25-tools/ChangeLog
+++ b/media-radio/ax25-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/ax25-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-tools/ChangeLog,v 1.10 2011/08/30 16:59:58 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-tools/ChangeLog,v 1.11 2011/09/03 18:39:45 tomjbe Exp $
+
+  03 Sep 2011; Thomas Beierlein <tomjbe@gentoo.org>
+  files/ax25-tools-0.0.10_rc2-cve-2011-2910.patch:
+  Fix bad patch file. Bug # 381651
 
 *ax25-tools-0.0.10_rc2-r1 (30 Aug 2011)
 

diff --git a/media-radio/ax25-tools/Manifest b/media-radio/ax25-tools/Manifest
index 96cdb965ed2388206a4266104b2cf684b3168032..c1d15246a8c7d5f5d156387ebe1588c4a6efe649 100644 (file)
--- a/media-radio/ax25-tools/Manifest
+++ b/media-radio/ax25-tools/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ax25-tools-0.0.10_rc2-cve-2011-2910.patch 2244 RMD160 059d178ab078ca3f29c6416875386ceee977d917 SHA1 6dd4f2ee3284ffca97900faf379d5aa9a1d9d563 SHA256 234f3afbffb3ae6e684fa285a76867878f622c77d495da51df15add6e51f1a7a
+AUX ax25-tools-0.0.10_rc2-cve-2011-2910.patch 1474 RMD160 513f2dfe8c5d0116157d359addb395f3d99fd5a1 SHA1 60776c48b3e59d78f938773f2228d2c379290bb4 SHA256 3dde9b738169aeb6281280e4c828dfbc497de1ade4d79734f8c3ea0bcf6ce604
 AUX ax25-tools-0.0.10_rc2-parallel-make.patch 1060 RMD160 a237f109b9469605b1ebdc97f37573c3be2c130f SHA1 cb3a937b709b0722c00d6209488acf9c7b464f17 SHA256 71d648a3af02b7da0aaf5cb030bbfba81365eda615b37a590649138355c455fd
 AUX ax25d.rc 482 RMD160 dd74fe17fbf74ac661dae36d0e968be9dade1e68 SHA1 92e140c82f9c3b69c7844aec63647f458cb67c68 SHA256 a2f32c9070c68607a664cad44a54acd13e885758807805c4c71c8bfd27a473fd
 AUX mheardd.rc 492 RMD160 cacfbd7f70b7f2559cefd3cd0cbf5e8973b81223 SHA1 f086a4910f57f74b0441d677c157160543db04ba SHA256 fb470bb033a3064b801a7345db59df669a89c87f224e420484205d879df6ac5c
@@ -12,12 +12,12 @@ AUX ttylinkd.rc 497 RMD160 ee239c28b7e6d435d22a96fc2a54e43f800c2b57 SHA1 d4f437d
 DIST ax25-tools-0.0.10-rc2.tar.gz 381575 RMD160 2bf2a34ebdc9fcf02583ec8f950313fec7d588a3 SHA1 f06e0b962ffc734658f1ad6be96d40bcaee19587 SHA256 d3a33914c168f6b9b3fef2cc543e5debbf9c95bf06f4c902f06c68eabfe4b4eb
 EBUILD ax25-tools-0.0.10_rc2-r1.ebuild 1652 RMD160 af3d4b0ef899f63c457a9b5c2c7e085205c98cd9 SHA1 905297647ca7c2cc9c2009f440923716b4c63697 SHA256 9326888b20fb4a0ca7593b6a894dd6dcd7b3b50263438a29e66e433884f12432
 EBUILD ax25-tools-0.0.10_rc2.ebuild 1587 RMD160 ab504315895099ddd5939e60c97e965612572e86 SHA1 9bf59a0b7e79afb8cba396237ffebcdb846a6718 SHA256 4ce8647061543e8638d8ac33f0c04e7fc64c3be1e582c828afe46aad6d48ed87
-MISC ChangeLog 911 RMD160 116c9e5fde374215d344bc6ede00437115e55e23 SHA1 bad960ae7468b6be46e62f899ebf1b9a9276c5bc SHA256 6c8debe55bd7d6f1579820a0bd244ec4a592701a6c8970e4fca95f75875ea3f1
+MISC ChangeLog 1050 RMD160 3f8f6ef8d65987fff922f0b76a752c43c5032fe1 SHA1 e43f4f51db0efc0a545e44d1a1ed8681a2237f8e SHA256 21a76956c83d39699d0642c0e2129e15b48c289e9c91713db6379db0bbd0b132
 MISC metadata.xml 337 RMD160 c586729cfa7415d7cd6cfdc6d47b8faaac3377de SHA1 9f4961a43808eae75e6a09e7fd2426f77e38b16d SHA256 fef311db1d583af0215c11f10a1425003603dbf8cbb66c4f7030cc5c6ca91cf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5dFxsACgkQQe4uqXYgU9XivgCgh/5KuDPoD60cdekC4UdEbbYp
-HygAnAlxn3JV/zHYZy0eABIlpnmi6a6i
-=ubRQ
+iEYEARECAAYFAk5idIAACgkQQe4uqXYgU9WQLwCfR5yYZP31W4JUcCZlKCg+o1Qh
+8UUAoLLxEcESAPzQLOpk4/8aPsp+L6RB
+=Ct3G
 -----END PGP SIGNATURE-----

diff --git a/media-radio/ax25-tools/files/ax25-tools-0.0.10_rc2-cve-2011-2910.patch b/media-radio/ax25-tools/files/ax25-tools-0.0.10_rc2-cve-2011-2910.patch
index 9b5eb608c7bf7faf3bc9f76db6a08a74277e6003..c2631af7857857e44afcc66c4cc4c9c8fff8764e 100644 (file)
--- a/media-radio/ax25-tools/files/ax25-tools-0.0.10_rc2-cve-2011-2910.patch
+++ b/media-radio/ax25-tools/files/ax25-tools-0.0.10_rc2-cve-2011-2910.patch
@@ -1,13 +1,6 @@
 diff -Nur ax25-tools-0.0.10-rc2/ax25/ax25d.c ax25-tools/ax25/ax25d.c
 --- ax25-tools-0.0.10-rc2/ax25/ax25d.c 2009-06-21 20:01:55.000000000 +0200
 +++ ax25-tools/ax25/ax25d.c    2011-08-18 11:51:08.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: ax25-tools-0.0.10_rc2-cve-2011-2910.patch,v 1.1 2011/08/30 16:59:58 tomjbe Exp $
-+ * $Id: ax25-tools-0.0.10_rc2-cve-2011-2910.patch,v 1.1 2011/08/30 16:59:58 tomjbe Exp $
-  *
-  *  This is my version of axl.c, written for the LBBS code to make it
-  *    compatable with the kernel AX25 driver.  It appears to work, with
 @@ -577,7 +577,7 @@
                                                        /* close link */
                                                        /* setproctitle("ax25d [%s]: disconnecting", User); */
@@ -40,19 +33,6 @@ diff -Nur ax25-tools-0.0.10-rc2/ax25/ax25d.c ax25-tools/ax25/ax25d.c
 diff -Nur ax25-tools-0.0.10-rc2/ax25/axspawn.c ax25-tools/ax25/axspawn.c
 --- ax25-tools-0.0.10-rc2/ax25/axspawn.c       2009-06-21 20:01:55.000000000 +0200
 +++ ax25-tools/ax25/axspawn.c  2011-08-18 12:43:49.000000000 +0200
-@@ -1,10 +1,10 @@
- /*
-  *
-- * $Id: ax25-tools-0.0.10_rc2-cve-2011-2910.patch,v 1.1 2011/08/30 16:59:58 tomjbe Exp $
-+ * $Id: ax25-tools-0.0.10_rc2-cve-2011-2910.patch,v 1.1 2011/08/30 16:59:58 tomjbe Exp $
-  *
-  * axspawn.c - run a program from ax25d.
-  *
-- * Copyright (c) 1996 Jörg Reuter DL1BKE (jreuter@poboxes.com)
-+ * Copyright (c) 1996 Joerg Reuter DL1BKE (jreuter@poboxes.com)
-  *
-  * This program is a hack.
-  * 
 @@ -1693,7 +1693,11 @@
                  pututline(&ut_line);
                  endutent();