summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-11-28 07:28:08 +0000
committerUlrich Müller <ulm@gentoo.org>2008-11-28 07:28:08 +0000
commit7647332b6c46b22ebd65a5064169022fe4a9b3b8 (patch)
treef19f74e123e621ad10627378b938a77c2d685cc1 /sys-apps/gawk
parentVersion bump (fixes security bug #247620 / CVE-2008-4314) (diff)
downloadgentoo-2-7647332b6c46b22ebd65a5064169022fe4a9b3b8.tar.gz
gentoo-2-7647332b6c46b22ebd65a5064169022fe4a9b3b8.tar.bz2
gentoo-2-7647332b6c46b22ebd65a5064169022fe4a9b3b8.zip
Fix GNU Info files, bug 249130.
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686)
Diffstat (limited to 'sys-apps/gawk')
-rw-r--r--sys-apps/gawk/ChangeLog6
-rw-r--r--sys-apps/gawk/files/gawk-3.1.6-gnuinfo.patch28
-rw-r--r--sys-apps/gawk/gawk-3.1.6.ebuild3
3 files changed, 35 insertions, 2 deletions
diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 7cdc5966697d..2baa753f568f 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/gawk
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.124 2008/10/28 10:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.125 2008/11/28 07:28:08 ulm Exp $
+
+ 28 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
+ +files/gawk-3.1.6-gnuinfo.patch, gawk-3.1.6.ebuild:
+ Fix GNU Info files, bug 249130.
28 Oct 2008; Raúl Porcel <armin76@gentoo.org> gawk-3.1.6.ebuild:
alpha/ia64 stable #244384
diff --git a/sys-apps/gawk/files/gawk-3.1.6-gnuinfo.patch b/sys-apps/gawk/files/gawk-3.1.6-gnuinfo.patch
new file mode 100644
index 000000000000..3c753439438f
--- /dev/null
+++ b/sys-apps/gawk/files/gawk-3.1.6-gnuinfo.patch
@@ -0,0 +1,28 @@
+Fix broken Info files produced by texinfo 4.11
+http://bugs.gentoo.org/249130
+
+--- gawk-3.1.6/doc/gawkinet.info
++++ gawk-3.1.6/doc/gawkinet.info
+@@ -1,7 +1,8 @@
++This is gawkinet.info, produced by makeinfo version 4.13 from
++gawkinet.texi.
++
+ INFO-DIR-SECTION Network applications
+ START-INFO-DIR-ENTRY
+-This is gawkinet.info, produced by makeinfo version 4.11 from gawkinet.texi.
+-
+ * Gawkinet: (gawkinet). TCP/IP Internetworking With `gawk'.
+ END-INFO-DIR-ENTRY
+
+--- gawk-3.1.6/doc/gawk.info
++++ gawk-3.1.6/doc/gawk.info
+@@ -1,7 +1,7 @@
++This is gawk.info, produced by makeinfo version 4.13 from gawk.texi.
++
+ INFO-DIR-SECTION Text creation and manipulation
+ START-INFO-DIR-ENTRY
+-This is gawk.info, produced by makeinfo version 4.11 from gawk.texi.
+-
+ * Gawk: (gawk). A text scanning and processing language.
+ END-INFO-DIR-ENTRY
+ INFO-DIR-SECTION Individual utilities
diff --git a/sys-apps/gawk/gawk-3.1.6.ebuild b/sys-apps/gawk/gawk-3.1.6.ebuild
index 02f4551c0139..2a0487344922 100644
--- a/sys-apps/gawk/gawk-3.1.6.ebuild
+++ b/sys-apps/gawk/gawk-3.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.6.ebuild,v 1.10 2008/10/28 10:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.6.ebuild,v 1.11 2008/11/28 07:28:08 ulm Exp $
inherit eutils toolchain-funcs multilib
@@ -28,6 +28,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/autoconf-mktime-2.61.patch #220040
epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch
+ epatch "${FILESDIR}"/${P}-gnuinfo.patch #249130
}
src_compile() {