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

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

1 files changed, 39 insertions, 0 deletions

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