diff options
| -rw-r--r-- | misc/dpkg/Makefile | 4 | ||||
| -rw-r--r-- | misc/dpkg/distinfo | 12 | ||||
| -rw-r--r-- | misc/dpkg/patches/patch-dselect_cxx-support.cc | 19 | ||||
| -rw-r--r-- | misc/dpkg/patches/patch-lib_compat_strsignal.c | 21 |
4 files changed, 7 insertions, 49 deletions
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile index 4f7b1dfbf0f..579b7418247 100644 --- a/misc/dpkg/Makefile +++ b/misc/dpkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2017/02/08 10:13:29 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2017/03/06 22:47:04 wiz Exp $ -DISTNAME= dpkg_1.18.22 +DISTNAME= dpkg_1.18.23 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/} diff --git a/misc/dpkg/distinfo b/misc/dpkg/distinfo index 5a230eca0ac..5bca155661d 100644 --- a/misc/dpkg/distinfo +++ b/misc/dpkg/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.11 2017/02/14 21:26:22 joerg Exp $ +$NetBSD: distinfo,v 1.12 2017/03/06 22:47:04 wiz Exp $ -SHA1 (dpkg_1.18.22.tar.xz) = 2756deecfc0095e7ccd0c0d51abdd20cc74c3fbf -RMD160 (dpkg_1.18.22.tar.xz) = 7f8f86eb8d495311cc8683706795d7895a0aa73f -SHA512 (dpkg_1.18.22.tar.xz) = c4653b92d3b3ab3051e1cbe7abb757f75b8ab902a54dcd6e2379115d3f36ae7c5d6e0a00f34a3cec1a96484dc708197061824dd81e465d8627e726bfc48eb2b4 -Size (dpkg_1.18.22.tar.xz) = 4520088 bytes -SHA1 (patch-dselect_cxx-support.cc) = 852d9b6de83062a747b61ef416436bde97c6ffb7 -SHA1 (patch-lib_compat_strsignal.c) = 7fa145059f28faa1f3e7bb34848ebd5e62941a20 +SHA1 (dpkg_1.18.23.tar.xz) = a090c0003d27bd467b9d4e683f2fa634f88d9486 +RMD160 (dpkg_1.18.23.tar.xz) = 84ee173c6efa0437f9faccefea59f82edaea821e +SHA512 (dpkg_1.18.23.tar.xz) = 4f9bed1fb0558fa6b003601b7be8d67eb592140b7f9ac4cf0bccb394e14b42a822cdc692c8c6e27ad2929719fe78659f21c128cb17618733d344fd3489f42be7 +Size (dpkg_1.18.23.tar.xz) = 4516252 bytes diff --git a/misc/dpkg/patches/patch-dselect_cxx-support.cc b/misc/dpkg/patches/patch-dselect_cxx-support.cc deleted file mode 100644 index 2df2ff3ade4..00000000000 --- a/misc/dpkg/patches/patch-dselect_cxx-support.cc +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-dselect_cxx-support.cc,v 1.1 2017/02/14 21:26:22 joerg Exp $ - -Do not depend on cxxabi.h to have declared __cxa_pure_virtual. - ---- dselect/cxx-support.cc.orig 2017-02-09 16:14:23.124533168 +0000 -+++ dselect/cxx-support.cc -@@ -81,9 +81,11 @@ operator delete[](void *a, size_t size) - } - - #ifdef HAVE___CXA_PURE_VIRTUAL -+namespace __cxxabiv1 { - extern "C" void --abi::__cxa_pure_virtual() -+__cxa_pure_virtual() - { - internerr("pure virtual function called"); - } -+} - #endif diff --git a/misc/dpkg/patches/patch-lib_compat_strsignal.c b/misc/dpkg/patches/patch-lib_compat_strsignal.c deleted file mode 100644 index ea53d2343f1..00000000000 --- a/misc/dpkg/patches/patch-lib_compat_strsignal.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-lib_compat_strsignal.c,v 1.1 2017/02/05 18:46:29 wiz Exp $ - - CC libcompat_test_la-scandir.lo -strsignal.c:63:26: error: conflicting types for 'sys_siglist' - extern const char *const sys_siglist[]; - ^ -In file included from strsignal.c:22:0: -/usr/include/signal.h:52:27: note: previous declaration of 'sys_siglist' was here - extern const char *const *sys_siglist __RENAME(__sys_siglist14); - ^ - ---- lib/compat/strsignal.c.orig 2017-01-31 03:03:31.000000000 +0000 -+++ lib/compat/strsignal.c -@@ -60,7 +60,6 @@ const char *const sys_siglist[] = { - # define NSIG 32 - # endif - # define COMPAT_NSIGLIST NSIG --extern const char *const sys_siglist[]; - #endif - - const char * |