packages: deltarpm/deltarpm.spec, deltarpm/deltarpm-3.4-no-skip-doc.patch, ...

cactus cactus at pld-linux.org
Wed Jun 23 05:50:47 CEST 2010 

Author: cactus                       Date: Wed Jun 23 03:50:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; sync patch0, updated patch1 - added our lzma support, more buffer mem for lzma, disable rsync detect

---- Files affected:
packages/deltarpm:
   deltarpm.spec (1.6 -> 1.7) , deltarpm-3.4-no-skip-doc.patch (1.1 -> 1.2) , deltarpm-3.4-pld.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/deltarpm/deltarpm.spec
diff -u packages/deltarpm/deltarpm.spec:1.6 packages/deltarpm/deltarpm.spec:1.7
--- packages/deltarpm/deltarpm.spec:1.6	Mon Oct 26 01:02:18 2009
+++ packages/deltarpm/deltarpm.spec	Wed Jun 23 05:50:41 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Generowanie różnic między pakietami rpm
 Name:		deltarpm
 Version:	3.5
-Release:	1
+Release:	2
 License:	BSD
 Group:		Base
 Source0:	ftp://ftp.suse.com/pub/projects/deltarpm/%{name}-%{version}.tar.bz2
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/06/23 03:50:41  cactus
+- rel 2; sync patch0, updated patch1 - added our lzma support, more buffer mem for lzma, disable rsync detect
+
 Revision 1.6  2009/10/26 00:02:18  cactus
 - up to 3.5
 - disabled rpmdumpheader bin - problems with rpm headers

================================================================
Index: packages/deltarpm/deltarpm-3.4-no-skip-doc.patch
diff -u packages/deltarpm/deltarpm-3.4-no-skip-doc.patch:1.1 packages/deltarpm/deltarpm-3.4-no-skip-doc.patch:1.2
--- packages/deltarpm/deltarpm-3.4-no-skip-doc.patch:1.1	Sun Sep  9 17:08:11 2007
+++ packages/deltarpm/deltarpm-3.4-no-skip-doc.patch	Wed Jun 23 05:50:41 2010
@@ -1,7 +1,7 @@
-diff -ur deltarpm-3.4b/makedeltarpm.c deltarpm-3.4a/makedeltarpm.c
---- deltarpm-3.4b/makedeltarpm.c	2007-03-06 15:35:55.000000000 +0200
-+++ deltarpm-3.4a/makedeltarpm.c	2007-04-04 21:13:04.000000000 +0300
-@@ -887,6 +887,13 @@
+diff -u deltarpm-3.5/makedeltarpm.c deltarpm-pld/makedeltarpm.c
+--- deltarpm-3.5/makedeltarpm.c	2009-08-18 15:18:13.000000000 +0200
++++ deltarpm-pld/makedeltarpm.c	2010-06-17 01:01:12.000000000 +0200
+@@ -926,6 +929,13 @@
  		    fprintf(vfp, "skipping %s: bad file flags\n", np);
  		  skipped_fileflags++;
  		}
@@ -14,11 +14,11 @@
 +		}
  	      else if ((fileverify[i] & (VERIFY_MD5|VERIFY_FILESIZE)) != (VERIFY_MD5|VERIFY_FILESIZE))
  		{
- 		  if (verbose > 1) 
-diff -ur deltarpm-3.4b/rpmhead.h deltarpm-3.4a/rpmhead.h
---- deltarpm-3.4b/rpmhead.h	2007-03-06 15:35:55.000000000 +0200
-+++ deltarpm-3.4a/rpmhead.h	2007-04-04 21:12:05.000000000 +0300
-@@ -35,6 +35,7 @@
+ 		  if (verbose > 1)
+diff -u deltarpm-3.5/rpmhead.h deltarpm-pld/rpmhead.h
+--- deltarpm-3.5/rpmhead.h	2009-07-21 15:41:08.000000000 +0200
++++ deltarpm-pld/rpmhead.h	2009-10-26 00:57:40.000000000 +0100
+@@ -38,6 +38,7 @@
  #define SIGTAG_SHA1     269
  
  #define FILE_CONFIG     (1 << 0)

================================================================
Index: packages/deltarpm/deltarpm-3.4-pld.patch
diff -u packages/deltarpm/deltarpm-3.4-pld.patch:1.2 packages/deltarpm/deltarpm-3.4-pld.patch:1.3
--- packages/deltarpm/deltarpm-3.4-pld.patch:1.2	Mon Oct 26 01:02:18 2009
+++ packages/deltarpm/deltarpm-3.4-pld.patch	Wed Jun 23 05:50:41 2010
@@ -1,6 +1,72 @@
-diff -ruN deltarpm-3.4/Makefile deltarpm-3.4.new/Makefile
---- deltarpm-3.4/Makefile	2007-09-09 14:28:40.228449568 +0000
-+++ deltarpm-3.4.new/Makefile	2007-09-09 14:29:42.218992621 +0000
+diff -u deltarpm-3.5/cfile.c deltarpm-pld/cfile.c
+--- 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:
+diff -u deltarpm-3.5-old/makedeltarpm.c deltarpm/makedeltarpm.c
+--- deltarpm-3.5-old/makedeltarpm.c	2009-08-18 15:18:13.000000000 +0200
++++ deltarpm/makedeltarpm.c	2010-06-17 01:01:12.000000000 +0200
+@@ -833,13 +833,16 @@
+     bfd = cfile_open(CFILE_OPEN_RD, CFILE_IO_BUFFER, newcpio, CFILE_COMP_UN, newcpiolen, 0, 0);
+   else
+     bfd = cfile_open(CFILE_OPEN_RD, fd, 0, CFILE_COMP_XX, CFILE_LEN_UNLIMITED, 0, 0);
++  
+   if (!bfd)
+     {
+       fprintf(stderr, "payload open failed\n");
+       exit(1);
+     }
++    
+   if (verbose && !alone)
+     fprintf(vfp, "reading old rpm...\n");
++  
+   if (rpmonly)
+     {
+       while ((l = bfd->read(bfd, buf, sizeof(buf))) > 0)
+@@ -1188,11 +1198,11 @@
+ 	  fprintf(stderr, "payload open failed\n");
+ 	  exit(1);
+ 	}
+-      if (cfile_detect_rsync(newbz))
++/*      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')
+diff -u deltarpm-3.5/Makefile deltarpm-pld/Makefile
+--- deltarpm-3.5/Makefile	2009-07-21 16:27:17.000000000 +0200
++++ deltarpm-pld/Makefile	2010-06-16 22:42:11.000000000 +0200
 @@ -1,6 +1,6 @@
 -prefix=/usr/local
 +prefix=/usr
@@ -10,9 +76,7 @@
  rpmdumpheader=$(bindir)/rpmdumpheader
  zlibdir=zlib-1.2.2.f-rsyncable
  CFLAGS = -O2 -Wall -g
---- deltarpm-3.5/Makefile.orig	2009-10-26 00:53:55.000000000 +0100
-+++ deltarpm-3.5/Makefile	2009-10-26 00:54:50.000000000 +0100
-@@ -38,7 +38,6 @@
+@@ -38,7 +39,6 @@
  	install -m 755 makedeltarpm  $(DESTDIR)$(bindir)
  	install -m 755 applydeltarpm $(DESTDIR)$(bindir)
  	install -m 755 combinedeltarpm $(DESTDIR)$(bindir)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/deltarpm/deltarpm.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/deltarpm/deltarpm-3.4-no-skip-doc.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/deltarpm/deltarpm-3.4-pld.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list