buildrpm: bump bundled Python version to 2.7.16 when building for centos{5,6}

When building rpm packages for centos 5 and 6, we bundle a mercurial-specific
version of Python 2.7 in /opt/python-hg.

This change is analogous to 5e947367606c, and bumps the embedded Python version
from 2.7.14 (released in 2017) to 2.7.16 (latest as of today).

contrib/Makefile.python

@@ -1,76 +1,76
-PYTHONVER=2.7.14
+PYTHONVER=2.7.16
 PYTHONNAME=python-
 PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)
 SYMLINKDIR=$(HOME)/bin
 
 help:
 	@echo
 	@echo 'Make a custom installation of a Python version'
 	@echo
 	@echo 'Common make parameters:'
 	@echo '  PYTHONVER=...    [$(PYTHONVER)]'
 	@echo '  PREFIX=...       [$(PREFIX)]'
 	@echo '  SYMLINKDIR=...   [$(SYMLINKDIR) creating $(PYTHONNAME)$(PYTHONVER)]'
 	@echo
 	@echo 'Common make targets:'
 	@echo '  python    - install Python $$PYTHONVER in $$PREFIX'
 	@echo '  symlink   - create a $$SYMLINKDIR/$(PYTHONNAME)$$PYTHONVER symlink'
 	@echo
 	@echo 'Example: create a temporary Python installation:'
 	@echo '  $$ make -f Makefile.python python PYTHONVER=${PYTHONVER} PREFIX=/tmp/p27'
 	@echo '  $$ /tmp/p27/bin/python -V'
 	@echo '  Python 2.7'
 	@echo
 	@echo 'Some external libraries are required for building Python: zlib bzip2 openssl.'
 	@echo 'Make sure their development packages are installed systemwide.'
 # fedora: yum install zlib-devel bzip2-devel openssl-devel
 # debian: apt-get install zlib1g-dev libbz2-dev libssl-dev
 	@echo
 	@echo 'To build a nice collection of interesting Python versions:'
 	@echo '  $$ for v in 2.{6{,.1,.2,.9},7{,.8,.10}}; do'
 	@echo '    make -f Makefile.python symlink PYTHONVER=$$v || break; done'
 	@echo 'To run a Mercurial test on all these Python versions:'
 	@echo '  $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do'
 	@echo '    echo $$py; $$py run-tests.py test-http.t; echo; done'
 	@echo
 
 export LANGUAGE=C
 export LC_ALL=C
 
 python: $(PREFIX)/bin/python docutils
 	printf 'import sys, zlib, bz2, docutils, ssl' | $(PREFIX)/bin/python
 
 PYTHON_SRCDIR=Python-$(PYTHONVER)
 PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz
 
 $(PREFIX)/bin/python:
 	[ -f $(PYTHON_SRCFILE) ] || wget http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) || curl -OL http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) || [ -f $(PYTHON_SRCFILE) ]
 	rm -rf $(PYTHON_SRCDIR)
 	tar xf $(PYTHON_SRCFILE)
 	# Debian/Ubuntu disables SSLv2,3 the hard way, disable it on old Pythons too
 	-sed -i 's,self.*SSLv[23]_method(),0;//\0,g' $(PYTHON_SRCDIR)/Modules/_ssl.c
 	# Find multiarch system libraries on Ubuntu and disable fortify error when setting argv
 	LDFLAGS="-L/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"; \
 	BASECFLAGS=-U_FORTIFY_SOURCE; \
 	export LDFLAGS BASECFLAGS; \
 	cd $(PYTHON_SRCDIR) && ./configure --prefix=$(PREFIX) && make all SVNVERSION=pwd && make install
 	printf 'import sys, zlib, bz2, ssl' | $(PREFIX)/bin/python
 	rm -rf $(PYTHON_SRCDIR)
 
 DOCUTILSVER=0.12
 DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER)
 DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz
 
 docutils: $(PREFIX)/bin/python
 	@$(PREFIX)/bin/python -c 'import docutils' || ( set -ex; \
 	[ -f $(DOCUTILS_SRCFILE) ] || wget http://downloads.sourceforge.net/project/docutils/docutils/$(DOCUTILSVER)/$(DOCUTILS_SRCFILE) || [ -f $(DOCUTILS_SRCFILE) ]; \
 	rm -rf $(DOCUTILS_SRCDIR); \
 	tar xf $(DOCUTILS_SRCFILE); \
 	cd $(DOCUTILS_SRCDIR) && $(PREFIX)/bin/python setup.py install --prefix=$(PREFIX); \
 	$(PREFIX)/bin/python -c 'import docutils'; \
 	rm -rf $(DOCUTILS_SRCDIR); )
 
 symlink: python $(SYMLINKDIR)
 	ln -sf $(PREFIX)/bin/python $(SYMLINKDIR)/$(PYTHONNAME)$(PYTHONVER)
 
 .PHONY: help python docutils symlink

contrib/packaging/buildrpm

@@ -1,160 +1,160
 #!/bin/bash -e
 #
 # Build a Mercurial RPM from the current repo
 #
 # Tested on
 # - Fedora 20
 # - CentOS 5
 # - centOS 6
 
 . $(dirname $0)/packagelib.sh
 
 BUILD=1
 RPMBUILDDIR="$PWD/rpmbuild"
 
 while [ "$1" ]; do
     case "$1" in
     --prepare )
         shift
         BUILD=
         ;;
     --withpython | --with-python)
         shift
-        PYTHONVER=2.7.14
-        PYTHONMD5=cee2e4b33ad3750da77b2e85f2f8b724
+        PYTHONVER=2.7.16
+        PYTHONMD5=f1a2ace631068444831d01485466ece0
         ;;
     --rpmbuilddir )
         shift
         RPMBUILDDIR="$1"
         shift
         ;;
     * )
         echo "Invalid parameter $1!" 1>&2
         exit 1
         ;;
     esac
 done
 
 cd "`dirname $0`/../.."
 
 specfile=$PWD/contrib/packaging/mercurial.spec
 if [ ! -f $specfile ]; then
     echo "Cannot find $specfile!" 1>&2
     exit 1
 fi
 
 if [ ! -d .hg ]; then
     echo 'You are not inside a Mercurial repository!' 1>&2
     exit 1
 fi
 
 gethgversion
 
 if [ -z "$type" ] ; then
    release=1
 else
     release=0.9_$type
 fi
 
 if [ -n "$distance" ] ; then
     release=$release+${distance}_${node}
 fi
 
 if [ "$PYTHONVER" ]; then
     release=$release+$PYTHONVER
     RPMPYTHONVER=$PYTHONVER
 else
     RPMPYTHONVER=%{nil}
 fi
 
 mkdir -p $RPMBUILDDIR/{SOURCES,BUILD,SRPMS,RPMS}
 $HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz
 if [ "$PYTHONVER" ]; then
 (
     mkdir -p build
     cd build
     PYTHON_SRCFILE=Python-$PYTHONVER.tgz
     [ -f $PYTHON_SRCFILE ] || curl -Lo $PYTHON_SRCFILE http://www.python.org/ftp/python/$PYTHONVER/$PYTHON_SRCFILE
     if [ "$PYTHONMD5" ]; then
         echo "$PYTHONMD5 $PYTHON_SRCFILE" | md5sum -w -c
     fi
     ln -f $PYTHON_SRCFILE $RPMBUILDDIR/SOURCES/$PYTHON_SRCFILE
 
     DOCUTILSVER=`sed -ne "s/^%global docutilsname docutils-//p" $specfile`
     DOCUTILS_SRCFILE=docutils-$DOCUTILSVER.tar.gz
     [ -f $DOCUTILS_SRCFILE ] || curl -Lo $DOCUTILS_SRCFILE http://downloads.sourceforge.net/project/docutils/docutils/$DOCUTILSVER/$DOCUTILS_SRCFILE
     DOCUTILSMD5=`sed -ne "s/^%global docutilsmd5 //p" $specfile`
     if [ "$DOCUTILSMD5" ]; then
         echo "$DOCUTILSMD5 $DOCUTILS_SRCFILE" | md5sum -w -c
     fi
     ln -f $DOCUTILS_SRCFILE $RPMBUILDDIR/SOURCES/$DOCUTILS_SRCFILE
 )
 fi
 
 mkdir -p $RPMBUILDDIR/SPECS
 rpmspec=$RPMBUILDDIR/SPECS/mercurial.spec
 
 sed -e "s,^Version:.*,Version: $version," \
     -e "s,^Release:.*,Release: $release," \
     $specfile > $rpmspec
 
 echo >> $rpmspec
 echo "%changelog" >> $rpmspec
 
 if echo $version | grep '+' > /dev/null 2>&1; then
     latesttag="`echo $version | sed -e 's/+.*//'`"
     $HG log -r .:"$latesttag" -fM \
         --template '{date|hgdate}\t{author}\t{desc|firstline}\n' | python -c '
 import sys, time
 
 def datestr(date, format):
     return time.strftime(format, time.gmtime(float(date[0]) - date[1]))
 
 changelog = []
 for l in sys.stdin.readlines():
     tok = l.split("\t")
     hgdate = tuple(int(v) for v in tok[0].split())
     changelog.append((datestr(hgdate, "%F"), tok[1], hgdate, tok[2]))
 prevtitle = ""
 for l in sorted(changelog, reverse=True):
     title = "* %s %s" % (datestr(l[2], "%a %b %d %Y"), l[1])
     if prevtitle != title:
         prevtitle = title
         print
         print title
     print "- %s" % l[3].strip()
 ' >> $rpmspec
 
 else
 
     $HG log \
          --template '{date|hgdate}\t{author}\t{desc|firstline}\n' \
          .hgtags | python -c '
 import sys, time
 
 def datestr(date, format):
     return time.strftime(format, time.gmtime(float(date[0]) - date[1]))
 
 for l in sys.stdin.readlines():
     tok = l.split("\t")
     hgdate = tuple(int(v) for v in tok[0].split())
     print "* %s %s\n- %s" % (datestr(hgdate, "%a %b %d %Y"), tok[1], tok[2])
 ' >> $rpmspec
 
 fi
 
 sed -i \
     -e "s/^%define withpython.*$/%define withpython $RPMPYTHONVER/" \
     $rpmspec
 
 if [ "$BUILD" ]; then
     rpmbuild --define "_topdir $RPMBUILDDIR" -ba $rpmspec --clean
     if [ $? = 0 ]; then
         echo
         echo "Built packages for $version-$release:"
         find $RPMBUILDDIR/*RPMS/ -type f -newer $rpmspec
     fi
 else
     echo "Prepared sources for $version-$release $rpmspec are in $RPMBUILDDIR/SOURCES/ - use like:"
     echo "rpmbuild --define '_topdir $RPMBUILDDIR' -ba $rpmspec --clean"
 fi