From 4b7fa6ccfd1daf90460c391d8ff5fc9dcb4bf8fc Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Thu, 5 Jun 2025 20:47:19 +0200 Subject: [PATCH] net/sniproxy: Apply upstream patches One patch rewrites configure.ac so it no longer depends on macros that were included with gettext but no longer are in gettext 0.25. Another patch adds pcre2 support. The others are minor fixes. PR: 287327, 287167 Appoved by: krion --- net/sniproxy/Makefile | 17 ++++++++++------- net/sniproxy/distinfo | 12 +++++++++++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/net/sniproxy/Makefile b/net/sniproxy/Makefile index 0b53dda1e6ae..3341650826b7 100644 --- a/net/sniproxy/Makefile +++ b/net/sniproxy/Makefile @@ -1,8 +1,15 @@ PORTNAME= sniproxy DISTVERSION= 0.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net +PATCH_SITES= https://github.com/dlundquist/sniproxy/commit/ +PATCHFILES= 62e621f050f79eb78598b1296a089ef88a19ea91.diff:-p1 \ + 0e556bf0b9151e65575b3980b72f34331e5b6ab4.diff:-p1 \ + 7fdd86c054a21f7ac62343010de20f28645b14d2.diff:-p1 \ + 85e980261b9dfc0172fbc38f7bb24b291e859cee.diff:-p1 \ + 2d9965388712faa6ef74f7229f38e3a177904bae.diff:-p1 + MAINTAINER= krion@FreeBSD.org COMMENT= Proxy that routes based on TLS server name extension WWW= https://github.com/dlundquist/sniproxy @@ -11,10 +18,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libev.so:devel/libev \ - libpcre.so:devel/pcre \ + libpcre2-8.so:devel/pcre2 \ libudns.so:dns/udns -USES= autoreconf:build gettext pkgconfig +USES= autoreconf localbase pkgconfig SUB_FILES= pkg-message USE_RC_SUBR= sniproxy @@ -23,7 +30,6 @@ USE_GITHUB= yes GH_ACCOUNT= dlundquist GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share USE_LDCONFIG= yes PLIST_FILES= share/man/man5/sniproxy.conf.5.gz \ @@ -31,9 +37,6 @@ PLIST_FILES= share/man/man5/sniproxy.conf.5.gz \ sbin/sniproxy \ "@sample etc/sniproxy.conf.sample" -pre-configure: - cd ${WRKSRC} && ${SH} autogen.sh - post-patch: @${REINPLACE_CMD} -e 's|/var/tmp/|/var/run/|' ${WRKSRC}/${PORTNAME}.conf diff --git a/net/sniproxy/distinfo b/net/sniproxy/distinfo index b1dd665af9c2..afdda0c2e35d 100644 --- a/net/sniproxy/distinfo +++ b/net/sniproxy/distinfo @@ -1,3 +1,13 @@ -TIMESTAMP = 1680098921 +TIMESTAMP = 1765444620 SHA256 (dlundquist-sniproxy-0.6.1_GH0.tar.gz) = 6a06d12bedcbd5295a2c75d60a9df1cfde9e26efa31f44a34979b5cb8fb0bc1a SIZE (dlundquist-sniproxy-0.6.1_GH0.tar.gz) = 78939 +SHA256 (62e621f050f79eb78598b1296a089ef88a19ea91.diff) = 92b19681753137f8ed1bd4f289833dc21991d4f7a61919c244e35b466d231652 +SIZE (62e621f050f79eb78598b1296a089ef88a19ea91.diff) = 6021 +SHA256 (0e556bf0b9151e65575b3980b72f34331e5b6ab4.diff) = d84d14af62834efb08511dc8219406b96a4955358a3a3186e535321a15cd3222 +SIZE (0e556bf0b9151e65575b3980b72f34331e5b6ab4.diff) = 3154 +SHA256 (7fdd86c054a21f7ac62343010de20f28645b14d2.diff) = a3348fde1780a73a59c7c90e2f29e45130e0b21eca60438e49e7be9cc9086dea +SIZE (7fdd86c054a21f7ac62343010de20f28645b14d2.diff) = 6145 +SHA256 (85e980261b9dfc0172fbc38f7bb24b291e859cee.diff) = fd34d8973deaa8979d7c50f0a21a4f266c42d4e7535202967fc31e95ac3f445d +SIZE (85e980261b9dfc0172fbc38f7bb24b291e859cee.diff) = 277 +SHA256 (2d9965388712faa6ef74f7229f38e3a177904bae.diff) = 887b685804c137ace8ccd4d926df68f97dfa43e7c80fb626d819a553e9ecfea6 +SIZE (2d9965388712faa6ef74f7229f38e3a177904bae.diff) = 679