mirror of
https://github.com/nmap/nmap.git
synced 2026-02-06 13:36:36 +00:00
Remove nmap-update
This feature was never publicly released, and has not been distributed in our binary builds for a couple versions now. It needed to be removed in order to reduce the number of places Nmap looks for data files. See #2051
This commit is contained in:
@@ -27,9 +27,6 @@ NDIFF_STAGING_DIR = ndiff-root
|
||||
NPING_BUILD_DIR = nping-build
|
||||
NPING_STAGING_DIR = nping-root
|
||||
|
||||
NMAP_UPDATE_BUILD_DIR = nmap-update-build
|
||||
NMAP_UPDATE_STAGING_DIR = nmap-update-root
|
||||
|
||||
JHBUILD_PREFIX=$(HOME)/gtk/inst
|
||||
JHBUILD_SOURCE=$(HOME)/gtk/source
|
||||
PREFIX = /usr/local
|
||||
@@ -70,35 +67,10 @@ CFLAGS += $(UNIVERSAL_CFLAGS)
|
||||
CXXFLAGS += $(UNIVERSAL_CXXFLAGS)
|
||||
LDFLAGS += $(UNIVERSAL_LDFLAGS)
|
||||
|
||||
# Mac OS options for libraries used by nmap-update
|
||||
MAC_FLAGS = -lsasl2 -liconv -framework CoreFoundation -framework Security
|
||||
|
||||
# Jhbuild static libraries
|
||||
PYTHON = $(JHBUILD_PREFIX)/bin/python2.7
|
||||
OPENSSL_STATIC = $(JHBUILD_PREFIX)/lib/libssl.a $(JHBUILD_PREFIX)/lib/libcrypto.a
|
||||
LIBZ_STATIC = $(JHBUILD_PREFIX)/lib/libz.a
|
||||
SVN_STATIC = $(JHBUILD_PREFIX)/lib/libsvn_client-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_wc-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_diff-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_delta-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_subr-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libexpat.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_ra-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_ra_svn-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_ra_local-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_fs-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_repos-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_fs_util-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_fs_fs-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_fs_x-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libintl.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsvn_ra_serf-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libserf-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libz.a \
|
||||
$(JHBUILD_PREFIX)/lib/libsqlite3.a
|
||||
APR_STATIC = $(JHBUILD_PREFIX)/lib/libapr-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libaprutil-1.a \
|
||||
$(JHBUILD_PREFIX)/lib/libapriconv-1.a
|
||||
|
||||
# These are the positions used by the createdmg.sh and check_test.sh scripts
|
||||
export ICON_SIZE=88
|
||||
@@ -128,7 +100,7 @@ tool-checks: have-$(CC) have-jhbuild have-gtk-mac-bundler
|
||||
have-%:
|
||||
which $*
|
||||
|
||||
#$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping check-nmap-update COPYING.formatted
|
||||
#$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping COPYING.formatted
|
||||
$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping COPYING.formatted
|
||||
rm -rf $(IMAGE_STAGING_DIR)
|
||||
mkdir -p $(IMAGE_STAGING_DIR)
|
||||
@@ -138,7 +110,6 @@ $(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap
|
||||
pkgbuild --root $(NCAT_STAGING_DIR) --identifier org.insecure.nmap.ncat --version $(NMAP_VERSION) --install-location /usr/local ncat.pkg
|
||||
pkgbuild --root $(NDIFF_STAGING_DIR)/usr/local --identifier org.insecure.nmap.ndiff --version $(NMAP_VERSION) --install-location /usr/local ndiff.pkg
|
||||
pkgbuild --root $(NPING_STAGING_DIR) --identifier org.insecure.nmap.nping --version $(NMAP_VERSION) --install-location /usr/local nping.pkg
|
||||
#pkgbuild --root $(NMAP_UPDATE_STAGING_DIR) --identifier org.insecure.nmap.nmap-update --version $(NMAP_VERSION) --install-location /usr/local nmap-update.pkg
|
||||
pkgbuild --root $(ZENMAP_STAGING_DIR) --identifier org.insecure.nmap.zenmap --version $(NMAP_VERSION) --install-location /Applications zenmap.pkg
|
||||
|
||||
# Produce a .xml with packages information
|
||||
@@ -176,12 +147,6 @@ export-tarball:
|
||||
tar czf nmap-$(NMAP_VERSION).tar.gz nmap-$(NMAP_VERSION)
|
||||
cp nmap-$(NMAP_VERSION).tar.gz $(JHBUILD_SOURCE)/pkgs/
|
||||
|
||||
stage-nmap-update: export-$(NMAP_UPDATE_BUILD_DIR)
|
||||
cd $(NMAP_UPDATE_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping --with-nmap-update --with-apr=$(JHBUILD_PREFIX) --with-subversion=$(JHBUILD_PREFIX) --with-serf=$(JHBUILD_PREFIX) --with-openssl=$(JHBUILD_PREFIX) $(CONFIGURE_ARGS)
|
||||
make -C $(NMAP_UPDATE_BUILD_DIR) build-nmap-update APR_LIBS="$(APR_STATIC)" SVN_LIBS="$(SVN_STATIC)" OPENSSL_LIBS="$(OPENSSL_STATIC)" MAC_FLAGS="$(MAC_FLAGS)"
|
||||
rm -rf $(NMAP_UPDATE_STAGING_DIR)
|
||||
make -C $(NMAP_UPDATE_BUILD_DIR) install-nmap-update DESTDIR="`pwd`/$(NMAP_UPDATE_STAGING_DIR)" APR_LIBS="$(APR_STATIC)" SVN_LIBS="$(SVN_STATIC)" OPENSSL_LIBS="$(OPENSSL_STATIC)" MAC_FLAGS="$(MAC_FLAGS)"
|
||||
|
||||
stage-%: export-tarball
|
||||
jhbuild -m "file://`pwd`/openssl.modules" build $*
|
||||
rm -rf $*-root
|
||||
@@ -216,10 +181,8 @@ clean:
|
||||
rm -rf $(NDIFF_STAGING_DIR)
|
||||
rm -rf $(NPING_BUILD_DIR)
|
||||
rm -rf $(NPING_STAGING_DIR)
|
||||
rm -rf $(NMAP_UPDATE_BUILD_DIR)
|
||||
rm -rf $(NMAP_UPDATE_STAGING_DIR)
|
||||
rm -f COPYING.formatted
|
||||
rm -f $(IMAGE_NAME)
|
||||
rm -rf distribution.xml finalDist.xml nmap.pkg ncat.pkg ndiff.pkg nping.pkg nmap-update.pkg zenmap.pkg
|
||||
rm -rf distribution.xml finalDist.xml nmap.pkg ncat.pkg ndiff.pkg nping.pkg zenmap.pkg
|
||||
|
||||
.PHONY: clean export-% stage-%
|
||||
|
||||
Reference in New Issue
Block a user