Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package drpm for openSUSE:Factory checked in at 2022-12-05 18:00:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drpm (Old) and /work/SRC/openSUSE:Factory/.drpm.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drpm" Mon Dec 5 18:00:29 2022 rev:6 rq:1039868 version:0.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/drpm/drpm.changes 2022-05-01 18:53:31.207159148 +0200 +++ /work/SRC/openSUSE:Factory/.drpm.new.1835/drpm.changes 2022-12-05 18:00:31.020358047 +0100 @@ -1,0 +2,7 @@ +Sat Dec 3 19:33:45 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to 0.5.1: + * Fix SIGSEGV when an errors occurs in rpm_get_file_info (RhBug:1968594) + * For rpms without any files return file count 0 (RhBug:1968594) + +------------------------------------------------------------------- Old: ---- drpm-0.5.0.tar.bz2 New: ---- drpm-0.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drpm.spec ++++++ --- /var/tmp/diff_new_pack.Jj9nHP/_old 2022-12-05 18:00:32.340365235 +0100 +++ /var/tmp/diff_new_pack.Jj9nHP/_new 2022-12-05 18:00:32.344365256 +0100 @@ -36,14 +36,13 @@ %endif Name: drpm -Version: 0.5.0 +Version: 0.5.1 Release: 0 Summary: A small library for fetching information from DeltaRPM packages License: LGPL-2.1-or-later Group: System/Packages URL: https://github.com/rpm-software-management/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.bz2 - BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: libbz2-devel ++++++ drpm-0.5.0.tar.bz2 -> drpm-0.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/.gitignore new/drpm-0.5.1/.gitignore --- old/drpm-0.5.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/drpm-0.5.1/.gitignore 2022-03-08 14:12:56.000000000 +0100 @@ -0,0 +1,15 @@ +# directories +build +pkg +tmp +html +latex + +# file types +*~ +*.gch +*.o +*.so +*.so.* +*.out +*.x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/CMakeLists.txt new/drpm-0.5.1/CMakeLists.txt --- old/drpm-0.5.0/CMakeLists.txt 2020-06-03 05:15:52.000000000 +0200 +++ new/drpm-0.5.1/CMakeLists.txt 2022-03-08 14:12:56.000000000 +0100 @@ -4,7 +4,7 @@ set(DRPM_MAJOR_VERSION 0) set(DRPM_MINOR_VERSION 5) -set(DRPM_PATCH_VERSION 0) +set(DRPM_PATCH_VERSION 1) set(DRPM_VERSION ${DRPM_MAJOR_VERSION}.${DRPM_MINOR_VERSION}.${DRPM_PATCH_VERSION}) include(GNUInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/drpm.spec new/drpm-0.5.1/drpm.spec --- old/drpm-0.5.0/drpm.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/drpm-0.5.1/drpm.spec 2022-03-08 14:12:56.000000000 +0100 @@ -0,0 +1,163 @@ +%define __cmake_in_source_build 1 + +# Do not build with zstd for RHEL < 8 +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?suse_version} && 0%{?suse_version} < 1500) +%bcond_with zstd +%else +%bcond_without zstd +%endif + +Name: drpm +Version: 0.5.1 +Release: 1%{?dist} +Summary: A library for making, reading and applying deltarpm packages +# the entire source code is LGPLv2+, except src/drpm_diff.c and src/drpm_search.c which are BSD +License: LGPLv2+ and BSD +URL: https://github.com/rpm-software-management/%{name} +Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.bz2 + +BuildRequires: cmake >= 2.8.5 +BuildRequires: gcc + +BuildRequires: rpm-devel +BuildRequires: openssl-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: xz-devel +%if 0%{?suse_version} +BuildRequires: lzlib-devel +%endif +%if %{with zstd} +BuildRequires: pkgconfig(libzstd) +%endif + +BuildRequires: pkgconfig +BuildRequires: doxygen + +BuildRequires: libcmocka-devel >= 1.0 +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 +BuildRequires: valgrind +%endif + +%description +The drpm package provides a library for making, reading and applying deltarpms, +compatible with the original deltarpm packages. + +%package devel +Summary: C interface for the drpm library +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The drpm-devel package provides a C interface (drpm.h) for the drpm library. + +%prep +%autosetup +mkdir build + +%build +pushd build +%cmake .. -DWITH_ZSTD:BOOL=%{?with_zstd:ON}%{!?with_zstd:OFF} -DHAVE_LZLIB_DEVEL:BOOL=%{?suse_version:ON}%{!?suse_version:OFF} +%make_build +make doc +popd + +%install +pushd build +%make_install +popd + +%check +pushd build +ctest -VV +popd + +%if (0%{?rhel} && 0%{?rhel} < 8) || 0%{?suse_version} +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig +%endif + +%files +%{_libdir}/lib%{name}.so.* +%license COPYING LICENSE.BSD + +%files devel +%doc build/doc/html/ +%{_libdir}/lib%{name}.so +%{_includedir}/%{name}.h +%{_libdir}/pkgconfig/%{name}.pc + +%changelog +* Tue Mar 08 2022 Pavla Kratochvilova <pkrat...@redhat.com> - 0.5.1-1 +- Fix SIGSEGV when an errors occurs in `rpm_get_file_info` (RhBug:1968594) +- For rpms without any files return file count 0 (RhBug:1968594) + +* Tue Jun 02 2020 Neal Gompa <ngomp...@gmail.com> 0.5.0-1 +- Enable zstd support for RHEL 8 +- Fix license file entry in files list in spec +- Fix a memory leak on invalid input +- Hide the internal library symbols + +* Wed Sep 11 2019 Neal Gompa <ngomp...@gmail.com> 0.4.1-1 +- Relicense to LGPLv2+ + +* Wed Aug 14 2019 Neal Gompa <ngomp...@gmail.com> 0.4.0-1 +- Add support for zstd drpms +- CMake cleanups +- Make running tests optional +- Small spec improvements + +* Tue May 3 2016 Matej Chalk <mch...@redhat.com> 0.3.0-3 +- Now contains makedeltarpm and applydeltarpm functionality +- Added lzlib-devel dependency for OpenSUSE + +* Tue Apr 12 2016 Igor Gnatenko <ignate...@redhat.com> - 0.3.0-2 +- Cleanup spec +- Make build out-of-tree +- Sync with valgrind arches +- Build documentation + +* Thu Sep 3 2015 Matej Chalk <mch...@redhat.com> 0.3.0-1 +- Bumped minor version (deltarpm creation added) + +* Tue Aug 4 2015 Matej Chalk <mch...@redhat.com> 0.2.1-1 +- Added openssl dependency + +* Fri Jul 24 2015 Matej Chalk <mch...@redhat.com> 0.2.0-2 +- Fixed bug in test suite + +* Tue Jun 23 2015 Matej Chalk <mch...@redhat.com> 0.2.0-1 +- Bumped minor version + +* Fri Jun 19 2015 Matej Chalk <mch...@redhat.com> 0.1.3-4 +- Memory test only for architectures that have valgrind (#1232157) + +* Wed Mar 11 2015 Matej Chalk <mch...@redhat.com> 0.1.3-3 +- Added cmocka and valgrind package dependencies + +* Fri Mar 6 2015 Matej Chalk <mch...@redhat.com> 0.1.3-2 +- Added check section + +* Fri Feb 13 2015 Matej Chalk <mch...@redhat.com> 0.1.3-1 +- Bumped version to 0.1.3 +- Added CMake tool + +* Fri Dec 19 2014 Matej Chalk <mch...@redhat.com> 0.1.2-4 +- Enabled hardened build + +* Mon Dec 15 2014 Matej Chalk <mch...@redhat.com> 0.1.2-3 +- Added unversioned .so to package to enable linking with -ldrpm + +* Thu Dec 11 2014 Matej Chalk <mch...@redhat.com> 0.1.2-2 +- Removed unversioned .so from package +- Included copies of both GPLv3 and LGPLv3 + +* Wed Dec 3 2014 Matej Chalk <mch...@redhat.com> 0.1.2-1 +- Bumped version to 0.1.2 +- Added drpm.pc file for pkgconfig tool + +* Thu Nov 6 2014 Matej Chalk <mch...@redhat.com> 0.1.1-1 +- Bumped version to 0.1.1 + +* Wed Nov 5 2014 Matej Chalk <mch...@redhat.com> 0.1.0-1 +- Initial RPM release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/src/drpm_block.c new/drpm-0.5.1/src/drpm_block.c --- old/drpm-0.5.0/src/drpm_block.c 2019-09-11 13:28:23.000000000 +0200 +++ new/drpm-0.5.1/src/drpm_block.c 2022-03-08 14:12:56.000000000 +0100 @@ -22,6 +22,8 @@ #include "drpm.h" #include "drpm_private.h" +#include <sys/sysmacros.h> + #include <stdint.h> #include <stdbool.h> #include <unistd.h> @@ -31,7 +33,6 @@ #include <sys/stat.h> #include <sys/wait.h> #include <fcntl.h> -#include <linux/kdev_t.h> #define MAX_OPEN_FILES 50 #define MAX_CORE_BLOCKS 5000 @@ -546,8 +547,8 @@ } if (S_ISBLK(file.mode) || S_ISCHR(file.mode)) { - header.rdevmajor = MAJOR(file.rdev); - header.rdevminor = MINOR(file.rdev); + header.rdevmajor = major(file.rdev); + header.rdevminor = minor(file.rdev); } header.nlink = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/src/drpm_make.c new/drpm-0.5.1/src/drpm_make.c --- old/drpm-0.5.0/src/drpm_make.c 2019-09-11 13:28:23.000000000 +0200 +++ new/drpm-0.5.1/src/drpm_make.c 2022-03-08 14:12:56.000000000 +0100 @@ -22,6 +22,8 @@ #include "drpm.h" #include "drpm_private.h" +#include <sys/sysmacros.h> + #include <stdio.h> #include <stdint.h> #include <stdbool.h> @@ -34,7 +36,6 @@ #include <openssl/sha.h> #include <rpm/rpmfi.h> #include <rpm/rpmfc.h> -#include <linux/kdev_t.h> #define BUFFER_SIZE 4096 @@ -331,8 +332,10 @@ if (MD5_Init(&seq_md5) != 1) return DRPM_ERR_OTHER; - if ((error = rpm_get_file_info(rpm_file, &files, &file_count, &file_colors)) != DRPM_ERR_OK || - (error = rpm_get_digest_algo(rpm_file, &digest_algo)) != DRPM_ERR_OK) + if ((error = rpm_get_file_info(rpm_file, &files, &file_count, &file_colors)) != DRPM_ERR_OK) + return error; + + if ((error = rpm_get_digest_algo(rpm_file, &digest_algo)) != DRPM_ERR_OK) goto cleanup_fail; rpm_archive_rewind(rpm_file); @@ -414,8 +417,8 @@ } else if (S_ISLNK(file.mode)) { cpio_hdr.filesize = strlen(file.linkto); } else if (S_ISBLK(file.mode) || S_ISCHR(file.mode)) { - cpio_hdr.rdevmajor = MAJOR(file.rdev); - cpio_hdr.rdevminor = MINOR(file.rdev); + cpio_hdr.rdevmajor = major(file.rdev); + cpio_hdr.rdevminor = minor(file.rdev); } } @@ -483,8 +486,8 @@ if (MD5_Update(&seq_md5, name, name_len) != 1 || md5_update_be32(&seq_md5, cpio_hdr.mode) != 1 || md5_update_be32(&seq_md5, cpio_hdr.filesize) != 1 || - md5_update_be32(&seq_md5, MKDEV(cpio_hdr.rdevmajor, - cpio_hdr.rdevminor)) != 1) { + md5_update_be32(&seq_md5, makedev(cpio_hdr.rdevmajor, + cpio_hdr.rdevminor)) != 1) { error = DRPM_ERR_OTHER; goto cleanup_fail; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/src/drpm_rpm.c new/drpm-0.5.1/src/drpm_rpm.c --- old/drpm-0.5.0/src/drpm_rpm.c 2019-09-11 13:28:23.000000000 +0200 +++ new/drpm-0.5.1/src/drpm_rpm.c 2022-03-08 14:12:56.000000000 +0100 @@ -769,6 +769,7 @@ headerGet(rpmst->header, RPMTAG_FILEMODES, filemodes, HEADERGET_MINMEM) != 1 || headerGet(rpmst->header, RPMTAG_FILEVERIFYFLAGS, fileverify, HEADERGET_MINMEM) != 1 || headerGet(rpmst->header, RPMTAG_FILELINKTOS, filelinktos, HEADERGET_MINMEM) != 1) { + *count_ret = 0; goto cleanup; } @@ -962,7 +963,7 @@ return DRPM_ERR_OK; } -/* Reloads the signature to accomodate for changes. */ +/* Reloads the signature to accommodate for changes. */ int rpm_signature_reload(struct rpm *rpmst) { rpmst->signature = headerReload(rpmst->signature, RPMTAG_HEADERSIGNATURES); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/src/drpm_search.c new/drpm-0.5.1/src/drpm_search.c --- old/drpm-0.5.0/src/drpm_search.c 2019-09-11 13:28:23.000000000 +0200 +++ new/drpm-0.5.1/src/drpm_search.c 2022-03-08 14:12:56.000000000 +0100 @@ -145,7 +145,7 @@ uint32_t x = 0x83D31DF4; for (unsigned i = 0; i < HSIZE; i++) - x = (x << 1) ^ (x & (1 << 31) ? 1 : 0) ^ noise[*buf++]; + x = (x << 1) ^ (x & (1u << 31) ? 1 : 0) ^ noise[*buf++]; return x; } @@ -257,7 +257,7 @@ scannext: if (last_len >= 32 && scan - last_scan >= HSIZE) goto gotit; - prekey = (prekey << 1) ^ (prekey & (1 << 31) ? 1 : 0) ^ noise[new[scan + HSIZE]]; + prekey = (prekey << 1) ^ (prekey & (1u << 31) ? 1 : 0) ^ noise[new[scan + HSIZE]]; xprekey = noise[new[scan]] ^ (0x83D31DF4 ^ 0x07A63BE9); #if HSIZE % 32 != 0 prekey ^= (xprekey << (HSIZE % 32)) ^ (xprekey >> (32 - (HSIZE % 32))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drpm-0.5.0/src/drpm_utils.c new/drpm-0.5.1/src/drpm_utils.c --- old/drpm-0.5.0/src/drpm_utils.c 2019-09-11 13:28:23.000000000 +0200 +++ new/drpm-0.5.1/src/drpm_utils.c 2022-03-08 14:12:56.000000000 +0100 @@ -154,14 +154,14 @@ return parse_hex(dest, source) == SHA256_DIGEST_LENGTH; } -/* Reallocates memory for <*buffer> <threshhold> bytes at a time>. */ -bool resize(void **buffer, size_t members_count, size_t member_size, size_t threshhold) +/* Reallocates memory for <*buffer> <threshold> bytes at a time>. */ +bool resize(void **buffer, size_t members_count, size_t member_size, size_t threshold) { void *buf_tmp; - if (members_count % threshhold == 0) { + if (members_count % threshold == 0) { if ((buf_tmp = realloc(*buffer, - member_size * (members_count + threshhold))) == NULL) + member_size * (members_count + threshold))) == NULL) return false; *buffer = buf_tmp; }
