From 84ede7d1396d86422a51fdbfb7bc97251a7fa24bcc543d16238e668c613d7cb1 Mon Sep 17 00:00:00 2001 From: Martin Schreiner Date: Mon, 11 Mar 2024 04:08:13 +0000 Subject: [PATCH] Accepting request 1156816 from home:mschreiner:branches:system:packagemanager - Update to version 1.22.5. The full changelog is very large. Please check it here: https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.5 Version 1.22.5 includes all the changes from 1.22.4 and 1.22.3. These may be found here: https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.4 https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.3 - Refresh openssl.patch so it would apply cleanly. OBS-URL: https://build.opensuse.org/request/show/1156816 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=107 --- dpkg.changes | 12 ++++++++++ dpkg.spec | 2 +- dpkg_1.22.2.tar.xz | 3 --- dpkg_1.22.5.tar.xz | 3 +++ openssl.patch | 47 ++++++++++++++++++------------------- update-alternatives.changes | 12 ++++++++++ update-alternatives.spec | 2 +- 7 files changed, 52 insertions(+), 29 deletions(-) delete mode 100644 dpkg_1.22.2.tar.xz create mode 100644 dpkg_1.22.5.tar.xz diff --git a/dpkg.changes b/dpkg.changes index 78d8bda..aef1de0 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 11 03:51:46 UTC 2024 - Martin Schreiner + +- Update to version 1.22.5. + The full changelog is very large. Please check it here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.5 + Version 1.22.5 includes all the changes from 1.22.4 and 1.22.3. + These may be found here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.4 + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.3 +- Refresh openssl.patch so it would apply cleanly. + ------------------------------------------------------------------- Tue Feb 27 18:43:19 UTC 2024 - Martin Schreiner diff --git a/dpkg.spec b/dpkg.spec index c53fa67..f81f40d 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -17,7 +17,7 @@ Name: dpkg -Version: 1.22.2 +Version: 1.22.5 Release: 0 Summary: Debian package management system License: GPL-2.0-or-later diff --git a/dpkg_1.22.2.tar.xz b/dpkg_1.22.2.tar.xz deleted file mode 100644 index 3ac470a..0000000 --- a/dpkg_1.22.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a05ff60fdc80b012162d9ebb6bdfb80607bb8cd5eeb1429ae60b7f516668bbd -size 5603036 diff --git a/dpkg_1.22.5.tar.xz b/dpkg_1.22.5.tar.xz new file mode 100644 index 0000000..afd6c68 --- /dev/null +++ b/dpkg_1.22.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26d27610536fdf951aa2be84503166c6ca8f6c36f71c049ab562ccca3233ca7e +size 5627632 diff --git a/openssl.patch b/openssl.patch index 7192c8c..ee5e78d 100644 --- a/openssl.patch +++ b/openssl.patch @@ -1,8 +1,8 @@ -Index: dpkg-1.22.0/configure.ac +Index: dpkg-1.22.5/configure.ac =================================================================== ---- dpkg-1.22.0.orig/configure.ac -+++ dpkg-1.22.0/configure.ac -@@ -97,6 +97,13 @@ AC_SYS_LARGEFILE +--- dpkg-1.22.5.orig/configure.ac ++++ dpkg-1.22.5/configure.ac +@@ -111,6 +111,13 @@ AC_SYS_LARGEFILE # Checks for libraries. DPKG_LIB_RT DPKG_LIB_MD @@ -16,7 +16,7 @@ Index: dpkg-1.22.0/configure.ac DPKG_LIB_Z DPKG_LIB_BZ2 DPKG_LIB_LZMA -@@ -308,6 +315,7 @@ Configuration: +@@ -335,6 +342,7 @@ Configuration: libkvm . . . . . . . . . . . : ${have_libkvm:-no} libselinux . . . . . . . . . : $have_libselinux libmd . . . . . . . . . . . . : $have_libmd @@ -24,23 +24,10 @@ Index: dpkg-1.22.0/configure.ac libz . . . . . . . . . . . . : $have_libz_impl liblzma . . . . . . . . . . . : $have_liblzma libzstd . . . . . . . . . . . : $have_libzstd -Index: dpkg-1.22.0/lib/dpkg/Makefile.am +Index: dpkg-1.22.5/lib/dpkg/buffer.c =================================================================== ---- dpkg-1.22.0.orig/lib/dpkg/Makefile.am -+++ dpkg-1.22.0/lib/dpkg/Makefile.am -@@ -50,7 +50,7 @@ EXTRA_libdpkg_la_DEPENDENCIES += \ - libdpkg.sym \ - # EOL - endif --libdpkg_la_LDFLAGS += $(MD_LIBS) -+libdpkg_la_LDFLAGS += $(MD_LIBS) $(OPENSSL_LIBS) - libdpkg_la_LIBADD = \ - ../compat/libcompat.la \ - # EOL -Index: dpkg-1.22.0/lib/dpkg/buffer.c -=================================================================== ---- dpkg-1.22.0.orig/lib/dpkg/buffer.c -+++ dpkg-1.22.0/lib/dpkg/buffer.c +--- dpkg-1.22.5.orig/lib/dpkg/buffer.c ++++ dpkg-1.22.5/lib/dpkg/buffer.c @@ -23,10 +23,18 @@ #include #include @@ -61,10 +48,10 @@ Index: dpkg-1.22.0/lib/dpkg/buffer.c #include #include #include -Index: dpkg-1.22.0/m4/dpkg-libs.m4 +Index: dpkg-1.22.5/m4/dpkg-libs.m4 =================================================================== ---- dpkg-1.22.0.orig/m4/dpkg-libs.m4 -+++ dpkg-1.22.0/m4/dpkg-libs.m4 +--- dpkg-1.22.5.orig/m4/dpkg-libs.m4 ++++ dpkg-1.22.5/m4/dpkg-libs.m4 @@ -20,11 +20,26 @@ AC_DEFUN([DPKG_LIB_MD], [ MD_LIBS="$ac_cv_search_MD5Init" ]) @@ -95,3 +82,15 @@ Index: dpkg-1.22.0/m4/dpkg-libs.m4 # DPKG_WITH_COMPRESS_LIB(NAME, HEADER, FUNC) # ------------------------------------------------- # Check for availability of a compression library. +Index: dpkg-1.22.5/lib/dpkg/Makefile.am +=================================================================== +--- dpkg-1.22.5.orig/lib/dpkg/Makefile.am ++++ dpkg-1.22.5/lib/dpkg/Makefile.am +@@ -53,6 +53,7 @@ libdpkg_la_LIBADD = \ + $(ZSTD_LIBS) \ + $(BZ2_LIBS) \ + $(MD_LIBS) \ ++ $(OPENSSL_LIBS) \ + $(LIBINTL) \ + ../compat/libcompat.la \ + # EOL diff --git a/update-alternatives.changes b/update-alternatives.changes index 1ae2273..c147a11 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 11 03:51:46 UTC 2024 - Martin Schreiner + +- Update to version 1.22.5. + The full changelog is very large. Please check it here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.5 + Version 1.22.5 includes all the changes from 1.22.4 and 1.22.3. + These may be found here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.4 + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.3 +- Refresh openssl.patch so it would apply cleanly. + ------------------------------------------------------------------- Tue Feb 27 18:43:19 UTC 2024 - Martin Schreiner diff --git a/update-alternatives.spec b/update-alternatives.spec index 9abb574..31cebba 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -17,7 +17,7 @@ Name: update-alternatives -Version: 1.22.2 +Version: 1.22.5 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0-or-later