[packages/deltarpm] - updated to 3.6.3

qboosh qboosh at pld-linux.org
Sun Oct 8 10:32:53 CEST 2023


commit 174529b5ebaaf0561387ef408d420693344683aa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 8 09:23:09 2023 +0200

    - updated to 3.6.3

 deltarpm-3.4-pld.patch | 22 +++++++++++-----------
 deltarpm.spec          |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/deltarpm.spec b/deltarpm.spec
index d20c5f5..c8005ae 100644
--- a/deltarpm.spec
+++ b/deltarpm.spec
@@ -6,13 +6,13 @@
 Summary:	Create deltas between rpms
 Summary(pl.UTF-8):	Generowanie różnic między pakietami rpm
 Name:		deltarpm
-Version:	3.6.1
-Release:	8
+Version:	3.6.3
+Release:	1
 License:	BSD
 Group:		Base
-#Source0Download: https://github.com/rpm-software-management/deltarpm/releases
+#Source0Download: https://github.com/rpm-software-management/deltarpm/tags
 Source0:	https://github.com/rpm-software-management/deltarpm/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	c48086229bdfcf5af890f104231180c6
+# Source0-md5:	8788682eaa329e467f00f096ced03051
 Patch0:		%{name}-3.4-no-skip-doc.patch
 Patch1:		%{name}-3.4-pld.patch
 Patch2:		%{name}-rpm5.patch
diff --git a/deltarpm-3.4-pld.patch b/deltarpm-3.4-pld.patch
index 9e181e6..18320a9 100644
--- a/deltarpm-3.4-pld.patch
+++ b/deltarpm-3.4-pld.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- deltarpm-3.6.3/cfile.c.orig	2020-08-27 17:34:37.000000000 +0200
++++ deltarpm-3.6.3/cfile.c	2023-10-08 09:19:04.378740047 +0200
+@@ -654,7 +654,8 @@ cropen_lz(struct cfile *f)
  {
    lzma_stream tmp = LZMA_STREAM_INIT;
    f->strm.lz = tmp;
@@ -10,7 +10,7 @@
      {
        free(f);
        return 0;
-@@ -1119,6 +1120,10 @@
+@@ -1320,6 +1321,10 @@ cfile_open(int mode, int fd, void *fp, i
  	    comp = CFILE_COMP_LZMA;
  	  else if (f->buf[0] == 0135 && f->buf[1] == 0 && f->buf[2] == 0)
  	    comp = CFILE_COMP_LZMA;
@@ -20,8 +20,8 @@
 +	    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 @@
+ 	  else if ((f->buf[0] & 0xf0) == 0x20 && f->buf[1] == 0xb5 && f->buf[2] == 0x2f && f->buf[3] == 0xfd)
+@@ -1463,6 +1468,7 @@ cfile_setlevel(int comp, int level)
      case CFILE_COMP_GZ:
      case CFILE_COMP_GZ_RSYNC:
      case CFILE_COMP_BZ:
@@ -29,9 +29,9 @@
        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 @@
+--- deltarpm-3.6.3/makedeltarpm.c.orig	2023-10-07 22:04:03.314819811 +0200
++++ deltarpm-3.6.3/makedeltarpm.c	2023-10-08 09:19:37.131895941 +0200
+@@ -1084,11 +1084,13 @@ main(int argc, char **argv)
        fprintf(stderr, "payload open failed\n");
        exit(1);
      }
@@ -41,10 +41,10 @@
        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 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/deltarpm.git/commitdiff/174529b5ebaaf0561387ef408d420693344683aa



More information about the pld-cvs-commit mailing list