[94170] trunk/dports/net/honeyd

[jmr at macports.org]

Revision: 94170
          https://trac.macports.org/changeset/94170
Author:   jmr at macports.org
Date:     2012-06-11 06:09:44 -0700 (Mon, 11 Jun 2012)
Log Message:
-----------
honeyd: use libevent1 (#31713), fix setrlimit usage (#22297), fix bypassing destroot when installing some files, use python27

Modified Paths:
--------------
    trunk/dports/net/honeyd/Portfile

Added Paths:
-----------
    trunk/dports/net/honeyd/files/
    trunk/dports/net/honeyd/files/configure.patch
    trunk/dports/net/honeyd/files/darwin_rlimit.patch
    trunk/dports/net/honeyd/files/dpkt_Makefile.patch

Modified: trunk/dports/net/honeyd/Portfile
===================================================================
--- trunk/dports/net/honeyd/Portfile	2012-06-11 11:14:52 UTC (rev 94169)
+++ trunk/dports/net/honeyd/Portfile	2012-06-11 13:09:44 UTC (rev 94170)
@@ -4,7 +4,7 @@
 
 name              honeyd
 version           1.5c
-revision          2
+revision          3
 categories        net
 maintainers       markd
 
@@ -22,17 +22,26 @@
 platforms         darwin
 checksums         md5 9887b44333e380a2205f64fa245cb727
 
-depends_lib       port:libevent \
+depends_lib       port:libevent1 \
 		  port:libdnet \
 		  port:libpcap \
 		  port:pcre \
-		  port:python25 \
-		  port:py25-libdnet \
-		  port:py25-pylibpcap
+		  port:py27-libdnet \
+		  port:py27-pylibpcap
 
+patchfiles        configure.patch dpkt_Makefile.patch
+platform darwin {
+    patchfiles-append   darwin_rlimit.patch
+}
+post-patch {
+    reinplace "s|__PYTHON__|${prefix}/bin/python2.7|" ${worksrcpath}/dpkt/Makefile
+}
+
 configure.args	  --with-python
+configure.env     PATH_PYTHON=${prefix}/bin/python2.7 \
+                  EVENTINC="-I${prefix}/include/libevent1" \
+                  EVENTLIB="-L${prefix}/lib/libevent1 -levent"
 
 variant rrdtool {
 	depends_lib-append	port:rrdtool
 }
-

Added: trunk/dports/net/honeyd/files/configure.patch
===================================================================
--- trunk/dports/net/honeyd/files/configure.patch	                        (rev 0)
+++ trunk/dports/net/honeyd/files/configure.patch	2012-06-11 13:09:44 UTC (rev 94170)
@@ -0,0 +1,11 @@
+--- configure.orig	2007-05-28 16:15:44.000000000 +1000
++++ configure	2012-06-11 22:20:46.000000000 +1000
+@@ -21553,7 +21553,7 @@
+      fi
+      ;;
+   esac
+-else
++elif test -z "$EVENTINC" -o -z "$EVENTLIB"; then
+    if test -f ${prefix}/include/event.h; then
+      EVENTINC="-I${prefix}/include"
+      EVENTLIB="-L${prefix}/lib -levent"

Added: trunk/dports/net/honeyd/files/darwin_rlimit.patch
===================================================================
--- trunk/dports/net/honeyd/files/darwin_rlimit.patch	                        (rev 0)
+++ trunk/dports/net/honeyd/files/darwin_rlimit.patch	2012-06-11 13:09:44 UTC (rev 94170)
@@ -0,0 +1,19 @@
+--- honeyd.c.orig	2009-10-29 20:51:37.000000000 +0100
++++ honeyd.c	2009-10-29 20:53:14.000000000 +0100
+@@ -32,6 +32,7 @@
+ 
+ #include <sys/param.h>
+ #include <sys/types.h>
++#include <limits.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+@@ -450,7 +451,7 @@
+ 
+ 	/* Raising file descriptor limits */
+ 	rl.rlim_max = RLIM_INFINITY;
+-	rl.rlim_cur = RLIM_INFINITY;
++	rl.rlim_cur = ( OPEN_MAX < RLIM_INFINITY) ? OPEN_MAX : RLIM_INFINITY ;
+ 	if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
+ 		/* Linux does not seem to like this */
+ 		if (getrlimit(RLIMIT_NOFILE, &rl) == -1)

Added: trunk/dports/net/honeyd/files/dpkt_Makefile.patch
===================================================================
--- trunk/dports/net/honeyd/files/dpkt_Makefile.patch	                        (rev 0)
+++ trunk/dports/net/honeyd/files/dpkt_Makefile.patch	2012-06-11 13:09:44 UTC (rev 94170)
@@ -0,0 +1,15 @@
+--- dpkt/Makefile.orig	2007-05-28 16:04:50.000000000 +1000
++++ dpkt/Makefile	2012-06-11 22:40:45.000000000 +1000
+@@ -1,10 +1,10 @@
+ # $Id: Makefile,v 1.1.1.1 2005/10/29 18:20:48 provos Exp $
+ 
+ all:
+-	python setup.py build
++	__PYTHON__ setup.py --no-user-cfg build
+ 
+ install:
+-	python setup.py install
++	__PYTHON__ setup.py --no-user-cfg install --root=$(DESTDIR)
+ 
+ test:
+ 	python test.py
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120611/661bb3c6/attachment.html>