# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344602649 -7200 # Node ID 0a1da67e02dec425d11bdeb03e7f76058dfaef92 # Parent 11b64eba18d72b2ae42a8690211c3f9581967890 Modernize packaging, patch buildconf, use parallel make, and correct URL. diff -r 11b64eba18d7 -r 0a1da67e02de nmap/nmap.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nmap/nmap.patch Fri Aug 10 14:44:09 2012 +0200 @@ -0,0 +1,10 @@ +Index: ndiff/setup.py +--- ndiff/setup.py.orig 2009-06-24 23:35:54 +0200 ++++ ndiff/setup.py 2009-10-18 10:27:48 +0200 +@@ -29,5 +29,5 @@ + + "Installing your distribution's python-dev package may solve this problem.") + + distutils.core.setup(name = u"ndiff", scripts = [u"ndiff"], +- data_files = [(u"share/man/man1", [u"docs/ndiff.1"])], ++ data_files = [(u"man/man1", [u"docs/ndiff.1"])], + cmdclass = {"install_egg_info": null_command, "install": checked_install}) diff -r 11b64eba18d7 -r 0a1da67e02de nmap/nmap.spec --- a/nmap/nmap.spec Fri Aug 10 14:40:55 2012 +0200 +++ b/nmap/nmap.spec Fri Aug 10 14:44:09 2012 +0200 @@ -1,6 +1,6 @@ ## ## nmap.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -31,21 +31,18 @@ Class: BASE Group: Mapping License: GPL -Version: 4.76 -Release: 20090106 +Version: 6.01 +Release: 20120800 # list of sources -Source0: http://nmap.org/dist/nmap-%{version}.tgz +Source0: http://nmap.org/dist/nmap-%{version}.tar.bz2 +Patch0: nmap.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20050615, make, gcc, gcc::with_cxx = yes, bison, flex -PreReq: OpenPKG, openpkg >= 20050615 -BuildPreReq: libpcap, openssl, getopt, pcre -PreReq: libpcap, openssl, getopt, pcre -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, gcc::with_cxx = yes, bison, flex +PreReq: OpenPKG, openpkg >= 20100101 +BuildPreReq: python, libpcap, openssl, getopt, pcre +PreReq: python, libpcap, openssl, getopt, pcre %description Nmap is a utility for network exploration or security auditing. @@ -62,11 +59,12 @@ prog nmap = { version = %{version} url = http://nmap.org/dist/ - regex = nmap-(\d+\.\d+)\.tgz + regex = nmap-(\d+\.\d+)\.(?:tgz|tar\.bz2) } %prep %setup -q + %patch -p0 %{l_shtool} subst \ -e 's;/usr/local/;%{l_prefix}/;g' \ configure */configure @@ -74,10 +72,6 @@ -e 's;\(socklen_t int\);\1 size_t;g' \ aclocal.m4 \ configure - %{l_shtool} subst \ - -e 's;\(md5_block_data_order\);nmap_\1;g' \ - nbase/md32_common.h \ - nbase/nbase_md5.c %build cppflags="%{l_cppflags}" @@ -101,21 +95,20 @@ --with-openssl=%{l_prefix} \ --without-nmapfe \ --without-zenmap - %{l_make} %{l_mflags} + %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT %{l_make} %{l_mflags} install \ prefix=$RPM_BUILD_ROOT%{l_prefix} \ exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \ mandir=$RPM_BUILD_ROOT%{l_prefix}/man rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/icons rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gnome + rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/*/man1 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files %clean - rm -rf $RPM_BUILD_ROOT