From 581e4d3c1bd529d4b6c532bf73e3b17fca18bb83 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 26 Sep 2022 17:40:19 +0000 Subject: [PATCH] popt: update to 1.19. Changes from popt 1.18 Clarify license: we are not the X Consortium, use straight MIT license text Fix build without glob_pattern_p() Fix missing libiconv dependency for static linkage in popt.pc Fix segfault regression when NLS is enabled but libintl.h cannot be found (#32 ) Fix the handling of superfluous args passed with = Fix iconv resource leak on errors Fix POPT_CONTEXT_KEEP_FIRST handling in poptResetContext() Fix '=' getting shown for short options Fix memory corruption issues with poptStuffArgs() Fix handling of large files in poptReadFile() on 32bit systems Fix build without wchar / mbstate_t Fix potential memory leak in poptReadConfigFile() Fix "Usage" string calculated length Fix memory leak regressions in popt 1.18 Add --enable-werror configure option Add CREDITS file Improve random number handling Various code cleanups, const and type hygiene improvements Adjust test-suite expectations for libtool changes Various translation updates Various documentation improvements Various test-suite improvements Appease autoconf 2.70 Update gettext to 1.98.8 Run CI on fixed Fedora version (36 for now), use stricter compiler settings Drop unmaintained CHANGES file from tarballs --- devel/popt/Makefile | 6 ++---- devel/popt/PLIST | 6 +++++- devel/popt/distinfo | 10 ++++------ devel/popt/patches/patch-src_poptconfig.c | 21 -------------------- devel/popt/patches/patch-tests_testit.sh | 24 ----------------------- 5 files changed, 11 insertions(+), 56 deletions(-) delete mode 100644 devel/popt/patches/patch-src_poptconfig.c delete mode 100644 devel/popt/patches/patch-tests_testit.sh diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 75b775c84eff..404d2adc0fcb 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -1,14 +1,12 @@ -# $NetBSD: Makefile,v 1.49 2020/08/15 01:02:42 tnn Exp $ -# +# $NetBSD: Makefile,v 1.50 2022/09/26 17:40:19 wiz Exp $ -DISTNAME= popt-1.18 +DISTNAME= popt-1.19 CATEGORIES= devel MASTER_SITES= http://ftp.rpm.org/popt/releases/popt-1.x/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/rpm-software-management/popt COMMENT= Command line option parsing library -# mit license with advertising clause LICENSE= mit CONFLICTS= ORBit<=0.5.3 diff --git a/devel/popt/PLIST b/devel/popt/PLIST index 96c9dbaabd59..c90d3e3969f9 100644 --- a/devel/popt/PLIST +++ b/devel/popt/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.9 2010/06/05 13:26:46 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2022/09/26 17:40:19 wiz Exp $ include/popt.h lib/libpopt.la lib/pkgconfig/popt.pc man/man3/popt.3 +share/locale/ca/LC_MESSAGES/popt.mo share/locale/cs/LC_MESSAGES/popt.mo share/locale/da/LC_MESSAGES/popt.mo share/locale/de/LC_MESSAGES/popt.mo @@ -17,14 +18,17 @@ share/locale/id/LC_MESSAGES/popt.mo share/locale/is/LC_MESSAGES/popt.mo share/locale/it/LC_MESSAGES/popt.mo share/locale/ja/LC_MESSAGES/popt.mo +share/locale/ka/LC_MESSAGES/popt.mo share/locale/ko/LC_MESSAGES/popt.mo share/locale/lv/LC_MESSAGES/popt.mo share/locale/nb/LC_MESSAGES/popt.mo share/locale/nl/LC_MESSAGES/popt.mo share/locale/pl/LC_MESSAGES/popt.mo share/locale/pt/LC_MESSAGES/popt.mo +share/locale/pt_BR/LC_MESSAGES/popt.mo share/locale/ro/LC_MESSAGES/popt.mo share/locale/ru/LC_MESSAGES/popt.mo +share/locale/si/LC_MESSAGES/popt.mo share/locale/sk/LC_MESSAGES/popt.mo share/locale/sl/LC_MESSAGES/popt.mo share/locale/sv/LC_MESSAGES/popt.mo diff --git a/devel/popt/distinfo b/devel/popt/distinfo index 711752306c98..4df8b030bc89 100644 --- a/devel/popt/distinfo +++ b/devel/popt/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.28 2021/10/26 10:18:05 nia Exp $ +$NetBSD: distinfo,v 1.29 2022/09/26 17:40:19 wiz Exp $ -BLAKE2s (popt-1.18.tar.gz) = 0f39644a50b1023e12efb2b3c58e90f14fd931a21c95687a8ff2d4cbf9cb36a2 -SHA512 (popt-1.18.tar.gz) = 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5 -Size (popt-1.18.tar.gz) = 580569 bytes +BLAKE2s (popt-1.19.tar.gz) = 1934a5a6bbec2b186f5fdc2ec29b3035ea670685b791d7b4f55861a27c6086cb +SHA512 (popt-1.19.tar.gz) = 5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466 +Size (popt-1.19.tar.gz) = 596676 bytes SHA1 (patch-src_lookup3.c) = f91cf9edcaa7f27b933829aff91fa4faf9d23129 -SHA1 (patch-src_poptconfig.c) = 238436fe53a60463428e1b254d44a2c3a4eb0e50 SHA1 (patch-src_poptint.h) = 9a850dc35df8d256b6a585a8c6237341ce94e1f0 -SHA1 (patch-tests_testit.sh) = 72c55195f41bd47c689023bb74f367162b334b11 diff --git a/devel/popt/patches/patch-src_poptconfig.c b/devel/popt/patches/patch-src_poptconfig.c deleted file mode 100644 index ff7790328280..000000000000 --- a/devel/popt/patches/patch-src_poptconfig.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_poptconfig.c,v 1.1 2020/08/15 01:02:42 tnn Exp $ - -date: 2009-04-22 17:25:05 +0200; author: tnn; state: Exp; lines: +14 -11; -patch-aa: fix devel/popt build on NetBSD-current (>=5.99.11) which - has glob_pattern_p(3) in libc. -Reported in PR pkg/41265. - ---- src/poptconfig.c.orig 2020-04-16 10:32:54.000000000 +0000 -+++ src/poptconfig.c -@@ -21,7 +21,10 @@ - #if defined(HAVE_GLOB_H) - #include - --#if !defined(__GLIBC__) -+#if defined(__NetBSD__) -+#include -+#endif -+#if !defined(__GLIBC__) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100) - /* Return nonzero if PATTERN contains any metacharacters. - Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ - static int diff --git a/devel/popt/patches/patch-tests_testit.sh b/devel/popt/patches/patch-tests_testit.sh deleted file mode 100644 index 3a567d46fc72..000000000000 --- a/devel/popt/patches/patch-tests_testit.sh +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-tests_testit.sh,v 1.1 2020/08/15 01:02:42 tnn Exp $ - -Fix test suite failure. - ---- tests/testit.sh.orig 2020-03-24 11:01:52.000000000 +0000 -+++ tests/testit.sh -@@ -115,7 +115,7 @@ run test1 "test1 - 56" "arg1: 0 arg2: (n - run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar - - run test1 "test1 - 58" "\ --Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] -+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] - [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] - [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG] - [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE] -@@ -124,7 +124,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] - [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc] - [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage - run test1 "test1 - 59" "\ --Usage: lt-test1 [OPTION...] -+Usage: test1 [OPTION...] - --arg1 First argument with a really long - description. After all, we have to test - argument help wrapping somehow, right?