CVS commit: pkgsrc/net/scapy

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Oct 17 00:51:49 UTC 2024

Modified Files:
        pkgsrc/net/scapy: Makefile distinfo
Added Files:
        pkgsrc/net/scapy/patches: patch-setup.py

Log Message:
scapy: follow upstream's method of man page installation

Now that it's been fixed upstream, align with how it'll appear (again)
from now on.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/scapy/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/scapy/Makefile
diff -u pkgsrc/net/scapy/Makefile:1.50 pkgsrc/net/scapy/Makefile:1.51
--- pkgsrc/net/scapy/Makefile:1.50      Mon Oct 14 06:45:55 2024
+++ pkgsrc/net/scapy/Makefile   Thu Oct 17 00:51:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2024/10/14 06:45:55 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2024/10/17 00:51:49 gutteridge Exp $
 
 DISTNAME=      scapy-2.6.0
 PKGREVISION=   1
@@ -23,10 +23,11 @@ PYTHON_VERSIONS_INCOMPATIBLE=       39 # py-ip
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
-# Upstream mistakenly removed their scripting to install the man page.
-# https://github.com/secdev/scapy/issues/4549
-post-install:
-       ${MV} ${WRKSRC}/doc/scapy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scapy.1
+SUBST_CLASSES+=                config
+SUBST_STAGE.config=    pre-configure
+SUBST_FILES.config=    setup.py
+SUBST_SED.config+=     -e "s|share/man|${PKGMANDIR}|g"
+SUBST_MESSAGE.config=  Fixing man page paths.
 
 DATE_VAL=      ${DATE} "+%Y%m%d-%H%M%S"
 

Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.22 pkgsrc/net/scapy/distinfo:1.23
--- pkgsrc/net/scapy/distinfo:1.22      Tue Oct  1 23:49:29 2024
+++ pkgsrc/net/scapy/distinfo   Thu Oct 17 00:51:49 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2024/10/01 23:49:29 gutteridge Exp $
+$NetBSD: distinfo,v 1.23 2024/10/17 00:51:49 gutteridge Exp $
 
 BLAKE2s (scapy-2.6.0.tar.gz) = cebfa06ccf9c6ab4b06e58b1df71fef7cda63db37b0f330c06ca62db25502f0b
 SHA512 (scapy-2.6.0.tar.gz) = a5543b44411fcc22eb909e806e729605616ce98ab15ff208ee90ad606265c6604ef295bc0b9b130f22711ffed0ad9fd4c52783c8df7ef79849f7db38b97d9e1d
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = c544db1e6d4cf8c42f7c2b
 SHA1 (patch-scapy_____init____.py) = 9808c8fbe63283862c9e7e65c436b28de19ebe16
 SHA1 (patch-scapy_arch_bpf_supersocket.py) = 7f2ad841643c2e347871b54e476998de403d2a01
 SHA1 (patch-scapy_consts.py) = c897229e444d363e2aeea12cdd7264d3d275f4ab
+SHA1 (patch-setup.py) = 3cb36a40c7b1ca9837e87bc4f63b9bf5b56fcc87

Added files:

Index: pkgsrc/net/scapy/patches/patch-setup.py
diff -u /dev/null pkgsrc/net/scapy/patches/patch-setup.py:1.1
--- /dev/null   Thu Oct 17 00:51:49 2024
+++ pkgsrc/net/scapy/patches/patch-setup.py     Thu Oct 17 00:51:49 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2024/10/17 00:51:49 gutteridge Exp $
+
+Install the man page.
+https://github.com/secdev/scapy/pull/4569/commits/4f33e4d381957e9237402ecc8597d4de23f54b76
+
+--- setup.py.orig      2024-09-28 13:11:32.000000000 +0000
++++ setup.py
+@@ -83,6 +83,7 @@ class BuildPy(build_py):
+ 
+ setup(
+     cmdclass={'sdist': SDist, 'build_py': BuildPy},
++    data_files=[('share/man/man1', ["doc/scapy.1"])],
+     long_description=get_long_description(),
+     long_description_content_type='text/markdown',
+ )