CVS commit: pkgsrc/security/sslsplit

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr 29 09:27:40 UTC 2024

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

Log Message:
sslsplit: Fix building with OpenSSL 3


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/sslsplit/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/sslsplit/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/sslsplit/patches/patch-GNUmakefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/sslsplit/patches/patch-pxyconn.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.9 pkgsrc/security/sslsplit/Makefile:1.10
--- pkgsrc/security/sslsplit/Makefile:1.9       Tue Oct 24 22:11:00 2023
+++ pkgsrc/security/sslsplit/Makefile   Mon Apr 29 09:27:39 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2023/10/24 22:11:00 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2024/04/29 09:27:39 nia Exp $
 
 DISTNAME=      sslsplit-0.5.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security
 MASTER_SITES=  http://mirror.roe.ch/rel/sslsplit/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/security/sslsplit/distinfo
diff -u pkgsrc/security/sslsplit/distinfo:1.6 pkgsrc/security/sslsplit/distinfo:1.7
--- pkgsrc/security/sslsplit/distinfo:1.6       Tue Oct 26 11:18:03 2021
+++ pkgsrc/security/sslsplit/distinfo   Mon Apr 29 09:27:39 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:18:03 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/04/29 09:27:39 nia Exp $
 
 BLAKE2s (sslsplit-0.5.5.tar.bz2) = 55a3b02ec676ea789d2235a12dcbd396b7d9b04edccb3fc66b54e8b31525f0c5
 SHA512 (sslsplit-0.5.5.tar.bz2) = 1d4968382659e975cd59692f3de80d79831a7842c9b909bb3cefedb5e2928254394e0f593c3409e3d5b1d0b192d8f8123ae10b08cecfd65584d790437d9f3d2a
 Size (sslsplit-0.5.5.tar.bz2) = 532788 bytes
-SHA1 (patch-GNUmakefile) = 0d6f386ffbaacaaa5bcfdb514e7c1272d696bbfc
+SHA1 (patch-GNUmakefile) = ff6cdcddb7e83eed98d5d08ac64cc9a89026c103
 SHA1 (patch-main.c) = 5a0515e7bbda4ffc8592be06d53d0d7b92384563
+SHA1 (patch-pxyconn.c) = 913aaf8813ab6c77d84cab479c73a39b1b9a9e4a

Index: pkgsrc/security/sslsplit/patches/patch-GNUmakefile
diff -u pkgsrc/security/sslsplit/patches/patch-GNUmakefile:1.1 pkgsrc/security/sslsplit/patches/patch-GNUmakefile:1.2
--- pkgsrc/security/sslsplit/patches/patch-GNUmakefile:1.1      Mon Dec 30 22:17:29 2019
+++ pkgsrc/security/sslsplit/patches/patch-GNUmakefile  Mon Apr 29 09:27:40 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-GNUmakefile,v 1.1 2019/12/30 22:17:29 rhialto Exp $
+$NetBSD: patch-GNUmakefile,v 1.2 2024/04/29 09:27:40 nia Exp $
 
 Our package libnet11 is installed in slightly different directories.
 
+Let pkgsrc make its own choices about hardening flags.
+
 --- GNUmakefile.orig   2019-08-30 11:09:00.000000000 +0000
 +++ GNUmakefile
 @@ -335,9 +335,9 @@ endif
@@ -25,3 +27,13 @@ Our package libnet11 is installed in sli
  PKG_LIBS+=    -lnet
  endif
  ifdef LIBPCAP_FOUND
+@@ -407,8 +407,7 @@ TPKG_CPPFLAGS:=    $(subst -I,-isystem,$(TP
+ endif
+ 
+ CFLAGS+=      $(PKG_CFLAGS) \
+-              -std=c99 -Wall -Wextra -pedantic \
+-              -D_FORTIFY_SOURCE=2 -fstack-protector-all
++              -std=c99 -Wall -Wextra -pedantic
+ CPPFLAGS+=    $(PKG_CPPFLAGS) $(CPPDEFS) $(FEATURES)
+ TCPPFLAGS+=   $(TPKG_CPPFLAGS)
+ LDFLAGS+=     $(PKG_LDFLAGS)

Added files:

Index: pkgsrc/security/sslsplit/patches/patch-pxyconn.c
diff -u /dev/null pkgsrc/security/sslsplit/patches/patch-pxyconn.c:1.1
--- /dev/null   Mon Apr 29 09:27:40 2024
+++ pkgsrc/security/sslsplit/patches/patch-pxyconn.c    Mon Apr 29 09:27:40 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-pxyconn.c,v 1.1 2024/04/29 09:27:40 nia Exp $
+
+Fix building with OpenSSL 3.
+
+https://github.com/droe/sslsplit/commit/e17de8454a65d2b9ba432856971405dfcf1e7522.patch
+
+--- pxyconn.c.orig     2019-08-30 11:09:00.000000000 +0000
++++ pxyconn.c
+@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shut
+ }
+ #endif /* LIBEVENT_VERSION_NUMBER < 0x02010000 */
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#define ERR_GET_FUNC(x) 0
++#define ERR_func_error_string(x) ""
++#endif
+ 
+ /*
+  * Maximum size of data to buffer per connection direction before