Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Apr 2020 20:17:22 +0000 (UTC)
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r531789 - head/net/scapy
Message-ID:  <202004152017.03FKHMkH089431@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bofh
Date: Wed Apr 15 20:17:22 2020
New Revision: 531789
URL: https://svnweb.freebsd.org/changeset/ports/531789

Log:
  net/scapy: Fix FreeBSD HEAD CI
  
  - After introducing nexthop objects in base@r359823 FreeBSD CI is failing
    as netstat header has changed from Use to Nhop#. This patch is a
    temporary workaround while I will work on libxo implementation in
    scapy.
  - Remove some unchanged files in post-patch
  
  Reported by:	kp

Modified:
  head/net/scapy/Makefile

Modified: head/net/scapy/Makefile
==============================================================================
--- head/net/scapy/Makefile	Wed Apr 15 20:11:19 2020	(r531788)
+++ head/net/scapy/Makefile	Wed Apr 15 20:17:22 2020	(r531789)
@@ -3,7 +3,7 @@
 
 PORTNAME=	scapy
 PORTVERSION=	2.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -66,10 +66,10 @@ post-patch:
 	@${REINPLACE_CMD} "s,share/man/man1,man/man1," ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} "s,pdflatex,pdftex," ${WRKSRC}/scapy/extlib.py
 	@${REINPLACE_CMD} "s,/usr/share/,${LOCALBASE}/share/," \
-		${WRKSRC}/scapy/data.py \
-		${WRKSRC}/scapy/modules/nmap.py \
-	       	${WRKSRC}/scapy/utils6.py
+		${WRKSRC}/scapy/modules/nmap.py
 	@${REINPLACE_CMD} "s,/etc/,${LOCALBASE}/etc/," \
 		${WRKSRC}/scapy/modules/p0f.py
+	@${REINPLACE_CMD} 's|"use" in line|"use" in line or "nhop" in line|' \
+		${WRKSRC}/scapy/arch/unix.py
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004152017.03FKHMkH089431>