* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/
@ 2015-12-19 12:25 Christoph Mende
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Mende @ 2015-12-19 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 55108e5462e1acf9adf6c67531b901e37648a2fa
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 12:25:18 2015 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 12:25:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55108e54
net-misc/oidentd: fix compilation with gcc5 (bug #568586)
Package-Manager: portage-2.2.26
net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch | 25 +++++++++++++++++++++++++
net-misc/oidentd/oidentd-2.0.8-r5.ebuild | 5 +++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
new file mode 100644
index 0000000..a401a65
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
@@ -0,0 +1,25 @@
+Description: Fix a failure to build with gcc5.
+Bug: http://bugs.debian.org/778035
+
+--- a/src/oidentd_util.c 2015-07-03 05:56:24.000000000 -0400
++++ b/src/oidentd_util.c 2015-07-03 05:56:47.671378000 -0400
+@@ -75,7 +75,7 @@
+ ** PRNG functions on systems whose libraries provide them.)
+ */
+
+-inline int randval(int i) {
++extern __attribute__ ((gnu_inline)) int randval(int i) {
+ /* Per _Numerical Recipes in C_: */
+ return ((double) i * rand() / (RAND_MAX+1.0));
+ }
+--- a/src/oidentd_util.h 2015-07-03 05:56:32.000000000 -0400
++++ b/src/oidentd_util.h 2015-07-03 05:56:53.835378000 -0400
+@@ -58,7 +58,7 @@
+ int find_group(const char *temp_group, gid_t *gid);
+
+ int random_seed(void);
+-inline int randval(int i);
++extern __attribute__ ((gnu_inline)) int randval(int i);
+
+ #ifndef HAVE_SNPRINTF
+ int snprintf(char *str, size_t n, char const *fmt, ...);
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
index 0193766..b93ad92 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,8 @@ IUSE="debug ipv6 masquerade"
src_prepare() {
epatch "${FILESDIR}/${P}-masquerading.patch" \
- "${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+ "${FILESDIR}/${P}-bind-to-ipv6-too.patch" \
+ "${FILESDIR}/${P}-gcc5.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/
@ 2017-07-14 22:06 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-07-14 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 25e131ac86f3f6ba433a4d0d01b216de8036940d
Author: Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Mon May 29 11:13:26 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 22:05:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e131ac
net-misc/oidentd: bump to EAPI 6, add fedora masquerading patches
also adding a dependency on the selinux policy for this package,
as well as adding myself as maintainer
Closes: https://github.com/gentoo/gentoo/pull/4611
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../files/oidentd-2.0.8-bind-to-ipv6-too.patch | 4 +-
.../files/oidentd-2.0.8-log-conntrack-fails.patch | 52 ++++++++++++++++++++++
.../oidentd-2.0.8-no-conntrack-masquerading.patch | 41 +++++++++++++++++
net-misc/oidentd/metadata.xml | 20 ++++++---
net-misc/oidentd/oidentd-2.0.8-r5.ebuild | 12 +++--
...ntd-2.0.8-r5.ebuild => oidentd-2.0.8-r6.ebuild} | 38 +++++++++++-----
6 files changed, 143 insertions(+), 24 deletions(-)
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
index b3b0e510033..2652622cdd4 100644
--- a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
+++ b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
@@ -1,7 +1,7 @@
Patch to bind to ipv6 socket as well
Patch supplied by Fabian Knittel <fabian.knittel@avona.com>
---- oidentd-2.0.8//src/oidentd_inet_util.c 2006-05-22 02:31:19.000000000 +0200
-+++ oidentd-2.0.8.new//src/oidentd_inet_util.c 2010-03-01 20:26:11.000000000 +0100
+--- oidentd-2.0.8/src/oidentd_inet_util.c 2006-05-22 02:31:19.000000000 +0200
++++ oidentd-2.0.8.new/src/oidentd_inet_util.c 2010-03-01 20:26:11.000000000 +0100
@@ -60,6 +60,12 @@
#ifdef WANT_IPV6
case AF_INET6:
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch b/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch
new file mode 100644
index 00000000000..d29479ec028
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch
@@ -0,0 +1,52 @@
+From 612f1d85dd59fc39b124392df38586769ebc8add Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 11 Mar 2016 10:00:59 +0100
+Subject: [PATCH] Log Linux core_init failures as normal error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Opening Linux conntracking table file failure for different reason than
+missing the file is fatal for deamon initizalization. But the failure
+was logged inly in debugging build.
+
+This patch makes the fatal error visible in normal log.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1316308
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/kernel/linux.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/kernel/linux.c b/src/kernel/linux.c
+index 8bf265f..9103dbf 100644
+--- a/src/kernel/linux.c
++++ b/src/kernel/linux.c
+@@ -73,21 +73,21 @@ bool core_init(void) {
+ masq_fp = fopen(MASQFILE, "r");
+ if (masq_fp == NULL) {
+ if (errno != ENOENT) {
+- debug("fopen: %s: %s", MASQFILE, strerror(errno));
++ o_log(NORMAL, "fopen: %s: %s", MASQFILE, strerror(errno));
+ return false;
+ }
+
+ masq_fp = fopen(CONNTRACK, "r");
+ if (masq_fp == NULL) {
+ if (errno != ENOENT) {
+- debug("fopen: %s: %s", CONNTRACK, strerror(errno));
++ o_log(NORMAL, "fopen: %s: %s", CONNTRACK, strerror(errno));
+ return false;
+ }
+
+ masq_fp = fopen(NFCONNTRACK, "r");
+ if (masq_fp == NULL) {
+ if (errno != ENOENT) {
+- debug("fopen: %s: %s", NFCONNTRACK, strerror(errno));
++ o_log(NORMAL, "fopen: %s: %s", NFCONNTRACK, strerror(errno));
+ return false;
+ }
+ masq_fp = fopen("/dev/null", "r");
+--
+2.5.0
+
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch b/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch
new file mode 100644
index 00000000000..92ef0252316
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch
@@ -0,0 +1,41 @@
+From 20a63ad8a90c36397cceedd34887298890dbafa3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 11 Mar 2016 10:38:10 +0100
+Subject: [PATCH] Linux: Do not open conntracking table if masquerading is not
+ enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The contracking table was always opened. This is unnecessary because
+the table is used only when masquerading feature is requested on run
+time.
+
+This patch skips opening the conntracking table on Linux if
+masquerading is not requested.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1316308
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/kernel/linux.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/kernel/linux.c b/src/kernel/linux.c
+index 9103dbf..859f554 100644
+--- a/src/kernel/linux.c
++++ b/src/kernel/linux.c
+@@ -70,6 +70,11 @@ bool netfilter;
+ */
+ bool core_init(void) {
+ #ifdef MASQ_SUPPORT
++ if (!opt_enabled(MASQ)) {
++ masq_fp = NULL;
++ return true;
++ }
++
+ masq_fp = fopen(MASQFILE, "r");
+ if (masq_fp == NULL) {
+ if (errno != ENOENT) {
+--
+2.5.0
+
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index d2a75a6ff73..3be9f1f5f13 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <use>
- <flag name="masquerade">Enable support for masqueraded/NAT connections</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">ojnk</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>Dessa@gmake.de</email>
+ <name>Robert Förster</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="masquerade">Enable support for masqueraded/NAT connections</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">ojnk</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
index 52eef485cdc..1a328a04f7a 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,10 +14,14 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="debug ipv6 masquerade"
+PATCHES=(
+ "${FILESDIR}/${P}-masquerading.patch"
+ "${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+ "${FILESDIR}/${P}-gcc5.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${P}-masquerading.patch" \
- "${FILESDIR}/${P}-bind-to-ipv6-too.patch" \
- "${FILESDIR}/${P}-gcc5.patch"
+ epatch -p1 "${PATCHES[@]}"
}
src_configure() {
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
similarity index 52%
copy from net-misc/oidentd/oidentd-2.0.8-r5.ebuild
copy to net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index 52eef485cdc..5330a191234 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils systemd
+inherit linux-info systemd
DESCRIPTION="Another (RFC1413 compliant) ident daemon"
HOMEPAGE="http://ojnk.sourceforge.net/"
@@ -11,13 +11,30 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="debug ipv6 masquerade"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug ipv6 masquerade selinux"
-src_prepare() {
- epatch "${FILESDIR}/${P}-masquerading.patch" \
- "${FILESDIR}/${P}-bind-to-ipv6-too.patch" \
- "${FILESDIR}/${P}-gcc5.patch"
+DEPEND=""
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-oident )"
+
+DOCS=( AUTHORS ChangeLog README TODO NEWS "${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf )
+
+PATCHES=(
+ "${FILESDIR}/${P}-masquerading.patch"
+ "${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+ "${FILESDIR}/${P}-gcc5.patch"
+ "${FILESDIR}/${P}-log-conntrack-fails.patch"
+ "${FILESDIR}/${P}-no-conntrack-masquerading.patch"
+)
+
+pkg_setup() {
+ local CONFIG_CHECK="~INET_TCP_DIAG"
+
+ if use kernel_linux; then
+ linux-info_pkg_setup
+ fi
}
src_configure() {
@@ -31,9 +48,6 @@ src_configure() {
src_install() {
default
- dodoc AUTHORS ChangeLog README TODO NEWS \
- "${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
-
newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/
@ 2019-02-03 14:53 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-02-03 14:53 UTC (permalink / raw
To: gentoo-commits
commit: 9ca63b8f40cab90250e10c023ed18fc704018db2
Author: Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Sun Jan 20 12:10:51 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 3 14:53:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca63b8f
net-misc/oidentd: remove old
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Robert Förster <Dessa <AT> gmake.de>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/oidentd/Manifest | 1 -
net-misc/oidentd/files/oidentd.service-r1 | 9 -----
net-misc/oidentd/files/oidentd_at.service-r1 | 7 ----
net-misc/oidentd/oidentd-2.0.8-r5.ebuild | 53 ----------------------------
net-misc/oidentd/oidentd-2.2.2.ebuild | 52 ---------------------------
5 files changed, 122 deletions(-)
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 89a0403d30c..087131e366b 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,3 +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
DIST oidentd-2.3.2.tar.xz 187772 BLAKE2B 460d2959cf9f1f125a76191f8b67a083a7d9bce84c706c76f6e8da6113b12eb6e760345774d15079ff449c153ac54805d4bfa8b057c1238ff703474e118b8458 SHA512 7293339897149a990928105e6cdd77aef7cd273f625496fcc674a414764ebfe835d2a9525e518a7215fc93537c48b70d15999d5669227dbb7fbf5cefb3d04e14
diff --git a/net-misc/oidentd/files/oidentd.service-r1 b/net-misc/oidentd/files/oidentd.service-r1
deleted file mode 100644
index af426eed617..00000000000
--- a/net-misc/oidentd/files/oidentd.service-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index dac0e70fd79..00000000000
--- a/net-misc/oidentd/files/oidentd_at.service-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-[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/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
deleted file mode 100644
index 1a328a04f7a..00000000000
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-DESCRIPTION="Another (RFC1413 compliant) ident daemon"
-HOMEPAGE="http://ojnk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="debug ipv6 masquerade"
-
-PATCHES=(
- "${FILESDIR}/${P}-masquerading.patch"
- "${FILESDIR}/${P}-bind-to-ipv6-too.patch"
- "${FILESDIR}/${P}-gcc5.patch"
-)
-
-src_prepare() {
- epatch -p1 "${PATCHES[@]}"
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable masquerade masq) \
- $(use_enable masquerade nat)
-}
-
-src_install() {
- default
-
- dodoc AUTHORS ChangeLog README TODO NEWS \
- "${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
-
- newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
- newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
-
- systemd_newunit "${FILESDIR}"/${PN}_at.service ${PN}@.service
- systemd_dounit "${FILESDIR}"/${PN}.socket
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- echo
- elog "Example configuration files are in /usr/share/doc/${PF}"
- echo
-}
diff --git a/net-misc/oidentd/oidentd-2.2.2.ebuild b/net-misc/oidentd/oidentd-2.2.2.ebuild
deleted file mode 100644
index 73fc0be4d05..00000000000
--- a/net-misc/oidentd/oidentd-2.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/
@ 2020-02-17 18:38 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2020-02-17 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 1cc9a7d0c5b62ab36e04c724f5fa6877fb09a88f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 18:38:11 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 18:38:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc9a7d0
net-misc/oidentd: security cleanup (#709454)
Bug: https://bugs.gentoo.org/709454
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-misc/oidentd/Manifest | 1 -
net-misc/oidentd/files/oidentd-2.0.7-confd | 4 --
.../files/oidentd-2.0.8-bind-to-ipv6-too.patch | 17 ------
net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch | 25 ---------
.../files/oidentd-2.0.8-log-conntrack-fails.patch | 52 ------------------
.../oidentd/files/oidentd-2.0.8-masquerading.patch | 43 ---------------
.../oidentd-2.0.8-no-conntrack-masquerading.patch | 41 --------------
net-misc/oidentd/files/oidentd.conf | 22 --------
net-misc/oidentd/files/oidentd.service | 9 ----
net-misc/oidentd/files/oidentd.socket | 10 ----
net-misc/oidentd/files/oidentd_at.service | 7 ---
net-misc/oidentd/files/oidentd_masq.conf | 10 ----
net-misc/oidentd/oidentd-2.0.8-r6.ebuild | 63 ----------------------
13 files changed, 304 deletions(-)
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 4639109ca44..6d1c2163397 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,2 +1 @@
-DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0
diff --git a/net-misc/oidentd/files/oidentd-2.0.7-confd b/net-misc/oidentd/files/oidentd-2.0.7-confd
deleted file mode 100644
index 3116889e67e..00000000000
--- a/net-misc/oidentd/files/oidentd-2.0.7-confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# oidentd start-up options
-USER="nobody"
-GROUP="nobody"
-OPTIONS=""
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
deleted file mode 100644
index 2652622cdd4..00000000000
--- a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch to bind to ipv6 socket as well
-Patch supplied by Fabian Knittel <fabian.knittel@avona.com>
---- oidentd-2.0.8/src/oidentd_inet_util.c 2006-05-22 02:31:19.000000000 +0200
-+++ oidentd-2.0.8.new/src/oidentd_inet_util.c 2010-03-01 20:26:11.000000000 +0100
-@@ -60,6 +60,12 @@
- #ifdef WANT_IPV6
- case AF_INET6:
- SIN6(ai->ai_addr)->sin6_port = listen_port;
-+
-+ if (setsockopt(listenfd, IPPROTO_IPV6, IPV6_V6ONLY, &one,
-+ sizeof(one)) != 0) {
-+ debug("setsockopt IPV6_V6ONLY: %s", strerror(errno));
-+ return (-1);
-+ }
- break;
- #endif
-
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
deleted file mode 100644
index a401a65d9bc..00000000000
--- a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix a failure to build with gcc5.
-Bug: http://bugs.debian.org/778035
-
---- a/src/oidentd_util.c 2015-07-03 05:56:24.000000000 -0400
-+++ b/src/oidentd_util.c 2015-07-03 05:56:47.671378000 -0400
-@@ -75,7 +75,7 @@
- ** PRNG functions on systems whose libraries provide them.)
- */
-
--inline int randval(int i) {
-+extern __attribute__ ((gnu_inline)) int randval(int i) {
- /* Per _Numerical Recipes in C_: */
- return ((double) i * rand() / (RAND_MAX+1.0));
- }
---- a/src/oidentd_util.h 2015-07-03 05:56:32.000000000 -0400
-+++ b/src/oidentd_util.h 2015-07-03 05:56:53.835378000 -0400
-@@ -58,7 +58,7 @@
- int find_group(const char *temp_group, gid_t *gid);
-
- int random_seed(void);
--inline int randval(int i);
-+extern __attribute__ ((gnu_inline)) int randval(int i);
-
- #ifndef HAVE_SNPRINTF
- int snprintf(char *str, size_t n, char const *fmt, ...);
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch b/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch
deleted file mode 100644
index d29479ec028..00000000000
--- a/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 612f1d85dd59fc39b124392df38586769ebc8add Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 11 Mar 2016 10:00:59 +0100
-Subject: [PATCH] Log Linux core_init failures as normal error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Opening Linux conntracking table file failure for different reason than
-missing the file is fatal for deamon initizalization. But the failure
-was logged inly in debugging build.
-
-This patch makes the fatal error visible in normal log.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1316308
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/kernel/linux.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/kernel/linux.c b/src/kernel/linux.c
-index 8bf265f..9103dbf 100644
---- a/src/kernel/linux.c
-+++ b/src/kernel/linux.c
-@@ -73,21 +73,21 @@ bool core_init(void) {
- masq_fp = fopen(MASQFILE, "r");
- if (masq_fp == NULL) {
- if (errno != ENOENT) {
-- debug("fopen: %s: %s", MASQFILE, strerror(errno));
-+ o_log(NORMAL, "fopen: %s: %s", MASQFILE, strerror(errno));
- return false;
- }
-
- masq_fp = fopen(CONNTRACK, "r");
- if (masq_fp == NULL) {
- if (errno != ENOENT) {
-- debug("fopen: %s: %s", CONNTRACK, strerror(errno));
-+ o_log(NORMAL, "fopen: %s: %s", CONNTRACK, strerror(errno));
- return false;
- }
-
- masq_fp = fopen(NFCONNTRACK, "r");
- if (masq_fp == NULL) {
- if (errno != ENOENT) {
-- debug("fopen: %s: %s", NFCONNTRACK, strerror(errno));
-+ o_log(NORMAL, "fopen: %s: %s", NFCONNTRACK, strerror(errno));
- return false;
- }
- masq_fp = fopen("/dev/null", "r");
---
-2.5.0
-
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch b/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch
deleted file mode 100644
index 191e9b95e64..00000000000
--- a/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- oidentd.orig/src/kernel/linux.c 2006-05-22 06:58:53.000000000 +0300
-+++ oidentd-2.0.8/src/kernel/linux.c 2007-07-11 21:28:56.000000000 +0300
-@@ -48,6 +48,7 @@
- #define CFILE6 "/proc/net/tcp6"
- #define MASQFILE "/proc/net/ip_masquerade"
- #define CONNTRACK "/proc/net/ip_conntrack"
-+#define NFCONNTRACK "/proc/net/nf_conntrack"
-
- static int netlink_sock;
- extern struct sockaddr_storage proxy;
-@@ -82,7 +83,15 @@
- debug("fopen: %s: %s", CONNTRACK, strerror(errno));
- return false;
- }
-- masq_fp = fopen("/dev/null", "r");
-+
-+ masq_fp = fopen(NFCONNTRACK, "r");
-+ if (masq_fp == NULL) {
-+ if (errno != ENOENT) {
-+ debug("fopen: %s: %s", NFCONNTRACK, strerror(errno));
-+ return false;
-+ }
-+ masq_fp = fopen("/dev/null", "r");
-+ }
- }
-
- netfilter = true;
-@@ -367,6 +376,15 @@
- &nport_temp, &mport_temp);
- }
-
-+ if (ret != 21) {
-+ ret = sscanf(buf,
-+ "%*15s %*d %15s %*d %*d ESTABLISHED src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d packets=%*d bytes=%*d src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d",
-+ proto, &l1, &l2, &l3, &l4, &r1, &r2, &r3, &r4,
-+ &masq_lport_temp, &masq_fport_temp,
-+ &nl1, &nl2, &nl3, &nl4, &nr1, &nr2, &nr3, &nr4,
-+ &nport_temp, &mport_temp);
-+ }
-+
- if (ret != 21)
- continue;
-
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch b/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch
deleted file mode 100644
index 92ef0252316..00000000000
--- a/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 20a63ad8a90c36397cceedd34887298890dbafa3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 11 Mar 2016 10:38:10 +0100
-Subject: [PATCH] Linux: Do not open conntracking table if masquerading is not
- enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The contracking table was always opened. This is unnecessary because
-the table is used only when masquerading feature is requested on run
-time.
-
-This patch skips opening the conntracking table on Linux if
-masquerading is not requested.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1316308
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/kernel/linux.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/kernel/linux.c b/src/kernel/linux.c
-index 9103dbf..859f554 100644
---- a/src/kernel/linux.c
-+++ b/src/kernel/linux.c
-@@ -70,6 +70,11 @@ bool netfilter;
- */
- bool core_init(void) {
- #ifdef MASQ_SUPPORT
-+ if (!opt_enabled(MASQ)) {
-+ masq_fp = NULL;
-+ return true;
-+ }
-+
- masq_fp = fopen(MASQFILE, "r");
- if (masq_fp == NULL) {
- if (errno != ENOENT) {
---
-2.5.0
-
diff --git a/net-misc/oidentd/files/oidentd.conf b/net-misc/oidentd/files/oidentd.conf
deleted file mode 100644
index 03b28d82780..00000000000
--- a/net-misc/oidentd/files/oidentd.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Configuration for oidentd
-# see oidentd.conf(5)
-#
-default {
- default {
- deny spoof
- deny spoof_all
- deny spoof_privport
- allow random
- allow random_numeric
- allow numeric
- deny hide
- }
-}
-
-# you may want to hide root connections
-#user "root" {
-# default {
-# force reply "UNKNOWN"
-# }
-#}
-
diff --git a/net-misc/oidentd/files/oidentd.service b/net-misc/oidentd/files/oidentd.service
deleted file mode 100644
index bf159d855b8..00000000000
--- a/net-misc/oidentd/files/oidentd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=TCP/IP IDENT protocol server
-
-[Service]
-ExecStart=/usr/sbin/oidentd -i -S -u nobody -g nobody
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/oidentd/files/oidentd.socket b/net-misc/oidentd/files/oidentd.socket
deleted file mode 100644
index 63df7036e54..00000000000
--- a/net-misc/oidentd/files/oidentd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) socket
-Conflicts=oidentd.service
-
-[Socket]
-ListenStream=113
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/net-misc/oidentd/files/oidentd_at.service b/net-misc/oidentd/files/oidentd_at.service
deleted file mode 100644
index ac03a94d6c8..00000000000
--- a/net-misc/oidentd/files/oidentd_at.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) per-connection server
-
-[Service]
-ExecStart=/usr/sbin/oidentd -I -S -u nobody -g nobody
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
diff --git a/net-misc/oidentd/files/oidentd_masq.conf b/net-misc/oidentd/files/oidentd_masq.conf
deleted file mode 100644
index 6811288ff4c..00000000000
--- a/net-misc/oidentd/files/oidentd_masq.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# oident masquarded connections configuration
-
-# use this file if your host is masquarading connections for several
-# hosts and you want to return a reply based on the hostname of
-# the originating machine
-# add "-f" to OIDENT_OPTIONS in /etc/conf.d/oidentd if you want
-# to forward ident requests to the real host
-
-# add hosts in the following format, see oidentd_masq.conf(5) for details:
-# <ip or host>[/mask] <username> <os>
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
deleted file mode 100644
index aa6c386da6e..00000000000
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd
-
-DESCRIPTION="Another (RFC1413 compliant) ident daemon"
-HOMEPAGE="https://oidentd.janikrabe.com/"
-SRC_URI="mirror://sourceforge/ojnk/${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=""
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-oident )"
-
-DOCS=( AUTHORS ChangeLog README TODO NEWS "${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf )
-
-PATCHES=(
- "${FILESDIR}/${P}-masquerading.patch"
- "${FILESDIR}/${P}-bind-to-ipv6-too.patch"
- "${FILESDIR}/${P}-gcc5.patch"
- "${FILESDIR}/${P}-log-conntrack-fails.patch"
- "${FILESDIR}/${P}-no-conntrack-masquerading.patch"
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~INET_TCP_DIAG"
-
- if use kernel_linux; then
- linux-info_pkg_setup
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable masquerade masq) \
- $(use_enable masquerade nat)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
- newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN}
-
- systemd_newunit "${FILESDIR}"/${PN}_at.service ${PN}@.service
- systemd_dounit "${FILESDIR}"/${PN}.socket
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- echo
- elog "Example configuration files are in /usr/share/doc/${PF}"
- echo
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/
@ 2021-08-17 18:41 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-08-17 18:41 UTC (permalink / raw
To: gentoo-commits
commit: 0c65bd4dd2f7001b8c521e06f5378e661a0d063b
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 18:41:06 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 18:41:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c65bd4d
net-misc/oidentd: fix compilation with disabled ipv6
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/oidentd-3.0.0-ipv6-masquerade.patch | 85 ++++++++++++++++++++++
net-misc/oidentd/oidentd-3.0.0-r1.ebuild | 2 +
2 files changed, 87 insertions(+)
diff --git a/net-misc/oidentd/files/oidentd-3.0.0-ipv6-masquerade.patch b/net-misc/oidentd/files/oidentd-3.0.0-ipv6-masquerade.patch
new file mode 100644
index 00000000000..47573e3f08a
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-3.0.0-ipv6-masquerade.patch
@@ -0,0 +1,85 @@
+From 5fdbfea671f75f869abeadd02a36bc941b25020f Mon Sep 17 00:00:00 2001
+From: Janik Rabe <info@janikrabe.com>
+Date: Tue, 17 Aug 2021 19:28:46 +0100
+Subject: [PATCH] Allow using masquerading without IPv6 support on Linux
+
+---
+ ChangeLog | 4 ++++
+ NEWS | 4 ++++
+ src/kernel/linux.c | 10 +++++++++-
+ 3 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 8102669..09f8db6 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2021-08-17 Janik Rabe <info@janikrabe.com>
++
++ * Allow using masquerading without IPv6 support on Linux.
++
+ 2021-08-16 Janik Rabe <info@janikrabe.com>
+
+ * Released as version 3.0.0.
+diff --git a/NEWS b/NEWS
+index bb64455..8820d3a 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,7 @@
++Unreleased changes
++
++ * Allow using masquerading without IPv6 support on Linux.
++
+ Changes in version 3.0.0
+
+ * Support for '--debug' is now included by default.
+diff --git a/src/kernel/linux.c b/src/kernel/linux.c
+index db0296c..f68e433 100644
+--- a/src/kernel/linux.c
++++ b/src/kernel/linux.c
+@@ -462,10 +462,12 @@ static int masq_ct_line(char *line,
+ in_addr_t remotem4;
+ in_addr_t localn4;
+ in_addr_t remoten4;
++#if WANT_IPV6
+ struct in6_addr localm6;
+ struct in6_addr remotem6;
+ struct in6_addr localn6;
+ struct in6_addr remoten6;
++#endif
+ u_int32_t nport_temp;
+ u_int32_t mport_temp;
+ u_int32_t masq_lport_temp;
+@@ -511,6 +513,8 @@ static int masq_ct_line(char *line,
+ sin_setv4(remoten4, &remoten_ss);
+
+ break;
++
++#if WANT_IPV6
+ case AF_INET6:
+ if (strcasecmp(family, "ipv6"))
+ return 1;
+@@ -527,9 +531,11 @@ static int masq_ct_line(char *line,
+ sin_setv6(&remoten6, &remoten_ss);
+
+ break;
++#endif
++
+ default:
+ debug("masq_ct_line: bad address family %d", faddr->ss_family);
+- return -1;
++ return 1;
+ }
+
+ masq_lport = (in_port_t) masq_lport_temp;
+@@ -561,8 +567,10 @@ static int masq_ct_line(char *line,
+ if (con_uid == MISSING_UID && faddr->ss_family == AF_INET)
+ con_uid = get_user4(htons(masq_lport), htons(masq_fport), laddr, &remotem_ss);
+
++#if WANT_IPV6
+ if (con_uid == MISSING_UID && faddr->ss_family == AF_INET6)
+ con_uid = get_user6(htons(masq_lport), htons(masq_fport), laddr, &remotem_ss);
++#endif
+
+ if (con_uid == MISSING_UID)
+ return -1;
diff --git a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild b/net-misc/oidentd/oidentd-3.0.0-r1.ebuild
index 614fff09c55..3c1eea07ecf 100644
--- a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild
+++ b/net-misc/oidentd/oidentd-3.0.0-r1.ebuild
@@ -28,6 +28,8 @@ BDEPEND="
sys-devel/flex
"
+PATCHES=( "${FILESDIR}/${P}-ipv6-masquerade.patch" )
+
src_prepare() {
sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/
@ 2023-09-02 13:37 Arthur Zamarin
0 siblings, 0 replies; 6+ messages in thread
From: Arthur Zamarin @ 2023-09-02 13:37 UTC (permalink / raw
To: gentoo-commits
commit: e87846004085e75f079bd72195b0be8c548a1df1
Author: Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Thu Aug 31 22:32:19 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 13:36:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8784600
net-misc/oidentd: drop 2.5.0
Signed-off-by: Robert Förster <Dessa <AT> gmake.de>
Closes: https://github.com/gentoo/gentoo/pull/32542
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/oidentd/Manifest | 1 -
.../oidentd/files/oidentd-2.5.0-respect-ar.patch | 12 -----
net-misc/oidentd/oidentd-2.5.0.ebuild | 55 ----------------------
3 files changed, 68 deletions(-)
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 53a062b75d15..5c40fbb4aceb 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,3 +1,2 @@
-DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
DIST oidentd-3.0.0.tar.xz 187088 BLAKE2B ca824119cbb54aee52658c9a167ace88b2ed7f118565d7be043e19534a323772d18a043d803cd553c7408a525e3c717ffb990fb8794b4af4e8ac6c1efe4571c0 SHA512 92e733272979c08bba012f33aa6e0eadc15e18e03c24258b0333f74c201df87cc619012e2d8da69aac10c15684691464f59551c9b9d83e690b3902e47f649c68
DIST oidentd-3.1.0.tar.xz 183596 BLAKE2B ed648b525153437659b9437612eb8023465d6e45a401ba64bda86e82948c588a2da4da877b371a6bb2b6f0e6f29f1a5ec844009bb2bfcf4eb0d830254da03bcd SHA512 03ce6c64a4351cecdc9177e5a035860d433689de4c86d344eab5af9810b03caedface983c4c4fb2e7ae31b7d868bfcbdd15a094a3f79f43c400258c4902a5972
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
deleted file mode 100644
index 156b136f7755..000000000000
--- a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index fd799d2a1495..000000000000
--- a/net-misc/oidentd/oidentd-2.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-02 13:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-19 12:25 [gentoo-commits] repo/gentoo:master commit in: net-misc/oidentd/files/, net-misc/oidentd/ Christoph Mende
-- strict thread matches above, loose matches on Subject: below --
2017-07-14 22:06 Michał Górny
2019-02-03 14:53 Andreas Sturmlechner
2020-02-17 18:38 Thomas Deutschmann
2021-08-17 18:41 Conrad Kostecki
2023-09-02 13:37 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox