Auto-gen Nmap version for macOS build. Bump OpenSSL to 1.1.1k.

macosx/Makefile

@@ -1,8 +1,8 @@
 # This makefile builds a disk image (.dmg) containing the installer for Nmap,
 # Zenmap, Ncat, and Ndiff.
 
-NMAP_VERSION := $(shell echo NMAP_VERSION | $(CPP) -imacros nmap.h - | sed -n '$$s/[" ]//g;$$p')
+NMAP_VERSION := $(shell echo NMAP_VERSION | $(CPP) -imacros ../nmap.h - | sed -n '$$s/[" ]//g;$$p')
-NMAP_VERSION := $(shell echo NMAP_NUM_VERSION | $(CPP) -imacros nmap.h - | sed -n '$$s/[" ]//g;$$p')
+NMAP_VERSION := $(shell echo NMAP_NUM_VERSION | $(CPP) -imacros ../nmap.h - | sed -n '$$s/[" ]//g;$$p')
 #OSX_VERSION=$(shell sw_vers -productVersion | cut -d'.' -f1,2 | tr -d ' ')
 OSX_VERSION=10.11
 OSX_MIN_VERSION = 10.9
@@ -168,7 +168,10 @@ xstage-nping: export-$(NPING_BUILD_DIR)
 	rm -rf $(NPING_STAGING_DIR)
 	make -C $(NPING_BUILD_DIR) install-nping DESTDIR="`pwd`/$(NPING_STAGING_DIR)" OPENSSL_LIBS="$(OPENSSL_STATIC)"
 
-stage-%: export-tarball
+openssl.modules: ../nmap.h
+	sed -i '/ENTITY nmap_version/s/".*"/"$(NMAP_VERSION)"/' $@
+
+stage-%: export-tarball openssl.modules
 	jhbuild -m "file://`pwd`/openssl.modules" build $*
 	rm -rf $*-root
 	mkdir $*-root

macosx/openssl.modules

@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd" [
+<!ENTITY nmap_version "7.91">
+]>
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
 
@@ -21,7 +23,7 @@
         makeinstallargs="INSTALL_PREFIX='$(DESTDIR)' install_dev"
         supports-parallel-builds="no"
         supports-non-srcdir-builds="no">
-        <branch repo="openssl" version="1.1.1h" module="openssl-1.1.1h.tar.gz"/>
+        <branch repo="openssl" version="1.1.1k" module="openssl-1.1.1k.tar.gz"/>
     </autotools>
 
     <autotools id="nmap" supports-non-srcdir-builds="no"
@@ -30,7 +32,7 @@
         makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"'
 	makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
     >
-        <branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
+        <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>
             <dep package="openssl" />
         </dependencies>
@@ -42,7 +44,7 @@
         makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
         makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
     >
-        <branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
+        <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>
             <dep package="openssl" />
         </dependencies>
@@ -54,7 +56,7 @@
         makeargs='build-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
         makeinstallargs='install-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
     >
-        <branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
+        <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>
             <dep package="openssl" />
         </dependencies>
@@ -66,7 +68,7 @@
         makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"'
 	makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
     >
-        <branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
+        <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>
             <dep package="openssl" />
         </dependencies>
@@ -78,7 +80,7 @@
         makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
         makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
     >
-        <branch repo="nmap-local" module="nmap-7.91.tar.gz" version="7.91"/>
+        <branch repo="nmap-local" module="nmap-&nmap_version;.tar.gz" version="&nmap_version;"/>
         <dependencies>
             <dep package="openssl" />
         </dependencies>