PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 12:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for zenmap Windows build

Browse Source
This commit is contained in:
dmiller
2023-02-01 20:05:27 +00:00
parent 3cf5f5e7a1
commit a8dedf7f5f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mswin32/Makefile
View File

@@ -1,3 +1,4 @@
export MSYS2_ARG_CONV_EXCL=*
MAKENSIS=C:/Program Files (x86)/NSIS3-strlen/makensis.exe MAKENSIS=C:/Program Files (x86)/NSIS3-strlen/makensis.exe
SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%') SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%')
NMAPDIR=.. NMAPDIR=..
@@ -29,7 +30,7 @@ bundle-nmap: bundle-zip bundle-nsis
build-nmap${OEM_SUFFIX}: nmap.sln build-nmap${OEM_SUFFIX}: nmap.sln
cmd /c Build.bat Build "$(VCCONFIG)${OEM_SUFFIX}" cmd /c Build.bat Build "$(VCCONFIG)${OEM_SUFFIX}"
stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefixes $(NMAPDIR)/nmap-os-db $(NMAPDIR)/nmap-payloads $(NMAPDIR)/nmap-protocols $(NMAPDIR)/nmap-rpc $(NMAPDIR)/nmap-service-probes $(NMAPDIR)/nmap-services $(NMAPDIR)/docs/nmap.xsl $(NMAPDIR)/nse_main.lua $(NMAPDIR)/mswin32/nmap_performance.reg $(NMAPDIR)/README-WIN32 $(NMAPDIR)/docs/3rd-party-licenses.txt icon1.ico LICENSE.formatted vc_redist.x86.exe stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefixes $(NMAPDIR)/nmap-os-db $(NMAPDIR)/nmap-protocols $(NMAPDIR)/nmap-rpc $(NMAPDIR)/nmap-service-probes $(NMAPDIR)/nmap-services $(NMAPDIR)/docs/nmap.xsl $(NMAPDIR)/nse_main.lua $(NMAPDIR)/mswin32/nmap_performance.reg $(NMAPDIR)/README-WIN32 $(NMAPDIR)/docs/3rd-party-licenses.txt icon1.ico LICENSE.formatted vc_redist.x86.exe
mkdir -p nmap-$(NMAP_VERSION) mkdir -p nmap-$(NMAP_VERSION)
cp $^ nmap-$(NMAP_VERSION)/ cp $^ nmap-$(NMAP_VERSION)/
# Use "cmd /c copy" rather than "cp" to preserve Windows ACLs. Using # Use "cmd /c copy" rather than "cp" to preserve Windows ACLs. Using
@@ -55,7 +56,7 @@ stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefix
# Install the ndiff batch file wrapper in the zip distribution. # Install the ndiff batch file wrapper in the zip distribution.
cp $(NMAPDIR)/ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py cp $(NMAPDIR)/ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py
cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat
cd $(NMAPDIR)/zenmap && install_scripts/windows/build.sh cd $(NMAPDIR)/zenmap/install_scripts/windows && sh build.sh
cp -R $(NMAPDIR)/zenmap/dist/zenmap-w64 nmap-$(NMAP_VERSION)/ cp -R $(NMAPDIR)/zenmap/dist/zenmap-w64 nmap-$(NMAP_VERSION)/
cp $(NMAPDIR)/zenmap/README nmap-$(NMAP_VERSION)/ZENMAP_README cp $(NMAPDIR)/zenmap/README nmap-$(NMAP_VERSION)/ZENMAP_README
cp $(NMAPDIR)/zenmap/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION) cp $(NMAPDIR)/zenmap/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION)
@@ -122,4 +123,4 @@ LICENSE.formatted: $(NMAPDIR)/LICENSE
clean: clean:
./Build.bat Clean "$(VCCONFIG)${OEM_SUFFIX}" ./Build.bat Clean "$(VCCONFIG)${OEM_SUFFIX}"
rm -rf nmap-$(NMAP_VERSION) nmap-$(NMAP_VERSION)-oem Debug Release Release-oem msbuild.log LICENSE.formatted rm -rf make-vars.make nmap-$(NMAP_VERSION) nmap-$(NMAP_VERSION)-oem Debug Release Release-oem msbuild.log LICENSE.formatted

8
zenmap/install_scripts/windows/PKGBUILD
View File

@@ -10,7 +10,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
pkgver=$(echo NMAP_VERSION | $(CC) -E -imacros nmap.h - | sed -n '$s/[" ]//g;$p') NMAP_DIR=$(realpath "../../..")
pkgver=$(echo NMAP_VERSION | ${CC} -E -imacros "${NMAP_DIR}/nmap.h" - | sed -n '$s/[" ]//g;$p')
pkgrel=1 pkgrel=1
pkgdesc="Graphical Nmap frontend and results viewer" pkgdesc="Graphical Nmap frontend and results viewer"
url="https://nmap.org/zenmap/" url="https://nmap.org/zenmap/"
@@ -23,10 +24,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-gobjec
makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
package() { package() {
# If this script is in zenmap/install_scripts/windows/PKGBUILD cd "${NMAP_DIR}/zenmap"
# then a repackage (makepkg -R) will set srcdir=zenmap/install_scripts/windows/src
# We want to cd to zenmap/
cd "${srcdir}/../../.."
${MINGW_PREFIX}/bin/python setup.py build ${MINGW_PREFIX}/bin/python setup.py build
MSYS2_ARG_CONV_EXCL="--prefix=" \ MSYS2_ARG_CONV_EXCL="--prefix=" \
${MINGW_PREFIX}/bin/python setup.py install vanilla --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 ${MINGW_PREFIX}/bin/python setup.py install vanilla --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1

2
zenmap/install_scripts/windows/build.sh
View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
# bash shebang because MSYS2/Styrene require Bash, not just /bin/sh # bash shebang because MSYS2/Styrene require Bash, not just /bin/sh
set -x
set -e
BUILDDIR=dist BUILDDIR=dist