Date: Sunday, May 12, 2013 @ 08:17:21 Author: eric Revision: 185195 upgpkg: inetutils 1.9.1-5
Remove initscripts support, Move binaries in /usr/sbin to /usr/bin, Clean up depends Modified: inetutils/trunk/PKGBUILD inetutils/trunk/ftpd.service inetutils/trunk/inetutils.install inetutils/trunk/rlogin.xinetd inetutils/trunk/rsh.xinetd inetutils/trunk/talk.xinetd inetutils/trunk/telnet.xinetd Deleted: inetutils/trunk/ftpd.conf inetutils/trunk/ftpd.rc -------------------+ PKGBUILD | 39 ++++++++++++++++++--------------------- ftpd.conf | 4 ---- ftpd.rc | 37 ------------------------------------- ftpd.service | 2 +- inetutils.install | 2 +- rlogin.xinetd | 2 +- rsh.xinetd | 2 +- talk.xinetd | 2 +- telnet.xinetd | 2 +- 9 files changed, 24 insertions(+), 68 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-12 04:33:49 UTC (rev 185194) +++ PKGBUILD 2013-05-12 06:17:21 UTC (rev 185195) @@ -3,36 +3,34 @@ pkgname=inetutils pkgver=1.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" license=('GPL3') groups=('base') -depends=('readline' 'ncurses' 'pam') -backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ +depends=('pam') +backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') options=('!emptydirs') install=inetutils.install source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ - ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ + telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ ftpd.service dnsdomainname) sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' - 'ff0aad9946a38915580b094dadf67e790e8a2f87' - '84dc802b5e57b5e04c847572225a3b9612017155' - '68a590083b45997dfdb80e666b2de762f494ba74' - 'bfad98a4a62f1fff8779f076c6019ed07f9111af' - '27d99b910eec0fc26bd79ccc2c1de26608330298' - '81f10b3b688e3952f793b35bcef63b5bf257a92b' - '81f4a8da823cf0bb14284fc71ee6108849691eda' - 'fb607dafe177f074e14891dd887ef9e9ab67a875' + 'SKIP' + '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3' + 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c' + 'd9b8f8aab094ecb779d0f16f21b4683ab327516f' + '26763ae31b8a5be256666a0ba55746941d75d6ee' + 'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802' 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h - ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ - --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ + ./configure --prefix=/usr --libexec=/usr/bin \ + --localstatedir=/var --sysconfdir=/etc \ --without-wrap --with-pam \ --enable-ftp --enable-ftpd \ --enable-telnet --enable-telnetd \ @@ -50,20 +48,19 @@ } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d "${pkgdir}/bin" - ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" - install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" + ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname" + ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname" + install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname" echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" - install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" - install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" Deleted: ftpd.conf =================================================================== --- ftpd.conf 2013-05-12 04:33:49 UTC (rev 185194) +++ ftpd.conf 2013-05-12 06:17:21 UTC (rev 185195) @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ftpd -# -FTPD_ARGS="" Deleted: ftpd.rc =================================================================== --- ftpd.rc 2013-05-12 04:33:49 UTC (rev 185194) +++ ftpd.rc 2013-05-12 06:17:21 UTC (rev 185195) @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ftpd - -PID=$(pidof -o %PPID /usr/sbin/ftpd) -case "$1" in - start) - stat_busy "Starting ftpd" - [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ftpd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Modified: ftpd.service =================================================================== --- ftpd.service 2013-05-12 04:33:49 UTC (rev 185194) +++ ftpd.service 2013-05-12 06:17:21 UTC (rev 185195) @@ -3,7 +3,7 @@ After=network.target [Service] -ExecStart=/usr/sbin/ftpd -D +ExecStart=/usr/bin/ftpd -D Type=forking [Install] Modified: inetutils.install =================================================================== --- inetutils.install 2013-05-12 04:33:49 UTC (rev 185194) +++ inetutils.install 2013-05-12 06:17:21 UTC (rev 185195) @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(inetutils.info.gz) post_install() { Modified: rlogin.xinetd =================================================================== --- rlogin.xinetd 2013-05-12 04:33:49 UTC (rev 185194) +++ rlogin.xinetd 2013-05-12 06:17:21 UTC (rev 185195) @@ -4,7 +4,7 @@ socket_type = stream wait = no user = root - server = /usr/sbin/rlogind + server = /usr/bin/rlogind log_on_failure += USERID disable = yes } Modified: rsh.xinetd =================================================================== --- rsh.xinetd 2013-05-12 04:33:49 UTC (rev 185194) +++ rsh.xinetd 2013-05-12 06:17:21 UTC (rev 185195) @@ -4,7 +4,7 @@ socket_type = stream wait = no user = root - server = /usr/sbin/rshd + server = /usr/bin/rshd log_on_failure += USERID disable = yes } Modified: talk.xinetd =================================================================== --- talk.xinetd 2013-05-12 04:33:49 UTC (rev 185194) +++ talk.xinetd 2013-05-12 06:17:21 UTC (rev 185195) @@ -4,7 +4,7 @@ socket_type = dgram wait = yes user = root - server = /usr/sbin/talkd + server = /usr/bin/talkd log_on_failure += USERID disable = yes } Modified: telnet.xinetd =================================================================== --- telnet.xinetd 2013-05-12 04:33:49 UTC (rev 185194) +++ telnet.xinetd 2013-05-12 06:17:21 UTC (rev 185195) @@ -4,7 +4,7 @@ socket_type = stream wait = no user = root - server = /usr/sbin/telnetd + server = /usr/bin/telnetd log_on_failure += USERID disable = yes }