diff --git a/net/dante/Makefile b/net/dante/Makefile index 458dbabda958..8bbb0261a7b6 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -1,53 +1,51 @@ PORTNAME= dante PORTVERSION= 1.4.3 CATEGORIES= net security MASTER_SITES= http://www.inet.no/dante/files/ \ ftp://ftp.inet.no/pub/socks/ MAINTAINER= danfe@FreeBSD.org COMMENT= Circuit-level firewall/proxy WWW= https://www.inet.no/dante/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libminiupnpc.so:net/miniupnpc \ libsasl2.so:security/cyrus-sasl2 -CONFLICTS= socks5 - USES= libtool localbase GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ --with-sockd-conf=${PREFIX}/etc/sockd.conf INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_RC_SUBR= sockd OPTIONS_DEFINE= DOCS EXAMPLES post-install: .for x in s d ${INSTALL_DATA} ${WRKSRC}/example/sock${x}.conf \ ${STAGEDIR}${PREFIX}/etc/sock${x}.conf.sample .endfor post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/example/sockd-basic.conf \ ${WRKSRC}/example/sockd-chaining.conf \ ${WRKSRC}/example/socks-simple-withoutnameserver.conf \ ${WRKSRC}/example/socks-simple.conf ${STAGEDIR}${EXAMPLESDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib ${INSTALL_DATA} ${WRKSRC}/doc/README* \ ${WRKSRC}/doc/rfc* \ ${WRKSRC}/doc/SOCKS4*.protocol \ ${WRKSRC}/UPGRADE ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/sockd-stat.awk \ ${STAGEDIR}${DOCSDIR}/contrib .include diff --git a/net/dante/files/patch-dlib_interposition.c b/net/dante/files/patch-dlib_interposition.c new file mode 100644 index 000000000000..cf6b642130d8 --- /dev/null +++ b/net/dante/files/patch-dlib_interposition.c @@ -0,0 +1,31 @@ +--- dlib/interposition.c.orig 2020-11-11 16:11:56 UTC ++++ dlib/interposition.c +@@ -1736,7 +1736,7 @@ getsockopt(s, level, optname, optval, optlen) + HAVE_PROT_GETSOCKOPT_4 optval; + HAVE_PROT_GETSOCKOPT_5 optlen; + { +- if (socks_issyscall(s, SYMBOL_GETSOCKNAME)) ++ if (socks_issyscall(s, SYMBOL_GETSOCKOPT)) + return sys_getsockopt(s, level, optname, optval, optlen); + return Rgetsockopt(s, level, optname, optval, optlen); + } +@@ -2168,6 +2168,19 @@ _getsockname(s, name, namelen) + if (socks_issyscall(s, SYMBOL_GETSOCKNAME)) + return sys_getsockname(s, name, namelen); + return Rgetsockname(s, name, namelen); ++} ++ ++HAVE_PROT_GETSOCKOPT_0 ++_getsockopt(s, level, optname, optval, optlen) ++ HAVE_PROT_GETSOCKOPT_1 s; ++ HAVE_PROT_GETSOCKOPT_2 level; ++ HAVE_PROT_GETSOCKOPT_3 optname; ++ HAVE_PROT_GETSOCKOPT_4 optval; ++ HAVE_PROT_GETSOCKOPT_5 optlen; ++{ ++ if (socks_issyscall(s, SYMBOL_GETSOCKOPT)) ++ return sys_getsockopt(s, level, optname, optval, optlen); ++ return Rgetsockopt(s, level, optname, optval, optlen); + } + + HAVE_PROT_LISTEN_0