security/oidentd: Update to 2.5.0

PR:		247657
Submitted by:	daniel.engberg.lists@pyret.net
Approved by:	maintainer timeout (oliver, >1 month)
This commit is contained in:
Steve Wills 2020-08-02 13:05:56 +00:00
parent 3bbdc8d831
commit 0bcfe1aae2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=543953
8 changed files with 77 additions and 93 deletions

View File

@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= oidentd
PORTVERSION= 2.3.2
PORTVERSION= 2.5.0
CATEGORIES= security
MASTER_SITES= https://github.com/janikrabe/oidentd/releases/download/v2.3.2/
MASTER_SITES= https://files.janikrabe.com/pub/oidentd/releases/2.5.0/
MAINTAINER= oliver@FreeBSD.org
COMMENT= Ident server that supports user-defined ident strings
@ -21,7 +21,6 @@ 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
@ -33,10 +32,6 @@ CONFIGURE_ARGS=--disable-masq
CONFIGURE_ARGS+=--disable-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

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1555678649
SHA256 (oidentd-2.3.2.tar.gz) = b62ccff3b72e402ef999048b21a59bd944c76225b2fdb1890e75cf1ce1948581
SIZE (oidentd-2.3.2.tar.gz) = 265691
TIMESTAMP = 1593501228
SHA256 (oidentd-2.5.0.tar.gz) = ead896a3beb81532bff110330ce129e2ef8f4d3f571df996e88b7b6727c5b5b4
SIZE (oidentd-2.5.0.tar.gz) = 277788

View File

@ -0,0 +1,36 @@
--- doc/oidentd.8.orig 2020-04-16 13:34:16 UTC
+++ doc/oidentd.8
@@ -57,7 +57,7 @@ clients.
\fB\-C, \-\-config\fP=\fIFILE\fP
.RS 4
Use the specified system\-wide configuration file. If this option is not
-given, \fBoidentd\fP defaults to \fB/usr/local/etc/oidentd.conf\fP. The format of the
+given, \fBoidentd\fP defaults to \fB%%PREFIX%%/etc/oidentd.conf\fP. The format of the
system\-wide configuration file is described in \fBoidentd.conf\fP(5).
.RE
.sp
@@ -217,7 +217,7 @@ Print version and build information and exit.
.RE
.SH "FILES"
.sp
-\fB/usr/local/etc/oidentd.conf\fP
+\fB%%PREFIX%%/etc/oidentd.conf\fP
.RS 4
System\-wide configuration file; see \fBoidentd.conf\fP(5).
.RE
@@ -227,7 +227,7 @@ System\-wide configuration file; see \fBoidentd.conf\f
User configuration files; see \fBoidentd.conf\fP(5).
.RE
.sp
-\fB/usr/local/etc/oidentd_masq.conf\fP
+\fB%%PREFIX%%/etc/oidentd_masq.conf\fP
.RS 4
Masquerading configuration file; see \fBoidentd_masq.conf\fP(5).
.RE
@@ -246,4 +246,4 @@ Please report any bugs to \c
.SH "SEE ALSO"
.sp
\fBoidentd.conf\fP(5)
-\fBoidentd_masq.conf\fP(5)
\ No newline at end of file
+\fBoidentd_masq.conf\fP(5)

View File

@ -0,0 +1,18 @@
--- doc/oidentd.conf.5.orig 2020-04-16 13:34:16 UTC
+++ doc/oidentd.conf.5
@@ -34,7 +34,7 @@ The \fBoidentd\fP configuration files are used to cont
sends to clients after receiving a query for a connection owned by a particular
user.
.sp
-The system\-wide configuration file \fB/usr/local/etc/oidentd.conf\fP specifies the
+The system\-wide configuration file \fB%%PREFIX%%/etc/oidentd.conf\fP specifies the
types of responses individual users are permitted to send. By default, users
must respond with their real username.
.sp
@@ -442,4 +442,4 @@ Please report any bugs to \c
.SH "SEE ALSO"
.sp
\fBoidentd\fP(8)
-\fBoidentd_masq.conf\fP(5)
\ No newline at end of file
+\fBoidentd_masq.conf\fP(5)

View File

@ -0,0 +1,18 @@
--- doc/oidentd_masq.conf.5.orig 2020-04-16 13:34:16 UTC
+++ doc/oidentd_masq.conf.5
@@ -31,7 +31,7 @@ oidentd_masq.conf \- oidentd NAT configuration file
.SH "DESCRIPTION"
.sp
If NAT support is enabled with the \fB\-\-masquerade\fP option, \fBoidentd\fP reads the
-\fB/usr/local/etc/oidentd_masq.conf\fP file to determine ident responses to queries
+\fB%%PREFIX%%/etc/oidentd_masq.conf\fP file to determine ident responses to queries
intended for other machines. It is also possible to forward queries to ident
servers on the hosts connecting through the machine \fBoidentd\fP runs on. For more
information on forwarding, please see the \fB\-\-forward\fP option in \fBoidentd\fP(8).
@@ -94,4 +94,4 @@ Please report any bugs to \c
.SH "SEE ALSO"
.sp
\fBoidentd\fP(8)
-\fBoidentd.conf\fP(5)
\ No newline at end of file
+\fBoidentd.conf\fP(5)

View File

@ -1,34 +0,0 @@
--- 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=<config file>"
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"
@@ -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

View File

@ -1,38 +0,0 @@
--- 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
@@ -148,7 +148,7 @@
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.
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.
-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.
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.
-.SH EXAMPLE /etc/oidentd.conf FILE
+.SH EXAMPLE %%PREFIX%%/etc/oidentd.conf FILE
.nf
default {
default {

View File

@ -1,11 +0,0 @@
--- 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