CVS commit: pkgsrc/devel/popt

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug 15 01:02:43 UTC 2020

Modified Files:
        pkgsrc/devel/popt: Makefile distinfo
Added Files:
        pkgsrc/devel/popt/patches: patch-src_lookup3.c patch-src_poptconfig.c
            patch-src_poptint.h patch-tests_testit.sh
Removed Files:
        pkgsrc/devel/popt/patches: patch-aa patch-lookup3.c patch-poptint.h

Log Message:
popt: update to 1.18

Replace HOMEPAGE and MASTER_SITE, the old rpm5.org site seems dead & broken

Changes from popt 1.16
  fix an ugly and ancient security issue with popt failing to
    drop privileges on alias exec from a SUID/SGID program
  perform rudimentary sanity checks when reading in popt config files
  collect accumulated misc fixes (memleaks etc) from distros
  convert translations to utf-8 encoding
  convert old postscript documentation to pdf
  dust off ten years worth of autotools sediment
  reorganize and clean up the source tree for clarity
  remove the obnoxious splint annotations from the sources


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/popt/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/popt/distinfo
cvs rdiff -u -r1.8 -r0 pkgsrc/devel/popt/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/popt/patches/patch-lookup3.c
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/popt/patches/patch-poptint.h
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/popt/patches/patch-src_lookup3.c \
    pkgsrc/devel/popt/patches/patch-src_poptconfig.c \
    pkgsrc/devel/popt/patches/patch-src_poptint.h \
    pkgsrc/devel/popt/patches/patch-tests_testit.sh

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

Modified files:

Index: pkgsrc/devel/popt/Makefile
diff -u pkgsrc/devel/popt/Makefile:1.48 pkgsrc/devel/popt/Makefile:1.49
--- pkgsrc/devel/popt/Makefile:1.48     Sun Nov  3 10:39:28 2019
+++ pkgsrc/devel/popt/Makefile  Sat Aug 15 01:02:42 2020
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.48 2019/11/03 10:39:28 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2020/08/15 01:02:42 tnn Exp $
 #
 
-DISTNAME=      popt-1.16
-PKGREVISION=   2
+DISTNAME=      popt-1.18
 CATEGORIES=    devel
-MASTER_SITES=  http://rpm5.org/files/popt/
+MASTER_SITES=  http://ftp.rpm.org/popt/releases/popt-1.x/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/rpm-software-management/popt
 COMMENT=       Command line option parsing library
 # mit license with advertising clause
 LICENSE=       mit

Index: pkgsrc/devel/popt/distinfo
diff -u pkgsrc/devel/popt/distinfo:1.25 pkgsrc/devel/popt/distinfo:1.26
--- pkgsrc/devel/popt/distinfo:1.25     Sun May  5 23:16:06 2019
+++ pkgsrc/devel/popt/distinfo  Sat Aug 15 01:02:42 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.25 2019/05/05 23:16:06 rjs Exp $
+$NetBSD: distinfo,v 1.26 2020/08/15 01:02:42 tnn Exp $
 
-SHA1 (popt-1.16.tar.gz) = cfe94a15a2404db85858a81ff8de27c8ff3e235e
-RMD160 (popt-1.16.tar.gz) = 9c52bff97259de4010499f69c76d2a6396920342
-SHA512 (popt-1.16.tar.gz) = bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-Size (popt-1.16.tar.gz) = 702769 bytes
-SHA1 (patch-aa) = 7edb4bbd7fe044da9f388159fdc22327377e267e
-SHA1 (patch-lookup3.c) = 7643b577c0913742fc4333c4469d606d81b6aa98
-SHA1 (patch-poptint.h) = 11d104d4dfd15ed00161a504f58a32d7e5671c02
+SHA1 (popt-1.18.tar.gz) = 0bf05488e151228fce9c0c9601162a9f432f69d9
+RMD160 (popt-1.18.tar.gz) = 637fc4bad9c4669a6695ec4c40225e16ee9357c8
+SHA512 (popt-1.18.tar.gz) = 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
+Size (popt-1.18.tar.gz) = 580569 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

Added files:

Index: pkgsrc/devel/popt/patches/patch-src_lookup3.c
diff -u /dev/null pkgsrc/devel/popt/patches/patch-src_lookup3.c:1.1
--- /dev/null   Sat Aug 15 01:02:43 2020
+++ pkgsrc/devel/popt/patches/patch-src_lookup3.c       Sat Aug 15 01:02:42 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lookup3.c,v 1.1 2020/08/15 01:02:42 tnn Exp $
+
+Don't include stdint.h if it does not exist.  Fixes PR#44770
+
+--- src/lookup3.c.orig 2011-04-01 21:06:28.047391300 +0000
++++ src/lookup3.c
+@@ -34,7 +34,9 @@
+ */
+ /* -------------------------------------------------------------------- */
+ 
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ 
+ #if defined(_JLU3_SELFTEST)
+ # define _JLU3_jlu32w         1
Index: pkgsrc/devel/popt/patches/patch-src_poptconfig.c
diff -u /dev/null pkgsrc/devel/popt/patches/patch-src_poptconfig.c:1.1
--- /dev/null   Sat Aug 15 01:02:43 2020
+++ pkgsrc/devel/popt/patches/patch-src_poptconfig.c    Sat Aug 15 01:02:42 2020
@@ -0,0 +1,21 @@
+$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 <glob.h>
+ 
+-#if !defined(__GLIBC__)
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#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
Index: pkgsrc/devel/popt/patches/patch-src_poptint.h
diff -u /dev/null pkgsrc/devel/popt/patches/patch-src_poptint.h:1.1
--- /dev/null   Sat Aug 15 01:02:43 2020
+++ pkgsrc/devel/popt/patches/patch-src_poptint.h       Sat Aug 15 01:02:42 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_poptint.h,v 1.1 2020/08/15 01:02:42 tnn Exp $
+
+Don't include stdint.h if it does not exist.  Fixes PR#44770
+
+--- src/poptint.h.orig 2010-01-19 00:39:10.000000000 +0000
++++ src/poptint.h
+@@ -9,7 +9,13 @@
+ #ifndef H_POPTINT
+ #define H_POPTINT
+ 
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
++
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ 
+ /**
+  * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
Index: pkgsrc/devel/popt/patches/patch-tests_testit.sh
diff -u /dev/null pkgsrc/devel/popt/patches/patch-tests_testit.sh:1.1
--- /dev/null   Sat Aug 15 01:02:43 2020
+++ pkgsrc/devel/popt/patches/patch-tests_testit.sh     Sat Aug 15 01:02:42 2020
@@ -0,0 +1,24 @@
+$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?