Upstream moved to github, there are lots of changes, I've upstreamed our
patches and other fixes.
$ show-reverse-deps net/libdnet
net/arpd
net/snort
net/tcpreplay
security/scanssh
These consumers all package fine.
Upstream now has cmake support, but it is still is worse shape than
autoconf (I've already fixed a lot).
Shared library has new symbols, no removals or size changes.
py-libdnet is only used by net/libdnet's tests, it builds with py3 now,
but the PLIST looks wrong (running out of py porters foo here).
Can someone help me out with the python bits or shall we drop them?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/libdnet/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile 17 Apr 2023 20:29:40 -0000 1.50
+++ Makefile 5 May 2023 22:27:08 -0000
@@ -1,25 +1,23 @@
COMMENT-main= portable low-level networking library
COMMENT-python= python interface to libdnet
-MODPY_EGG_VERSION= 1.12
-REVISION= 14
-DISTNAME= libdnet-${MODPY_EGG_VERSION}
+GH_ACCOUNT= ofalk
+GH_PROJECT= libdnet
+# 1.16.4 release with my merged PRs on top
+GH_COMMIT= 8a0163b38fefdf6184f41645548cfbe306a254b5
+DISTNAME= libdnet-1.16.4
PKGNAME-main= ${DISTNAME}
PKGNAME-python= py-${DISTNAME}
-SHARED_LIBS= dnet 1.0
+SHARED_LIBS= dnet 1.1
CATEGORIES= net
-HOMEPAGE= https://github.com/dugsong/libdnet
# BSD
PERMIT_PACKAGE= Yes
WANTLIB= c
-MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=libdnet/}
-EXTRACT_SUFX= .tgz
-
PSEUDO_FLAVORS= no_python
FLAVOR?=
@@ -35,8 +33,8 @@ CONFIGURE_ARGS += --without-check
.include <bsd.port.arch.mk>
.if ${BUILD_PACKAGES:M-python}
MODULES+= lang/python
-MODPY_VERSION= ${MODPY_DEFAULT_VERSION_2}
CONFIGURE_ARGS+= --with-python
+BUILD_DEPENDS+= lang/cython${MODPY_FLAVOR}
MAKE_FLAGS= PYTHON=${MODPY_BIN}
TEST_DEPENDS= ${FULLPKGNAME-python}:${FULLPKGPATH-python}
TEST_FLAGS= TESTS_ENVIRONMENT=${MODPY_BIN}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/libdnet/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 31 Oct 2013 21:12:12 -0000 1.9
+++ distinfo 5 May 2023 22:18:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdnet-1.12.tgz) = g7MwOXh8+ZmQ6XfO9/GKXV56r/xFBVSKg9Mb01FesCY=
-SIZE (libdnet-1.12.tgz) = 970125
+SHA256 (libdnet-1.16.4-8a0163b3.tar.gz) =
71M91JzvltN3ekO7QcjfrtB331azMFDhKYDlIU3qkY8=
+SIZE (libdnet-1.16.4-8a0163b3.tar.gz) = 684512
Index: patches/patch-src_intf_c
===================================================================
RCS file: /cvs/ports/net/libdnet/patches/patch-src_intf_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_intf_c
--- patches/patch-src_intf_c 11 Mar 2022 19:46:13 -0000 1.3
+++ patches/patch-src_intf_c 5 May 2023 22:20:27 -0000
@@ -1,9 +1,12 @@
Do not issue an SIOCSIFNETMASK before SIOCSIFADDR it is not
needed even if the XXX says otherwise.
---- src/intf.c.orig Mon Jan 9 08:09:49 2006
-+++ src/intf.c Thu Apr 11 16:16:02 2013
-@@ -66,7 +66,13 @@
+pending https://github.com/ofalk/libdnet/pull/92
+
+Index: src/intf.c
+--- src/intf.c.orig
++++ src/intf.c
+@@ -69,7 +69,13 @@
/* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
struct dnet_ifaliasreq {
char ifra_name[IFNAMSIZ];
@@ -18,7 +21,7 @@ needed even if the XXX says otherwise.
struct sockaddr ifra_brdaddr;
struct sockaddr ifra_mask;
int ifra_cookie; /* XXX - IRIX!@#$ */
-@@ -281,7 +287,7 @@ intf_set(intf_t *intf, const struct intf_entry *entry)
+@@ -303,7 +309,7 @@ intf_set(intf_t *intf, const struct intf_entry *entry)
}
/* Set interface address. */
if (entry->intf_addr.addr_type == ADDR_TYPE_IP) {
Index: patches/patch-test_dnet_aton_c
===================================================================
RCS file: patches/patch-test_dnet_aton_c
diff -N patches/patch-test_dnet_aton_c
--- patches/patch-test_dnet_aton_c 11 Mar 2022 19:46:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-http://code.google.com/p/libdnet/issues/detail?id=17
-
---- test/dnet/aton.c.orig Mon Oct 14 17:42:10 2002
-+++ test/dnet/aton.c Thu Jan 20 03:26:57 2011
-@@ -86,7 +86,7 @@ off_aton(char *string, uint16_t *off)
- } else {
- i = strtol(string, &p, 10);
- if (*string == '\0' || (*p != '\0' && *p != '+') ||
-- i > IP_OFFMASK)
-+ i > (IP_OFFMASK << 3))
- return (-1);
- *off = htons(((*p == '+') ? IP_MF : 0) | (i >> 3));
- }
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/libdnet/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 17 Apr 2023 20:21:23 -0000 1.5
+++ pkg/PLIST-main 5 May 2023 22:24:24 -0000
@@ -12,15 +12,18 @@ include/dnet/icmp.h
include/dnet/intf.h
include/dnet/ip.h
include/dnet/ip6.h
+include/dnet/ndisc.h
include/dnet/os.h
include/dnet/rand.h
include/dnet/route.h
+include/dnet/sctp.h
include/dnet/tcp.h
include/dnet/tun.h
include/dnet/udp.h
@static-lib lib/libdnet.a
lib/libdnet.la
@lib lib/libdnet.so.${LIBdnet_VERSION}
+lib/python${MODPY_VERSION}/
@man man/man3/dnet.3
@man man/man8/dnet.8
@bin sbin/dnet
Index: pkg/PLIST-python
===================================================================
RCS file: /cvs/ports/net/libdnet/pkg/PLIST-python,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-python
--- pkg/PLIST-python 17 Apr 2023 20:21:23 -0000 1.7
+++ pkg/PLIST-python 5 May 2023 22:24:24 -0000
@@ -1,2 +1,12 @@
-lib/python${MODPY_VERSION}/site-packages/dnet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
-@so lib/python${MODPY_VERSION}/site-packages/dnet.so
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/EGG-INFO/
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/EGG-INFO/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/EGG-INFO/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/EGG-INFO/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/EGG-INFO/native_libs.txt
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/EGG-INFO/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/EGG-INFO/top_level.txt
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/${MODPY_PYCACHE}dnet.${MODPY_PYC_MAGIC_TAG}pyc
+@so
lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/dnet.${MODPY_PYC_MAGIC_TAG}so
+lib/python${MODPY_VERSION}/site-packages/dnet-1.16.4-py${MODPY_VERSION}-openbsd-7.3-amd64.egg/dnet.py
