[arch-commits] Commit in nmap/trunk (PKGBUILD kdesu.patch)

[Gaetan Bisson]

    Date: Thursday, November 29, 2012 @ 21:53:54
  Author: bisson
Revision: 172140

upstream update

Modified:
  nmap/trunk/PKGBUILD
Deleted:
  nmap/trunk/kdesu.patch

-------------+
 PKGBUILD    |   19 ++++++-------------
 kdesu.patch |   14 --------------
 2 files changed, 6 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-30 00:38:49 UTC (rev 172139)
+++ PKGBUILD	2012-11-30 02:53:54 UTC (rev 172140)
@@ -4,29 +4,21 @@
 # Contributor: Hugo Doria <hugo at archlinux.org>
 
 pkgname=nmap
-pkgver=6.01
-pkgrel=3
+pkgver=6.25
+pkgrel=1
 pkgdesc='Utility for network discovery and security auditing'
 url='http://nmap.org/'
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('pygtk')
 optdepends=('pygtk: zenmap')
-depends=('pcre' 'openssl' 'libpcap' 'lua51')
-source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2"
-        'kdesu.patch')
-sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a'
-          '159bc1243564d3a9dee820291bf07168870cbaf6')
+depends=('pcre' 'openssl' 'libpcap' 'lua')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# Show icon only if runnable; see FS#12045
-	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 \
@@ -37,6 +29,7 @@
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	make DESTDIR="${pkgdir}" install
 
 	rm "${pkgdir}"/usr/bin/uninstall_zenmap

Deleted: kdesu.patch
===================================================================
--- kdesu.patch	2012-11-30 00:38:49 UTC (rev 172139)
+++ kdesu.patch	2012-11-30 02:53:54 UTC (rev 172140)
@@ -1,14 +0,0 @@
-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";;