1 --- deltarpm-git-20110223/Makefile.orig 2012-08-28 14:36:04.972108891 -0300
2 +++ deltarpm-git-20110223/Makefile 2012-08-28 14:36:45.929107787 -0300
3 @@ -9,28 +9,33 @@ zlibldflags=$(zlibbundled)
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)
13 all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
15 python: _deltarpmmodule.so
17 makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibbundled)
18 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
20 applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibbundled)
21 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
23 combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibbundled)
24 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
26 rpmdumpheader: rpmdumpheader.o
27 - $(CC) $(LDFLAGS) $^ -lrpm -lrpmio -o $@
28 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
30 makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
31 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
33 applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
34 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
36 fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibbundled)
37 + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
39 _deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
40 for PY in python python3 ; do \
41 @@ -41,13 +46,13 @@ _deltarpmmodule.so: readdeltarpm.o rpmhe
42 if [ ! -f "python$$PYVER/$@" ]; then \
43 mkdir -p python$$PYVER ;\
44 $(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflag) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\
45 - $(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS) $$PYLDFLAGS; \
46 + $(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LIBS) $$PYLDFLAGS; \
52 - cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
53 + cd $(zlibdir) ; make CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" libz.a
57 @@ -59,7 +64,7 @@ install:
58 install -m 755 makedeltarpm $(DESTDIR)$(bindir)
59 install -m 755 applydeltarpm $(DESTDIR)$(bindir)
60 install -m 755 combinedeltarpm $(DESTDIR)$(bindir)
61 - install -m 755 rpmdumpheader $(DESTDIR)$(rpmdumpheader)
62 + install -m 755 rpmdumpheader -D $(DESTDIR)$(rpmdumpheader)
63 install -m 755 makedeltaiso $(DESTDIR)$(bindir)
64 install -m 755 applydeltaiso $(DESTDIR)$(bindir)
65 install -m 755 fragiso $(DESTDIR)$(bindir)
66 --- deltarpm-git-20110223/rpmdumpheader.c.orig 2012-08-28 14:36:14.336108640 -0300
67 +++ deltarpm-git-20110223/rpmdumpheader.c 2012-08-28 14:36:17.157108563 -0300
72 -#include <rpm/rpmlib.h>
73 -#include <rpm/rpmts.h>
74 -#include <rpm/rpmdb.h>
79 +#include <rpmtypes.h>
87 int main(int argc, char **argv)
91 - rpmdbMatchIterator mi;
96 @@ -66,16 +74,24 @@ int main(int argc, char **argv)
99 mi = rpmtsInitIterator(ts, RPMTAG_NAME, n, 0);
100 - rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, e);
101 - rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, v);
102 - rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP, r);
103 + rpmmiAddPattern(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, e);
104 + rpmmiAddPattern(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, v);
105 + rpmmiAddPattern(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP, r);
107 - rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP, a);
108 + rpmmiAddPattern(mi, RPMTAG_ARCH, RPMMIRE_STRCMP, a);
110 - if ((h = rpmdbNextIterator(mi)) != NULL)
111 + if ((h = rpmmiNext(mi)) != NULL)
113 - fdo = Fopen("-", "w.ufdio");
114 - headerWrite(fdo, h, HEADER_MAGIC_YES);
116 + const char item[] = "Header";
117 + const char * msg = NULL;
119 + fdo = Fopen("-", "w.ufdio");
120 + rc = rpmpkgWrite(item, (FD_t)fdo, h, &msg);
121 + if (rc != RPMRC_OK) {
122 + rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "headerWrite", item, msg);
124 + msg = (const char*)_free(msg);
128 @@ -85,7 +101,7 @@ int main(int argc, char **argv)
129 fprintf(stderr, "%s-%s-%s%s%s is not installed\n", n, v, r, a ? "." : "", a ? a : "");
132 - mi = rpmdbFreeIterator(mi);
133 + mi = rpmmiFree(mi);