[arch-commits] Commit in nmap/repos (3 files)
Douglas Soares de Andrade
douglas at archlinux.org
Wed Jul 9 04:16:14 UTC 2008
Date: Wednesday, July 9, 2008 @ 00:16:14
Author: douglas
Revision: 4715
Merged revisions 3091-4714 via svnmerge from
svn+ssh://archlinux.org/home/svn-packages/nmap/trunk
........
r4714 | douglas | 2008-07-09 01:15:36 -0300 (Qua, 09 Jul 2008) | 2 lines
upgpkg: nmap 4.68-1
Updated for i686: 4.68
........
Modified:
nmap/repos/extra-i686/ (properties)
nmap/repos/extra-i686/PKGBUILD
nmap/repos/extra-i686/zenmap_pixmaps.patch
----------------------+
PKGBUILD | 16 +++++------
zenmap_pixmaps.patch | 66 ++++++++++++-------------------------------------
2 files changed, 25 insertions(+), 57 deletions(-)
Property changes on: nmap/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /nmap/trunk:1-3090
+ /nmap/trunk:1-4714
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-07-09 04:15:36 UTC (rev 4714)
+++ extra-i686/PKGBUILD 2008-07-09 04:16:14 UTC (rev 4715)
@@ -2,8 +2,8 @@
# Maintainer: Dan McGee <dan at archlinux.org>
pkgname=nmap
-pkgver=4.65
-pkgrel=2
+pkgver=4.68
+pkgrel=1
pkgdesc="A network exploration tool and security/port scanner"
arch=(i686 x86_64)
url="http://nmap.org"
@@ -15,18 +15,21 @@
source=(http://download.insecure.org/nmap/dist/$pkgname-$pkgver.tgz
zenmap_pixmaps.patch)
+md5sums=('a1373c992e4b21d8db4d65c6eb8fec42'
+ '91674cf81562064627bc5359277857fb')
+
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 --mandir=/usr/share/man \
--libexecdir=/usr/lib
make || return 1
make DESTDIR="$startdir/pkg" install
+
+ # super ugly- we have to move these in the source too
+ mv zenmap/share/zenmap/pixmaps/{*.png,*.svg} $startdir/pkg/usr/share/pixmaps/zenmap/
# remove zenmap uninstall script
rm "$startdir/pkg/usr/bin/uninstall_zenmap"
@@ -34,6 +37,3 @@
# install custom GPL2 license
install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
}
-
-md5sums=('8bc0b544fe9eadd3e15e905adad91f41'
- '53f6f97ae707e8e7b2e4d38d1c6576a8')
Modified: extra-i686/zenmap_pixmaps.patch
===================================================================
--- extra-i686/zenmap_pixmaps.patch 2008-07-09 04:15:36 UTC (rev 4714)
+++ extra-i686/zenmap_pixmaps.patch 2008-07-09 04:16:14 UTC (rev 4715)
@@ -1,56 +1,24 @@
-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
+diff -Naur nmap-4.68/zenmap/setup.py nmap-4.68-new/zenmap/setup.py
+--- nmap-4.68/zenmap/setup.py 2008-06-06 02:55:01.000000000 -0300
++++ nmap-4.68-new/zenmap/setup.py 2008-07-09 00:57:19.000000000 -0300
+@@ -44,7 +44,7 @@
# 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')
+ data_dir = os.path.join('share', APP_NAME)
+-pixmaps_dir = os.path.join(data_dir, '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 = os.path.join(data_dir, 'locale')
+ config_dir = os.path.join(data_dir, 'config')
+ docs_dir = os.path.join(data_dir, 'docs')
+diff -Naur nmap-4.68/zenmap/zenmapCore/Paths.py nmap-4.68-new/zenmap/zenmapCore/Paths.py
+--- nmap-4.68/zenmap/zenmapCore/Paths.py 2008-06-06 02:32:19.000000000 -0300
++++ nmap-4.68-new/zenmap/zenmapCore/Paths.py 2008-07-09 00:59:22.000000000 -0300
+@@ -60,7 +60,7 @@
+ CONFIG_DIR = join(prefix, "share", APP_NAME, "config")
LOCALE_DIR = join(prefix, "share", APP_NAME, "locale")
MISC_DIR = join(prefix, "share", APP_NAME, "misc")
- ICONS_DIR = join(prefix, "share", "icons")
--PIXMAPS_DIR = join(prefix, "share", "pixmaps")
-+PIXMAPS_DIR = join(prefix, "share", "pixmaps", APP_NAME)
+-PIXMAPS_DIR = join(prefix, "share", "zenmap", "pixmaps")
++PIXMAPS_DIR = join(prefix, "share", "zenmap", "pixmaps", APP_NAME)
DOCS_DIR = join(prefix, "share", APP_NAME, "docs")
+ def get_extra_executable_search_paths():
More information about the arch-commits
mailing list