CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-03 22:29:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update macosx build to OpenSSL 1.1.1h, use jhbuild for all build steps

Browse source
This commit is contained in:
dmiller 2020-09-30 03:10:24 +00:00
parent e214019922
commit 46f1954c0f
2 changed files with 49 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
macosx/Makefile
View file

@ -3,6 +3,8 @@
NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
NMAP_NUM_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_NUM_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
#OSX_VERSION=$(shell sw_vers -productVersion | cut -d'.' -f1,2 | tr -d ' ')
OSX_VERSION=10.11
OSX_MIN_VERSION = 10.9
NAME_VERSION = nmap-$(NMAP_VERSION)$(if $(APPENDAGE),-$(APPENDAGE))
@ -147,6 +149,25 @@ export-tarball:
tar czf nmap-$(NMAP_VERSION).tar.gz nmap-$(NMAP_VERSION)
cp nmap-$(NMAP_VERSION).tar.gz $(JHBUILD_SOURCE)/pkgs/
xstage-nmap: export-$(NMAP_BUILD_DIR)
cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping --with-openssl="$(JHBUILD_PREFIX)" --with-libz="$(JHBUILD_PREFIX)" $(CONFIGURE_ARGS)
# LIB* is libssh2's name for *_LIBS
make -C $(NMAP_BUILD_DIR) OPENSSL_LIBS="$(OPENSSL_STATIC)" LIBSSL="$(OPENSSL_STATIC)" ZLIB_LIBS="$(LIBZ_STATIC)" LIBZ="$(LIBZ_STATIC)"
rm -rf $(NMAP_STAGING_DIR)
make -C $(NMAP_BUILD_DIR) install DESTDIR="`pwd`/$(NMAP_STAGING_DIR)" OPENSSL_LIBS="$(OPENSSL_STATIC)" ZLIB_LIBS="$(LIBZ_STATIC)"
xstage-ncat: export-$(NCAT_BUILD_DIR)
cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff --without-nping --with-openssl="$(JHBUILD_PREFIX)" $(CONFIGURE_ARGS)
make -C $(NCAT_BUILD_DIR) build-ncat OPENSSL_LIBS="$(OPENSSL_STATIC)"
rm -rf $(NCAT_STAGING_DIR)
make -C $(NCAT_BUILD_DIR) install-ncat DESTDIR="`pwd`/$(NCAT_STAGING_DIR)" OPENSSL_LIBS="$(OPENSSL_STATIC)"
xstage-nping: export-$(NPING_BUILD_DIR)
cd $(NPING_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --with-nping --with-openssl="$(JHBUILD_PREFIX)" $(CONFIGURE_ARGS)
make -C $(NPING_BUILD_DIR) build-nping OPENSSL_LIBS="$(OPENSSL_STATIC)"
rm -rf $(NPING_STAGING_DIR)
make -C $(NPING_BUILD_DIR) install-nping DESTDIR="`pwd`/$(NPING_STAGING_DIR)" OPENSSL_LIBS="$(OPENSSL_STATIC)"
stage-%: export-tarball
jhbuild -m "file://`pwd`/openssl.modules" build $*
rm -rf $*-root

31
macosx/openssl.modules
View file

@ -14,14 +14,14 @@
<!-- MODULES -->
<autotools id="openssl" autogen-sh="Configure" autogenargs="shared enable-ssl2"
<autotools id="openssl" autogen-sh="Configure" autogenargs="shared enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s
--openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
makeargs="depend all"
makeinstallargs="INSTALL_PREFIX='$(DESTDIR)' install_sw"
makeinstallargs="INSTALL_PREFIX='$(DESTDIR)' install_dev"
supports-parallel-builds="no"
supports-non-srcdir-builds="no">
<branch repo="openssl" version="1.0.2s" module="openssl-1.0.2s.tar.gz"/>
<branch repo="openssl" version="1.1.1h" module="openssl-1.1.1h.tar.gz"/>
</autotools>
<autotools id="nmap" supports-non-srcdir-builds="no"
@ -60,10 +60,35 @@
</dependencies>
</autotools>
<autotools id="nmap" supports-non-srcdir-builds="no"
autogen-sh="configure" autogenargs="--with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
--without-zenmap --without-ncat --without-ndiff --without-nping"
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.80.tar.gz" version="7.80"/>
<dependencies>
<dep package="openssl" />
</dependencies>
</autotools>
<autotools id="ncat" supports-non-srcdir-builds="no"
autogen-sh="configure" autogenargs="--with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
--without-zenmap --without-ndiff --without-nping"
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.80.tar.gz" version="7.80"/>
<dependencies>
<dep package="openssl" />
</dependencies>
</autotools>
<!-- METAMODULE -->
<metamodule id="nmap-packages">
<dependencies>
<dep package="openssl" />
<dep package="nmap" />
<dep package="ncat" />
<dep package="nping" />