Accepting request 970774 from Base:System

OBS-URL: https://build.opensuse.org/request/show/970774
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/deltarpm?expand=0&rev=32

deltarpm-b7987f6aa4211df3df03dcfc55a00b2ce7472e0a.patch

@@ -0,0 +1,45 @@
+commit b7987f6aa4211df3df03dcfc55a00b2ce7472e0a
+Author: Peter Pentchev <roam@debian.org>
+Date:   Tue Feb 15 18:52:20 2022 +0200
+
+    Fix a couple of C compiler warnings.
+
+diff --git a/applydeltarpm.c b/applydeltarpm.c
+index 36d6125..5b08192 100644
+--- a/applydeltarpm.c
++++ b/applydeltarpm.c
+@@ -1575,7 +1575,7 @@ main(int argc, char **argv)
+ 	  exit(1);
+ 	}
+       rpmMD5Update(&wrmd5, d.h->intro, 16);
+-      strncpy((char *)d.h->dp + d.payformatoff, "cpio", 4);
++      memcpy((char *)d.h->dp + d.payformatoff, "cpio", 4);
+       if (fwrite(d.h->data, 16 * d.h->cnt + d.h->dcnt, 1, ofp) != 1)
+ 	{
+ 	  fprintf(stderr, "write error\n");
+diff --git a/deltarpmmodule.c b/deltarpmmodule.c
+index 40ea60f..5e505b1 100644
+--- a/deltarpmmodule.c
++++ b/deltarpmmodule.c
+@@ -45,7 +45,7 @@ PyObject *createDict(struct deltarpm d)
+   /* Sequence */
+   if (d.seq) {
+     char *tmp = calloc(d.seql * 2 + 1, sizeof(char));
+-    int i;
++    unsigned int i;
+ 
+     if(tmp == NULL) {
+       PyErr_SetFromErrno(PyExc_SystemError);
+diff --git a/md5.c b/md5.c
+index 0f3b9c2..69aaae1 100644
+--- a/md5.c
++++ b/md5.c
+@@ -161,7 +161,7 @@ void rpmMD5Final(unsigned char digest[16], struct MD5Context *ctx)
+     if (ctx->doByteReverse)
+ 	byteReverse((unsigned char *) ctx->buf, 4);
+     memcpy(digest, ctx->buf, 16);
+-    memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
++    memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
+ }
+ 
+ /* The four core functions - F1 is optimized somewhat */

deltarpm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr 13 16:25:58 UTC 2022 - Marcus Meissner <meissner@suse.com>
+
+- deltarpm-b7987f6aa4211df3df03dcfc55a00b2ce7472e0a.patch: fixed 
+  some C bugs ( incorrect sized memset() , memcpy instead of strcpy,
+  unsigned int)
+
+-------------------------------------------------------------------
 Fri Oct 29 15:09:47 CEST 2021 - mls@suse.de
 
 - update to deltarpm-3.6.3

deltarpm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package deltarpm
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,8 +26,10 @@ Release:        0
 Summary:        Tools to Create and Apply deltarpms
 License:        BSD-3-Clause
 Group:          System/Packages
-Url:            https://github.com/rpm-software-management/deltarpm/
+URL:            https://github.com/rpm-software-management/deltarpm/
 Source:         deltarpm-3.6.3.tar.gz
+# is in upstream git
+Patch0:         deltarpm-b7987f6aa4211df3df03dcfc55a00b2ce7472e0a.patch
 BuildRequires:  libbz2-devel
 %if %{with python2}
 BuildRequires:  python2-devel