deltarpm-3.4-pld.patch

   1 diff -u deltarpm-3.5/cfile.c deltarpm-pld/cfile.c
   2 --- deltarpm-3.5/cfile.c        2009-07-29 14:50:48.000000000 +0200
   3 +++ deltarpm-pld/cfile.c        2010-06-17 01:27:15.000000000 +0200
   4 @@ -658,7 +658,8 @@
   5  {
   6    lzma_stream tmp = LZMA_STREAM_INIT;
   7    f->strm.lz = tmp;
   8 -  if (lzma_auto_decoder(&f->strm.lz, 1 << 25, 0) != LZMA_OK)
   9 +  //if (lzma_auto_decoder(&f->strm.lz, 1 << 25, 0) != LZMA_OK)
  10 +  if (lzma_auto_decoder(&f->strm.lz, 1 << 27, 0) != LZMA_OK)
  11      {
  12        free(f);
  13        return 0;
  14 @@ -1119,6 +1120,10 @@
  15             comp = CFILE_COMP_LZMA;
  16           else if (f->buf[0] == 0135 && f->buf[1] == 0 && f->buf[2] == 0)
  17             comp = CFILE_COMP_LZMA;
  18 +         else if (f->buf[0] == 0 && f->buf[1] == 0x5d && f->buf[2] == 0 && f->buf[3] == 0)
  19 +           comp = CFILE_COMP_LZMA;
  20 +         else if (f->buf[0] == 0 && f->buf[1] == 0x03 && f->buf[2] == 0 && f->buf[3] == 0)
  21 +           comp = CFILE_COMP_LZMA;
  22           else if (f->buf[0] == 0xfd && f->buf[1] == '7' && f->buf[2] == 'z' && f->buf[3] == 'X' && f->buf[4] == 'Z')
  23             comp = CFILE_COMP_XZ;
  24         }
  25 @@ -1245,6 +1250,7 @@
  26      case CFILE_COMP_GZ:
  27      case CFILE_COMP_GZ_RSYNC:
  28      case CFILE_COMP_BZ:
  29 +    case CFILE_COMP_LZMA:
  30        deflevel = 9;
  31        break;
  32      default:
  33 diff -u deltarpm-3.5-old/makedeltarpm.c deltarpm/makedeltarpm.c
  34 --- deltarpm-3.5-old/makedeltarpm.c     2009-08-18 15:18:13.000000000 +0200
  35 +++ deltarpm/makedeltarpm.c     2010-06-17 01:01:12.000000000 +0200
  36 @@ -833,13 +833,16 @@
  37      bfd = cfile_open(CFILE_OPEN_RD, CFILE_IO_BUFFER, newcpio, CFILE_COMP_UN, newcpiolen, 0, 0);
  38    else
  39      bfd = cfile_open(CFILE_OPEN_RD, fd, 0, CFILE_COMP_XX, CFILE_LEN_UNLIMITED, 0, 0);
  40 +
  41    if (!bfd)
  42      {
  43        fprintf(stderr, "payload open failed\n");
  44        exit(1);
  45      }
  46 +
  47    if (verbose && !alone)
  48      fprintf(vfp, "reading old rpm...\n");
  49 +
  50    if (rpmonly)
  51      {
  52        while ((l = bfd->read(bfd, buf, sizeof(buf))) > 0)
  53 @@ -1188,11 +1198,11 @@
  54           fprintf(stderr, "payload open failed\n");
  55           exit(1);
  56         }
  57 -      if (cfile_detect_rsync(newbz))
  58 +/*      if (cfile_detect_rsync(newbz))
  59         {
  60           fprintf(stderr, "detect_rsync failed\n");
  61           exit(1);
  62 -       }
  63 +       }*/
  64        targetcomp = newbz->comp;
  65        if ((payloadflags = headstring(d.h, TAG_PAYLOADFLAGS)) != 0)
  66         if (*payloadflags >= '1' && *payloadflags <= '9')
  67 diff -u deltarpm-3.5/Makefile deltarpm-pld/Makefile
  68 --- deltarpm-3.5/Makefile       2009-07-21 16:27:17.000000000 +0200
  69 +++ deltarpm-pld/Makefile       2010-06-16 22:42:11.000000000 +0200
  70 @@ -1,6 +1,6 @@
  71 -prefix=/usr/local
  72 +prefix=/usr
  73  bindir=$(prefix)/bin
  74 -mandir=$(prefix)/man
  75 +mandir=$(prefix)/share/man
  76  rpmdumpheader=$(bindir)/rpmdumpheader
  77  zlibdir=zlib-1.2.2.f-rsyncable
  78  CFLAGS = -O2 -Wall -g