CVS commit: pkgsrc/misc/dpkg

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Mar  9 07:56:51 UTC 2024

Modified Files:
        pkgsrc/misc/dpkg: Makefile PLIST distinfo
        pkgsrc/misc/dpkg/patches: patch-configure

Log Message:
dpkg: updated to 1.22.5

1.22.5

po: Regenerate .pot files and merge .po files with them
Dpkg::Vendor::Debian: Enable qa=+bug-implicit-func for abi=+time64 feature
Dpkg::Vendor::Debian: Enable time64 feature by default except on <some>-i386
test: Pass -T+1 to xz to workaround spurious warning with xz 5.6.0
Dpkg::Vendor::Ubuntu: Pass compiler flags to disable features
Dpkg::Vendor: Make the add_build_flags() a non-private method
Dpkg::Vendor::Debian: Only append branch compiler flags if $flag is set


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/misc/dpkg/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/misc/dpkg/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/dpkg/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/dpkg/patches/patch-configure

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.60 pkgsrc/misc/dpkg/Makefile:1.61
--- pkgsrc/misc/dpkg/Makefile:1.60      Sat Feb 17 10:57:05 2024
+++ pkgsrc/misc/dpkg/Makefile   Sat Mar  9 07:56:51 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2024/02/17 10:57:05 adam Exp $
+# $NetBSD: Makefile,v 1.61 2024/03/09 07:56:51 adam Exp $
 
-DISTNAME=      dpkg_1.22.4
+DISTNAME=      dpkg_1.22.5
 PKGNAME=       ${DISTNAME:S/_/-/}
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}

Index: pkgsrc/misc/dpkg/PLIST
diff -u pkgsrc/misc/dpkg/PLIST:1.17 pkgsrc/misc/dpkg/PLIST:1.18
--- pkgsrc/misc/dpkg/PLIST:1.17 Sat Feb 17 10:57:05 2024
+++ pkgsrc/misc/dpkg/PLIST      Sat Mar  9 07:56:51 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2024/02/17 10:57:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2024/03/09 07:56:51 adam Exp $
 bin/dpkg
 bin/dpkg-architecture
 bin/dpkg-buildapi
@@ -250,7 +250,6 @@ man/es/man5/deb-old.5
 man/es/man5/dpkg.cfg.5
 man/es/man5/dselect.cfg.5
 man/fr/man1/dpkg-architecture.1
-man/fr/man1/dpkg-buildpackage.1
 man/fr/man1/dpkg-checkbuilddeps.1
 man/fr/man1/dpkg-deb.1
 man/fr/man1/dpkg-distaddfile.1
@@ -528,7 +527,6 @@ man/pl/man5/dpkg.cfg.5
 man/pl/man5/dselect.cfg.5
 man/pt/man1/dpkg-architecture.1
 man/pt/man1/dpkg-buildapi.1
-man/pt/man1/dpkg-buildflags.1
 man/pt/man1/dpkg-buildpackage.1
 man/pt/man1/dpkg-checkbuilddeps.1
 man/pt/man1/dpkg-deb.1

Index: pkgsrc/misc/dpkg/distinfo
diff -u pkgsrc/misc/dpkg/distinfo:1.22 pkgsrc/misc/dpkg/distinfo:1.23
--- pkgsrc/misc/dpkg/distinfo:1.22      Sat Feb 17 10:57:05 2024
+++ pkgsrc/misc/dpkg/distinfo   Sat Mar  9 07:56:51 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2024/02/17 10:57:05 adam Exp $
+$NetBSD: distinfo,v 1.23 2024/03/09 07:56:51 adam Exp $
 
-BLAKE2s (dpkg_1.22.4.tar.xz) = 0ceafe287dece16eb5f6b1838ba6cb267001f3754403118b5be7dedf715bdfc5
-SHA512 (dpkg_1.22.4.tar.xz) = 7fe54f5d3e8461b9c6f6252272f6ee99f0f7318d287455cb37565483b6d44ad2fddf61a38d6820ca0ebcd9abb5d1d70175acc1e3c70e41e8d8654cb3d9fc103d
-Size (dpkg_1.22.4.tar.xz) = 5623080 bytes
-SHA1 (patch-configure) = 07bc3ef0108edfb3e0b10c38999480d498ea64d6
+BLAKE2s (dpkg_1.22.5.tar.xz) = accecfe0a3e19e2fc13166e0b69749a9072b3470b9fd61cfd4a8cb7ad35783fc
+SHA512 (dpkg_1.22.5.tar.xz) = 5bcaccbed13a07f06aa4bd9860a6f552ad92b30ff5697cdfb0e81ea13d2d60ef29ad32eb46ba0f3ce8b7a3a4fecbee6fd4aaf5e556fc806f403aaee1750c25cf
+Size (dpkg_1.22.5.tar.xz) = 5627632 bytes
+SHA1 (patch-configure) = 65b4536aac73b14b2da01f47fa1fe6f2bbd7faea
 SHA1 (patch-lib_dpkg_buffer.c) = 3032071569fdc649a74512e047ee263ed5288bdb
 SHA1 (patch-lib_dpkg_color.c) = 7bcb9ab6705f9c423d355c26c58bf916dc4cc935
 SHA1 (patch-lib_dpkg_color.h) = 4d5a7989d74130f9f0b89173befb19a6d9b9dcc2

Index: pkgsrc/misc/dpkg/patches/patch-configure
diff -u pkgsrc/misc/dpkg/patches/patch-configure:1.1 pkgsrc/misc/dpkg/patches/patch-configure:1.2
--- pkgsrc/misc/dpkg/patches/patch-configure:1.1        Tue Jun 13 15:44:29 2023
+++ pkgsrc/misc/dpkg/patches/patch-configure    Sat Mar  9 07:56:51 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2023/06/13 15:44:29 adam Exp $
+$NetBSD: patch-configure,v 1.2 2024/03/09 07:56:51 adam Exp $
 
 Allow libdpkg being a shared library.
 Use md5 from OpenSSL.
 
---- configure.orig     2023-05-11 02:04:01.000000000 +0000
+--- configure.orig     2024-02-27 03:28:03.000000000 +0000
 +++ configure
-@@ -17030,12 +17030,6 @@ CC=$lt_save_CC
+@@ -17074,12 +17074,6 @@ CC=$lt_save_CC
  
  
  
@@ -15,10 +15,10 @@ Use md5 from OpenSSL.
 -    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
+ 
+ 
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker flag" >&5
+@@ -23971,16 +23965,16 @@ fi
  
  
    have_libmd="no"
@@ -39,7 +39,7 @@ Use md5 from OpenSSL.
  if test ${ac_cv_search_MD5Init+y}
  then :
    printf %s "(cached) " >&6
-@@ -23437,16 +23431,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -23992,16 +23986,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.  */