From 5dcc015e1eac52042fbd00a9d064f11456c845b96fc378eb8dcb7d86319b5556 Mon Sep 17 00:00:00 2001 From: Martin Schreiner Date: Mon, 18 Sep 2023 05:18:35 +0000 Subject: [PATCH 1/2] Accepting request 1111825 from home:mschreiner:branches:system:packagemanager - Update to version 1.22.0. The full changelog is very large. Please check it here: https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog - Refresh openssl.patch so it works on 1.22.0. - Various rpmlint warnings persist, were already happening on previous builds. No changes with this version update. But I'll try to fix them soon. OBS-URL: https://build.opensuse.org/request/show/1111825 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=97 --- dpkg.changes | 8 ++++++++ dpkg.spec | 2 +- dpkg_1.21.22.tar.xz | 3 --- dpkg_1.22.0.tar.xz | 3 +++ openssl.patch | 34 +++++++++++++++++----------------- update-alternatives.changes | 8 ++++++++ update-alternatives.spec | 2 +- 7 files changed, 38 insertions(+), 22 deletions(-) delete mode 100644 dpkg_1.21.22.tar.xz create mode 100644 dpkg_1.22.0.tar.xz diff --git a/dpkg.changes b/dpkg.changes index 7839336..bb71aff 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 18 04:57:23 UTC 2023 - Martin Schreiner + +- Update to version 1.22.0. + The full changelog is very large. Please check it here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog +- Refresh openssl.patch so it works on 1.22.0. + ------------------------------------------------------------------- Thu Jul 20 11:25:20 UTC 2023 - Adam Majer diff --git a/dpkg.spec b/dpkg.spec index ee78dc2..a3fdc89 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -17,7 +17,7 @@ Name: dpkg -Version: 1.21.22 +Version: 1.22.0 Release: 0 Summary: Debian package management system License: GPL-2.0-or-later diff --git a/dpkg_1.21.22.tar.xz b/dpkg_1.21.22.tar.xz deleted file mode 100644 index e611e1a..0000000 --- a/dpkg_1.21.22.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a1d15481bba79d7a4899fd55b4b6b18a987ca8d56ee8c43e9cab63b8a0a3545 -size 5419900 diff --git a/dpkg_1.22.0.tar.xz b/dpkg_1.22.0.tar.xz new file mode 100644 index 0000000..bcb0560 --- /dev/null +++ b/dpkg_1.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd1525aa169afa0e60044b23f31c23523a339023754878a4210d74abd98c72ed +size 5519320 diff --git a/openssl.patch b/openssl.patch index 9307930..7192c8c 100644 --- a/openssl.patch +++ b/openssl.patch @@ -1,10 +1,10 @@ -Index: dpkg-1.21.22/configure.ac +Index: dpkg-1.22.0/configure.ac =================================================================== ---- dpkg-1.21.22.orig/configure.ac -+++ dpkg-1.21.22/configure.ac -@@ -94,6 +94,13 @@ AC_SYS_LARGEFILE - +--- dpkg-1.22.0.orig/configure.ac ++++ dpkg-1.22.0/configure.ac +@@ -97,6 +97,13 @@ AC_SYS_LARGEFILE # Checks for libraries. + DPKG_LIB_RT DPKG_LIB_MD +AS_IF([test "x$have_libmd" = "xno"], [ + DPKG_LIB_OPENSSL @@ -16,7 +16,7 @@ Index: dpkg-1.21.22/configure.ac DPKG_LIB_Z DPKG_LIB_BZ2 DPKG_LIB_LZMA -@@ -286,6 +293,7 @@ Configuration: +@@ -308,6 +315,7 @@ Configuration: libkvm . . . . . . . . . . . : ${have_libkvm:-no} libselinux . . . . . . . . . : $have_libselinux libmd . . . . . . . . . . . . : $have_libmd @@ -24,12 +24,12 @@ Index: dpkg-1.21.22/configure.ac libz . . . . . . . . . . . . : $have_libz_impl liblzma . . . . . . . . . . . : $have_liblzma libzstd . . . . . . . . . . . : $have_libzstd -Index: dpkg-1.21.22/lib/dpkg/Makefile.am +Index: dpkg-1.22.0/lib/dpkg/Makefile.am =================================================================== ---- dpkg-1.21.22.orig/lib/dpkg/Makefile.am -+++ dpkg-1.21.22/lib/dpkg/Makefile.am -@@ -36,7 +36,7 @@ libdpkg_la_LDFLAGS += \ - -Wl,--version-script=$(srcdir)/libdpkg.map \ +--- 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) @@ -37,10 +37,10 @@ Index: dpkg-1.21.22/lib/dpkg/Makefile.am libdpkg_la_LIBADD = \ ../compat/libcompat.la \ # EOL -Index: dpkg-1.21.22/lib/dpkg/buffer.c +Index: dpkg-1.22.0/lib/dpkg/buffer.c =================================================================== ---- dpkg-1.21.22.orig/lib/dpkg/buffer.c -+++ dpkg-1.21.22/lib/dpkg/buffer.c +--- dpkg-1.22.0.orig/lib/dpkg/buffer.c ++++ dpkg-1.22.0/lib/dpkg/buffer.c @@ -23,10 +23,18 @@ #include #include @@ -61,10 +61,10 @@ Index: dpkg-1.21.22/lib/dpkg/buffer.c #include #include #include -Index: dpkg-1.21.22/m4/dpkg-libs.m4 +Index: dpkg-1.22.0/m4/dpkg-libs.m4 =================================================================== ---- dpkg-1.21.22.orig/m4/dpkg-libs.m4 -+++ dpkg-1.21.22/m4/dpkg-libs.m4 +--- dpkg-1.22.0.orig/m4/dpkg-libs.m4 ++++ dpkg-1.22.0/m4/dpkg-libs.m4 @@ -20,11 +20,26 @@ AC_DEFUN([DPKG_LIB_MD], [ MD_LIBS="$ac_cv_search_MD5Init" ]) diff --git a/update-alternatives.changes b/update-alternatives.changes index 8c61adc..33e0a94 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 18 04:57:23 UTC 2023 - Martin Schreiner + +- Update to version 1.22.0. + The full changelog is very large. Please check it here: + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog +- Refresh openssl.patch so it works on 1.22.0. + ------------------------------------------------------------------- Thu Jul 20 11:25:20 UTC 2023 - Adam Majer diff --git a/update-alternatives.spec b/update-alternatives.spec index 649fb29..729db2d 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -17,7 +17,7 @@ Name: update-alternatives -Version: 1.21.22 +Version: 1.22.0 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0-or-later From 5ed19d98210d1d41e544acf7206d9111fcde08ef9aa8f9620698fee5af7b5b99 Mon Sep 17 00:00:00 2001 From: Martin Schreiner Date: Thu, 21 Sep 2023 15:36:14 +0000 Subject: [PATCH 2/2] Accepting request 1112834 from home:mschreiner:branches:system:packagemanager Fix incorrect changelog link for 1.22.0. OBS-URL: https://build.opensuse.org/request/show/1112834 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=98 --- dpkg.changes | 2 +- update-alternatives.changes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dpkg.changes b/dpkg.changes index bb71aff..8e5dc23 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -3,7 +3,7 @@ Mon Sep 18 04:57:23 UTC 2023 - Martin Schreiner - Update to version 1.22.0. The full changelog is very large. Please check it here: - https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.0 - Refresh openssl.patch so it works on 1.22.0. ------------------------------------------------------------------- diff --git a/update-alternatives.changes b/update-alternatives.changes index 33e0a94..4452ef1 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -3,7 +3,7 @@ Mon Sep 18 04:57:23 UTC 2023 - Martin Schreiner - Update to version 1.22.0. The full changelog is very large. Please check it here: - https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog + https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/debian/changelog?h=1.22.0 - Refresh openssl.patch so it works on 1.22.0. -------------------------------------------------------------------