CVS commit: pkgsrc/security/sslsplit

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Mon Dec 30 22:17:29 UTC 2019

Modified Files:
        pkgsrc/security/sslsplit: Makefile distinfo
Added Files:
        pkgsrc/security/sslsplit/patches: patch-GNUmakefile patch-main.c

Log Message:
security/sslsplit: update to 0.5.5.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/sslsplit/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/sslsplit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/sslsplit/patches/patch-GNUmakefile \
    pkgsrc/security/sslsplit/patches/patch-main.c

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

Modified files:

Index: pkgsrc/security/sslsplit/Makefile
diff -u pkgsrc/security/sslsplit/Makefile:1.4 pkgsrc/security/sslsplit/Makefile:1.5
--- pkgsrc/security/sslsplit/Makefile:1.4       Sat Mar  5 11:29:26 2016
+++ pkgsrc/security/sslsplit/Makefile   Mon Dec 30 22:17:29 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/03/05 11:29:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2019/12/30 22:17:29 rhialto Exp $
 
-DISTNAME=      sslsplit-0.4.10
-PKGREVISION=   1
+DISTNAME=      sslsplit-0.5.5
 CATEGORIES=    security
 MASTER_SITES=  http://mirror.roe.ch/rel/sslsplit/
 EXTRACT_SUFX=  .tar.bz2
@@ -16,6 +15,7 @@ USE_TOOLS+=   gmake
 
 MAKE_ENV+=     LIBEVENT_BASE=${BUILDLINK_PREFIX.libevent}
 MAKE_ENV+=     OPENSSL_BASE=${BUILDLINK_PREFIX.openssl}
+MAKE_ENV+=     LIBNET_BASE=${BUILDLINK_PREFIX.libnet11}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
@@ -24,5 +24,6 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/sslsplit.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/libnet11/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/sslsplit/distinfo
diff -u pkgsrc/security/sslsplit/distinfo:1.2 pkgsrc/security/sslsplit/distinfo:1.3
--- pkgsrc/security/sslsplit/distinfo:1.2       Wed Nov  4 01:18:11 2015
+++ pkgsrc/security/sslsplit/distinfo   Mon Dec 30 22:17:29 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:18:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/12/30 22:17:29 rhialto Exp $
 
-SHA1 (sslsplit-0.4.10.tar.bz2) = 6027a3fdb356cdd2dbd3ac566296ca779db0d076
-RMD160 (sslsplit-0.4.10.tar.bz2) = 1c41142c6d27046126ccc3b3dbbb0c4110d6147a
-SHA512 (sslsplit-0.4.10.tar.bz2) = c169c55dfb203525863c4c337ef3459b3ec15ee8c7f5b544e5545a4d48efc79f798715b37234982e955589b55d9325ce29f30c9dd04a26e75de01aed6c20258b
-Size (sslsplit-0.4.10.tar.bz2) = 266830 bytes
+SHA1 (sslsplit-0.5.5.tar.bz2) = 1e861265cfb0e9738a325155a58c52380261d640
+RMD160 (sslsplit-0.5.5.tar.bz2) = 9835bd8286383453a916aa906516b3ee60b85e2b
+SHA512 (sslsplit-0.5.5.tar.bz2) = 1d4968382659e975cd59692f3de80d79831a7842c9b909bb3cefedb5e2928254394e0f593c3409e3d5b1d0b192d8f8123ae10b08cecfd65584d790437d9f3d2a
+Size (sslsplit-0.5.5.tar.bz2) = 532788 bytes
+SHA1 (patch-GNUmakefile) = 0d6f386ffbaacaaa5bcfdb514e7c1272d696bbfc
+SHA1 (patch-main.c) = b0483283a99cf2aaca5248dcd2a66a64e7d0cd39

Added files:

Index: pkgsrc/security/sslsplit/patches/patch-GNUmakefile
diff -u /dev/null pkgsrc/security/sslsplit/patches/patch-GNUmakefile:1.1
--- /dev/null   Mon Dec 30 22:17:29 2019
+++ pkgsrc/security/sslsplit/patches/patch-GNUmakefile  Mon Dec 30 22:17:29 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-GNUmakefile,v 1.1 2019/12/30 22:17:29 rhialto Exp $
+
+Our package libnet11 is installed in slightly different directories.
+
+--- GNUmakefile.orig   2019-08-30 11:09:00.000000000 +0000
++++ GNUmakefile
+@@ -335,9 +335,9 @@ endif
+ 
+ # Always search filesystem for libnet because libnet-config is unreliable
+ ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR)
+-LIBNET_FOUND:=        $(call locate,libnet,include/libnet-1.1/libnet.h,$(LIBNET_BASE))
++LIBNET_FOUND:=        $(call locate,libnet,include/libnet11/libnet.h,$(LIBNET_BASE))
+ ifdef LIBNET_FOUND
+-LIBNET_FOUND_INC:=    $(LIBNET_FOUND)/include/libnet-1.1
++LIBNET_FOUND_INC:=    $(LIBNET_FOUND)/include/libnet11
+ else
+ LIBNET_FOUND:=        $(call locate,libnet,include/libnet.h,$(LIBNET_BASE))
+ LIBNET_FOUND_INC:=    $(LIBNET_FOUND)/include
+@@ -367,7 +367,7 @@ endif
+ ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR)
+ ifdef LIBNET_FOUND
+ PKG_CPPFLAGS+=        -I$(LIBNET_FOUND_INC)
+-PKG_LDFLAGS+= -L$(LIBNET_FOUND)/lib
++PKG_LDFLAGS+= -L$(LIBNET_FOUND)/lib/libnet11
+ PKG_LIBS+=    -lnet
+ endif
+ ifdef LIBPCAP_FOUND
Index: pkgsrc/security/sslsplit/patches/patch-main.c
diff -u /dev/null pkgsrc/security/sslsplit/patches/patch-main.c:1.1
--- /dev/null   Mon Dec 30 22:17:29 2019
+++ pkgsrc/security/sslsplit/patches/patch-main.c       Mon Dec 30 22:17:29 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-main.c,v 1.1 2019/12/30 22:17:29 rhialto Exp $
+
+Our libnet11 package does not have the libnet_version() function,
+apparently similar to OpenBSD.
+
+--- main.c.orig        2019-08-30 11:09:00.000000000 +0000
++++ main.c
+@@ -119,7 +119,7 @@ main_version(void)
+       fprintf(stderr, "rtlinked against libevent %s\n", event_get_version());
+ #ifndef WITHOUT_MIRROR
+       fprintf(stderr, "compiled against libnet %s\n", LIBNET_VERSION);
+-#ifndef __OpenBSD__
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+       const char *lnv = libnet_version();
+       if (!strncmp(lnv, "libnet version ", 15))
+               lnv += 15;