summaryrefslogtreecommitdiff
path: root/extra/nmap
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-08-19 00:04:07 +0000
committerroot <root@rshg054.dnsready.net>2012-08-19 00:04:07 +0000
commitc512f9eb344575ac6bce0b13729c05e1760cd094 (patch)
tree8d60a9bd559a941bba52a67170900c159d2024eb /extra/nmap
parent948da5eabcbf8d74270e661d0730ba1c203913f5 (diff)
Sun Aug 19 00:04:07 UTC 2012
Diffstat (limited to 'extra/nmap')
-rw-r--r--extra/nmap/PKGBUILD12
-rw-r--r--extra/nmap/kdesu.patch14
2 files changed, 22 insertions, 4 deletions
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index b519d8c37..1609326b3 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 161987 2012-06-17 23:52:34Z bisson $
+# $Id: PKGBUILD 165381 2012-08-17 08:46:12Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=nmap
pkgver=6.01
-pkgrel=1
+pkgrel=2
pkgdesc='Utility for network discovery and security auditing'
url='http://nmap.org/'
arch=('i686' 'x86_64')
@@ -13,8 +13,10 @@ license=('GPL')
makedepends=('pygtk')
optdepends=('pygtk: zenmap')
depends=('pcre' 'openssl' 'libpcap' 'lua')
-source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2"
+ 'kdesu.patch')
+sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a'
+ '159bc1243564d3a9dee820291bf07168870cbaf6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,6 +25,8 @@ build() {
echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop
echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop
+ patch -p1 -i ../kdesu.patch # FS#31158
+
./configure \
--prefix=/usr \
--libexecdir=/usr/lib \
diff --git a/extra/nmap/kdesu.patch b/extra/nmap/kdesu.patch
new file mode 100644
index 000000000..daed631d6
--- /dev/null
+++ b/extra/nmap/kdesu.patch
@@ -0,0 +1,14 @@
+diff -Naur old/zenmap/install_scripts/unix/su-to-zenmap.sh new/zenmap/install_scripts/unix/su-to-zenmap.sh
+--- old/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:34:05.863827354 +1000
++++ new/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:35:53.872952226 +1000
+@@ -40,8 +40,8 @@
+ fi
+ case $SU_TO_ROOT_X in
+ gksu) gksu -u "$PRIV" "$COMMAND";;
+- kdesu) kdesu -u "$PRIV" "$COMMAND";;
+- kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
++ kdesu) kdesu -u "$PRIV" -c "$COMMAND";;
++ kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";;
+ ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
+ # As a last resort, open a new xterm use sudo/su
+ sdterm) xterm -e "sudo -u $PRIV $COMMAND";;