]>
Commit | Line | Data |
---|---|---|
059333c0 BZ |
1 | --- deltarpm-3.5/cfile.c 2009-07-29 14:50:48.000000000 +0200 |
2 | +++ deltarpm-pld/cfile.c 2010-06-17 01:27:15.000000000 +0200 | |
3 | @@ -658,7 +658,8 @@ | |
4 | { | |
5 | lzma_stream tmp = LZMA_STREAM_INIT; | |
6 | f->strm.lz = tmp; | |
7 | - if (lzma_auto_decoder(&f->strm.lz, 1 << 25, 0) != LZMA_OK) | |
8 | + //if (lzma_auto_decoder(&f->strm.lz, 1 << 25, 0) != LZMA_OK) | |
9 | + if (lzma_auto_decoder(&f->strm.lz, 1 << 27, 0) != LZMA_OK) | |
10 | { | |
11 | free(f); | |
12 | return 0; | |
13 | @@ -1119,6 +1120,10 @@ | |
14 | comp = CFILE_COMP_LZMA; | |
15 | else if (f->buf[0] == 0135 && f->buf[1] == 0 && f->buf[2] == 0) | |
16 | comp = CFILE_COMP_LZMA; | |
17 | + else if (f->buf[0] == 0 && f->buf[1] == 0x5d && f->buf[2] == 0 && f->buf[3] == 0) | |
18 | + comp = CFILE_COMP_LZMA; | |
19 | + else if (f->buf[0] == 0 && f->buf[1] == 0x03 && f->buf[2] == 0 && f->buf[3] == 0) | |
20 | + comp = CFILE_COMP_LZMA; | |
21 | else if (f->buf[0] == 0xfd && f->buf[1] == '7' && f->buf[2] == 'z' && f->buf[3] == 'X' && f->buf[4] == 'Z') | |
22 | comp = CFILE_COMP_XZ; | |
23 | } | |
24 | @@ -1245,6 +1250,7 @@ | |
25 | case CFILE_COMP_GZ: | |
26 | case CFILE_COMP_GZ_RSYNC: | |
27 | case CFILE_COMP_BZ: | |
28 | + case CFILE_COMP_LZMA: | |
29 | deflevel = 9; | |
30 | break; | |
31 | default: | |
17c4044f ER |
32 | --- deltarpm-git-20110223/makedeltarpm.c~ 2011-11-07 22:27:12.000000000 +0200 |
33 | +++ deltarpm-git-20110223/makedeltarpm.c 2011-11-07 22:27:52.884618404 +0200 | |
34 | @@ -1080,11 +1080,13 @@ | |
059333c0 BZ |
35 | fprintf(stderr, "payload open failed\n"); |
36 | exit(1); | |
37 | } | |
17c4044f ER |
38 | +/* |
39 | if (cfile_detect_rsync(newbz)) | |
059333c0 | 40 | { |
17c4044f ER |
41 | fprintf(stderr, "detect_rsync failed\n"); |
42 | exit(1); | |
43 | } | |
44 | +*/ | |
45 | targetcomp = newbz->comp; | |
46 | if ((payloadflags = headstring(d.h, TAG_PAYLOADFLAGS)) != 0) | |
47 | if (*payloadflags >= '1' && *payloadflags <= '9') | |
48 | --- deltarpm-git-20110223/Makefile~ 2011-02-19 18:53:23.000000000 +0200 | |
49 | +++ deltarpm-git-20110223/Makefile 2011-11-07 22:29:01.877800526 +0200 | |
50 | @@ -1,7 +1,7 @@ | |
1bcd303b JS |
51 | -prefix=/usr/local |
52 | +prefix=/usr | |
53 | bindir=$(prefix)/bin | |
17c4044f | 54 | libdir=$(prefix)/lib |
1bcd303b JS |
55 | -mandir=$(prefix)/man |
56 | +mandir=$(prefix)/share/man | |
57 | rpmdumpheader=$(bindir)/rpmdumpheader | |
58 | zlibdir=zlib-1.2.2.f-rsyncable | |
17c4044f | 59 | zlibbundled=$(zlibdir)/libz.a |