[arch-commits] Commit in nmap/repos (6 files)

Gaetan Bisson bisson at archlinux.org
Fri Aug 17 08:46:12 UTC 2012


    Date: Friday, August 17, 2012 @ 04:46:12
  Author: bisson
Revision: 165381

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nmap/repos/extra-i686/PKGBUILD
    (from rev 165380, nmap/trunk/PKGBUILD)
  nmap/repos/extra-i686/kdesu.patch
    (from rev 165380, nmap/trunk/kdesu.patch)
  nmap/repos/extra-x86_64/PKGBUILD
    (from rev 165380, nmap/trunk/PKGBUILD)
  nmap/repos/extra-x86_64/kdesu.patch
    (from rev 165380, nmap/trunk/kdesu.patch)
Deleted:
  nmap/repos/extra-i686/PKGBUILD
  nmap/repos/extra-x86_64/PKGBUILD

--------------------------+
 extra-i686/PKGBUILD      |   84 +++++++++++++++++++++++----------------------
 extra-i686/kdesu.patch   |   14 +++++++
 extra-x86_64/PKGBUILD    |   84 +++++++++++++++++++++++----------------------
 extra-x86_64/kdesu.patch |   14 +++++++
 4 files changed, 116 insertions(+), 80 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-08-17 08:45:29 UTC (rev 165380)
+++ extra-i686/PKGBUILD	2012-08-17 08:46:12 UTC (rev 165381)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=nmap
-pkgver=6.01
-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' 'lua')
-source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a')
-
-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 
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	rm "${pkgdir}"/usr/bin/uninstall_zenmap
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: nmap/repos/extra-i686/PKGBUILD (from rev 165380, nmap/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-08-17 08:46:12 UTC (rev 165381)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=nmap
+pkgver=6.01
+pkgrel=2
+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' 'lua')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2"
+        'kdesu.patch')
+sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a'
+          '159bc1243564d3a9dee820291bf07168870cbaf6')
+
+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 \
+		--mandir=/usr/share/man \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	rm "${pkgdir}"/usr/bin/uninstall_zenmap
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: nmap/repos/extra-i686/kdesu.patch (from rev 165380, nmap/trunk/kdesu.patch)
===================================================================
--- extra-i686/kdesu.patch	                        (rev 0)
+++ extra-i686/kdesu.patch	2012-08-17 08:46:12 UTC (rev 165381)
@@ -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";;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-08-17 08:45:29 UTC (rev 165380)
+++ extra-x86_64/PKGBUILD	2012-08-17 08:46:12 UTC (rev 165381)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=nmap
-pkgver=6.01
-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' 'lua')
-source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a')
-
-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 
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	rm "${pkgdir}"/usr/bin/uninstall_zenmap
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: nmap/repos/extra-x86_64/PKGBUILD (from rev 165380, nmap/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-08-17 08:46:12 UTC (rev 165381)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=nmap
+pkgver=6.01
+pkgrel=2
+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' 'lua')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2"
+        'kdesu.patch')
+sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a'
+          '159bc1243564d3a9dee820291bf07168870cbaf6')
+
+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 \
+		--mandir=/usr/share/man \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	rm "${pkgdir}"/usr/bin/uninstall_zenmap
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: nmap/repos/extra-x86_64/kdesu.patch (from rev 165380, nmap/trunk/kdesu.patch)
===================================================================
--- extra-x86_64/kdesu.patch	                        (rev 0)
+++ extra-x86_64/kdesu.patch	2012-08-17 08:46:12 UTC (rev 165381)
@@ -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";;




More information about the arch-commits mailing list