[arch-commits] Commit in nmap/trunk (ChangeLog PKGBUILD)

[Gaetan Bisson]

    Date: Monday, May 21, 2012 @ 19:59:45
  Author: bisson
Revision: 159343

upstream update

Modified:
  nmap/trunk/PKGBUILD
Deleted:
  nmap/trunk/ChangeLog

-----------+
 ChangeLog |   19 -------------------
 PKGBUILD  |   52 ++++++++++++++++++++++++----------------------------
 2 files changed, 24 insertions(+), 47 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2012-05-21 22:25:00 UTC (rev 159342)
+++ ChangeLog	2012-05-21 23:59:45 UTC (rev 159343)
@@ -1,19 +0,0 @@
-2012-02-22  Angel Velasquez <angvp at archlinux.org>
-	* Lua 5.2 rebuild
-
-2008-10-28  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Python 2.6 rebuild.
-
-2008-07-23  Hugo Doria  <hugo at archlinux.org>
-
-	* Added pygtk in optdepends: 4.68-3
-
-2008-07-09  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Fixing the pixmaps path for i686: 4.68
-
-2008-07-09  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.68
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-21 22:25:00 UTC (rev 159342)
+++ PKGBUILD	2012-05-21 23:59:45 UTC (rev 159343)
@@ -1,45 +1,41 @@
 # $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
 # Contributor: Hugo Doria <hugo at archlinux.org>
 
 pkgname=nmap
-pkgver=5.51
-pkgrel=4
-pkgdesc="A network exploration tool and security/port scanner"
+pkgver=6.00
+pkgrel=1
+pkgdesc='Utility for network discovery and security auditing'
+url='http://nmap.org/'
 arch=('i686' 'x86_64')
-url="http://nmap.org"
 license=('GPL')
+options=('!makeflags')
+optdepends=('pygtk: zenmap')
+makedepends=('pygtk')
 depends=('pcre' 'openssl' 'libpcap' 'lua')
-# python is needed for zenmap
-makedepends=('python2')
-optdepends=('pygtk: gui for nmap')
-options=('!makeflags')
-source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0b80d2cb92ace5ebba8095a4c2850275')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('11d8f418e31a85e5b5ad6b4cf98f3c1b5c19ddb2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  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 
+	# 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 
 
-  # Force usage of external libpcap
-  # OSX bug check fails because of missing types
-  # autoreconf fails because our autotools are too new (?)
-  sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--mandir=/usr/share/man \
 
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --libexecdir=/usr/lib
-  make
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
-  # remove zenmap uninstall script
-  rm "${pkgdir}/usr/bin/uninstall_zenmap"
-
-  # install custom GPL2 license
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+	rm "${pkgdir}"/usr/bin/uninstall_zenmap
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }