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

Update build instructions for MacPorts 2.1.1.

Browse Source 
An important side effect of this change is the move the
--with-included-loaders flag from gtk2 to gdk-pixbuf2. This upstream
change:
http://git.gnome.org/browse/gtk+/commit/configure.in?h=gtk-2-24&id=cb29d2770714943af7b488a6a94f1f37b7466c8f
means that --with-included-loaders no longer has an effect when given to
gtk2's configure. This caused dynamic loaders to be searched for under
my /Users/david/macports-10.5 installation directory, which isn't
present after installing from the .dmg package.

Here's an report of a hang caused by the missing loaders:
http://seclists.org/nmap-dev/2012/q2/370
This commit is contained in:
david
2012-05-31 07:04:39 +00:00
parent a6ce8d5691
commit a1bae1bb5f
2 changed files with 107 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
zenmap/install_scripts/macosx/MacPorts-ports.diff
View File

@@ -1,24 +1,53 @@
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/archivers/xz/Portfile ports/archivers/xz/Portfile
--- ports.orig/archivers/xz/Portfile 2011-07-14 03:00:23.000000000 -0700
+++ ports/archivers/xz/Portfile 2012-05-30 19:41:29.000000000 -0700
@@ -23,9 +23,9 @@
checksums sha1 79661fd1c24603437e325d76732046b1da683b32 \
rmd160 10127da6e2e35e5e92b3125f6088c756b80931e5
-depends_lib port:libiconv port:gettext
+depends_lib port:gettext
-configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
+configure.args --with-libintl-prefix=${prefix}
# previous version defaulted to static liblzma (through --enable-dynamic=mixed)
configure.args-append --disable-shared
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/apr-util/Portfile ports/devel/apr-util/Portfile
--- ports.orig/devel/apr-util/Portfile 2012-01-31 15:30:28.000000000 -0800
+++ ports/devel/apr-util/Portfile 2012-05-30 16:53:56.000000000 -0700
@@ -21,13 +21,13 @@
rmd160 a16ca2c192e82ff811570e84b88f9b6b60141ca6
depends_lib port:apr port:expat \
- port:libiconv port:db46 \
+ port:db46 \
port:sqlite3
use_parallel_build yes
configure.ccache no
configure.args --with-apr=${prefix}/bin/apr-1-config --with-expat=${prefix} \
- --with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
+ --with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
--without-mysql --without-pgsql --with-sqlite3=${prefix}
test.run yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/atk/Portfile ports/devel/atk/Portfile
--- ports.orig/devel/atk/Portfile 2011-07-12 06:30:20.000000000 -0700
+++ ports/devel/atk/Portfile 2011-10-13 18:38:07.000000000 -0700
@@ -31,12 +31,10 @@
port:gtk-doc
--- ports.orig/devel/atk/Portfile 2012-05-28 17:30:31.000000000 -0700
+++ ports/devel/atk/Portfile 2012-05-30 00:10:54.000000000 -0700
@@ -27,8 +27,7 @@
depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
- port:gettext \
- port:libiconv
+ port:gettext
archcheck.files-append lib/libglib-2.0.dylib \
- lib/libintl.dylib \
- lib/libiconv.dylib
+ lib/libintl.dylib
configure.args --enable-static \
--disable-introspection
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/gettext/Portfile ports/devel/gettext/Portfile
--- ports.orig/devel/gettext/Portfile 2011-07-25 23:30:20.000000000 -0700
+++ ports/devel/gettext/Portfile 2011-10-13 18:38:08.000000000 -0700
+++ ports/devel/gettext/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -46,12 +46,10 @@
configure.args-append --without-git \
--without-cvs
@@ -35,29 +64,31 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/gettext/Port
test.run yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/glib2/Portfile ports/devel/glib2/Portfile
--- ports.orig/devel/glib2/Portfile 2011-07-27 23:30:20.000000000 -0700
+++ ports/devel/glib2/Portfile 2011-10-13 18:38:08.000000000 -0700
@@ -41,12 +41,10 @@
--- ports.orig/devel/glib2/Portfile 2012-05-17 21:00:38.000000000 -0700
+++ ports/devel/glib2/Portfile 2012-05-30 00:11:31.000000000 -0700
@@ -41,13 +41,11 @@
patch-gio_gdbusprivate.c.diff
depends_lib port:gettext \
- port:libiconv \
port:zlib \
port:libffi \
path:bin/perl:perl5
archcheck.files lib/libintl.dylib \
- lib/libiconv.dylib \
lib/libz.dylib
lib/libz.dylib \
lib/libffi.dylib
use_autoconf yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/gnome/gtk2/Portfile ports/gnome/gtk2/Portfile
--- ports.orig/gnome/gtk2/Portfile 2011-09-08 10:30:22.000000000 -0700
+++ ports/gnome/gtk2/Portfile 2011-10-13 19:41:49.000000000 -0700
@@ -43,9 +43,20 @@
path:lib/pkgconfig/pango.pc:pango \
port:gdk-pixbuf2
--- ports.orig/gnome/gtk2/Portfile 2012-05-02 11:01:07.000000000 -0700
+++ ports/gnome/gtk2/Portfile 2012-05-30 09:46:48.000000000 -0700
@@ -47,10 +47,20 @@
# port:librsvg
-depends_run port:shared-mime-info
-depends_run port:shared-mime-info \
- port:hicolor-icon-theme
-
+# If shared-mime-info is installed it causes GTK+ to use Glib's GIO to
+# do automatic file type guessing and to disable its own internal
@@ -65,18 +96,18 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/gnome/gtk2/Portfil
+# (/usr/share/mime) isn't present. Avoid using GIO and always use GTK+'s
+# internal guesser.
+# depends_run port:shared-mime-info
+depends_run port:hicolor-icon-theme
+
+# Don't have the GDK pixbuf loaders and immodules as loadable modules.
+# This would require running install_name_tool on the .so files to make
+# the libraries they depend on relative to @executable_path, not the
+# MacPorts installation directory.
+# Don't have the immodules as loadable modules. This would require
+# running install_name_tool on the .so files to make the libraries they
+# depend on relative to @executable_path, not the MacPorts installation
+# directory.
configure.args --enable-static \
+ --with-included-loaders \
+ --with-included-immodules \
--disable-glibtest \
--disable-introspection \
gio_can_sniff=yes
@@ -87,19 +98,6 @@
@@ -92,19 +102,6 @@
xinstall -d ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README \
${destroot}${docdir}
@@ -96,7 +127,7 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/gnome/gtk2/Portfil
}
platform darwin 8 {
@@ -115,7 +113,7 @@
@@ -123,7 +120,7 @@
}
if {[variant_isset universal]} {
@@ -106,11 +137,11 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/gnome/gtk2/Portfil
set cups ${universal_sysroot}${cups}
}
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/graphics/fontconfig/Portfile ports/graphics/fontconfig/Portfile
--- ports.orig/graphics/fontconfig/Portfile 2011-05-25 05:00:19.000000000 -0700
+++ ports/graphics/fontconfig/Portfile 2011-10-13 18:38:08.000000000 -0700
@@ -25,12 +25,10 @@
sha1 570fb55eb14f2c92a7b470b941e9d35dbfafa716 \
rmd160 fefee412cad4fa71b573e997e14f1df12f439be2
--- ports.orig/graphics/fontconfig/Portfile 2012-05-10 09:00:32.000000000 -0700
+++ ports/graphics/fontconfig/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -27,12 +27,10 @@
depends_build port:pkgconfig
-depends_lib port:libiconv \
- port:expat \
@@ -122,10 +153,26 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/graphics/fontconfi
+archcheck.files lib/libexpat.dylib \
lib/libfreetype.dylib
set add_fonts /usr/X11R6/lib/X11/fonts
if {${os.platform} == "darwin" && ${os.major} < 9} {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/graphics/gdk-pixbuf2/Portfile ports/graphics/gdk-pixbuf2/Portfile
--- ports.orig/graphics/gdk-pixbuf2/Portfile 2012-05-15 04:30:33.000000000 -0700
+++ ports/graphics/gdk-pixbuf2/Portfile 2012-05-30 09:47:13.000000000 -0700
@@ -47,7 +47,12 @@
}
}
+# Don't have the GDK image loaders as loadable modules. This would
+# require running install_name_tool on the .so files to make the
+# libraries they depend on relative to @executable_path, not the
+# MacPorts installation directory.
configure.args --with-libjasper \
+ --with-included-loaders \
--enable-introspection=no
test.run yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/perl/p5-locale-gettext/Portfile ports/perl/p5-locale-gettext/Portfile
--- ports.orig/perl/p5-locale-gettext/Portfile 2011-08-15 10:00:54.000000000 -0700
+++ ports/perl/p5-locale-gettext/Portfile 2011-10-13 18:38:08.000000000 -0700
+++ ports/perl/p5-locale-gettext/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -22,7 +22,7 @@
rmd160 767adfce05b8fe77ddd7d3814951822746cf6e4b
@@ -136,8 +183,8 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/perl/p5-locale-get
if {[variant_isset universal]} {
set archflags ${configure.universal_cflags}
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py26-gobject/Portfile ports/python/py26-gobject/Portfile
--- ports.orig/python/py26-gobject/Portfile 2011-09-13 14:00:24.000000000 -0700
+++ ports/python/py26-gobject/Portfile 2011-10-13 18:38:08.000000000 -0700
--- ports.orig/python/py26-gobject/Portfile 2012-04-14 04:30:34.000000000 -0700
+++ ports/python/py26-gobject/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -35,7 +35,6 @@
depends_lib path:${prefix}/lib/pkgconfig/glib-2.0.pc:glib2 \
port:libxslt \
@@ -148,7 +195,7 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py26-gobjec
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py27-libxml2/files/patch-setup.py.diff ports/python/py27-libxml2/files/patch-setup.py.diff
--- ports.orig/python/py27-libxml2/files/patch-setup.py.diff 2010-11-29 21:30:48.000000000 -0800
+++ ports/python/py27-libxml2/files/patch-setup.py.diff 2011-10-13 18:38:08.000000000 -0700
+++ ports/python/py27-libxml2/files/patch-setup.py.diff 2012-05-30 00:08:06.000000000 -0700
@@ -1,6 +1,6 @@
--- setup.py.orig 2007-10-11 15:24:20.000000000 +0200
+++ setup.py 2007-10-11 15:24:54.000000000 +0200
@@ -166,10 +213,10 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py27-libxml
xml_includes=""
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/help2man/Portfile ports/textproc/help2man/Portfile
--- ports.orig/textproc/help2man/Portfile 2011-10-07 20:00:24.000000000 -0700
+++ ports/textproc/help2man/Portfile 2011-10-13 18:38:08.000000000 -0700
@@ -23,7 +23,7 @@
rmd160 dc3f283bceb8216d571ca879a37e7f83255dc412
--- ports.orig/textproc/help2man/Portfile 2012-04-05 23:30:23.000000000 -0700
+++ ports/textproc/help2man/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -22,7 +22,7 @@
sha256 13599a89080628617f31ca1e7eee38d0b11b2c088708c14eba35b99d67b23cb4
depends_lib port:perl5.12 port:p5.12-locale-gettext \
- port:gettext port:libiconv
@@ -178,24 +225,20 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/help2man/
configure.perl ${prefix}/bin/perl5.12
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/libxml2/Portfile ports/textproc/libxml2/Portfile
--- ports.orig/textproc/libxml2/Portfile 2011-07-13 12:00:20.000000000 -0700
+++ ports/textproc/libxml2/Portfile 2011-10-13 18:38:08.000000000 -0700
@@ -21,10 +21,9 @@
--- ports.orig/textproc/libxml2/Portfile 2012-03-22 15:30:30.000000000 -0700
+++ ports/textproc/libxml2/Portfile 2012-05-30 00:13:53.000000000 -0700
@@ -22,7 +22,7 @@
sha1 859dd535edbb851cc15b64740ee06551a7a17d40 \
rmd160 30709622cfe3e2175e73d6701b7e19a25ab5ac47
-depends_lib port:libiconv port:zlib
+depends_lib port:zlib
-archcheck.files lib/libiconv.dylib \
- lib/libz.dylib
+archcheck.files lib/libz.dylib
post-extract {
reinplace "s|/etc|${prefix}/etc|g" \
reinplace -locale C "s|/etc|${prefix}/etc|g" \
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/libxslt/Portfile ports/textproc/libxslt/Portfile
--- ports.orig/textproc/libxslt/Portfile 2011-07-07 08:30:19.000000000 -0700
+++ ports/textproc/libxslt/Portfile 2011-10-13 18:38:08.000000000 -0700
+++ ports/textproc/libxslt/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -30,8 +30,7 @@
sha1 69f74df8228b504a87e2b257c2d5238281c65154 \
rmd160 fc7630352ae5772d25fc8132a373d477fb8d8d5f
@@ -207,13 +250,13 @@ diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/libxslt/P
configure.args --mandir=${prefix}/share/man \
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/x11/pango/Portfile ports/x11/pango/Portfile
--- ports.orig/x11/pango/Portfile 2011-07-29 19:00:21.000000000 -0700
+++ ports/x11/pango/Portfile 2011-10-13 19:35:24.000000000 -0700
@@ -102,6 +102,7 @@
configure.args \
--enable-static \
+ --with-included-modules \
--disable-introspection \
--without-x
--- ports.orig/x11/pango/Portfile 2012-05-30 00:08:06.000000000 -0700
+++ ports/x11/pango/Portfile 2012-05-30 00:16:09.000000000 -0700
@@ -95,6 +95,7 @@
}
configure.args --enable-static \
+ --with-included-modules \
--disable-introspection \
--disable-silent-rules \
--without-x

8
zenmap/install_scripts/macosx/README
View File

@@ -46,8 +46,8 @@ with MacPorts 2.0.3 on Mac OS X 10.6.8.
1. Install MacPorts.
export PATH=/usr/bin:/bin:/usr/sbin:/sbin
export PREFIX=$HOME/macports-10.5
tar xzvf MacPorts-2.0.3.tar.gz
cd MacPorts-2.0.3
tar xzvf MacPorts-2.1.1.tar.gz
cd MacPorts-2.1.1
./configure --with-no-root-privileges --prefix=$PREFIX --with-tclpackage=$PREFIX/Library/Tcl --with-applications-dir=$PREFIX/Applications
make
make install
@@ -62,7 +62,7 @@ with MacPorts 2.0.3 on Mac OS X 10.6.8.
cd $PREFIX
mkdir ports
ln -s var/macports/sources/rsync.macports.org/release/tarballs/ports ports.orig
for x in devel/atk devel/gettext devel/glib2 gnome/gtk2 graphics/fontconfig perl/p5-locale-gettext python/py26-gobject python/py27-libxml2 textproc/help2man textproc/libxml2 textproc/libxslt; do
for x in archivers/xz devel/apr-util devel/atk devel/gettext devel/glib2 gnome/gtk2 graphics/fontconfig graphics/gdk-pixbuf2 perl/p5-locale-gettext python/py26-gobject python/py27-libxml2 textproc/help2man textproc/libxml2 textproc/libxslt x11/pango; do
mkdir -v -p ports/$x;
cp -R ports.orig/$x ports/$(dirname $x);
done
@@ -75,7 +75,7 @@ with MacPorts 2.0.3 on Mac OS X 10.6.8.
file:///Users/user/macports-10.5/ports
above the rsync line. (Replace "user" with your user name.)
7. Install the dependencies of Zenmap.
$PREFIX/bin/port install py26-gtk py26-py2app
$PREFIX/bin/port install py26-gtk py26-py2app apr apr-util
Here are instructions for updating the patch to keep up with MacPorts
changes. First, sync the original ports tree.