From 6030f8b148614a039807e4cf41b2b718bf744373 Mon Sep 17 00:00:00 2001
From: Sören Tempel <soeren+git@soeren-tempel.net>
Date: Sun, 20 Mar 2016 00:42:36 +0100
Subject: main/nmap: upgrade to 7.10

---
 main/nmap/APKBUILD             | 16 ++++++++++------
 main/nmap/fortify-source.patch | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 main/nmap/fortify-source.patch

(limited to 'main')

diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index d01962a6b97..fe572b08a1e 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=nmap
-pkgver=7.01
-pkgrel=1
+pkgver=7.10
+pkgrel=0
 pkgdesc="A network exploration tool and security/port scanner"
 url="http://nmap.org"
 arch="all"
@@ -15,7 +15,8 @@ subpackages="
 	$pkgname-nselibs
 	$pkgname-nping
 	$pkgname-ncat"
-source="http://nmap.org/dist/$pkgname-$pkgver.tar.bz2"
+source="http://nmap.org/dist/$pkgname-$pkgver.tar.bz2
+	fortify-source.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
@@ -74,6 +75,9 @@ nping() {
 	mv "$pkgdir"/usr/bin/nping "$subpkgdir"/usr/bin || return 1
 }
 
-md5sums="7fa4edc592184c7addc14f5acb3fe6f7  nmap-7.01.tar.bz2"
-sha256sums="cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705  nmap-7.01.tar.bz2"
-sha512sums="8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7  nmap-7.01.tar.bz2"
+md5sums="4fbc455d3f097755fca9d56ae60fa5bc  nmap-7.10.tar.bz2
+cb569526cad25daaf60eb3fec751ebc7  fortify-source.patch"
+sha256sums="58cf8896d09057d1c3533f430c06b22791d0227ebbb93dede2ccb73693ed4b4b  nmap-7.10.tar.bz2
+afe6c342d3253a6de5117dd0a5f23cbcb4af2325fea739e01034df8582fdf884  fortify-source.patch"
+sha512sums="38bdbc1902875db150faf2051d90d4200dd3c2ca2abbd7dbe55981899e90c1ab173f84d9d76f1a3d4d3ff1edf927373f948c12cfcb0eae79d8ede20607308e6f  nmap-7.10.tar.bz2
+2d1f6e290723ac643f456a0e1ac95c4c966106cf2ab743839d25c835bf0141dc2d6bfee19285c3518d4c5f553b0505dabe5a496b769ba47b7adb03e791f05b8d  fortify-source.patch"
diff --git a/main/nmap/fortify-source.patch b/main/nmap/fortify-source.patch
new file mode 100644
index 00000000000..7eabead8be8
--- /dev/null
+++ b/main/nmap/fortify-source.patch
@@ -0,0 +1,16 @@
+-D_FORTIFY_SOURCE=2 is enable in gcc by default on alpine. See the
+010_all_default-fortify-source.patch patch in main/gcc. Disabling
+it here silences a bunch of compiler warnings.
+
+diff -upr nmap-7.10.orig/Makefile.in nmap-7.10/Makefile.in
+--- nmap-7.10.orig/Makefile.in	2016-03-20 00:47:16.555111217 +0100
++++ nmap-7.10/Makefile.in	2016-03-20 00:47:26.348392650 +0100
+@@ -41,7 +41,7 @@ DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+ # Level 1 only makes changes that don't affect "conforming" programs,
+ # while level 2 enforces additional restrictions.
+-DEFS += -D_FORTIFY_SOURCE=2
++# DEFS += -D_FORTIFY_SOURCE=2
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
+ # DEFS += -DMTRACE=1
-- 
cgit v1.2.3