diff options
Diffstat (limited to 'source/n/nmap')
| -rwxr-xr-x | source/n/nmap/nmap.SlackBuild | 15 | ||||
| -rw-r--r-- | source/n/nmap/nmap.ndiff.mandir.diff | 9 |
2 files changed, 8 insertions, 16 deletions
diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild index 0f331516d..1a20178a5 100755 --- a/source/n/nmap/nmap.SlackBuild +++ b/source/n/nmap/nmap.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,21 +20,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-6.40} +PKGNAM=nmap +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -63,8 +64,6 @@ rm -rf nmap-$VERSION tar xvf $CWD/nmap-$VERSION.tar.?z* || exit 1 cd nmap-$VERSION || exit 1 -zcat $CWD/nmap.ndiff.mandir.diff.gz | patch -p1 || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,6 +71,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +sed -i "s,share/man/man1,man/man1,g" ndiff/setup.py + # --without-nmap-update is needed below to avoid depending on apr and subversion libraries. # It's not worth the feature IMHO. LIBS="-lnl" \ diff --git a/source/n/nmap/nmap.ndiff.mandir.diff b/source/n/nmap/nmap.ndiff.mandir.diff deleted file mode 100644 index 597a31b92..000000000 --- a/source/n/nmap/nmap.ndiff.mandir.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- ./ndiff/setup.py.orig 2009-04-20 14:15:00.000000000 -0500 -+++ ./ndiff/setup.py 2009-04-30 17:28:56.000000000 -0500 -@@ -29,5 +29,5 @@ - + "Installing your distribution's python-dev package may solve this problem.") - - distutils.core.setup(name = u"ndiff", scripts = [u"ndiff"], -- data_files = [(u"share/man/man1", [u"docs/ndiff.1"])], -+ data_files = [(u"man/man1", [u"docs/ndiff.1"])], - cmdclass = {"install_egg_info": null_command, "install": checked_install}) |