Skip to content

Commit

Permalink
net/dante: restore read/send-side pipe system check during configure
Browse files Browse the repository at this point in the history
It was disabled (patched out) in July 2023 based on the pkg-fallout@
emails, nearly seven months after the last regression which could be
causing it had been fixed.  Evidently, the cluster was running buggy
kernel for its port-building jails long enough to confuse people the
problem was still somehow exhibiting itself.

While here, assume maintainership, fix some DRY bugs in the Makefile,
and install the manpages under $PREFIX/share/man per new world order.

PR:	272755
Fixes:	2b81a5f
  • Loading branch information
Alexey Dokuchaev authored and Alexey Dokuchaev committed Feb 5, 2024
1 parent 6fcbf44 commit 1b25faa
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 294 deletions.
31 changes: 17 additions & 14 deletions net/dante/Makefile
Expand Up @@ -4,7 +4,7 @@ CATEGORIES= net security
MASTER_SITES= http://www.inet.no/dante/files/ \
ftp://ftp.inet.no/pub/socks/

MAINTAINER= ports@FreeBSD.org
MAINTAINER= danfe@FreeBSD.org
COMMENT= Circuit-level firewall/proxy
WWW= https://www.inet.no/dante/

Expand All @@ -16,8 +16,9 @@ LIB_DEPENDS= libminiupnpc.so:net/miniupnpc \

CONFLICTS= socks5

USES= autoreconf libtool localbase
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
Expand All @@ -28,23 +29,25 @@ USE_RC_SUBR= sockd
OPTIONS_DEFINE= DOCS EXAMPLES

post-install:
${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${STAGEDIR}${PREFIX}/etc/socks.conf.sample
${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${STAGEDIR}${PREFIX}/etc/sockd.conf.sample
.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 ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/example/sockd-chaining.conf ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/example/socks-simple-withoutnameserver.conf ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/example/socks-simple.conf ${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}
@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
${INSTALL_DATA} ${WRKSRC}/doc/README* ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4*.protocol ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/UPGRADE ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/contrib/sockd-stat.awk ${STAGEDIR}${DOCSDIR}/contrib/sockd-stat.awk
${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 <bsd.port.mk>
276 changes: 0 additions & 276 deletions net/dante/files/patch-acinclude.m4

This file was deleted.

8 changes: 4 additions & 4 deletions net/dante/pkg-plist
Expand Up @@ -8,10 +8,6 @@ lib/libsocks.so
lib/libsocks.so.0
lib/libsocks.so.0.1.1
sbin/sockd
man/man1/socksify.1.gz
man/man5/sockd.conf.5.gz
man/man5/socks.conf.5.gz
man/man8/sockd.8.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-basic.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockd-chaining.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks-simple-withoutnameserver.conf
Expand All @@ -26,3 +22,7 @@ man/man8/sockd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/rfc1928.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc1929.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc1961.txt
share/man/man1/socksify.1.gz
share/man/man5/sockd.conf.5.gz
share/man/man5/socks.conf.5.gz
share/man/man8/sockd.8.gz

0 comments on commit 1b25faa

Please sign in to comment.