Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/xinetd/, sys-apps/xinetd/files/
Date: Thu, 23 Apr 2020 14:56:29
Message-Id: 1587653767.26cd6a6e2be7f7291b496f0c06f6ec71a108dc34.blueness@gentoo
1 commit: 26cd6a6e2be7f7291b496f0c06f6ec71a108dc34
2 Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz>
3 AuthorDate: Thu Apr 23 07:16:13 2020 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 23 14:56:07 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=26cd6a6e
7
8 xinetd: Many fixes now incorporated into new upstream. ::gentoo builds fine.
9
10 Gentoo has switched from raw xinetd upstream to openSUSE's fork, with a lot
11 of fixes applied, including various contributions from vapier over the last
12 three or so years.
13
14 In-tree version builds fine:
15 >>> Completed installing sys-apps/xinetd-2.3.15.3 into /var/tmp/portage/sys-apps/xinetd-2.3.15.3/image/
16 >>> sys-apps/xinetd-2.3.15.3 merged.
17
18 Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
19 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
20
21 sys-apps/xinetd/Manifest | 1 -
22 sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch | 27 -----------
23 sys-apps/xinetd/files/xinetd-2.3.14-config.patch | 9 ----
24 .../files/xinetd-2.3.14-install-contrib.patch | 24 ----------
25 .../files/xinetd-2.3.15-no-rpc-netdb_h.patch | 21 --------
26 .../xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch | 49 -------------------
27 sys-apps/xinetd/files/xinetd.confd | 3 --
28 sys-apps/xinetd/files/xinetd.rc6 | 33 -------------
29 sys-apps/xinetd/files/xinetd.service | 10 ----
30 sys-apps/xinetd/metadata.xml | 14 ------
31 sys-apps/xinetd/xinetd-2.3.15-r99.ebuild | 56 ----------------------
32 11 files changed, 247 deletions(-)
33
34 diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
35 deleted file mode 100644
36 index 1bba7b7..0000000
37 --- a/sys-apps/xinetd/Manifest
38 +++ /dev/null
39 @@ -1 +0,0 @@
40 -DIST xinetd-2.3.15.tar.gz 309774 SHA256 bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa WHIRLPOOL 5bcf69b2cfac3b3713648da666e4c98d62caea4c506be9dc5cc84f1acdc643812460a158b092705274d7452d394d3f2c03b5635f135f5d900bb6a5406f0350c2
41
42 diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch b/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch
43 deleted file mode 100644
44 index 2ebdf4c..0000000
45 --- a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch
46 +++ /dev/null
47 @@ -1,27 +0,0 @@
48 ---- Makefile.in.orig 2005-10-29 22:08:54.000000000 -0400
49 -+++ Makefile.in 2005-10-29 22:09:32.000000000 -0400
50 -@@ -75,15 +75,15 @@
51 -
52 - install: build
53 - for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
54 -- test -d $$i || mkdir -p $$i ; done
55 -- $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
56 -- $(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
57 -- $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
58 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
59 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
60 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
61 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
62 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
63 -+ test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done
64 -+ $(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR)
65 -+ $(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR)
66 -+ $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR)
67 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5
68 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8
69 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8
70 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8
71 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8
72 - @echo "You must put your xinetd.conf in /etc/xinetd.conf"
73 - @echo "There is a sample config file in xinetd/sample.conf and you can"
74 - @echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
75
76 diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-config.patch b/sys-apps/xinetd/files/xinetd-2.3.14-config.patch
77 deleted file mode 100644
78 index c368dea..0000000
79 --- a/sys-apps/xinetd/files/xinetd-2.3.14-config.patch
80 +++ /dev/null
81 @@ -1,9 +0,0 @@
82 ---- contrib/xinetd.conf
83 -+++ contrib/xinetd.conf
84 -@@ -22,5 +22,5 @@
85 - #
86 - # no_access =
87 --# only_from =
88 -+ only_from = localhost
89 - # max_load = 0
90 - cps = 50 10
91
92 diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch b/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch
93 deleted file mode 100644
94 index c1717e4..0000000
95 --- a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch
96 +++ /dev/null
97 @@ -1,24 +0,0 @@
98 ---- xinetd-2.3.14/Makefile.in
99 -+++ xinetd-2.3.14/Makefile.in
100 -@@ -9,6 +9,7 @@
101 - DESTDIR =
102 - prefix = @prefix@
103 - exec_prefix = @exec_prefix@
104 -+ETCDIR = @sysconfdir@
105 - DAEMONDIR = @sbindir@
106 - MANDIR = @mandir@
107 - topdir = @top_srcdir@
108 -@@ -97,7 +98,12 @@
109 - rm -f $(MANDIR)/man8/xinetd.log.8
110 - rm -f $(MANDIR)/man8/xinetd.8
111 - rm -f $(MANDIR)/man8/itox.8
112 --
113 -+
114 -+install-contrib:
115 -+ test -d $(DESTDIR)$(ETCDIR)/xinetd.d || mkdir -p $(DESTDIR)$(ETCDIR)/xinetd.d
116 -+ $(INSTALL_CMD) -m 644 contrib/xinetd.conf $(DESTDIR)$(ETCDIR)
117 -+ $(INSTALL_CMD) -m 644 contrib/xinetd.d/* $(DESTDIR)$(ETCDIR)/xinetd.d
118 -+
119 - distclean: clean
120 - rm -f config.cache config.log Makefile config.status xinetd/itox
121 - rm -f config.h @srcdir@/libs/include/* @srcdir@/libs/man/*
122
123 diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-no-rpc-netdb_h.patch b/sys-apps/xinetd/files/xinetd-2.3.15-no-rpc-netdb_h.patch
124 deleted file mode 100644
125 index c52c599..0000000
126 --- a/sys-apps/xinetd/files/xinetd-2.3.15-no-rpc-netdb_h.patch
127 +++ /dev/null
128 @@ -1,21 +0,0 @@
129 -diff -Naur xinetd-2.3.15.orig/xinetd/confparse.c xinetd-2.3.15/xinetd/confparse.c
130 ---- xinetd-2.3.15.orig/xinetd/confparse.c 2007-09-20 10:58:27.000000000 -0400
131 -+++ xinetd-2.3.15/xinetd/confparse.c 2015-07-15 17:44:58.782269320 -0400
132 -@@ -632,7 +632,7 @@
133 - */
134 - continue;
135 - }
136 --#if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
137 -+#ifdef HAVE_RPC_RPCENT_H
138 - if ( SC_IS_RPC( scp ) && SC_IS_RPC ( tmp_scp ) )
139 - {
140 - const struct rpc_data *rdp1 = SC_RPCDATA( scp ) ;
141 -@@ -746,7 +746,7 @@
142 - }
143 -
144 - /* #ifndef NO_RPC */
145 --#if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
146 -+#ifdef HAVE_RPC_RPCENT_H
147 - if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
148 - {
149 - struct rpcent *rep = (struct rpcent *)getrpcbyname( SC_NAME(scp) ) ;
150
151 diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch b/sys-apps/xinetd/files/xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch
152 deleted file mode 100644
153 index b3d3f3c..0000000
154 --- a/sys-apps/xinetd/files/xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch
155 +++ /dev/null
156 @@ -1,49 +0,0 @@
157 -diff -Naur xinetd-2.3.15.orig/aclocal.m4 xinetd-2.3.15/aclocal.m4
158 ---- xinetd-2.3.15.orig/aclocal.m4 2003-02-19 12:29:27.000000000 -0500
159 -+++ xinetd-2.3.15/aclocal.m4 1969-12-31 19:00:00.000000000 -0500
160 -@@ -1,27 +0,0 @@
161 --dnl Check for variable types.
162 --dnl
163 --AC_DEFUN(XINETD_CHECK_TYPE,
164 --[AC_REQUIRE([AC_HEADER_STDC])dnl
165 --AC_MSG_CHECKING(for $1)
166 --AC_CACHE_VAL(xinetd_cv_type_$1,
167 --[AC_EGREP_CPP($1, [#include <sys/types.h>
168 --#if STDC_HEADERS
169 --#include <stdlib.h>
170 --#endif
171 --#if HAVE_NETDB_H
172 --#include <netdb.h>
173 --#endif
174 --#if HAVE_RLIM_T
175 --#include <sys/resource.h>
176 --#endif
177 --#if HAVE_STDINT_H
178 --#include <stdint.h>
179 --#endif
180 --#if HAVE_UNISTD_H
181 --#include <unistd.h>
182 --#endif], xinetd_cv_type_$1=yes, xinetd_cv_type_$1=no)])dnl
183 --AC_MSG_RESULT($xinetd_cv_type_$1)
184 --if test $xinetd_cv_type_$1 = no; then
185 -- AC_DEFINE($1, $2)
186 --fi
187 --])
188 -diff -Naur xinetd-2.3.15.orig/configure.in xinetd-2.3.15/configure.in
189 ---- xinetd-2.3.15.orig/configure.in 2007-09-20 10:58:27.000000000 -0400
190 -+++ xinetd-2.3.15/configure.in 2015-07-15 17:42:15.415277150 -0400
191 -@@ -65,14 +65,6 @@
192 - ])
193 - ])
194 -
195 --XINETD_CHECK_TYPE(uint16_t, unsigned short)
196 --XINETD_CHECK_TYPE(uint32_t, unsigned int)
197 --XINETD_CHECK_TYPE(uint64_t, unsigned long long)
198 --XINETD_CHECK_TYPE(uid_t, unsigned int)
199 --XINETD_CHECK_TYPE(gid_t, unsigned int)
200 --XINETD_CHECK_TYPE(socklen_t, unsigned int)
201 --XINETD_CHECK_TYPE(rlim_t, long long)
202 --
203 - AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [
204 - AC_TRY_COMPILE(
205 - [
206
207 diff --git a/sys-apps/xinetd/files/xinetd.confd b/sys-apps/xinetd/files/xinetd.confd
208 deleted file mode 100644
209 index ae211f3..0000000
210 --- a/sys-apps/xinetd/files/xinetd.confd
211 +++ /dev/null
212 @@ -1,3 +0,0 @@
213 -# /etc/conf.d/xinetd: config file for /etc/init.d/xinetd
214 -
215 -XINETD_OPTS="-stayalive -reuse"
216
217 diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
218 deleted file mode 100644
219 index 57cee36..0000000
220 --- a/sys-apps/xinetd/files/xinetd.rc6
221 +++ /dev/null
222 @@ -1,33 +0,0 @@
223 -#!/sbin/runscript
224 -# Copyright 1999-2011 Gentoo Foundation
225 -# Distributed under the terms of the GNU General Public License v2
226 -# $Id$
227 -
228 -extra_started_commands="reload dump check"
229 -
230 -depend() {
231 - use net
232 -}
233 -
234 -start() {
235 - ebegin "Starting xinetd"
236 - start-stop-daemon --start --exec /usr/sbin/xinetd -- \
237 - -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
238 - eend $?
239 -}
240 -
241 -stop() {
242 - ebegin "Stopping xinetd"
243 - start-stop-daemon --stop --quiet --pidfile /var/run/xinetd.pid
244 - eend $?
245 -}
246 -
247 -do_sig() {
248 - local sig=$1 ; shift
249 - ebegin "$*"
250 - start-stop-daemon --signal ${sig} --pidfile /var/run/xinetd.pid
251 - eend $?
252 -}
253 -reload() { do_sig HUP "Reloading configuration" ; }
254 -dump() { do_sig USR1 "Dumping configuration" ; }
255 -check() { do_sig IOT "Performing Consistency Check" ; }
256
257 diff --git a/sys-apps/xinetd/files/xinetd.service b/sys-apps/xinetd/files/xinetd.service
258 deleted file mode 100644
259 index c6f6271..0000000
260 --- a/sys-apps/xinetd/files/xinetd.service
261 +++ /dev/null
262 @@ -1,10 +0,0 @@
263 -[Unit]
264 -Description=A secure replacement for inetd
265 -After=network.target
266 -
267 -[Service]
268 -ExecStart=/usr/sbin/xinetd -dontfork
269 -ExecReload=/bin/kill -HUP $MAINPID
270 -
271 -[Install]
272 -WantedBy=multi-user.target
273
274 diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
275 deleted file mode 100644
276 index e143258..0000000
277 --- a/sys-apps/xinetd/metadata.xml
278 +++ /dev/null
279 @@ -1,14 +0,0 @@
280 -<?xml version="1.0" encoding="UTF-8"?>
281 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
282 -<pkgmetadata>
283 - <maintainer type="project">
284 - <email>base-system@g.o</email>
285 - <name>Gentoo Base System</name>
286 - </maintainer>
287 - <use>
288 - <flag name="rpc">support RPC services</flag>
289 - </use>
290 - <upstream>
291 - <remote-id type="github">xinetd-org/xinetd</remote-id>
292 - </upstream>
293 -</pkgmetadata>
294
295 diff --git a/sys-apps/xinetd/xinetd-2.3.15-r99.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r99.ebuild
296 deleted file mode 100644
297 index 86e6ee7..0000000
298 --- a/sys-apps/xinetd/xinetd-2.3.15-r99.ebuild
299 +++ /dev/null
300 @@ -1,56 +0,0 @@
301 -# Copyright 1999-2016 Gentoo Foundation
302 -# Distributed under the terms of the GNU General Public License v2
303 -
304 -EAPI="4"
305 -
306 -inherit autotools eutils flag-o-matic systemd toolchain-funcs
307 -
308 -DESCRIPTION="powerful replacement for inetd"
309 -HOMEPAGE="http://www.xinetd.org/"
310 -SRC_URI="http://www.xinetd.org/${P}.tar.gz"
311 -
312 -LICENSE="BSD"
313 -SLOT="0"
314 -KEYWORDS="amd64 arm arm64 ~mips ppc x86"
315 -IUSE="perl rpc tcpd"
316 -
317 -DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
318 - rpc? ( net-libs/libtirpc )"
319 -RDEPEND="${DEPEND}
320 - perl? ( dev-lang/perl )"
321 -DEPEND="${DEPEND}
322 - virtual/pkgconfig"
323 -
324 -src_prepare() {
325 - epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch
326 - epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch
327 - epatch "${FILESDIR}"/${PN}-2.3.14-config.patch
328 - epatch "${FILESDIR}"/${PN}-2.3.15-no-rpc-netdb_h.patch
329 - epatch "${FILESDIR}"/${PN}-2.3.15-remove-XINETD_CHECK_TYPE.patch
330 - eautoconf
331 - find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
332 -}
333 -
334 -src_configure() {
335 - if ! use rpc ; then
336 - append-cppflags -DNO_RPC
337 - export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
338 - fi
339 - tc-export AR PKG_CONFIG
340 - LIBS=$(${PKG_CONFIG} --libs libtirpc) \
341 - econf \
342 - $(use_with tcpd libwrap) \
343 - --with-loadavg
344 -}
345 -
346 -src_install() {
347 - emake DESTDIR="${ED}" install install-contrib
348 - use perl || rm -f "${ED}"/usr/sbin/xconv.pl
349 -
350 - newinitd "${FILESDIR}"/xinetd.rc6 xinetd
351 - newconfd "${FILESDIR}"/xinetd.confd xinetd
352 - systemd_dounit "${FILESDIR}/${PN}.service"
353 -
354 - newdoc contrib/xinetd.conf xinetd.conf.dist.sample
355 - dodoc AUDIT INSTALL README TODO CHANGELOG
356 -}
Report Message
Find on MARC Find on Google Groups