- up to 3.6 (git snapshot)

[packages/deltarpm.git] / deltarpm-3.4-pld.patch

--- deltarpm-3.5/cfile.c	2009-07-29 14:50:48.000000000 +0200
+++ deltarpm-pld/cfile.c	2010-06-17 01:27:15.000000000 +0200
@@ -658,7 +658,8 @@
 {
   lzma_stream tmp = LZMA_STREAM_INIT;
   f->strm.lz = tmp;
-  if (lzma_auto_decoder(&f->strm.lz, 1 << 25, 0) != LZMA_OK)
+  //if (lzma_auto_decoder(&f->strm.lz, 1 << 25, 0) != LZMA_OK)
+  if (lzma_auto_decoder(&f->strm.lz, 1 << 27, 0) != LZMA_OK)
     {
       free(f);
       return 0;
@@ -1119,6 +1120,10 @@
 	    comp = CFILE_COMP_LZMA;
 	  else if (f->buf[0] == 0135 && f->buf[1] == 0 && f->buf[2] == 0)
 	    comp = CFILE_COMP_LZMA;
+	  else if (f->buf[0] == 0 && f->buf[1] == 0x5d && f->buf[2] == 0 && f->buf[3] == 0)
+	    comp = CFILE_COMP_LZMA;
+	  else if (f->buf[0] == 0 && f->buf[1] == 0x03 && f->buf[2] == 0 && f->buf[3] == 0)
+	    comp = CFILE_COMP_LZMA;
 	  else if (f->buf[0] == 0xfd && f->buf[1] == '7' && f->buf[2] == 'z' && f->buf[3] == 'X' && f->buf[4] == 'Z')
 	    comp = CFILE_COMP_XZ;
 	}
@@ -1245,6 +1250,7 @@
     case CFILE_COMP_GZ:
     case CFILE_COMP_GZ_RSYNC:
     case CFILE_COMP_BZ:
+    case CFILE_COMP_LZMA:
       deflevel = 9;
       break;
     default:
--- deltarpm-git-20110223/makedeltarpm.c~	2011-11-07 22:27:12.000000000 +0200
+++ deltarpm-git-20110223/makedeltarpm.c	2011-11-07 22:27:52.884618404 +0200
@@ -1080,11 +1080,13 @@
       fprintf(stderr, "payload open failed\n");
       exit(1);
     }
+/*
   if (cfile_detect_rsync(newbz))
     {
       fprintf(stderr, "detect_rsync failed\n");
       exit(1);
     }
+*/
   targetcomp = newbz->comp;
   if ((payloadflags = headstring(d.h, TAG_PAYLOADFLAGS)) != 0)
     if (*payloadflags >= '1' && *payloadflags <= '9')
--- deltarpm-git-20110223/Makefile~	2011-02-19 18:53:23.000000000 +0200
+++ deltarpm-git-20110223/Makefile	2011-11-07 22:29:01.877800526 +0200
@@ -1,7 +1,7 @@
-prefix=/usr/local
+prefix=/usr
 bindir=$(prefix)/bin
 libdir=$(prefix)/lib
-mandir=$(prefix)/man
+mandir=$(prefix)/share/man
 rpmdumpheader=$(bindir)/rpmdumpheader
 zlibdir=zlib-1.2.2.f-rsyncable
 zlibbundled=$(zlibdir)/libz.a