1 --- deltarpm-3.6/Makefile 2015-02-01 13:27:11.084208113 +0200
2 +++ deltarpm-3.6/Makefile 2015-02-01 13:26:31.965516931 +0200
4 zlibcppflags=-I$(zlibdir)
6 CFLAGS = -fPIC -O2 -Wall -g
7 -CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags)
8 -LDLIBS = -lbz2 $(zlibldflags) -llzma
10 +CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags) $(shell pkg-config --cflags rpm)
11 +LIBS = -lbz2 $(zlibldflags) $(shell pkg-config --libs rpm) $(shell pkg-config --libs liblzma)
12 PYTHONS = python python3
14 all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
16 python: _deltarpmmodule.so
18 makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibbundled)
19 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
21 applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibbundled)
22 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
24 combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibbundled)
25 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
27 rpmdumpheader: rpmdumpheader.o
28 - $(CC) $(LDFLAGS) $^ -lrpm -lrpmio -o $@
29 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
31 makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
32 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
34 applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
35 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
37 fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibbundled)
38 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
40 _deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
41 for PY in $(PYTHONS) ; do \
43 if [ ! -f "python$$PYVER/$@" ]; then \
44 mkdir -p python$$PYVER ;\
45 $(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflag) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\
46 - $(CC) $(LDFLAGS) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
47 + $(CC) $(LDFLAGS) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LIBS) $$PYLDFLAGS; \
53 - cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
54 + cd $(zlibdir) ; make CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" libz.a
59 install -m 755 makedeltarpm $(DESTDIR)$(bindir)
60 install -m 755 applydeltarpm $(DESTDIR)$(bindir)
61 install -m 755 combinedeltarpm $(DESTDIR)$(bindir)
62 - install -m 755 rpmdumpheader $(DESTDIR)$(rpmdumpheader)
63 + install -m 755 rpmdumpheader -D $(DESTDIR)$(rpmdumpheader)
64 install -m 755 makedeltaiso $(DESTDIR)$(bindir)
65 install -m 755 applydeltaiso $(DESTDIR)$(bindir)
66 install -m 755 fragiso $(DESTDIR)$(bindir)
67 --- deltarpm-git-20110223/rpmdumpheader.c.orig 2012-08-28 14:36:14.336108640 -0300
68 +++ deltarpm-git-20110223/rpmdumpheader.c 2012-08-28 14:36:17.157108563 -0300
73 -#include <rpm/rpmlib.h>
74 -#include <rpm/rpmts.h>
75 -#include <rpm/rpmdb.h>
80 +#include <rpmtypes.h>
88 int main(int argc, char **argv)
92 - rpmdbMatchIterator mi;
97 @@ -66,16 +74,24 @@ int main(int argc, char **argv)
100 mi = rpmtsInitIterator(ts, RPMTAG_NAME, n, 0);
101 - rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, e);
102 - rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, v);
103 - rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP, r);
104 + rpmmiAddPattern(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, e);
105 + rpmmiAddPattern(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, v);
106 + rpmmiAddPattern(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP, r);
108 - rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP, a);
109 + rpmmiAddPattern(mi, RPMTAG_ARCH, RPMMIRE_STRCMP, a);
111 - if ((h = rpmdbNextIterator(mi)) != NULL)
112 + if ((h = rpmmiNext(mi)) != NULL)
114 - fdo = Fopen("-", "w.ufdio");
115 - headerWrite(fdo, h, HEADER_MAGIC_YES);
117 + const char item[] = "Header";
118 + const char * msg = NULL;
120 + fdo = Fopen("-", "w.ufdio");
121 + rc = rpmpkgWrite(item, (FD_t)fdo, h, &msg);
122 + if (rc != RPMRC_OK) {
123 + rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "headerWrite", item, msg);
125 + msg = (const char*)_free(msg);
129 @@ -85,7 +101,7 @@ int main(int argc, char **argv)
130 fprintf(stderr, "%s-%s-%s%s%s is not installed\n", n, v, r, a ? "." : "", a ? a : "");
133 - mi = rpmdbFreeIterator(mi);
134 + mi = rpmmiFree(mi);