fix bug in default settings (Bug #104061): 'char' options were compared

  against -1 to see if they were unset, but 'char' type defaults to unsigned

(Portage version: 2.1-r1)

7 files changed, 97 insertions, 3 deletions

diff --git a/app-arch/pdv/ChangeLog b/app-arch/pdv/ChangeLog
index e9d81f422d91..5c5a9b580b5f 100644
--- a/app-arch/pdv/ChangeLog
+++ b/app-arch/pdv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/pdv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/ChangeLog,v 1.9 2006/01/21 01:51:38 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/ChangeLog,v 1.10 2006/07/23 06:53:00 wormo Exp $
+
+*pdv-1.5.1-r2 (25 Jul 2006)
+
+  23 Jul 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/pdv-1.5.1-default-args.patch, +pdv-1.5.1-r2.ebuild:
+  fix bug in default settings (Bug #104061): 'char' options were compared
+  against -1 to see if they were unset, but 'char' type defaults to unsigned
 
   21 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> pdv-1.5.1-r1.ebuild:
   Make modular X friendly.
diff --git a/app-arch/pdv/files/digest-pdv-1.5.1 b/app-arch/pdv/files/digest-pdv-1.5.1
index c879cb585b81..efa8168f1754 100644
--- a/app-arch/pdv/files/digest-pdv-1.5.1
+++ b/app-arch/pdv/files/digest-pdv-1.5.1
@@ -1 +1,3 @@
 MD5 4dbfa3dd2a766a2d253728b80bb94838 pdv-1.5.1.tar.gz 87858
+RMD160 fa2e814a29e88a60f0e7e026cf8b40855ff89265 pdv-1.5.1.tar.gz 87858
+SHA256 1c941a571e1f60b903b4b8e5154f1321d32cd593118c9f399e3fed4561a1b1ad pdv-1.5.1.tar.gz 87858
diff --git a/app-arch/pdv/files/digest-pdv-1.5.1-r1 b/app-arch/pdv/files/digest-pdv-1.5.1-r1
index c879cb585b81..efa8168f1754 100644
--- a/app-arch/pdv/files/digest-pdv-1.5.1-r1
+++ b/app-arch/pdv/files/digest-pdv-1.5.1-r1
@@ -1 +1,3 @@
 MD5 4dbfa3dd2a766a2d253728b80bb94838 pdv-1.5.1.tar.gz 87858
+RMD160 fa2e814a29e88a60f0e7e026cf8b40855ff89265 pdv-1.5.1.tar.gz 87858
+SHA256 1c941a571e1f60b903b4b8e5154f1321d32cd593118c9f399e3fed4561a1b1ad pdv-1.5.1.tar.gz 87858
diff --git a/app-arch/pdv/files/digest-pdv-1.5.1-r2 b/app-arch/pdv/files/digest-pdv-1.5.1-r2
new file mode 100644
index 000000000000..efa8168f1754
--- /dev/null
+++ b/app-arch/pdv/files/digest-pdv-1.5.1-r2
@@ -0,0 +1,3 @@
+MD5 4dbfa3dd2a766a2d253728b80bb94838 pdv-1.5.1.tar.gz 87858
+RMD160 fa2e814a29e88a60f0e7e026cf8b40855ff89265 pdv-1.5.1.tar.gz 87858
+SHA256 1c941a571e1f60b903b4b8e5154f1321d32cd593118c9f399e3fed4561a1b1ad pdv-1.5.1.tar.gz 87858
diff --git a/app-arch/pdv/files/pdv-1.5.1-default-args.patch b/app-arch/pdv/files/pdv-1.5.1-default-args.patch
new file mode 100644
index 000000000000..dc61def911fb
--- /dev/null
+++ b/app-arch/pdv/files/pdv-1.5.1-default-args.patch
@@ -0,0 +1,16 @@
+diff -ur pdv-1.5.1.orig/pdv.h pdv-1.5.1/pdv.h
+--- pdv-1.5.1.orig/pdv.h	2001-09-01 12:09:28.000000000 -0700
++++ pdv-1.5.1/pdv.h	2006-07-22 22:20:43.000000000 -0700
+@@ -47,9 +47,9 @@
+ 	char   *cmd;           /* command to execute after delivery */
+ 	char   *hlpmsg;        /* user help message */
+ 	char   *agrmsg;        /* optional agreement message */
+-	char   iscompressed;   /* filter payload through uncompress */ 
+-	char   isatar;         /* filter payload through tar */
+-	char   iszipped;       /* use internal compression library */
++	signed char   iscompressed;    /* filter payload through uncompress */ 
++	signed char   isatar;          /* filter payload through tar */
++	signed char   iszipped;        /* use internal compression library */
+ 	off_t  payloadstart;   /* start of payload (after pdv stub) */
+ 	off_t  metadatastart;  /* start of payload data (at end of file) */
+ };
diff --git a/app-arch/pdv/pdv-1.5.1-r2.ebuild b/app-arch/pdv/pdv-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..dadca86d55db
--- /dev/null
+++ b/app-arch/pdv/pdv-1.5.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/pdv-1.5.1-r2.ebuild,v 1.1 2006/07/23 06:53:00 wormo Exp $
+
+inherit eutils
+
+DESCRIPTION="build a self-extracting and self-installing binary package"
+HOMEPAGE="http://pdv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~hppa ~ppc ~x86"
+IUSE="nomotif"
+
+DEPEND=">=sys-devel/autoconf-2.58
+	sys-devel/automake
+	!nomotif? ( x11-libs/openmotif )
+	!nomotif? ( || (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libXt-1.0.0
+	>=x11-libs/libXext-1.0.0
+	>=x11-libs/libXp-1.0.0 )
+	virtual/x11
+	) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix a size-of-variable bug
+	epatch "${FILESDIR}"/${P}-opt.patch
+	# fix a free-before-use bug
+	epatch "${FILESDIR}"/${P}-early-free.patch
+	# fix a configure script bug
+	epatch "${FILESDIR}"/${P}-x-config.patch
+	# fix default args bug from assuming 'char' is signed
+	epatch "${FILESDIR}"/${P}-default-args.patch
+}
+
+src_compile() {
+	# re-build configure script since patch was applied to configure.in
+	cd "${S}"/X11
+	export WANT_AUTOCONF=2.5
+	aclocal
+	automake -a -c
+	autoconf
+
+	cd "${S}"
+	local myconf=""
+	use nomotif && myconf="--without-x" # configure script is broken, cant use use_with
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	dobin pdv pdvmkpkg || die
+	doman pdv.1 pdvmkpkg.1
+	if ! use nomotif ; then
+		dobin X11/xmpdvmkpkg || die
+		doman xmpdvmkpkg.1 || die
+	fi
+	dodoc AUTHORS ChangeLog NEWS README pdv.lsm
+}
diff --git a/app-arch/pdv/pdv-1.5.1.ebuild b/app-arch/pdv/pdv-1.5.1.ebuild
index 32184d635448..2a5de5615a65 100644
--- a/app-arch/pdv/pdv-1.5.1.ebuild
+++ b/app-arch/pdv/pdv-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/pdv-1.5.1.ebuild,v 1.7 2005/01/01 11:53:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/pdv-1.5.1.ebuild,v 1.8 2006/07/23 06:53:00 wormo Exp $
 
 DESCRIPTION="build a self-extracting and self-installing binary package"
 HOMEPAGE="http://pdv.sourceforge.net/"