Version Bump, #319221; moved to maintainer-needed; unbundled zlib -> vulnerable version

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 91 insertions, 3 deletions

diff --git a/app-arch/deltarpm/ChangeLog b/app-arch/deltarpm/ChangeLog
index 33c530f87fd9..dea6e5482f8d 100644
--- a/app-arch/deltarpm/ChangeLog
+++ b/app-arch/deltarpm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/deltarpm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/ChangeLog,v 1.4 2008/06/09 00:36:56 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/ChangeLog,v 1.5 2010/05/18 08:58:16 jlec Exp $
+
+*deltarpm-3.5 (18 May 2010)
+
+  18 May 2010; Justin Lecher <jlec@gentoo.org> +files/3.5-zlib.patch,
+  +deltarpm-3.5.ebuild, metadata.xml:
+  Version Bump, #319221; moved to maintainer-needed; unbundled zlib ->
+  vulnerable version
 
 *deltarpm-3.4 (09 Jun 2008)
 
diff --git a/app-arch/deltarpm/deltarpm-3.5.ebuild b/app-arch/deltarpm/deltarpm-3.5.ebuild
new file mode 100644
index 000000000000..10addb0f20e8
--- /dev/null
+++ b/app-arch/deltarpm/deltarpm-3.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/deltarpm-3.5.ebuild,v 1.1 2010/05/18 08:58:16 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tools to create and apply deltarpms"
+HOMEPAGE="ftp://ftp.suse.com/pub/projects/deltarpm/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/deltarpm/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	app-arch/xz-utils
+	app-arch/bzip2
+	<app-arch/rpm-5"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-zlib.patch
+	sed -i \
+		-e '/^prefix/s:/local::' \
+		-e '/^mandir/s:/man:/share/man:' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc README
+}
diff --git a/app-arch/deltarpm/files/3.5-zlib.patch b/app-arch/deltarpm/files/3.5-zlib.patch
new file mode 100644
index 000000000000..4c5b5d36ded2
--- /dev/null
+++ b/app-arch/deltarpm/files/3.5-zlib.patch
@@ -0,0 +1,39 @@
+diff --git a/Makefile b/Makefile
+index b26952c..e914e5a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,26 +4,26 @@ mandir=$(prefix)/man
+ rpmdumpheader=$(bindir)/rpmdumpheader
+ zlibdir=zlib-1.2.2.f-rsyncable
+ CFLAGS = -O2 -Wall -g
+-CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
+-LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
++CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\"
++LDLIBS = -lbz2 -lz -llzma
+ LDFLAGS =
+ 
+ all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
+ 
+-makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
++makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o
+ 
+-applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
++applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o
+ 
+-combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
++combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o
+ 
+ rpmdumpheader: rpmdumpheader.o
+ 	$(CC) $(LDFLAGS) $^ -lrpm -o $@
+ 
+-makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
++makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o
+ 
+-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
++applydeltaiso: applydeltaiso.o util.o md5.o cfile.o
+ 
+-fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
++fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o
+ 
+ $(zlibdir)/libz.a:
+ 	cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index f6c9b5f447f4..ae1cee2f7a85 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>maintainer-needed</herd>
 <longdescription>A tool to create and apply deltarpms.</longdescription>
 </pkgmetadata>