commit:     ac0c0a6bbf1a7f83e48c9ac5fd612b8e6ce5ba94
Author:     Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Wed Apr 16 10:39:01 2014 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Wed Apr 16 10:39:01 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=ac0c0a6b

Simplify and fix up compilation of pynids.

---
 net-analyzer/pynids/Manifest                       |  3 +-
 .../pynids/files/pynids-0.6.1-setup-fix.patch      | 61 ++++++++++++++++++++++
 net-analyzer/pynids/pynids-0.6.1.ebuild            | 12 ++++-
 3 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/pynids/Manifest b/net-analyzer/pynids/Manifest
index 24921c7..c665cbd 100644
--- a/net-analyzer/pynids/Manifest
+++ b/net-analyzer/pynids/Manifest
@@ -1,2 +1,3 @@
+AUX pynids-0.6.1-setup-fix.patch 2117 SHA256 
a83827678dd3e189a9bae406cedf07b01523f8db7c5179c5072e73deefef1b5b SHA512 
a5f7afb1c82a7470f11db4e0b8f85dea4f8f2e827749a5c4718dd5c9a1758c7c9f4aca1b4850ba5c2a225e9e0a5364fda2620f434474c88c91fd457895b373c5
 WHIRLPOOL 
b227c4611e8d645bf006ee9784bb4ef9f94df6349826e51f9cbca729242de6e8db72acd67bd19438fee18c091a9d66c071c5f318f8b2814eef62d376908313c6
 DIST pynids-0.6.1.tar.gz 174723 SHA256 
fb7fd5ab32b92017c441c405574d8b77955b05220591e4fa946eea55efa1af86 SHA512 
ae78bc024cde3d708f1d173c6a4e3f483dfa6d4bae3aae73d4daa0c0179cadd36107df7af6ba97d81c59a9658c0b252234f96e9aa7506c97244cfdaee5185a97
 WHIRLPOOL 
5797eab6ca786de716db67b782739bed87b945c6555c00aa0a907518c09f0a3aa89bdbccb0af90f661e52776119ca2d6c8dbb9641185007807d4dff81ab4a4b9
-EBUILD pynids-0.6.1.ebuild 398 SHA256 
2b4be8b1142d71147fda670d39163789c8382bad468de4298107af0905cf67db SHA512 
77dc57de92fdd8163ad2d7b42dd88ec9caafe0a06acaa5d513e8a6c53601d9a42b8a9bcd55e88503017e49ce29aa35916ab7044a8d1c3b6156ec116714f0d73a
 WHIRLPOOL 
45d3fc5ed601d88fb61e2f974fc8f9daf98a6135f85787b49aa5335500d2739b379e21cef241baacfc6cb79e761baedd37e5979d8dc89cf526d7249b8daf7dfe
+EBUILD pynids-0.6.1.ebuild 520 SHA256 
01f00775482bacc01d68efdfff58b01c413cf45964bdf1ad0b0fbaf02882c0e0 SHA512 
c28e052938f04b62cf490012fdacd2a9f439b1157987df3e59da5c208223fe93cc9543489e140e8c7495dff1bb407aeee6625628fb3d8b11d24b26eedf698361
 WHIRLPOOL 
dc20ea0d37b017017471b1a36dbdd6cf4060cf0ebc45b017bd18474ddfb0340401f8ec744352198db4ed11829086020ae8bbdab1e86c1bf7bfc03109e93cffd4

diff --git a/net-analyzer/pynids/files/pynids-0.6.1-setup-fix.patch 
b/net-analyzer/pynids/files/pynids-0.6.1-setup-fix.patch
new file mode 100644
index 0000000..de7a01d
--- /dev/null
+++ b/net-analyzer/pynids/files/pynids-0.6.1-setup-fix.patch
@@ -0,0 +1,61 @@
+diff --git a/setup.py b/setup.py
+index d69a7c6..017ac5b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,38 +16,10 @@ PKGNAME  = 'libnids-1.24'
+ PKGTAR   = PKGNAME + '.tar.gz'
+ BUILDDIR = PKGNAME
+ 
+-INCLUDE_DIRS  = ['/usr/local/include', '/opt/local/include']
+-LIBRARY_DIRS  = ['/usr/local/lib', '/opt/local/lib']
++INCLUDE_DIRS  = ['/usr/include']
++LIBRARY_DIRS  = ['/usr/lib']
+ EXTRA_OBJECTS = []
+ 
+-class nidsMaker(build):
+-    NIDSTAR = PKGTAR
+-    NIDSDIR = BUILDDIR
+-    include_dirs = [ pathjoin(NIDSDIR, 'src') ]
+-    library_dirs = []
+-    extra_objects  = [ pathjoin(NIDSDIR, 'src', 'libnids.a') ]
+-
+-    def buildNids(self):
+-        # extremely crude package builder
+-        try:
+-            os.stat(self.NIDSDIR)
+-            return None           # assume already built
+-        except OSError:
+-            pass
+-
+-        spawn(['tar', '-zxf', self.NIDSTAR], search_path = 1)
+-        os.chdir(self.NIDSDIR)
+-        spawn([pathjoin('.','configure'), 'CFLAGS=-fPIC'])
+-        spawn(['make'], search_path = 1)
+-        os.chdir('..')
+-
+-    def run(self):
+-        self.buildNids()
+-        build.run(self)
+-
+-INCLUDE_DIRS = nidsMaker.include_dirs + INCLUDE_DIRS
+-EXTRA_OBJECTS = nidsMaker.extra_objects + EXTRA_OBJECTS
+-
+ setup (# Distribution meta-data
+         name = "pynids",
+         version = "0.6.1",
+@@ -61,13 +33,12 @@ library offering sniffing, IP defragmentation, TCP stream 
reassembly and TCP
+ port scan detection.
+ -------
+ ''',
+-        cmdclass = {'build': nidsMaker},
+         ext_modules = [ Extension(
+-                            "nidsmodule",
++                            "nids",
+                             #define_macros = [ ("DEBUG", None), ],
+                             sources=["nidsmodule.c"],
+                             include_dirs = INCLUDE_DIRS,
+-                            libraries = ["pcap", "net", "glib-2.0", 
"gthread-2.0"],
++                            libraries = ["pcap", "net", "glib-2.0", 
"gthread-2.0", "nids"],
+                             library_dirs = LIBRARY_DIRS,
+                             extra_objects = EXTRA_OBJECTS
+                         ) 

diff --git a/net-analyzer/pynids/pynids-0.6.1.ebuild 
b/net-analyzer/pynids/pynids-0.6.1.ebuild
index 4e5e453..1b1e68a 100644
--- a/net-analyzer/pynids/pynids-0.6.1.ebuild
+++ b/net-analyzer/pynids/pynids-0.6.1.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-inherit distutils
+PYTHON_DEPEND="2:2.7"
+
+inherit eutils distutils
 
 DESCRIPTION="Python interface for libnids"
 HOMEPAGE="http://jon.oberheide.org/pynids/";
@@ -18,3 +20,9 @@ IUSE=""
 DEPEND="net-libs/libnids"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+       cd ${S}
+       rm libnids-*.tar.gz
+       epatch "${FILESDIR}/${P}-setup-fix.patch"
+}
+

Reply via email to