Revbump; patch to fix buffer overflows (bug 339073)

Package-Manager: portage-2.2_rc86_p7/cvs/Linux i686

4 files changed, 102 insertions, 2 deletions

diff --git a/dev-util/wiggle/ChangeLog b/dev-util/wiggle/ChangeLog
index 8ad1550eac76..59801d5a281d 100644
--- a/dev-util/wiggle/ChangeLog
+++ b/dev-util/wiggle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/wiggle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.20 2010/03/24 18:15:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.21 2010/09/29 02:59:50 abcd Exp $
+
+*wiggle-0.8-r1 (29 Sep 2010)
+
+  29 Sep 2010; Jonathan Callen <abcd@gentoo.org> +wiggle-0.8-r1.ebuild,
+  +files/wiggle-0.8-buffer-overflow.patch:
+  Revbump; patch to fix buffer overflows (bug 339073)
 
 *wiggle-0.8 (24 Mar 2010)
 
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 8aa3633c2ae6..f5803cf8f0ad 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX wiggle-0.8-buffer-overflow.patch 210 RMD160 85a458cb653acbe9397ac60ec2884ea142140efc SHA1 5aa7334dc7fdf8f4793036ca6399872f7dbe8d04 SHA256 0e09f13ddb58a22042f78b7ccf63be9ea5c4740049d044632ae18b61f67956f1
 DIST wiggle-0.6-patches-20060513.tar.bz2 11850 RMD160 f9a267dd57ffb45ed8c4c24cb1aa0f8fb5fa15a1 SHA1 9c7ca333087b84fd831833cb262d153844acfb4e SHA256 1477859efaa4a999c545e1ca6875f90feeb0c41231b5b1888a24485a215cddf3
 DIST wiggle-0.6.tar.gz 514638 RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a SHA1 2ed54a1d462f3e80029df83aebe3f0054c5aa4c9 SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c
 DIST wiggle-0.8.tar.gz 2097175 RMD160 1dfa3a9b35c8b54b796964318ae06a8cded7ff35 SHA1 1aaa44677daeefe085c4398473e617a366d8a779 SHA256 f8bf7981f5e5811dcf6c519c5e335031a1c9b7833c919a2c5707ac8d5524b94a
 EBUILD wiggle-0.6-r3.ebuild 2182 RMD160 2ea6fcb3cce9157c7e4bcfd1572b2457f448aba0 SHA1 3d3cfb50662951fee503b4ac46277232e8806c88 SHA256 02339c358346d78059c0d70a62815b24a57eb59d8f0496187b8b4315ba28da80
+EBUILD wiggle-0.8-r1.ebuild 1880 RMD160 fd60843ae3f7f5e53a48b9301e5b90bda8ffa861 SHA1 08494d27032aa89f962a01dc021f4b3c1f9af55a SHA256 070b660f44157a0b01d17283b10fe8b1ab781a06ad416bbd7b0029f5915b3e51
 EBUILD wiggle-0.8.ebuild 1870 RMD160 1e73b9d72abfdb5f043ee111317324e827f236a9 SHA1 8f5000c627b18894fe6fe34e3625ce1bfa5b587a SHA256 fb06861cfcb781cdd2464b0bd8aa01ba36635399e6db7c0187d63d420dbf71b6
-MISC ChangeLog 2471 RMD160 27f1e9406e2139a4714deb7d1fffb6a848ab757e SHA1 637cf9d83f67a1f812c7bd2a6c08be9fe2fc4da4 SHA256 299d77665d13a269dfffdaf2033b6faad82b6ca83efd0f50eec37bf74220cbd9
+MISC ChangeLog 2668 RMD160 4d15f58fad6c6745a8cd18a45afb3730b2abbadc SHA1 2d35a7acf3217fbd1b764b1798cc79ffe6dd8322 SHA256 fbcea46759e83e3eaa1a779b2f435229925da1076328482d3357b373281821ce
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMoqu0AAoJELHSF2kinlg4v8kP/RarrHVJw2ou7BUd2RZsPWP4
+QMzkhicc4MGwlF1EhjREp1qdv/KO/jZbpRhd6GiC/0hkmSlv+wOF4fZcNkci5Ade
+djovnT6uJHemoCj7fjSw3i642DS+NSeAuL37ey4pnKXhjqoIJye9nLEgYW1MrzoZ
+GD3fpj5lUrNP1wnLUOBJVZqr4le63Xs8Xp67RZjr0SuPTTGnXgPNP/uRIG6B6upV
+JVIehQa6TjTh00rgGqLIqnL07zBhhm7DHpGfPa3vk/RUkz9mRfpIRH2zJnXdypYr
+Td/Ue426S7HXQz7zWNUpa1VpFo1WOfE9B6ovB+0eQOMtUoPYoaA8ZExO4dB9ivrD
+Pn7Uc1zYCDHZrLkkG9wSV8hwfJIY6HBpTgVmP5jE1pILEuIqGn+zNDeDQFgye+zI
+s0DsnJFZMq3zzdrqyM5B9LFTRs/Ku/fN76qnLvWzXfoO6dosDTz0TLMQizW6L7KJ
+5diXYt6yUGgoU11JZ1gGg5E2dxuLz8QL4QIyYWIjyZBXoHJBxR9JDaVVHlE5Pz+T
+/gHnaszuAkTJOkXqnYkPpgiidcscxRcE7cc4tJf+yuRNsQ1v3QqExVa0pG5qz4fj
+uhJ4Sr/CG9m/gJ5uAsaboSAfXNADLctTe3CDp2g2tYZlN9K1LiQ8gBhGKiOcTwz6
+LUSHfK3jfCmgIwkSU6m0
+=7d0M
+-----END PGP SIGNATURE-----
diff --git a/dev-util/wiggle/files/wiggle-0.8-buffer-overflow.patch b/dev-util/wiggle/files/wiggle-0.8-buffer-overflow.patch
new file mode 100644
index 000000000000..c0ad9188818b
--- /dev/null
+++ b/dev-util/wiggle/files/wiggle-0.8-buffer-overflow.patch
@@ -0,0 +1,11 @@
+--- wiggle-0.8.orig/vpatch.c
++++ wiggle-0.8/vpatch.c
+@@ -391,7 +391,7 @@
+ 
+ void draw_one(int row, struct plist *pl, FILE *f, int reverse)
+ {
+-	char hdr[10];
++	char hdr[12];
+ 	hdr[0] = 0;
+ 
+ 	if (pl == NULL) {
diff --git a/dev-util/wiggle/wiggle-0.8-r1.ebuild b/dev-util/wiggle/wiggle-0.8-r1.ebuild
new file mode 100644
index 000000000000..a8b11983a3cd
--- /dev/null
+++ b/dev-util/wiggle/wiggle-0.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.8-r1.ebuild,v 1.1 2010/09/29 02:59:50 abcd Exp $
+
+EAPI=3
+
+inherit eutils fixheadtails toolchain-funcs
+
+DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
+SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# The 'p' tool does support bitkeeper, but I'm against just dumping it in here
+# due to it's size.  I've explictly listed every other dependancy here due to
+# the nature of the shell program 'p'
+RDEPEND="dev-util/diffstat
+	dev-util/patchutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	sys-apps/gawk
+	sys-apps/grep
+	sys-apps/less
+	sys-apps/sed
+	sys-apps/coreutils
+	sys-devel/patch"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+	test? ( sys-process/time )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
+
+	# Fix the reference to the help file so `p help' works
+	sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
+
+	# Don't add Neil Brown's default sign off line to every patch
+	sed -i '/$CERT/,+4s,^,#,' p || die "sed failed on p"
+
+	# Use prefixed time binary
+	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"
+
+	ht_fix_file p
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" \
+		wiggle || die "emake wiggle failed."
+}
+
+src_install() {
+	dobin wiggle p || die "failed to install binaries"
+	doman wiggle.1 || die "failed to install man page"
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes || die "failed to install docs"
+	insinto /usr/share/wiggle
+	doins p.help || die "failed to install help file"
+}