gentoo resync : 13.06.2020

3 files changed, 70 insertions, 0 deletions

diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index e56110747565..455eebef4bcd 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,5 +1,8 @@
 AUX oidentd-2.0.7-init 837 BLAKE2B ab01ed3d6675f6196edcf7712c9f2e77369edc2481433788e63a3a82e591831869623723002f49a4498ed10ba7657f51dbc795895384213e473eba950e7ba7be SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3
 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a
+AUX oidentd-2.5.0-respect-ar.patch 250 BLAKE2B e756da25bca3a2e98be1a625c99f33b20ebb237cd7a3fe8f6e01664db328636451bd7af70cc16e08e45344511660787836358f92c2fa1806998dcf35f73fdc10 SHA512 6ddb24e88e864359faf8f6aa6a28de01067b0cc20c349e8c9f6ec4dafde26636e7cce3e11e137c12cd868f0de85546462be599333966ad8bf850cea5afc9b62c
 DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0
+DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
 EBUILD oidentd-2.4.0.ebuild 1181 BLAKE2B e7dfd55712c91fa3073ac2e49a7e2f6360fc4804bb3aa64971dae63addfa814de422657358ede9510087787b869b9f5c95aaad7b4e26f7cd9eed1549128ae06b SHA512 dcaba59488562d2758972307cb5ea0bd99d11ae2cec142d64fe54f2adfe9df085959f91733a117dd35ce3684899a3d7d087791230506339ca7bd3937346aede0
+EBUILD oidentd-2.5.0.ebuild 1259 BLAKE2B 45b92137129317d9ec7f1089bb6b44a0627c1436c937a20ddefd75ea410bea53b63766345927263ccae06424968020d1cad14888a03bc161274eaac8dab32191 SHA512 00d0dda12a7428eb39750084f02a834b56da6980a7bcbec38afef52d1fbc61c44854b47935ef8f17401f6d1228ef3e248e261749cdecec48b530bf79a4582917
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch b/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
new file mode 100644
index 000000000000..156b136f7755
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index b458d11..b163128 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,6 +32,7 @@ AC_PROG_LEX
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+ AC_PATH_PROG(sedpath, sed)
++AM_PROG_AR
+ 
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
diff --git a/net-misc/oidentd/oidentd-2.5.0.ebuild b/net-misc/oidentd/oidentd-2.5.0.ebuild
new file mode 100644
index 000000000000..ceb7d227fd8e
--- /dev/null
+++ b/net-misc/oidentd/oidentd-2.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="https://oidentd.janikrabe.com/"
+SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug ipv6 masquerade selinux"
+
+DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
+
+RDEPEND="
+	acct-user/oidentd
+	acct-group/oidentd
+	selinux? ( sec-policy/selinux-oident )
+	${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-respect-ar.patch" )
+
+src_prepare() {
+	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_enable masquerade libnfct)
+		$(use_enable masquerade nat)
+		--enable-xdgbdir
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
+
+	systemd_dounit contrib/systemd/${PN}@.service
+	systemd_dounit contrib/systemd/${PN}.socket
+	systemd_dounit contrib/systemd/${PN}.service
+}