cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 4.68.

Browse Source 
Original diff from giovanni (MAINTAINER); thanks! Regen patches and
fix the newly broken generation of the egg-info file while here.

ok okan@
This commit is contained in:
wcmaier 2008-07-09 14:46:19 +00:00
parent 92ee1a8d26
commit b9a28d6528
8 changed files with 92 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/nmap/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.79 2008/06/17 21:18:03 steven Exp $
# $OpenBSD: Makefile,v 1.80 2008/07/09 14:46:19 wcmaier Exp $
COMMENT-main= scan ports and fingerprint stack of network hosts
COMMENT-zenmap= graphical frontend for nmap
MODPY_EGG_VERSION= 4.65
MODPY_EGG_VERSION= 4.68
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}

10
net/nmap/distinfo
View File

@ -1,5 +1,5 @@
MD5 (nmap-4.65.tgz) = i8C1RP6erdPhXpBa2tkfQQ==
RMD160 (nmap-4.65.tgz) = reeL9igvDwTBCRYmOPvlvAZ5g9A=
SHA1 (nmap-4.65.tgz) = fUD5bb12SfnwkmNc1L6/bzW2i3Y=
SHA256 (nmap-4.65.tgz) = DcZ2VfmROfmcsNoLhEaGwmiS20t67xBRbIY2SMBG5p0=
SIZE (nmap-4.65.tgz) = 4960616
MD5 (nmap-4.68.tgz) = oTc8mS5LIdjbTWXG64/sQg==
RMD160 (nmap-4.68.tgz) = UDB0C1/KR+sfy0C6bhXz+H4ybFY=
SHA1 (nmap-4.68.tgz) = ur1MmqcHz9yv6eWDoNLIi4AWEDk=
SHA256 (nmap-4.68.tgz) = TBAm2hOGxM6FmrH9pTMRKS56nGpXbsMo566baD7bxa8=
SIZE (nmap-4.68.tgz) = 6799273

14
net/nmap/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-Makefile_in,v 1.8 2008/07/09 14:46:19 wcmaier Exp $
--- Makefile.in.orig Tue Jul 8 10:14:15 2008
+++ Makefile.in Tue Jul 8 10:14:20 2008
@@ -193,8 +193,8 @@ $(ZENMAPDIR)/setup.py:
cd $(ZENMAPDIR) && install_scripts/unix/setup.sh
# Update the version number used by Zenmap.
-$(ZENMAPDIR)/zenmapCore/Version.py $(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h
- cd $(ZENMAPDIR) && $(PYTHON) install_scripts/utils/version_update.py "$(NMAP_VERSION)"
+#$(ZENMAPDIR)/zenmapCore/Version.py $(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h
+# cd $(ZENMAPDIR) && $(PYTHON) install_scripts/utils/version_update.py "$(NMAP_VERSION)"
# By default distutils rewrites installed scripts to hardcode the
# location of the Python interpreter they were built with (something

12
net/nmap/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2008/06/17 21:18:03 steven Exp $
--- configure.orig Tue May 27 17:59:43 2008
+++ configure Sun Jun 15 10:22:16 2008
@@ -6445,6 +6445,7 @@ cat >>conftest.$ac_ext <<_ACEOF
$OpenBSD: patch-configure,v 1.8 2008/07/09 14:46:19 wcmaier Exp $
--- configure.orig Sun Jun 15 02:05:12 2008
+++ configure Tue Jul 8 10:13:21 2008
@@ -6590,6 +6590,7 @@ cat >>conftest.$ac_ext <<_ACEOF
extern char pcap_version[];
int main() {
int major, minor1, minor2;
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.7 2008/06/17 21:18:03 steven Exp $
sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
if (major > 0)
exit(0);
@@ -6765,7 +6766,7 @@ cat confdefs.h >>conftest.$ac_ext
@@ -6910,7 +6911,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.7 2008/06/17 21:18:03 steven Exp $
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -6960,7 +6961,7 @@ if test $have_pcre != yes ; then
@@ -7105,7 +7106,7 @@ if test $have_pcre != yes ; then
else
# We only need to check for and use this if we are NOT using included pcre

8
net/nmap/patches/patch-tcpip_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tcpip_cc,v 1.7 2008/06/17 21:18:03 steven Exp $
--- tcpip.cc.orig Thu May 22 22:45:32 2008
+++ tcpip.cc Sat Jun 14 14:52:55 2008
@@ -2079,7 +2079,7 @@ bool pcap_selectable_fd_valid() {
$OpenBSD: patch-tcpip_cc,v 1.8 2008/07/09 14:46:19 wcmaier Exp $
--- tcpip.cc.orig Fri Jun 20 15:44:54 2008
+++ tcpip.cc Tue Jul 8 10:13:21 2008
@@ -2103,7 +2103,7 @@ bool pcap_selectable_fd_valid() {
results. If you just want to test whether the function is supported,
use pcap_selectable_fd_valid() instead. */
int my_pcap_get_selectable_fd(pcap_t *p) {

14
net/nmap/patches/patch-zenmap_setup_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-zenmap_setup_py,v 1.3 2008/06/17 21:18:03 steven Exp $
--- zenmap/setup.py.orig Wed May 7 19:19:40 2008
+++ zenmap/setup.py Sat Jun 14 15:05:36 2008
@@ -124,12 +124,11 @@ def path_strip_prefix(path, prefix):
$OpenBSD: patch-zenmap_setup_py,v 1.4 2008/07/09 14:46:19 wcmaier Exp $
--- zenmap/setup.py.orig Fri Jun 6 00:55:01 2008
+++ zenmap/setup.py Tue Jul 8 10:13:21 2008
@@ -120,12 +120,11 @@ def path_strip_prefix(path, prefix):
class my_install(install):
def run(self):
@ -15,9 +15,9 @@ $OpenBSD: patch-zenmap_setup_py,v 1.3 2008/06/17 21:18:03 steven Exp $
self.write_installed_files()
def get_installed_files(self):
@@ -283,17 +282,10 @@ for dir in dirs:
"PIXMAPS_DIR": os.path.join(self.prefix, pixmaps_dir),
"ICONS_DIR": os.path.join(self.prefix, icons_dir)}
@@ -278,17 +277,10 @@ for dir in dirs:
"MISC_DIR": os.path.join(self.prefix, misc_dir),
"PIXMAPS_DIR": os.path.join(self.prefix, pixmaps_dir)}
- # Find and read the Paths.py file.
- pcontent = ""

3
net/nmap/pkg/PFRAG.shared-main
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.4 2008/06/17 21:18:03 steven Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.5 2008/07/09 14:46:19 wcmaier Exp $
libexec/nmap/
libexec/nmap/nselib-bin/
libexec/nmap/nselib-bin/bit.so
share/nmap/nselib/
share/nmap/nselib/comm.lua
share/nmap/nselib/datafiles.lua
share/nmap/nselib/http.lua
share/nmap/nselib/ipOps.lua

109
net/nmap/pkg/PLIST-zenmap
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-zenmap,v 1.4 2008/06/17 21:18:03 steven Exp $
@comment $OpenBSD: PLIST-zenmap,v 1.5 2008/07/09 14:46:19 wcmaier Exp $
bin/nmapfe
bin/xnmap
bin/zenmap
@ -167,62 +167,6 @@ lib/python${MODPY_VERSION}/site-packages/zenmapGUI/Wizard.pyc
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/__init__.py
lib/python${MODPY_VERSION}/site-packages/zenmapGUI/__init__.pyc
@man man/man1/zenmap.1
@comment share/icons/
share/icons/nmap-eye.ico
share/pixmaps/
share/pixmaps/default.svg
share/pixmaps/default_32.png
share/pixmaps/default_75.png
share/pixmaps/freebsd.svg
share/pixmaps/freebsd_32.png
share/pixmaps/freebsd_75.png
share/pixmaps/irix.svg
share/pixmaps/irix_32.png
share/pixmaps/irix_75.png
share/pixmaps/linux.svg
share/pixmaps/linux_32.png
share/pixmaps/linux_75.png
share/pixmaps/macosx.svg
share/pixmaps/macosx_32.png
share/pixmaps/macosx_75.png
share/pixmaps/openbsd.svg
share/pixmaps/openbsd_32.png
share/pixmaps/openbsd_75.png
share/pixmaps/redhat.svg
share/pixmaps/redhat_32.png
share/pixmaps/redhat_75.png
share/pixmaps/shadow_man.svg
share/pixmaps/shadow_man_32.png
share/pixmaps/shadow_man_75.png
share/pixmaps/solaris.svg
share/pixmaps/solaris_32.png
share/pixmaps/solaris_75.png
share/pixmaps/splash.png
share/pixmaps/ubuntu.svg
share/pixmaps/ubuntu_32.png
share/pixmaps/ubuntu_75.png
share/pixmaps/unknown.svg
share/pixmaps/unknown_32.png
share/pixmaps/unknown_75.png
share/pixmaps/vl_1.svg
share/pixmaps/vl_1_32.png
share/pixmaps/vl_1_75.png
share/pixmaps/vl_2.svg
share/pixmaps/vl_2_32.png
share/pixmaps/vl_2_75.png
share/pixmaps/vl_3.svg
share/pixmaps/vl_3_32.png
share/pixmaps/vl_3_75.png
share/pixmaps/vl_4.svg
share/pixmaps/vl_4_32.png
share/pixmaps/vl_4_75.png
share/pixmaps/vl_5.svg
share/pixmaps/vl_5_32.png
share/pixmaps/vl_5_75.png
share/pixmaps/win.svg
share/pixmaps/win_32.png
share/pixmaps/win_75.png
share/pixmaps/wizard_logo.png
share/zenmap/
share/zenmap/config/
share/zenmap/config/scan_profile.usp
@ -240,3 +184,54 @@ share/zenmap/misc/os_db.dmp
share/zenmap/misc/profile_editor.xml
share/zenmap/misc/services.dmp
share/zenmap/misc/wizard.xml
share/zenmap/pixmaps/
share/zenmap/pixmaps/default.svg
share/zenmap/pixmaps/default_32.png
share/zenmap/pixmaps/default_75.png
share/zenmap/pixmaps/freebsd.svg
share/zenmap/pixmaps/freebsd_32.png
share/zenmap/pixmaps/freebsd_75.png
share/zenmap/pixmaps/irix.svg
share/zenmap/pixmaps/irix_32.png
share/zenmap/pixmaps/irix_75.png
share/zenmap/pixmaps/linux.svg
share/zenmap/pixmaps/linux_32.png
share/zenmap/pixmaps/linux_75.png
share/zenmap/pixmaps/macosx.svg
share/zenmap/pixmaps/macosx_32.png
share/zenmap/pixmaps/macosx_75.png
share/zenmap/pixmaps/openbsd.svg
share/zenmap/pixmaps/openbsd_32.png
share/zenmap/pixmaps/openbsd_75.png
share/zenmap/pixmaps/redhat.svg
share/zenmap/pixmaps/redhat_32.png
share/zenmap/pixmaps/redhat_75.png
share/zenmap/pixmaps/solaris.svg
share/zenmap/pixmaps/solaris_32.png
share/zenmap/pixmaps/solaris_75.png
share/zenmap/pixmaps/splash.png
share/zenmap/pixmaps/ubuntu.svg
share/zenmap/pixmaps/ubuntu_32.png
share/zenmap/pixmaps/ubuntu_75.png
share/zenmap/pixmaps/unknown.svg
share/zenmap/pixmaps/unknown_32.png
share/zenmap/pixmaps/unknown_75.png
share/zenmap/pixmaps/vl_1.svg
share/zenmap/pixmaps/vl_1_32.png
share/zenmap/pixmaps/vl_1_75.png
share/zenmap/pixmaps/vl_2.svg
share/zenmap/pixmaps/vl_2_32.png
share/zenmap/pixmaps/vl_2_75.png
share/zenmap/pixmaps/vl_3.svg
share/zenmap/pixmaps/vl_3_32.png
share/zenmap/pixmaps/vl_3_75.png
share/zenmap/pixmaps/vl_4.svg
share/zenmap/pixmaps/vl_4_32.png
share/zenmap/pixmaps/vl_4_75.png
share/zenmap/pixmaps/vl_5.svg
share/zenmap/pixmaps/vl_5_32.png
share/zenmap/pixmaps/vl_5_75.png
share/zenmap/pixmaps/win.svg
share/zenmap/pixmaps/win_32.png
share/zenmap/pixmaps/win_75.png
share/zenmap/pixmaps/wizard_logo.png