diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-19 17:54:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-19 17:54:19 -0300 |
| commit | 251b132bc8d5157b996afff54617d2483637aa4b (patch) | |
| tree | 7c1b56c3d3ffaadc49e329930b7eb0be75b328cb /extra/nmap | |
| parent | 3ed19e74567434fe0bc82d835513b5b62f151838 (diff) | |
| parent | 07455ea1de16867b168628e8a9f7f5bffc169a5f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/r8168-lts/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/r8168-lts/PKGBUILD
community-testing/sage-mathematics/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/dhcpcd/PKGBUILD
core/glibc/PKGBUILD
core/net-tools/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/cups/PKGBUILD
extra/maxima/PKGBUILD
extra/scim-hangul/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/subversion/PKGBUILD
extra/telepathy-idle/PKGBUILD
extra/x11vnc/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libxml2/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
testing/binutils/PKGBUILD
testing/calligra/PKGBUILD
testing/dhcp/PKGBUILD
testing/gcc/PKGBUILD
testing/glibc/PKGBUILD
testing/inkscape/PKGBUILD
testing/iproute2/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/PKGBUILD.36
testing/poppler/PKGBUILD
Diffstat (limited to 'extra/nmap')
| -rw-r--r-- | extra/nmap/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/nmap/kdesu.patch | 14 |
2 files changed, 22 insertions, 4 deletions
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index efa432755..24f0a2900 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' 'mips64el') @@ -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";; |