From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1009674-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 35DF31382C5
	for <garchives@archives.gentoo.org>; Thu, 15 Mar 2018 16:05:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5660DE0729;
	Thu, 15 Mar 2018 16:05:20 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 280B9E0729
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Mar 2018 16:05:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 0BB91335C7B
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Mar 2018 16:05:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A7B081F1
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Mar 2018 16:05:16 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1521129912.55294d236f95c6c668686559ef11daed0e59d821.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/, net-misc/oidentd/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/oidentd/Manifest net-misc/oidentd/files/oidentd-2.2.2-confd net-misc/oidentd/files/oidentd.service-r1 net-misc/oidentd/files/oidentd_at.service-r1 net-misc/oidentd/metadata.xml net-misc/oidentd/oidentd-2.2.2.ebuild
X-VCS-Directories: net-misc/oidentd/ net-misc/oidentd/files/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 55294d236f95c6c668686559ef11daed0e59d821
X-VCS-Branch: master
Date: Thu, 15 Mar 2018 16:05:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d7a19751-4a7b-4bdc-a485-659ea15a9a1a
X-Archives-Hash: 179e35e3bfcf9c0e80a18df360dede4a

commit:     55294d236f95c6c668686559ef11daed0e59d821
Author:     Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Wed Mar  7 22:06:54 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 16:05:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55294d23

net-misc/oidentd: bump to 2.2.2 from new upstream, create own user

Closes: https://github.com/gentoo/gentoo/pull/7387
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/oidentd/Manifest                    |  1 +
 net-misc/oidentd/files/oidentd-2.2.2-confd   |  4 +++
 net-misc/oidentd/files/oidentd.service-r1    |  9 +++++
 net-misc/oidentd/files/oidentd_at.service-r1 |  7 ++++
 net-misc/oidentd/metadata.xml                |  2 +-
 net-misc/oidentd/oidentd-2.2.2.ebuild        | 52 ++++++++++++++++++++++++++++
 6 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 342efb7a1d8..f5561f79d57 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1 +1,2 @@
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
+DIST oidentd-2.2.2.tar.gz 260185 BLAKE2B a719413751280d44e134245793c4a88d93dd573d7d85895e341040c2d83a7b201f21f499b931c27e5c0f1d7d0957d730b2cda698ef98b74755e2ca1958457579 SHA512 c5c5040f8955e61e8a7cddd310501d24c3b2a3818e0cd122db85c03dc5b2b18ca7ea4e7edb420df3ad81558a25d4b31c1fea97684a9f53c71c9159014f84678d

diff --git a/net-misc/oidentd/files/oidentd-2.2.2-confd b/net-misc/oidentd/files/oidentd-2.2.2-confd
new file mode 100644
index 00000000000..215b62d8880
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.2.2-confd
@@ -0,0 +1,4 @@
+# oidentd start-up options
+USER="oidentd"
+GROUP="oidentd"
+OPTIONS=""

diff --git a/net-misc/oidentd/files/oidentd.service-r1 b/net-misc/oidentd/files/oidentd.service-r1
new file mode 100644
index 00000000000..af426eed617
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd.service-r1
@@ -0,0 +1,9 @@
+[Unit]
+Description=TCP/IP IDENT protocol server
+
+[Service]
+ExecStart=/usr/sbin/oidentd -i -S -u oidentd -g oidentd
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-misc/oidentd/files/oidentd_at.service-r1 b/net-misc/oidentd/files/oidentd_at.service-r1
new file mode 100644
index 00000000000..dac0e70fd79
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd_at.service-r1
@@ -0,0 +1,7 @@
+[Unit]
+Description=Ident (RFC 1413) per-connection server
+
+[Service]
+ExecStart=/usr/sbin/oidentd -I -S -u oidentd -g oidentd
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket

diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index 3be9f1f5f13..ed7fbe111de 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -13,6 +13,6 @@
 		<flag name="masquerade">Enable support for masqueraded/NAT connections</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">ojnk</remote-id>
+		<remote-id type="github">janikrabe/oidentd</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-misc/oidentd/oidentd-2.2.2.ebuild b/net-misc/oidentd/oidentd-2.2.2.ebuild
new file mode 100644
index 00000000000..73fc0be4d05
--- /dev/null
+++ b/net-misc/oidentd/oidentd-2.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd user
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="https://oidentd.janikrabe.com/"
+SRC_URI="https://ftp.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug ipv6 masquerade selinux"
+
+DEPEND="masquerade? (
+		net-libs/libnetfilter_conntrack
+		sys-libs/libcap-ng )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-oident )"
+
+pkg_setup() {
+	local CONFIG_CHECK="~INET_TCP_DIAG"
+
+	linux-info_pkg_setup
+
+	enewgroup oidentd
+	enewuser oidentd -1 -1 -1 oidentd
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_enable masquerade masq)
+		$(use_enable masquerade nat)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
+
+	systemd_newunit "${FILESDIR}"/${PN}_at.service-r1 ${PN}@.service
+	systemd_dounit "${FILESDIR}"/${PN}.socket
+	systemd_dounit "${FILESDIR}"/${PN}.service-r1
+}