From: Justin Lecher <jlec@gentoo.org>
Date: Tue, 18 May 2010 08:58:16 +0000 (+0000)
Subject: Version Bump, #319221; moved to maintainer-needed; unbundled zlib -> vulnerable version
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd389676c3b648fe459b20a2d07a280af35d6588;p=gentoo.git

Version Bump, #319221; moved to maintainer-needed; unbundled zlib -> vulnerable version
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

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/Manifest b/app-arch/deltarpm/Manifest
index 695950a02d5b..cec95aff3978 100644
--- a/app-arch/deltarpm/Manifest
+++ b/app-arch/deltarpm/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 3.5-zlib.patch 1809 RMD160 cfdc6bbb5d413ab68bba1dcc13f09f61359cce74 SHA1 61e6f77b6ee5c11b56cbe01804e27925a2c47b39 SHA256 00a06bbc7fa27c77d2856a1035a103fb95d887b653d49a14f5b4e9ef775f13aa
 DIST deltarpm-3.3.tar.bz2 471121 RMD160 eda74a7cf8a24c466a642070a96ab2c75194effd SHA1 0c6863407674697d7b776b52dc5551bef6658541 SHA256 e2c3e1e175e4c15980dc8f9d2c5d9749d6be5bbd787a4959aefea8e924887aba
 DIST deltarpm-3.4.tar.bz2 490137 RMD160 ffdff2a0aa584292023594d47c55e644e1e0ae38 SHA1 89d157a727826cb9fb945f936c087412f28f8628 SHA256 81e956bd13dec8f0c4701e76fa386889ecabcc3221f5684eaf93179f86146383
+DIST deltarpm-3.5.tar.bz2 492136 RMD160 6dd307261ab546d238a8009dc6f73d1eb16fbf76 SHA1 07cc1ec30f63344fde0eee478e146b77dd0e80c0 SHA256 db534094ce7ae7e50f85fb085ebb9147054383cec87279df34eed0434ec8a321
 EBUILD deltarpm-3.3.ebuild 771 RMD160 03a49bf003465be116d5cde19f2208db82ed82bd SHA1 80b4e277bbc7f89f94328da9d1bb487eed8688d2 SHA256 bdacfedeaf35c569f3b71e8e63b2556424c8e7e131e06a64bb156b5bc02b279c
 EBUILD deltarpm-3.4.ebuild 780 RMD160 2fb878f65e82cbd64183cd8b53d4bbbece873105 SHA1 f7a880caa5bbc213003473a982e6001185718959 SHA256 d1d4d1e6739f4b94997d872a4db017ff8c29890bb814315ac2f49873b2a2e31e
-MISC ChangeLog 786 RMD160 eccd11c43799268f76d3d9756034d47c9b5c8ed6 SHA1 2e946ed56c2b84bb921a9f4c46538a7baddb10fb SHA256 e066fb182d0c08352df05c062f5df5426d71d0220a0c0eb273bfcb7d92edf353
-MISC metadata.xml 233 RMD160 f1e62244e13604321439cd4c330977269cf12953 SHA1 e00c2ab36a080a32a0880e1d2a0a32326b55e877 SHA256 f49f7f59cba02df9da7382b21abe36aef71ffe83344b564b8bc23d70f3c8e499
+EBUILD deltarpm-3.5.ebuild 883 RMD160 bdb0fe34192238e09418b8ca930ef2880bd6b997 SHA1 9672d1d14dccb64715c02023bd2affb1250007b3 SHA256 baf39db57dd3331bbd1a8701c3ec6bdd0fdcd8d883bc0a7e0c456d069d384b94
+MISC ChangeLog 1012 RMD160 7bde3816f68d53a45204d744306dcb1c5c7e9667 SHA1 4a14b2acffa037f2b4648c4b18336e3d01a5ad05 SHA256 430a29c0bb636a1d616f33cbcefdafa1d1190eaa68ab6cc72ab03f0254c0ce9d
+MISC metadata.xml 243 RMD160 8e6a99f696ec3cadfc448dc39472e8685662721f SHA1 a317c45e25b6beb727aaceaf6530144b26435018 SHA256 710883cefce48cce18e46ae0d574d9e6273f2f41c82887cde888d21dba8c37fa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvyVq4ACgkQgAnW8HDreRbfGACfcFpaK0ohmsxN1XsOGPT/6dSZ
+ll0AoMEQvB6whEcoViAMHTAXAHE81+pQ
+=8uEr
+-----END PGP SIGNATURE-----
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>