Index: head/security/oidentd/Makefile =================================================================== --- head/security/oidentd/Makefile (revision 499355) +++ head/security/oidentd/Makefile (revision 499356) @@ -1,51 +1,50 @@ # Created by: trevor # $FreeBSD$ PORTNAME= oidentd -PORTVERSION= 2.0.8 -PORTREVISION= 2 +PORTVERSION= 2.3.2 CATEGORIES= security -MASTER_SITES= SF/ojnk/${PORTNAME}/${PORTVERSION} +MASTER_SITES= https://github.com/janikrabe/oidentd/releases/download/v2.3.2/ MAINTAINER= oliver@FreeBSD.org COMMENT= Ident server that supports user-defined ident strings LICENSE= GPLv2 USE_RC_SUBR= oidentd GNU_CONFIGURE= yes PLIST_FILES= sbin/oidentd etc/oidentd.conf.sample \ etc/oidentd_masq.conf.sample MANPAGES= oidentd.conf.5 oidentd_masq.conf.5 oidentd.8 .for man in ${MANPAGES} PLIST_FILES+= man/man${man:E}/${man}.gz .endfor USE_CSTD= gnu89 OPTIONS_DEFINE= IPV6 CONFIGURE_ARGS=--disable-masq .include .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--disable-ipv6 .else CATEGORIES+= ipv6 .endif post-patch: @${REINPLACE_CMD} -e 's,/etc/,${PREFIX}&,g' ${WRKSRC}/src/oidentd.h @${REINPLACE_CMD} -e 's|\[5-9\]||g;s|\[4-9\]||g' ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/oidentd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/oidentd.conf.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${FILESDIR}/oidentd_masq.conf.sample ${STAGEDIR}${PREFIX}/etc .for MANFILE in ${MANPAGES} @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/doc/${MANFILE} ${INSTALL_MAN} ${WRKSRC}/doc/${MANFILE} ${STAGEDIR}${PREFIX}/man/man${MANFILE:E} .endfor .include Index: head/security/oidentd/distinfo =================================================================== --- head/security/oidentd/distinfo (revision 499355) +++ head/security/oidentd/distinfo (revision 499356) @@ -1,2 +1,3 @@ -SHA256 (oidentd-2.0.8.tar.gz) = a54cbed187281f8d5a301d1d8fd5cb0f30bfb13a5a8e9ab752ace76c1010fb6f -SIZE (oidentd-2.0.8.tar.gz) = 212354 +TIMESTAMP = 1555678649 +SHA256 (oidentd-2.3.2.tar.gz) = b62ccff3b72e402ef999048b21a59bd944c76225b2fdb1890e75cf1ce1948581 +SIZE (oidentd-2.3.2.tar.gz) = 265691 Index: head/security/oidentd/files/patch-oidentd-multiple-ip =================================================================== --- head/security/oidentd/files/patch-oidentd-multiple-ip (revision 499355) +++ head/security/oidentd/files/patch-oidentd-multiple-ip (nonexistent) @@ -1,137 +0,0 @@ -diff -ur doc/oidentd.8 doc/oidentd.8.orig ---- doc/oidentd.8.orig 2003-07-13 20:27:52.000000000 +0200 -+++ doc/oidentd.8 2008-04-14 15:04:26.000000000 +0200 -@@ -50,7 +50,7 @@ - - .TP - .B "\-a or \-\-address=" --Listen for connections on the specified address. The default is to listen for connections on all configured IP addresses. -+Listen for connections on the specified address, this option can be specified multiple times. The default is to listen for connections on all configured IP addresses. - - .TP - .B "\-c or \-\-charset=" -diff -ur src/oidentd.c src/oidentd.c.orig ---- src/oidentd.c.orig 2006-05-22 02:43:26.000000000 +0200 -+++ src/oidentd.c 2008-04-14 14:55:07.000000000 +0200 -@@ -73,7 +73,7 @@ - char *config_file; - - in_port_t listen_port; --struct sockaddr_storage *addr; -+struct sockaddr_storage **addr; - - int main(int argc, char **argv) { - int *listen_fds = NULL; -diff -ur src/oidentd_inet_util.c src/oidentd_inet_util.c.orig ---- src/oidentd_inet_util.c.orig 2006-05-22 02:31:19.000000000 +0200 -+++ src/oidentd_inet_util.c 2008-04-14 15:00:37.000000000 +0200 -@@ -92,16 +92,18 @@ - ** Setup the listening socket(s). - */ - --int *setup_listen(struct sockaddr_storage *listen_addr, in_port_t listen_port) { -+int *setup_listen(struct sockaddr_storage **listen_addr, in_port_t listen_port) { - int ret; -- int *bound_fds; -+ int *bound_fds = NULL; - u_char listen_port_str[64]; - struct addrinfo hints, *res, *cur; -+ int naddr = 0; - - if (listen_addr != NULL) { -+ do { - cur = xcalloc(1, sizeof(struct addrinfo)); - -- cur->ai_family = listen_addr->ss_family; -+ cur->ai_family = listen_addr[naddr]->ss_family; - - switch (cur->ai_family) { - #ifdef WANT_IPV6 -@@ -115,20 +117,22 @@ - } - - cur->ai_addr = xmalloc(cur->ai_addrlen); -- memcpy(cur->ai_addr, listen_addr, cur->ai_addrlen); -+ memcpy(cur->ai_addr, listen_addr[naddr], cur->ai_addrlen); - - ret = setup_bind(cur, listen_port); - free(cur->ai_addr); - free(cur); -- free(listen_addr); -+ free(listen_addr[naddr]); - - if (ret == -1) - return (NULL); - -- bound_fds = xmalloc(2 * sizeof(int)); -- bound_fds[0] = ret; -- bound_fds[1] = -1; -- -+ bound_fds = xrealloc(bound_fds, (naddr + 2) * sizeof(int)); -+ bound_fds[naddr] = ret; -+ bound_fds[naddr+1] = -1; -+ naddr++; -+ } while (listen_addr[naddr] != NULL); -+ free(listen_addr); - return (bound_fds); - } - -diff -ur src/oidentd_inet_util.h src/oidentd_inet_util.h.orig ---- src/oidentd_inet_util.h.orig 2006-05-22 00:52:24.000000000 +0200 -+++ src/oidentd_inet_util.h 2008-04-14 15:00:26.000000000 +0200 -@@ -22,7 +22,7 @@ - #define SIN4(x) ((struct sockaddr_in *) (x)) - #define SIN6(x) ((struct sockaddr_in6 *) (x)) - --int *setup_listen(struct sockaddr_storage *listen_addr, in_port_t listen_port); -+int *setup_listen(struct sockaddr_storage **listen_addr, in_port_t listen_port); - - int get_port(const char *name, in_port_t *port); - int get_addr(const char *const hostname, struct sockaddr_storage *g_addr); -diff -ur src/oidentd_options.c src/oidentd_options.c.orig ---- src/oidentd_options.c.orig 2006-05-22 02:31:19.000000000 +0200 -+++ src/oidentd_options.c 2008-04-14 15:00:49.000000000 +0200 -@@ -53,7 +53,7 @@ - extern u_int32_t timeout; - extern u_int32_t connection_limit; - extern in_port_t listen_port; --extern struct sockaddr_storage *addr; -+extern struct sockaddr_storage **addr; - extern uid_t uid; - extern gid_t gid; - -@@ -126,6 +126,7 @@ - int opt; - char *temp_os; - char *charset = NULL; -+ int naddrs = 0; - - #ifdef MASQ_SUPPORT - if (get_port(DEFAULT_FPORT, &fwdport) == -1) { -@@ -151,13 +152,16 @@ - struct sockaddr_storage *temp_ss = - xmalloc(sizeof(struct sockaddr_storage)); - -+ if (naddrs % 16 == 0) -+ addr = xrealloc(addr, sizeof(struct sockaddr_storage *)*(naddrs+16)); -+ - if (get_addr(optarg, temp_ss) == -1) { - o_log(NORMAL, "Fatal: Unknown host: \"%s\"", optarg); - free(temp_ss); - return (-1); - } - -- addr = temp_ss; -+ addr[naddrs++] = temp_ss; - break; - } - -@@ -327,6 +331,8 @@ - return (-1); - } - } -+ if (addr != NULL) -+ addr[naddrs] = NULL; - - if (charset != NULL) { - size_t len = strlen(temp_os) + strlen(charset) + 4; Property changes on: head/security/oidentd/files/patch-oidentd-multiple-ip ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/oidentd/files/patch-configure =================================================================== --- head/security/oidentd/files/patch-configure (revision 499355) +++ head/security/oidentd/files/patch-configure (nonexistent) @@ -1,33 +0,0 @@ ---- configure.orig Fri Jul 11 17:50:57 2003 -+++ configure Sat Aug 21 20:41:25 2004 -@@ -3597,7 +3597,7 @@ - - echo "$as_me:$LINENO: checking for egrep" >&5 - echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -+if test "${ac_cv_prog_egrep+set}" = set ; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -@@ -3858,6 +3858,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+#include -+#include -+#include - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext -@@ -5478,6 +5481,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+#include -+#include -+#include -+#include -+#include - #include - _ACEOF - rm -f conftest.$ac_objext Property changes on: head/security/oidentd/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/oidentd/files/patch-oidentd.8 =================================================================== --- head/security/oidentd/files/patch-oidentd.8 (revision 499355) +++ head/security/oidentd/files/patch-oidentd.8 (revision 499356) @@ -1,34 +1,34 @@ ---- doc/oidentd.8.orig Sun Apr 27 20:40:59 2003 -+++ doc/oidentd.8 Sat Sep 4 16:12:29 2004 -@@ -58,7 +58,7 @@ - +--- doc/oidentd.8.orig 2019-01-08 08:56:02.000000000 +0100 ++++ doc/oidentd.8 2019-04-19 15:01:30.103268000 +0200 +@@ -65,7 +65,7 @@ .TP .B "\-C or \-\-config=" --Use the specified file as the configuration file. The default location of the configuration file is \fB/etc/oidentd.conf\fP. -+Use the specified file as the configuration file. The default location of the configuration file is \fB%%PREFIX%%/etc/oidentd.conf\fP. + Use the specified file as the configuration file. The default location of the +-configuration file is \fB/etc/oidentd.conf\fP. ++configuration file is \fB%%PREFIX%%/etc/oidentd.conf\fP. .TP .B "\-d or \-\-debug" -@@ -70,7 +70,7 @@ - - .TP - .B "\-f or \-\-forward=[]" --When IP masquerading support is enabled, forward requests for machines that masquerade through us to those machines on the specified port. If a port is not given, oidentd will use the default port for the ident service ("auth" or port 113). If the forwarded request fails, \fBoidentd\fP will fall back to reading the \fB/etc/oidentd_masq.conf\fP file. In order for forwarding to work, the machine to which the connection is forwarded must also be running oidentd, and oidentd must be run with the -P switch specifying the host that is forwarding the connections. If the ident daemon on the host to which the connection is forwarded is capable of returning a fixed string for any lookup (for example, the ident server built in to the mIRC windows IRC client), it is not necessary to run oidentd on that host. -+When IP masquerading support is enabled, forward requests for machines that masquerade through us to those machines on the specified port. If a port is not given, oidentd will use the default port for the ident service ("auth" or port 113). If the forwarded request fails, \fBoidentd\fP will fall back to reading the \fB%%PREFIX%%/etc/oidentd_masq.conf\fP file. In order for forwarding to work, the machine to which the connection is forwarded must also be running oidentd, and oidentd must be run with the -P switch specifying the host that is forwarding the connections. If the ident daemon on the host to which the connection is forwarded is capable of returning a fixed string for any lookup (for example, the ident server built in to the mIRC windows IRC client), it is not necessary to run oidentd on that host. - - .TP - .B "\-g or \-\-group=" -@@ -152,11 +152,11 @@ +@@ -85,7 +85,7 @@ + masquerade through us to those machines on the specified port. If a port is not + given, \fBoidentd\fP will use the default port for the ident service ("auth" or + port 113). If the forwarded request fails, \fBoidentd\fP will fall back to +-reading the \fB/etc/oidentd_masq.conf\fP file. In order for forwarding to work, ++reading the \fB%%PREFIX%%/etc/oidentd_masq.conf\fP file. In order for forwarding to work, + the machine to which the connection is forwarded must also be running + \fBoidentd\fP, and \fBoidentd\fP must be run with the \fB-P\fP switch + specifying the host that is forwarding the connections. If the ident daemon on +@@ -198,11 +198,11 @@ .SH FILES .TP -.B /etc/oidentd.conf +.B %%PREFIX%%/etc/oidentd.conf The system-wide configuration file. .TP -.B /etc/oidentd_masq.conf +.B %%PREFIX%%/etc/oidentd_masq.conf The NAT/IP masquerading mappings. .TP Index: head/security/oidentd/files/patch-oidentd.conf.5 =================================================================== --- head/security/oidentd/files/patch-oidentd.conf.5 (revision 499355) +++ head/security/oidentd/files/patch-oidentd.conf.5 (revision 499356) @@ -1,38 +1,38 @@ ---- doc/oidentd.conf.5.orig Sun Apr 27 20:40:59 2003 -+++ doc/oidentd.conf.5 Sat Sep 4 16:12:48 2004 -@@ -16,7 +16,7 @@ - The \fBoidentd\fP configuration file is used to specify the amount of control users have over the responses \fBoidentd\fP returns upon successful lookups for connections owned by them. - .PP - The \fB$HOME/.oidentd.conf\fP file allows a user to specify what ident response will be returned for specific connections. +--- doc/oidentd.conf.5.orig 2019-01-08 08:56:17.000000000 +0100 ++++ doc/oidentd.conf.5 2019-04-19 15:03:44.447798000 +0200 +@@ -22,7 +22,7 @@ + The \fB$HOME/.oidentd.conf\fP file allows a user to specify what ident response + will be returned for specific connections. + -.SH /etc/oidentd.conf SYNTAX +.SH %%PREFIX%%/etc/oidentd.conf SYNTAX + .TP .B USER DIRECTIVE - The \fBoidentd.conf\fP file consists of 0 or more \fIuser\fP directives. The \fIuser\fP directive is used to grant capabilities on a per-user basis. -@@ -101,7 +101,7 @@ +@@ -148,7 +148,7 @@ + manner. - The \fIglobal\fP directive acts as a wildcard, matching all connections, so if used at all, the global directive should be the first entry in the file and should be used only once. Use is permitted anywhere in the file and infinitely many times, however it doesn't make much sense to use it in this manner. + The range directive has the same syntax and semantics as the range directive in +-the \fB/etc/oidentd.conf\fP file. See above for a description. ++the \fB%%PREFIX%%/etc/oidentd.conf\fP file. See above for a description. --The range directive has the same syntax and semantics as the range directive in the \fB/etc/oidentd.conf\fP file. See above for a description. -+The range directive has the same syntax and semantics as the range directive in the \fB%%PREFIX%%/etc/oidentd.conf\fP file. See above for a description. + Valid capabilities are \fIreply\fP, \fIforward\fP, \fIrandom\fP, \fInumeric\fP, + \fIrandom_numeric\fP, and \fIhide\fP. Descriptions can be found below. +@@ -185,7 +185,7 @@ + In a user's \fB$HOME/.oidentd.conf\fP file, up to 20 strings may be specified + for a \fBreply\fP statement. - Valid capabilities are \fIreply\fP, \fIrandom\fP, \fInumeric\fP, \fIrandom_numeric\fP, and \fIhide\fP. Descriptions can be found below. - .SH CAPABILITIES -@@ -126,7 +126,7 @@ +-In the \fB/etc/oidentd.conf\fP file, there is no limitation on the number of ++In the \fB%%PREFIX%%/etc/oidentd.conf\fP file, there is no limitation on the number of + strings that may be specified. - In a user's \fB$HOME/.oidentd.conf\fP file, up to 20 strings may be specified for a \fBreply\fP statement. + The strings must be quoted strings (e.g. "string"). Strings may contain the +@@ -260,7 +260,7 @@ + Reply to successful with a randomly generated ident response of the form userN, + where N is a random number between 0 and 100000. --In the \fB/etc/oidentd.conf\fP file, there is no limitation on the number of strings that may be specified. -+In the \fB%%PREFIX%%/etc/oidentd.conf\fP file, there is no limitation on the number of strings that may be specified. - - The strings must be quoted strings (e.g. "string"). Strings may contain the following escape characters: - -@@ -183,7 +183,7 @@ - .TP - .B random_numeric - Reply to successful with a randomly generated ident response of the form userN, where N is a random number between 0 and 100000. -.SH EXAMPLE /etc/oidentd.conf FILE +.SH EXAMPLE %%PREFIX%%/etc/oidentd.conf FILE .nf default { default { Index: head/security/oidentd/files/patch-oidentd_masq.conf.5 =================================================================== --- head/security/oidentd/files/patch-oidentd_masq.conf.5 (revision 499355) +++ head/security/oidentd/files/patch-oidentd_masq.conf.5 (revision 499356) @@ -1,11 +1,11 @@ ---- doc/oidentd_masq.conf.5.orig Sun Apr 27 20:40:59 2003 -+++ doc/oidentd_masq.conf.5 Sat Sep 4 16:12:11 2004 -@@ -13,7 +13,7 @@ - oidentd_masq.conf - oidentd IP masquerading/NAT configuration file. - - .SH DESCRIPTION --If you are using IP masquerading or NAT, oidentd can optionally return a username for connections from other machines. Support for this is specified by calling \fBoidentd\fP with the \-m (or \-\-masq) flag and by creating an \fB/etc/oidentd_masq.conf\fP file. -+If you are using IP masquerading or NAT, oidentd can optionally return a username for connections from other machines. Support for this is specified by calling \fBoidentd\fP with the \-m (or \-\-masq) flag and by creating an \fB%%PREFIX%%/etc/oidentd_masq.conf\fP file. +--- doc/oidentd_masq.conf.5.orig 2019-01-08 08:56:09.000000000 +0100 ++++ doc/oidentd_masq.conf.5 2019-04-19 16:07:21.986856000 +0200 +@@ -18,7 +18,7 @@ + If you are using IP masquerading or NAT, \fBoidentd\fP can optionally return a + username for connections from other machines. Support for this is enabled by + calling \fBoidentd\fP with the \fB\-m\fP (or \fB\-\-masquerade\fP) flag and by +-creating an \fB/etc/oidentd_masq.conf\fP file. This file is read from top to ++creating an \fB%%PREFIX%%/etc/oidentd_masq.conf\fP file. This file is read from top to + bottom, and \fBoidentd\fP stops at the first matching entry it encounters. .PP - \fBoidentd\fP can also forward requests for an IP masqueraded connection to the machine from which connection originates by way of the -f option. This will only work if the host to which the connection is forwarded is running oidentd with the -P (proxy) flag, or if the host's ident daemon will return a valid reply regardless of the input supplied by and the address of the host requesting the info (some ident daemons for windows do this, maybe others). - + \fBoidentd\fP can also forward requests for an IP masqueraded connection to Index: head/security/oidentd/pkg-descr =================================================================== --- head/security/oidentd/pkg-descr (revision 499355) +++ head/security/oidentd/pkg-descr (revision 499356) @@ -1,19 +1,19 @@ From the README: "oidentd is an ident (rfc1413 compliant) daemon that runs on Linux, FreeBSD, OpenBSD and Solaris. oidentd can handle IP masqueraded/NAT connections on Linux, FreeBSD (ipf only) and OpenBSD. oidentd has a flexible mechanism for specifying ident responses. Users can be granted permission to specify their own ident responses. Responses can be specified according to host and port pairs." FreeBSD's inetd has a built-in ident service which can also generate bogus responses. Please see the TODO file for more information on why only ipf is supported under FreeBSD. -WWW: http://ojnk.sourceforge.net/ +WWW: https://oidentd.janikrabe.com/ Mark Laws mdl@60hz.org