[arch-commits] CVS update of extra/network/nmap (PKGBUILD zenmap_pixmaps.patch)

[Dan McGee]

    Date: Wednesday, February 27, 2008 @ 00:02:54
  Author: dan
    Path: /home/cvs-extra/extra/network/nmap

   Added: zenmap_pixmaps.patch (1.1)
Modified: PKGBUILD (1.51 -> 1.52)

upgpkg: nmap 4.53-2
    Fix FS#9227, zenmap pixmap location


----------------------+
 PKGBUILD             |   14 ++++++++----
 zenmap_pixmaps.patch |   57 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 4 deletions(-)


Index: extra/network/nmap/PKGBUILD
diff -u extra/network/nmap/PKGBUILD:1.51 extra/network/nmap/PKGBUILD:1.52
--- extra/network/nmap/PKGBUILD:1.51	Sun Jan 27 21:24:50 2008
+++ extra/network/nmap/PKGBUILD	Wed Feb 27 00:02:53 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.51 2008/01/28 02:24:50 dan Exp $
+# $Id: PKGBUILD,v 1.52 2008/02/27 05:02:53 dan Exp $
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=nmap
 pkgver=4.53
-pkgrel=1
+pkgrel=2
 pkgdesc="A network exploration tool and security/port scanner"
 arch=(i686 x86_64)
 url="http://nmap.org"
@@ -12,10 +12,17 @@
 # python is needed for zenmap
 makedepends=('python')
 options=('!makeflags')
-source=(http://download.insecure.org/nmap/dist/$pkgname-$pkgver.tgz)
+source=(http://download.insecure.org/nmap/dist/$pkgname-$pkgver.tgz
+        zenmap_pixmaps.patch)
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  # patch so zenmap pixmaps are installed in a subdirectory
+  patch -Np1 < ../zenmap_pixmaps.patch
+  # super ugly- we have to move these in the source too
+  mkdir zenmap/share/pixmaps/zenmap
+  mv zenmap/share/pixmaps/{*.png,*.svg} zenmap/share/pixmaps/zenmap/
+
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR="$startdir/pkg" install
@@ -27,4 +34,3 @@
   install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums=('0d86c1c4fa55e936d0b7c8051f7036e9')
Index: extra/network/nmap/zenmap_pixmaps.patch
diff -u /dev/null extra/network/nmap/zenmap_pixmaps.patch:1.1
--- /dev/null	Wed Feb 27 00:02:54 2008
+++ extra/network/nmap/zenmap_pixmaps.patch	Wed Feb 27 00:02:54 2008
@@ -0,0 +1,57 @@
+diff -aur nmap-4.53.old/zenmap/setup.py nmap-4.53/zenmap/setup.py
+--- nmap-4.53.old/zenmap/setup.py	2008-02-26 22:53:56.000000000 -0600
++++ nmap-4.53/zenmap/setup.py	2008-02-26 22:56:43.000000000 -0600
+@@ -37,7 +37,7 @@
+ # Directories for POSIX operating systems
+ # These are created after a "install" or "py2exe" command
+ # These directories are relative to the installation or dist directory
+-pixmaps_dir = os.path.join('share', 'pixmaps')
++pixmaps_dir = os.path.join('share', 'pixmaps', APP_NAME)
+ icons_dir = os.path.join('share', 'icons')
+ locale_dir = os.path.join('share', APP_NAME, 'locale')
+ config_dir = os.path.join('share', APP_NAME, 'config')
+diff -aur nmap-4.53.old/zenmap/zenmapCore/BasePaths.py nmap-4.53/zenmap/zenmapCore/BasePaths.py
+--- nmap-4.53.old/zenmap/zenmapCore/BasePaths.py	2008-02-26 22:53:56.000000000 -0600
++++ nmap-4.53/zenmap/zenmapCore/BasePaths.py	2008-02-26 22:55:36.000000000 -0600
+@@ -42,7 +42,7 @@
+                   target_list = 'target_list.txt',
+                   wizard = 'wizard.xml',
+                   options = 'options.xml',
+-                  pixmaps_dir = os.path.join('share', 'pixmaps'),
++                  pixmaps_dir = os.path.join('share', 'pixmaps', APP_NAME),
+                   i18n_dir = os.path.join('share','locale'),
+                   i18n_message_file = APP_NAME + '.mo',
+                   scan_results_extension = 'usr',  # comes from umit scan result
+@@ -50,7 +50,7 @@
+                   user_home = HOME,
+                   basic_search_sequence = [HOME, CURRENT_DIR],
+                   config_search_sequence = [HOME, CURRENT_DIR],
+-                  pixmaps_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'pixmaps'),
++                  pixmaps_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'pixmaps', APP_NAME),
+                                              HOME],
+                   i18n_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'locale'), HOME],
+                   db = APP_NAME + ".db",
+@@ -69,8 +69,9 @@
+                                                      CURRENT_DIR, '/etc'],
+                            pixmaps_search_sequence = [os.path.join(CURRENT_DIR,
+                                                                    'share',
+-                                                                   'pixmaps'),
+-                                                      '/usr/share/pixmaps',
++                                                                   'pixmaps',
++																   APP_NAME),
++                                                      '/usr/share/pixmaps/zenmap',
+                                                       '/opt/' + APP_NAME, HOME],
+                            i18n_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'locale'),
+                                                    '/usr/share/locale',
+diff -aur nmap-4.53.old/zenmap/zenmapCore/Paths.py nmap-4.53/zenmap/zenmapCore/Paths.py
+--- nmap-4.53.old/zenmap/zenmapCore/Paths.py	2008-02-26 22:53:56.000000000 -0600
++++ nmap-4.53/zenmap/zenmapCore/Paths.py	2008-02-26 22:56:11.000000000 -0600
+@@ -45,7 +45,7 @@
+ LOCALE_DIR = join(main_dir, "share", APP_NAME, "locale")
+ MISC_DIR = join(main_dir, "share", APP_NAME, "misc")
+ ICONS_DIR = join(main_dir, "share", "icons")
+-PIXMAPS_DIR = join(main_dir, "share", "pixmaps")
++PIXMAPS_DIR = join(main_dir, "share", "pixmaps", APP_NAME)
+ DOCS_DIR = join(main_dir, "share", APP_NAME, "docs")
+ 
+