pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/misc/dpkg



Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jun 13 15:44:29 UTC 2023

Modified Files:
        pkgsrc/misc/dpkg: Makefile PLIST distinfo
Added Files:
        pkgsrc/misc/dpkg/patches: patch-configure patch-lib_dpkg_buffer.c

Log Message:
dpkg: updated to 1.21.22

dpkg (1.21.22) unstable; urgency=medium

  [ Guillem Jover ]
  * Code internals:
    - libdpkg: Handle missing Version when formatting source:Upstream-Version.
      Reported by John Scott <jscott%posteo.net@localhost>.
  * Localization:
    - Add Portuguese scripts translations.
      Thanks to Américo Monteiro <a_monteiro%gmx.com@localhost>.

 -- Guillem Jover <guillem%debian.org@localhost>  Thu, 11 May 2023 04:04:01 +0200

dpkg (1.21.21) unstable; urgency=medium

  * Architecture support:
    - Restore "arch: Add support for loong64 CPU".
  * Localization:
    - Update Dutch header boilerplate with an actual copyright line.
    - Update French scripts translation.
      Thanks to Sébastien Poher <sebastien%volted.net@localhost>.

 -- Guillem Jover <guillem%debian.org@localhost>  Sat, 25 Feb 2023 04:39:29 +0100

dpkg (1.21.20) unstable; urgency=medium

  [ Guillem Jover ]
  * Documentation:
    - man: Remove duplicate word in dpkg-buildflags(1).
      Thanks to Peter Krefting <peter%softwolves.pp.se@localhost>.
  * Packaging:
    - Fix versioned Build-Depends on debhelper.
    - Update lintian overrides.
  * Test suite:
    - Update suppressions for cppcheck 2.10.
    - Skip auto-generated policykit policy file.
  * Localization:
    - Add Dutch scripts translation.
      Thanks to Frans Spiesschaert <Frans.Spiesschaert%yucom.be@localhost>.
    - Unfuzzy translations due to typo fix.
    - Update Czech translations.
      Thanks to Miroslav Kure <kurem%upcase.inf.upol.cz@localhost>.
    - Update Dutch translations.
      Thanks to Frans Spiesschaert <Frans.Spiesschaert%yucom.be@localhost>.
    - Update French man page translation.
      Thanks to Jean-Pierre Giraud <jenapierregiraud75%free.fr@localhost>.
    - Update French programs translations.
      Thanks to Sébastien Poher <sebastien%volted.net@localhost>.
    - Update Hungarian programs translation.
      Thanks to Nagy Elemér Károly <nagy.elemer.karoly%gmail.com@localhost>.
    - Update Korean dselect translation.
      Thanks to Sangdo Jun <sebuls%gmail.com@localhost>.
    - Update Occitan programs translation.
      Thanks to Quentin PAGÈS <quentinantonin%free.fr@localhost>.
    - Update Portuguese programs translation.
      Thanks to Miguel Figueiredo <elmig%debianpt.org@localhost>.
    - Update Romanian programs translation.
      Thanks to Remus-Gabriel Chelu <remusgabriel.chelu%disroot.org@localhost>.
    - Update Russian translations.
      Thanks to Yuri Kozlov <yuray%komyakino.ru@localhost>.
    - Update Simplified Chinese translations.
      Thanks to Boyuan Yang <byang%debian.org@localhost>.
    - Update Spanish dselect translation.
      Thanks to jonatan porras <jonatanpc8%gmail.com@localhost>.
    - Update Swedish translations.
      Thanks to Peter Krefting <peter%softwolves.pp.se@localhost>.
    - Update Thai programs translation.
      Thanks to Theppitak Karoonboonyanan <thep%debian.org@localhost>.
    - Update Traditional Chinese dselect translation.
      Thanks to Cheng-Chia Tseng <pswo10680%gmail.com@localhost>.
    - Workaround po4a formatting issue in French translation.

 -- Guillem Jover <guillem%debian.org@localhost>  Tue, 07 Feb 2023 12:19:12 +0100

dpkg (1.21.19) unstable; urgency=medium

  [ Guillem Jover ]
  * Architecture support:
    - Revert "arch: Add support for loong64 CPU".
  * Perl modules:
    - Dpkg::OpenPGP::Backend::GnuPG: Set secure signing preferred algorithms.
    - Dpkg::OpenPGP::Backend::GnuPG: Touch trustedkeys.gpg on temporary gpg
      home.
    - Dpkg::OpenPGP::Backend::GnuPG: Fallback to use «gpg dearmor» if
      present. Reported by Sven Joachim <svenjoac%gmx.de@localhost> (on IRC).
    - Dpkg::Vendor::Ubuntu: Fix lto feature to honor DEB_BUILD_OPTIONS.
  * Test suite:
    - Set the permissions explicitly for the copied ChangeLog.old file.
    - Add unit tests for lto build flags handling in Ubuntu.
      Thanks to Shengjing Zhu <shengjing.zhu%canonical.com@localhost>.
      See https://bugs.launchpad.net/bugs/2002582.
  * Localization:
    - Update Catalan translation.
    - Update Portuguese man pages translation.
      Thanks to Américo Monteiro <a_monteiro%gmx.com@localhost>.

  [ Sven Joachim ]
  * Localization:
    - Update German programs translation.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.

 -- Guillem Jover <guillem%debian.org@localhost>  Tue, 24 Jan 2023 23:39:50 +0100

dpkg (1.21.18) unstable; urgency=medium

  [ Guillem Jover ]
  * Perl modules:
    - Dpkg::BuildFlags: Fix strip method to always work with duplicates.

  * Documentation:
    - man: Add a note to dpkg-fsys-usrunmess(8) about Debian support.

  * Code internals:
    - libdpkg: Move compression level max bound check from dpkg-deb.
    - libdpkg: Switch dpkg_lzma_strerror() to use struct io_lzma.
    - libdpkg: Split compression filter operation tracking from its status.
    - libdpkg: Generalize compression stream action handling.
    - libdpkg: Abstract compression stream status tracking.
    - libdpkg: Add zstd support for .deb archives.
  * Build system:
    - Update .mailmap mappings.
  * Packaging:
    - Update copyright years.
  * Test suite:
    - Add dpkg-deb build and extract tests.

 -- Guillem Jover <guillem%debian.org@localhost>  Tue, 10 Jan 2023 18:46:37 +0100

dpkg (1.21.17) unstable; urgency=medium

  [ Guillem Jover ]
  * dpkg-genbuildinfo: Do not fail if the cross-compiler cannot compile.

  * Code internals:
    - dpkg-buildinfo: Fix indentation.
  * Packaging:
    - Stop shipping the «git log» changelog in exchange for no trimming.

 -- Guillem Jover <guillem%debian.org@localhost>  Thu, 05 Jan 2023 12:34:05 +0100

dpkg (1.21.16) unstable; urgency=medium

  [ Guillem Jover ]
  * dpkg-deb: Fix buffer overflow on long directory names with old deb formats.
    Reported by Georgy Yakovlev <gyakovlev%gentoo.org@localhost>.
  * Perl modules:
    - Dpkg::Compression: Pass --no-adjust to xz to force compression threaded
      mode.
    - Dpkg::Compression: Make xz not emit warnings nor exit non-zero on
      warnings.
    - Dpkg::OpenPGP::Backend::SOP: Add sqop as an alternative SOP
      implementation.
    - Dpkg::Source::Package::V3::Git: Move error() argument out of g_() call.
  * Code internals:
    - libdpkg: Make xz not emit warnings nor exit non-zero on warnings.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.
    - Update German scripts translation.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/misc/dpkg/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/misc/dpkg/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/misc/dpkg/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/dpkg/patches/patch-configure \
    pkgsrc/misc/dpkg/patches/patch-lib_dpkg_buffer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/dpkg/Makefile
diff -u pkgsrc/misc/dpkg/Makefile:1.56 pkgsrc/misc/dpkg/Makefile:1.57
--- pkgsrc/misc/dpkg/Makefile:1.56      Tue Jun  6 12:41:55 2023
+++ pkgsrc/misc/dpkg/Makefile   Tue Jun 13 15:44:29 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2023/06/06 12:41:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.57 2023/06/13 15:44:29 adam Exp $
 
-DISTNAME=      dpkg_1.21.9
+DISTNAME=      dpkg_1.21.22
 PKGNAME=       ${DISTNAME:S/_/-/}
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
@@ -30,6 +30,7 @@ CONFIGURE_ARGS.Darwin+=       --enable-linker-
 CONFIGURE_ENV+=                PATCH=${PREFIX}/bin/gpatch
 TEST_TARGET=           check
 INCOMPAT_CURSES+=      NetBSD-[0-5].*-*
+LIBS.NetBSD+=          -lterminfo
 
 REPLACE_PERL=          scripts/*.pl
 
@@ -37,12 +38,15 @@ CONFIGURE_ARGS+=    DPKG_DEVEL_MODE=1
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 PERL5_CONFIGURE=       no
 .include "../../lang/perl5/module.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
+.include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 # override the default
 CONFIGURE_ENV+=                TAR=${GTAR:Q}

Index: pkgsrc/misc/dpkg/PLIST
diff -u pkgsrc/misc/dpkg/PLIST:1.15 pkgsrc/misc/dpkg/PLIST:1.16
--- pkgsrc/misc/dpkg/PLIST:1.15 Wed Nov  2 10:47:32 2022
+++ pkgsrc/misc/dpkg/PLIST      Tue Jun 13 15:44:29 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2022/11/02 10:47:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2023/06/13 15:44:29 adam Exp $
 bin/dpkg
 bin/dpkg-architecture
 bin/dpkg-buildflags
@@ -49,6 +49,7 @@ include/dpkg/file.h
 include/dpkg/fsys.h
 include/dpkg/glob.h
 include/dpkg/macros.h
+include/dpkg/meminfo.h
 include/dpkg/namevalue.h
 include/dpkg/options.h
 include/dpkg/pager.h
@@ -77,12 +78,13 @@ include/dpkg/version.h
 lib/libdpkg.la
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Arch.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Build/Env.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Build/Info.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Build/Types.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildEnv.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildFlags.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildInfo.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildOptions.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildProfiles.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildTypes.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog/Debian.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog/Entry.pm
@@ -121,6 +123,12 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Index
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Interface/Storable.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Lock.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/OpenPGP.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/OpenPGP/Backend.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/OpenPGP/Backend/GnuPG.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/OpenPGP/Backend/SOP.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/OpenPGP/Backend/Sequoia.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/OpenPGP/ErrorCodes.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/OpenPGP/KeyHandle.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Package.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Path.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Shlibs.pm
@@ -147,6 +155,7 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vars.
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor/Debian.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor/Default.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor/Devuan.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor/Ubuntu.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Version.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dselect/Ftp.pm
@@ -241,10 +250,13 @@ man/fr/man1/dpkg-divert.1
 man/fr/man1/dpkg-genbuildinfo.1
 man/fr/man1/dpkg-genchanges.1
 man/fr/man1/dpkg-gencontrol.1
+man/fr/man1/dpkg-gensymbols.1
 man/fr/man1/dpkg-maintscript-helper.1
 man/fr/man1/dpkg-mergechangelogs.1
 man/fr/man1/dpkg-name.1
 man/fr/man1/dpkg-parsechangelog.1
+man/fr/man1/dpkg-query.1
+man/fr/man1/dpkg-realpath.1
 man/fr/man1/dpkg-scanpackages.1
 man/fr/man1/dpkg-scansources.1
 man/fr/man1/dpkg-shlibdeps.1
@@ -253,15 +265,31 @@ man/fr/man1/dpkg-split.1
 man/fr/man1/dpkg-statoverride.1
 man/fr/man1/dpkg-trigger.1
 man/fr/man1/dpkg-vendor.1
+man/fr/man1/dpkg.1
+man/fr/man1/dselect.1
 man/fr/man1/update-alternatives.1
 man/fr/man5/deb-buildinfo.5
+man/fr/man5/deb-changelog.5
 man/fr/man5/deb-changes.5
+man/fr/man5/deb-conffiles.5
 man/fr/man5/deb-control.5
+man/fr/man5/deb-extra-override.5
+man/fr/man5/deb-md5sums.5
 man/fr/man5/deb-old.5
 man/fr/man5/deb-origin.5
+man/fr/man5/deb-override.5
+man/fr/man5/deb-postinst.5
+man/fr/man5/deb-postrm.5
+man/fr/man5/deb-preinst.5
+man/fr/man5/deb-prerm.5
+man/fr/man5/deb-shlibs.5
+man/fr/man5/deb-split.5
 man/fr/man5/deb-src-control.5
 man/fr/man5/deb-src-files.5
 man/fr/man5/deb-src-rules.5
+man/fr/man5/deb-src-symbols.5
+man/fr/man5/deb-substvars.5
+man/fr/man5/deb-symbols.5
 man/fr/man5/deb-triggers.5
 man/fr/man5/deb.5
 man/fr/man5/deb822.5
@@ -269,14 +297,13 @@ man/fr/man5/dpkg.cfg.5
 man/fr/man5/dsc.5
 man/fr/man5/dselect.cfg.5
 man/fr/man7/deb-version.7
+man/fr/man8/dpkg-fsys-usrunmess.8
 man/fr/man8/start-stop-daemon.8
 man/hu/man5/dpkg.cfg.5
 man/hu/man5/dselect.cfg.5
 man/it/man1/dpkg-distaddfile.1
-man/it/man1/dpkg-maintscript-helper.1
 man/it/man1/dpkg-split.1
 man/it/man5/deb-old.5
-man/it/man5/deb.5
 man/it/man5/dpkg.cfg.5
 man/it/man5/dselect.cfg.5
 man/ja/man1/dpkg-distaddfile.1
@@ -314,12 +341,13 @@ man/man1/dselect.1
 man/man1/update-alternatives.1
 man/man3/Dpkg.3perl
 man/man3/Dpkg::Arch.3perl
-man/man3/Dpkg::Build::Env.3perl
 man/man3/Dpkg::Build::Info.3perl
-man/man3/Dpkg::Build::Types.3perl
+man/man3/Dpkg::BuildEnv.3perl
 man/man3/Dpkg::BuildFlags.3perl
+man/man3/Dpkg::BuildInfo.3perl
 man/man3/Dpkg::BuildOptions.3perl
 man/man3/Dpkg::BuildProfiles.3perl
+man/man3/Dpkg::BuildTypes.3perl
 man/man3/Dpkg::Changelog.3perl
 man/man3/Dpkg::Changelog::Debian.3perl
 man/man3/Dpkg::Changelog::Entry.3perl
@@ -359,6 +387,7 @@ man/man3/Dpkg::Substvars.3perl
 man/man3/Dpkg::Vendor.3perl
 man/man3/Dpkg::Vendor::Debian.3perl
 man/man3/Dpkg::Vendor::Default.3perl
+man/man3/Dpkg::Vendor::Devuan.3perl
 man/man3/Dpkg::Vendor::Ubuntu.3perl
 man/man3/Dpkg::Version.3perl
 man/man5/deb-buildinfo.5
@@ -655,6 +684,7 @@ share/locale/mr/LC_MESSAGES/dpkg.mo
 share/locale/nb/LC_MESSAGES/dpkg.mo
 share/locale/nb/LC_MESSAGES/dselect.mo
 share/locale/ne/LC_MESSAGES/dpkg.mo
+share/locale/nl/LC_MESSAGES/dpkg-dev.mo
 share/locale/nl/LC_MESSAGES/dpkg.mo
 share/locale/nl/LC_MESSAGES/dselect.mo
 share/locale/nn/LC_MESSAGES/dpkg.mo
@@ -664,6 +694,7 @@ share/locale/pa/LC_MESSAGES/dpkg.mo
 share/locale/pl/LC_MESSAGES/dpkg-dev.mo
 share/locale/pl/LC_MESSAGES/dpkg.mo
 share/locale/pl/LC_MESSAGES/dselect.mo
+share/locale/pt/LC_MESSAGES/dpkg-dev.mo
 share/locale/pt/LC_MESSAGES/dpkg.mo
 share/locale/pt/LC_MESSAGES/dselect.mo
 share/locale/pt_BR/LC_MESSAGES/dpkg.mo

Index: pkgsrc/misc/dpkg/distinfo
diff -u pkgsrc/misc/dpkg/distinfo:1.20 pkgsrc/misc/dpkg/distinfo:1.21
--- pkgsrc/misc/dpkg/distinfo:1.20      Wed Nov  2 10:47:32 2022
+++ pkgsrc/misc/dpkg/distinfo   Tue Jun 13 15:44:29 2023
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.20 2022/11/02 10:47:32 adam Exp $
+$NetBSD: distinfo,v 1.21 2023/06/13 15:44:29 adam Exp $
 
-BLAKE2s (dpkg_1.21.9.tar.xz) = c77dcd713a1f368b17ef44df5b2005ef0222b0e8cda6871d1e96dc4db12387ef
-SHA512 (dpkg_1.21.9.tar.xz) = 0f0b9b936a025f9d905dc35c030293d9a1bdcbed640187691ae2319d99d04dac954102b1270301b12b633c48f08d6c6af0f6f21df4afb2e34a0f0a37127fd238
-Size (dpkg_1.21.9.tar.xz) = 5084044 bytes
+BLAKE2s (dpkg_1.21.22.tar.xz) = 4ab0fe6c8c00a1ae341b72b1e5dd0ce789c3e3e81026cc1b26ef7a1287638da5
+SHA512 (dpkg_1.21.22.tar.xz) = 441bd0f75ccf89b87afa86eeae2455ec4ce9468195c1f89206aab3c98c7d449de4a728db73300dd8e62b44e4504c38e257a1e6aa10dac6ce93872fed3d033543
+Size (dpkg_1.21.22.tar.xz) = 5419900 bytes
+SHA1 (patch-configure) = 07bc3ef0108edfb3e0b10c38999480d498ea64d6
+SHA1 (patch-lib_dpkg_buffer.c) = 3032071569fdc649a74512e047ee263ed5288bdb
 SHA1 (patch-utils_start-stop-daemon.c) = 7927b364851b039e44279157aa783afde4508af9

Added files:

Index: pkgsrc/misc/dpkg/patches/patch-configure
diff -u /dev/null pkgsrc/misc/dpkg/patches/patch-configure:1.1
--- /dev/null   Tue Jun 13 15:44:29 2023
+++ pkgsrc/misc/dpkg/patches/patch-configure    Tue Jun 13 15:44:29 2023
@@ -0,0 +1,61 @@
+$NetBSD: patch-configure,v 1.1 2023/06/13 15:44:29 adam Exp $
+
+Allow libdpkg being a shared library.
+Use md5 from OpenSSL.
+
+--- configure.orig     2023-05-11 02:04:01.000000000 +0000
++++ configure
+@@ -17030,12 +17030,6 @@ CC=$lt_save_CC
+ 
+ 
+ 
+-  if test "$enable_shared" = "yes" && test -z "$AUTHOR_TESTING"
+-then :
+-
+-    as_fn_error $? "building libdpkg as a shared library is not supported" "$LINENO" 5
+-
+-fi
+    if test "$enable_shared" = "yes"; then
+   BUILD_SHARED_TRUE=
+   BUILD_SHARED_FALSE='#'
+@@ -23416,16 +23410,16 @@ fi
+ 
+ 
+   have_libmd="no"
+-         for ac_header in md5.h
++         for ac_header in openssl/md5.h
+ do :
+-  ac_fn_c_check_header_compile "$LINENO" "md5.h" "ac_cv_header_md5_h" "$ac_includes_default"
++  ac_fn_c_check_header_compile "$LINENO" "openssl/md5.h" "ac_cv_header_md5_h" "$ac_includes_default"
+ if test "x$ac_cv_header_md5_h" = xyes
+ then :
+   printf "%s\n" "#define HAVE_MD5_H 1" >>confdefs.h
+ 
+     dpkg_save_libmd_LIBS=$LIBS
+-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing MD5Init" >&5
+-printf %s "checking for library containing MD5Init... " >&6; }
++    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing MD5_Init" >&5
++printf %s "checking for library containing MD5_Init... " >&6; }
+ if test ${ac_cv_search_MD5Init+y}
+ then :
+   printf %s "(cached) " >&6
+@@ -23437,16 +23431,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-char MD5Init ();
++char MD5_Init ();
+ int
+ main (void)
+ {
+-return MD5Init ();
++return MD5_Init ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' md
++for ac_lib in '' crypto
+ do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
Index: pkgsrc/misc/dpkg/patches/patch-lib_dpkg_buffer.c
diff -u /dev/null pkgsrc/misc/dpkg/patches/patch-lib_dpkg_buffer.c:1.1
--- /dev/null   Tue Jun 13 15:44:29 2023
+++ pkgsrc/misc/dpkg/patches/patch-lib_dpkg_buffer.c    Tue Jun 13 15:44:29 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-lib_dpkg_buffer.c,v 1.1 2023/06/13 15:44:29 adam Exp $
+
+Use md5 from OpenSSL.
+
+--- lib/dpkg/buffer.c.orig     2023-03-27 00:41:09.000000000 +0000
++++ lib/dpkg/buffer.c
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ 
+ #include <errno.h>
+-#include <md5.h>
++#include <openssl/md5.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -50,7 +50,7 @@ buffer_md5_init(struct buffer_data *data
+       ctx = m_malloc(sizeof(*ctx));
+       ctx->hash = data->arg.ptr;
+       data->arg.ptr = ctx;
+-      MD5Init(&ctx->ctx);
++      MD5_Init(&ctx->ctx);
+ }
+ 
+ static off_t
+@@ -75,7 +75,7 @@ buffer_digest_update(struct buffer_data 
+       case BUFFER_DIGEST_NULL:
+               break;
+       case BUFFER_DIGEST_MD5:
+-              MD5Update(&(((struct buffer_md5_ctx *)digest->arg.ptr)->ctx),
++              MD5_Update(&(((struct buffer_md5_ctx *)digest->arg.ptr)->ctx),
+                         buf, length);
+               break;
+       default:
+@@ -95,7 +95,7 @@ buffer_md5_done(struct buffer_data *data
+ 
+       ctx = (struct buffer_md5_ctx *)data->arg.ptr;
+       hash = ctx->hash;
+-      MD5Final(digest, &ctx->ctx);
++      MD5_Final(digest, &ctx->ctx);
+       for (i = 0; i < 16; ++i) {
+               sprintf(hash, "%02x", *p++);
+               hash += 2;



Home | Main Index | Thread Index | Old Index