CVS commit: pkgsrc/www/nghttp2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Mar 31 21:42:28 UTC 2021

Modified Files:
        pkgsrc/www/nghttp2: distinfo
Added Files:
        pkgsrc/www/nghttp2/patches: patch-configure patch-configure.ac

Log Message:
nghttp2: accept lower python3.

Upstream has only intended to reject python 2.x.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/nghttp2/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/www/nghttp2/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/www/nghttp2/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/www/nghttp2/distinfo
diff -u pkgsrc/www/nghttp2/distinfo:1.46 pkgsrc/www/nghttp2/distinfo:1.47
--- pkgsrc/www/nghttp2/distinfo:1.46    Wed Feb  3 13:16:19 2021
+++ pkgsrc/www/nghttp2/distinfo Wed Mar 31 21:42:28 2021
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.46 2021/02/03 13:16:19 adam Exp $
+$NetBSD: distinfo,v 1.47 2021/03/31 21:42:28 maya Exp $
 
 SHA1 (nghttp2-1.43.0.tar.xz) = b9d846e53af53fc5814015c9d3d6c0d2c684c046
 RMD160 (nghttp2-1.43.0.tar.xz) = 180e966e128d9ca097f9c469508168bc0ac5beee
 SHA512 (nghttp2-1.43.0.tar.xz) = eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39
 Size (nghttp2-1.43.0.tar.xz) = 3973500 bytes
+SHA1 (patch-configure) = 9623d67431b844142ce05e1e5cf2b36f5e27b198
+SHA1 (patch-configure.ac) = 6b5ed158e763d13e3d79e8543977cc79c3db3eef

Added files:

Index: pkgsrc/www/nghttp2/patches/patch-configure
diff -u /dev/null pkgsrc/www/nghttp2/patches/patch-configure:1.5
--- /dev/null   Wed Mar 31 21:42:28 2021
+++ pkgsrc/www/nghttp2/patches/patch-configure  Wed Mar 31 21:42:28 2021
@@ -0,0 +1,52 @@
+$NetBSD: patch-configure,v 1.5 2021/03/31 21:42:28 maya Exp $
+
+Lower python requirement to the lowest available 3.x version in pkgsrc.
+
+--- configure.orig     2021-03-31 21:39:20.435004075 +0000
++++ configure
+@@ -17693,13 +17652,13 @@ fi
+ 
+         if test -n "$PYTHON"; then
+       # If the user set $PYTHON, use it and don't search something else.
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.8" >&5
+-$as_echo_n "checking whether $PYTHON version is >= 3.8... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.6" >&5
++$as_echo_n "checking whether $PYTHON version is >= 3.6... " >&6; }
+       prog="import sys
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '3.8'.split('.'))) + [0, 0, 0]
++minver = list(map(int, '3.6'.split('.'))) + [0, 0, 0]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+@@ -17720,8 +17679,8 @@ fi
+     else
+       # Otherwise, try each interpreter until we find one that satisfies
+       # VERSION.
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.8" >&5
+-$as_echo_n "checking for a Python interpreter with version >= 3.8... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.6" >&5
++$as_echo_n "checking for a Python interpreter with version >= 3.6... " >&6; }
+ if ${am_cv_pathless_PYTHON+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+@@ -17732,7 +17691,7 @@ else
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '3.8'.split('.'))) + [0, 0, 0]
++minver = list(map(int, '3.6'.split('.'))) + [0, 0, 0]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+@@ -17807,7 +17766,7 @@ $as_echo_n "checking for $am_display_PYT
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"`
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }

Index: pkgsrc/www/nghttp2/patches/patch-configure.ac
diff -u /dev/null pkgsrc/www/nghttp2/patches/patch-configure.ac:1.1
--- /dev/null   Wed Mar 31 21:42:28 2021
+++ pkgsrc/www/nghttp2/patches/patch-configure.ac       Wed Mar 31 21:42:28 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2021/03/31 21:42:28 maya Exp $
+
+Lower python requirement to the lowest available 3.x version in pkgsrc.
+
+--- configure.ac.orig  2021-02-02 11:35:58.000000000 +0000
++++ configure.ac
+@@ -151,7 +151,7 @@ AC_PROG_MKDIR_P
+ 
+ PKG_PROG_PKG_CONFIG([0.20])
+ 
+-AM_PATH_PYTHON([3.8],, [:])
++AM_PATH_PYTHON([3.6],, [:])
+ 
+ if [test "x$request_lib_only" = "xyes"]; then
+   request_app=no