diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2011-09-03 18:39:45 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2011-09-03 18:39:45 +0000 |
| commit | 6b7ebb038af41466ae11fad69e689b379fd027ae (patch) | |
| tree | 4231c4f6c1ef6b829cb300dbaae3a1f7720fdd18 /media-radio | |
| parent | Version bump (diff) | |
| download | gentoo-2-6b7ebb038af41466ae11fad69e689b379fd027ae.tar.gz gentoo-2-6b7ebb038af41466ae11fad69e689b379fd027ae.tar.bz2 gentoo-2-6b7ebb038af41466ae11fad69e689b379fd027ae.zip | |
Fix bad patch file. Bug # 381651
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'media-radio')
| -rw-r--r-- | media-radio/ax25-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-radio/ax25-tools/files/ax25-tools-0.0.10_rc2-cve-2011-2910.patch | 20 |
2 files changed, 5 insertions, 21 deletions
diff --git a/media-radio/ax25-tools/ChangeLog b/media-radio/ax25-tools/ChangeLog index b9739dc48652..be50a62226ae 100644 --- 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/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 9b5eb608c7bf..c2631af78578 100644 --- 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(); |