[arch-commits] Commit in bftpd/repos (32 files)
Thomas Bächler
thomas at archlinux.org
Wed Aug 29 23:52:16 UTC 2012
Date: Wednesday, August 29, 2012 @ 19:52:16
Author: thomas
Revision: 165789
db-move: moved bftpd from [testing] to [extra] (i686, x86_64)
Added:
bftpd/repos/extra-i686/PKGBUILD
(from rev 165788, bftpd/repos/testing-i686/PKGBUILD)
bftpd/repos/extra-i686/bftpd.install
(from rev 165788, bftpd/repos/testing-i686/bftpd.install)
bftpd/repos/extra-i686/bftpd.logrotate
(from rev 165788, bftpd/repos/testing-i686/bftpd.logrotate)
bftpd/repos/extra-i686/bftpd.pam
(from rev 165788, bftpd/repos/testing-i686/bftpd.pam)
bftpd/repos/extra-i686/bftpd.rc
(from rev 165788, bftpd/repos/testing-i686/bftpd.rc)
bftpd/repos/extra-i686/bftpd.service
(from rev 165788, bftpd/repos/testing-i686/bftpd.service)
bftpd/repos/extra-i686/bftpd.socket
(from rev 165788, bftpd/repos/testing-i686/bftpd.socket)
bftpd/repos/extra-i686/bftpd.xinetd
(from rev 165788, bftpd/repos/testing-i686/bftpd.xinetd)
bftpd/repos/extra-i686/bftpd_AT.service
(from rev 165788, bftpd/repos/testing-i686/bftpd_AT.service)
bftpd/repos/extra-x86_64/PKGBUILD
(from rev 165788, bftpd/repos/testing-x86_64/PKGBUILD)
bftpd/repos/extra-x86_64/bftpd.install
(from rev 165788, bftpd/repos/testing-x86_64/bftpd.install)
bftpd/repos/extra-x86_64/bftpd.logrotate
(from rev 165788, bftpd/repos/testing-x86_64/bftpd.logrotate)
bftpd/repos/extra-x86_64/bftpd.pam
(from rev 165788, bftpd/repos/testing-x86_64/bftpd.pam)
bftpd/repos/extra-x86_64/bftpd.rc
(from rev 165788, bftpd/repos/testing-x86_64/bftpd.rc)
bftpd/repos/extra-x86_64/bftpd.service
(from rev 165788, bftpd/repos/testing-x86_64/bftpd.service)
bftpd/repos/extra-x86_64/bftpd.socket
(from rev 165788, bftpd/repos/testing-x86_64/bftpd.socket)
bftpd/repos/extra-x86_64/bftpd.xinetd
(from rev 165788, bftpd/repos/testing-x86_64/bftpd.xinetd)
bftpd/repos/extra-x86_64/bftpd_AT.service
(from rev 165788, bftpd/repos/testing-x86_64/bftpd_AT.service)
Deleted:
bftpd/repos/extra-i686/PKGBUILD
bftpd/repos/extra-i686/bftpd.install
bftpd/repos/extra-i686/bftpd.logrotate
bftpd/repos/extra-i686/bftpd.pam
bftpd/repos/extra-i686/bftpd.rc
bftpd/repos/extra-i686/bftpd.xinetd
bftpd/repos/extra-x86_64/PKGBUILD
bftpd/repos/extra-x86_64/bftpd.install
bftpd/repos/extra-x86_64/bftpd.logrotate
bftpd/repos/extra-x86_64/bftpd.pam
bftpd/repos/extra-x86_64/bftpd.rc
bftpd/repos/extra-x86_64/bftpd.xinetd
bftpd/repos/testing-i686/
bftpd/repos/testing-x86_64/
-------------------------------+
extra-i686/PKGBUILD | 129 +++++++++++++++++++++-------------------
extra-i686/bftpd.install | 22 +++---
extra-i686/bftpd.logrotate | 10 +--
extra-i686/bftpd.pam | 6 -
extra-i686/bftpd.rc | 88 +++++++++++++--------------
extra-i686/bftpd.service | 10 +++
extra-i686/bftpd.socket | 10 +++
extra-i686/bftpd.xinetd | 22 +++---
extra-i686/bftpd_AT.service | 8 ++
extra-x86_64/PKGBUILD | 129 +++++++++++++++++++++-------------------
extra-x86_64/bftpd.install | 22 +++---
extra-x86_64/bftpd.logrotate | 10 +--
extra-x86_64/bftpd.pam | 6 -
extra-x86_64/bftpd.rc | 88 +++++++++++++--------------
extra-x86_64/bftpd.service | 10 +++
extra-x86_64/bftpd.socket | 10 +++
extra-x86_64/bftpd.xinetd | 22 +++---
extra-x86_64/bftpd_AT.service | 8 ++
18 files changed, 344 insertions(+), 266 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-i686/PKGBUILD 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=bftpd
-pkgver=3.8
-pkgrel=1
-pkgdesc="Small, easy-to-configure FTP server"
-arch=(i686 x86_64)
-url="http://bftpd.sourceforge.net/"
-license=('GPL')
-depends=('glibc' 'pam')
-install=bftpd.install
-backup=(etc/bftpd.conf
- etc/logrotate.d/bftpd
- etc/pam.d/bftpd
- etc/xinetd.d/bftpd)
-source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
- bftpd.rc
- bftpd.logrotate
- bftpd.pam
- bftpd.xinetd)
-md5sums=('880c1274e623ddd1e3e37f9f0cf09d70'
- '56a1bf7738a6db2b2cff89e611f4f11a'
- '853680dad0df39d0b4d2fb43d4be430a'
- '96f82c38f3f540b53f3e5144900acf17'
- 'ff70fd962666f4d74749a1c68167a966')
-
-build() {
- cd "${srcdir}"/$pkgname
- # The bftpd author keeps screwing up the release tarballs
- rm -f config.{cache,status}
- ./configure --prefix=/usr \
- --enable-pam \
- --mandir=/usr/share/man \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${srcdir}"/$pkgname
- install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8}
- install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd
- install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
- make DESTDIR="${pkgdir}" install
- # Remove log file and /var/run from the package
- # This guy keeps messing up his Makefile, /usr/var, wtf?
- rm -f "${pkgdir}"/usr/var/log/bftpd.log
- rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,}
- # Install PAM file
- mkdir -p "${pkgdir}"/etc/pam.d
- cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
- # Install xinetd file
- install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
- # Did I mention this guy keeps messing up his Makefiles?
- mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/
- rmdir "${pkgdir}"/usr/etc
- # Fix default in config file
- sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
-}
Copied: bftpd/repos/extra-i686/PKGBUILD (from rev 165788, bftpd/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=bftpd
+pkgver=3.8
+pkgrel=2
+pkgdesc="Small, easy-to-configure FTP server"
+arch=(i686 x86_64)
+url="http://bftpd.sourceforge.net/"
+license=('GPL')
+depends=('glibc' 'pam')
+install=bftpd.install
+backup=(etc/bftpd.conf
+ etc/logrotate.d/bftpd
+ etc/pam.d/bftpd
+ etc/xinetd.d/bftpd)
+source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
+ bftpd.rc
+ bftpd.logrotate
+ bftpd.pam
+ bftpd.xinetd
+ bftpd.service
+ bftpd.socket
+ bftpd_AT.service)
+md5sums=('880c1274e623ddd1e3e37f9f0cf09d70'
+ '2419d7293000813f9d01bd357181445c'
+ '853680dad0df39d0b4d2fb43d4be430a'
+ '96f82c38f3f540b53f3e5144900acf17'
+ '23feb84e8ecbae5df320b49e01821d9a'
+ '94b483f7c7b65580a30ebc6a8fe80d1b'
+ '93509ee83148160f60c009a2192a6774'
+ 'cb6a3334a7c8b5b8b559a643a65928c4')
+
+build() {
+ cd "${srcdir}"/$pkgname
+ # The bftpd author keeps screwing up the release tarballs
+ rm -f config.{cache,status}
+ sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in
+ ./configure --prefix=/usr \
+ --enable-pam \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname
+ install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8}
+ install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd
+ install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
+ make DESTDIR="${pkgdir}" install
+ # Remove log file and /var/run from the package
+ # This guy keeps messing up his Makefile, /usr/var, wtf?
+ rm -f "${pkgdir}"/usr/var/log/bftpd.log
+ rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,}
+ # Install PAM file
+ mkdir -p "${pkgdir}"/etc/pam.d
+ cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
+ # Install xinetd file
+ install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
+ # Did I mention this guy keeps messing up his Makefiles?
+ mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/
+ rmdir "${pkgdir}"/usr/etc
+ # Fix default in config file
+ sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
+ # Install systemd files
+ install -D -m644 "${srcdir}"/bftpd.service "${pkgdir}"/usr/lib/systemd/system/bftpd.service
+ install -D -m644 "${srcdir}"/bftpd_AT.service "${pkgdir}"/usr/lib/systemd/system/bftpd at .service
+ install -D -m644 "${srcdir}"/bftpd.socket "${pkgdir}"/usr/lib/systemd/system/bftpd.socket
+}
Deleted: extra-i686/bftpd.install
===================================================================
--- extra-i686/bftpd.install 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-i686/bftpd.install 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,11 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_install () {
- [ ! -f /var/log/bftpd.log ] && touch /var/log/bftpd.log
- true
-}
-
-post_upgrade() {
- post_install $1
-}
Copied: bftpd/repos/extra-i686/bftpd.install (from rev 165788, bftpd/repos/testing-i686/bftpd.install)
===================================================================
--- extra-i686/bftpd.install (rev 0)
+++ extra-i686/bftpd.install 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,11 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_install () {
+ [ ! -f /var/log/bftpd.log ] && touch /var/log/bftpd.log
+ true
+}
+
+post_upgrade() {
+ post_install $1
+}
Deleted: extra-i686/bftpd.logrotate
===================================================================
--- extra-i686/bftpd.logrotate 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-i686/bftpd.logrotate 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,5 +0,0 @@
-/var/log/bftpd.log {
- missingok
- notifempty
- delaycompress
-}
Copied: bftpd/repos/extra-i686/bftpd.logrotate (from rev 165788, bftpd/repos/testing-i686/bftpd.logrotate)
===================================================================
--- extra-i686/bftpd.logrotate (rev 0)
+++ extra-i686/bftpd.logrotate 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,5 @@
+/var/log/bftpd.log {
+ missingok
+ notifempty
+ delaycompress
+}
Deleted: extra-i686/bftpd.pam
===================================================================
--- extra-i686/bftpd.pam 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-i686/bftpd.pam 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
Copied: bftpd/repos/extra-i686/bftpd.pam (from rev 165788, bftpd/repos/testing-i686/bftpd.pam)
===================================================================
--- extra-i686/bftpd.pam (rev 0)
+++ extra-i686/bftpd.pam 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Deleted: extra-i686/bftpd.rc
===================================================================
--- extra-i686/bftpd.rc 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-i686/bftpd.rc 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE="/var/run/bftpd.pid"
-
-case "$1" in
- start)
- stat_busy "Starting bftpd Server"
- PID="$(pidof -o %PPID /usr/sbin/bftpd)"
- if [ -z "$PID" ]; then
- /usr/sbin/bftpd -d
- if [ $? -gt 0 ]; then
- stat_fail
- else
- # wait until it forks
- sleep 2
- echo $(pidof -o %PPID /usr/sbin/bftpd) > $PIDFILE
- add_daemon bftpd
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping bftpd Server"
- if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then
- kill -15 $(cat $PIDFILE)
- rm $PIDFILE
- stat_done
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
Copied: bftpd/repos/extra-i686/bftpd.rc (from rev 165788, bftpd/repos/testing-i686/bftpd.rc)
===================================================================
--- extra-i686/bftpd.rc (rev 0)
+++ extra-i686/bftpd.rc 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PIDFILE="/var/run/bftpd.pid"
+
+case "$1" in
+ start)
+ stat_busy "Starting bftpd Server"
+ PID="$(pidof -o %PPID /usr/bin/bftpd)"
+ if [ -z "$PID" ]; then
+ /usr/bin/bftpd -d
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ # wait until it forks
+ sleep 2
+ echo $(pidof -o %PPID /usr/bin/bftpd) > $PIDFILE
+ add_daemon bftpd
+ stat_done
+ fi
+ else
+ stat_fail
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping bftpd Server"
+ if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then
+ kill -15 $(cat $PIDFILE)
+ rm $PIDFILE
+ stat_done
+ else
+ stat_fail
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
Copied: bftpd/repos/extra-i686/bftpd.service (from rev 165788, bftpd/repos/testing-i686/bftpd.service)
===================================================================
--- extra-i686/bftpd.service (rev 0)
+++ extra-i686/bftpd.service 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,10 @@
+[Unit]
+Description=bftpd daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/bftpd -d
+GuessMainPID=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: bftpd/repos/extra-i686/bftpd.socket (from rev 165788, bftpd/repos/testing-i686/bftpd.socket)
===================================================================
--- extra-i686/bftpd.socket (rev 0)
+++ extra-i686/bftpd.socket 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,10 @@
+[Unit]
+Description=bftpd incoming socket
+Conflicts=bftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-i686/bftpd.xinetd
===================================================================
--- extra-i686/bftpd.xinetd 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-i686/bftpd.xinetd 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,11 +0,0 @@
-service ftp
-{
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/bftpd
- server_args = -i
- log_on_success += HOST DURATION
- log_on_failure += HOST
- disable = yes
-}
Copied: bftpd/repos/extra-i686/bftpd.xinetd (from rev 165788, bftpd/repos/testing-i686/bftpd.xinetd)
===================================================================
--- extra-i686/bftpd.xinetd (rev 0)
+++ extra-i686/bftpd.xinetd 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,11 @@
+service ftp
+{
+ socket_type = stream
+ wait = no
+ user = root
+ server = /usr/bin/bftpd
+ server_args = -i
+ log_on_success += HOST DURATION
+ log_on_failure += HOST
+ disable = yes
+}
Copied: bftpd/repos/extra-i686/bftpd_AT.service (from rev 165788, bftpd/repos/testing-i686/bftpd_AT.service)
===================================================================
--- extra-i686/bftpd_AT.service (rev 0)
+++ extra-i686/bftpd_AT.service 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,8 @@
+[Unit]
+Description=bftpd daemon
+
+[Service]
+ExecStart=/usr/bin/bftpd -i
+StandardInput=socket
+StandardOutput=socket
+StandardError=socket
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-x86_64/PKGBUILD 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=bftpd
-pkgver=3.8
-pkgrel=1
-pkgdesc="Small, easy-to-configure FTP server"
-arch=(i686 x86_64)
-url="http://bftpd.sourceforge.net/"
-license=('GPL')
-depends=('glibc' 'pam')
-install=bftpd.install
-backup=(etc/bftpd.conf
- etc/logrotate.d/bftpd
- etc/pam.d/bftpd
- etc/xinetd.d/bftpd)
-source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
- bftpd.rc
- bftpd.logrotate
- bftpd.pam
- bftpd.xinetd)
-md5sums=('880c1274e623ddd1e3e37f9f0cf09d70'
- '56a1bf7738a6db2b2cff89e611f4f11a'
- '853680dad0df39d0b4d2fb43d4be430a'
- '96f82c38f3f540b53f3e5144900acf17'
- 'ff70fd962666f4d74749a1c68167a966')
-
-build() {
- cd "${srcdir}"/$pkgname
- # The bftpd author keeps screwing up the release tarballs
- rm -f config.{cache,status}
- ./configure --prefix=/usr \
- --enable-pam \
- --mandir=/usr/share/man \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd "${srcdir}"/$pkgname
- install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8}
- install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd
- install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
- make DESTDIR="${pkgdir}" install
- # Remove log file and /var/run from the package
- # This guy keeps messing up his Makefile, /usr/var, wtf?
- rm -f "${pkgdir}"/usr/var/log/bftpd.log
- rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,}
- # Install PAM file
- mkdir -p "${pkgdir}"/etc/pam.d
- cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
- # Install xinetd file
- install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
- # Did I mention this guy keeps messing up his Makefiles?
- mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/
- rmdir "${pkgdir}"/usr/etc
- # Fix default in config file
- sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
-}
Copied: bftpd/repos/extra-x86_64/PKGBUILD (from rev 165788, bftpd/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=bftpd
+pkgver=3.8
+pkgrel=2
+pkgdesc="Small, easy-to-configure FTP server"
+arch=(i686 x86_64)
+url="http://bftpd.sourceforge.net/"
+license=('GPL')
+depends=('glibc' 'pam')
+install=bftpd.install
+backup=(etc/bftpd.conf
+ etc/logrotate.d/bftpd
+ etc/pam.d/bftpd
+ etc/xinetd.d/bftpd)
+source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
+ bftpd.rc
+ bftpd.logrotate
+ bftpd.pam
+ bftpd.xinetd
+ bftpd.service
+ bftpd.socket
+ bftpd_AT.service)
+md5sums=('880c1274e623ddd1e3e37f9f0cf09d70'
+ '2419d7293000813f9d01bd357181445c'
+ '853680dad0df39d0b4d2fb43d4be430a'
+ '96f82c38f3f540b53f3e5144900acf17'
+ '23feb84e8ecbae5df320b49e01821d9a'
+ '94b483f7c7b65580a30ebc6a8fe80d1b'
+ '93509ee83148160f60c009a2192a6774'
+ 'cb6a3334a7c8b5b8b559a643a65928c4')
+
+build() {
+ cd "${srcdir}"/$pkgname
+ # The bftpd author keeps screwing up the release tarballs
+ rm -f config.{cache,status}
+ sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in
+ ./configure --prefix=/usr \
+ --enable-pam \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname
+ install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8}
+ install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd
+ install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
+ make DESTDIR="${pkgdir}" install
+ # Remove log file and /var/run from the package
+ # This guy keeps messing up his Makefile, /usr/var, wtf?
+ rm -f "${pkgdir}"/usr/var/log/bftpd.log
+ rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,}
+ # Install PAM file
+ mkdir -p "${pkgdir}"/etc/pam.d
+ cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
+ # Install xinetd file
+ install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
+ # Did I mention this guy keeps messing up his Makefiles?
+ mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/
+ rmdir "${pkgdir}"/usr/etc
+ # Fix default in config file
+ sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
+ # Install systemd files
+ install -D -m644 "${srcdir}"/bftpd.service "${pkgdir}"/usr/lib/systemd/system/bftpd.service
+ install -D -m644 "${srcdir}"/bftpd_AT.service "${pkgdir}"/usr/lib/systemd/system/bftpd at .service
+ install -D -m644 "${srcdir}"/bftpd.socket "${pkgdir}"/usr/lib/systemd/system/bftpd.socket
+}
Deleted: extra-x86_64/bftpd.install
===================================================================
--- extra-x86_64/bftpd.install 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-x86_64/bftpd.install 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,11 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_install () {
- [ ! -f /var/log/bftpd.log ] && touch /var/log/bftpd.log
- true
-}
-
-post_upgrade() {
- post_install $1
-}
Copied: bftpd/repos/extra-x86_64/bftpd.install (from rev 165788, bftpd/repos/testing-x86_64/bftpd.install)
===================================================================
--- extra-x86_64/bftpd.install (rev 0)
+++ extra-x86_64/bftpd.install 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,11 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_install () {
+ [ ! -f /var/log/bftpd.log ] && touch /var/log/bftpd.log
+ true
+}
+
+post_upgrade() {
+ post_install $1
+}
Deleted: extra-x86_64/bftpd.logrotate
===================================================================
--- extra-x86_64/bftpd.logrotate 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-x86_64/bftpd.logrotate 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,5 +0,0 @@
-/var/log/bftpd.log {
- missingok
- notifempty
- delaycompress
-}
Copied: bftpd/repos/extra-x86_64/bftpd.logrotate (from rev 165788, bftpd/repos/testing-x86_64/bftpd.logrotate)
===================================================================
--- extra-x86_64/bftpd.logrotate (rev 0)
+++ extra-x86_64/bftpd.logrotate 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,5 @@
+/var/log/bftpd.log {
+ missingok
+ notifempty
+ delaycompress
+}
Deleted: extra-x86_64/bftpd.pam
===================================================================
--- extra-x86_64/bftpd.pam 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-x86_64/bftpd.pam 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
Copied: bftpd/repos/extra-x86_64/bftpd.pam (from rev 165788, bftpd/repos/testing-x86_64/bftpd.pam)
===================================================================
--- extra-x86_64/bftpd.pam (rev 0)
+++ extra-x86_64/bftpd.pam 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Deleted: extra-x86_64/bftpd.rc
===================================================================
--- extra-x86_64/bftpd.rc 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-x86_64/bftpd.rc 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE="/var/run/bftpd.pid"
-
-case "$1" in
- start)
- stat_busy "Starting bftpd Server"
- PID="$(pidof -o %PPID /usr/sbin/bftpd)"
- if [ -z "$PID" ]; then
- /usr/sbin/bftpd -d
- if [ $? -gt 0 ]; then
- stat_fail
- else
- # wait until it forks
- sleep 2
- echo $(pidof -o %PPID /usr/sbin/bftpd) > $PIDFILE
- add_daemon bftpd
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping bftpd Server"
- if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then
- kill -15 $(cat $PIDFILE)
- rm $PIDFILE
- stat_done
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
Copied: bftpd/repos/extra-x86_64/bftpd.rc (from rev 165788, bftpd/repos/testing-x86_64/bftpd.rc)
===================================================================
--- extra-x86_64/bftpd.rc (rev 0)
+++ extra-x86_64/bftpd.rc 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PIDFILE="/var/run/bftpd.pid"
+
+case "$1" in
+ start)
+ stat_busy "Starting bftpd Server"
+ PID="$(pidof -o %PPID /usr/bin/bftpd)"
+ if [ -z "$PID" ]; then
+ /usr/bin/bftpd -d
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ # wait until it forks
+ sleep 2
+ echo $(pidof -o %PPID /usr/bin/bftpd) > $PIDFILE
+ add_daemon bftpd
+ stat_done
+ fi
+ else
+ stat_fail
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping bftpd Server"
+ if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then
+ kill -15 $(cat $PIDFILE)
+ rm $PIDFILE
+ stat_done
+ else
+ stat_fail
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
Copied: bftpd/repos/extra-x86_64/bftpd.service (from rev 165788, bftpd/repos/testing-x86_64/bftpd.service)
===================================================================
--- extra-x86_64/bftpd.service (rev 0)
+++ extra-x86_64/bftpd.service 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,10 @@
+[Unit]
+Description=bftpd daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/bftpd -d
+GuessMainPID=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: bftpd/repos/extra-x86_64/bftpd.socket (from rev 165788, bftpd/repos/testing-x86_64/bftpd.socket)
===================================================================
--- extra-x86_64/bftpd.socket (rev 0)
+++ extra-x86_64/bftpd.socket 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,10 @@
+[Unit]
+Description=bftpd incoming socket
+Conflicts=bftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-x86_64/bftpd.xinetd
===================================================================
--- extra-x86_64/bftpd.xinetd 2012-08-29 23:50:48 UTC (rev 165788)
+++ extra-x86_64/bftpd.xinetd 2012-08-29 23:52:16 UTC (rev 165789)
@@ -1,11 +0,0 @@
-service ftp
-{
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/bftpd
- server_args = -i
- log_on_success += HOST DURATION
- log_on_failure += HOST
- disable = yes
-}
Copied: bftpd/repos/extra-x86_64/bftpd.xinetd (from rev 165788, bftpd/repos/testing-x86_64/bftpd.xinetd)
===================================================================
--- extra-x86_64/bftpd.xinetd (rev 0)
+++ extra-x86_64/bftpd.xinetd 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,11 @@
+service ftp
+{
+ socket_type = stream
+ wait = no
+ user = root
+ server = /usr/bin/bftpd
+ server_args = -i
+ log_on_success += HOST DURATION
+ log_on_failure += HOST
+ disable = yes
+}
Copied: bftpd/repos/extra-x86_64/bftpd_AT.service (from rev 165788, bftpd/repos/testing-x86_64/bftpd_AT.service)
===================================================================
--- extra-x86_64/bftpd_AT.service (rev 0)
+++ extra-x86_64/bftpd_AT.service 2012-08-29 23:52:16 UTC (rev 165789)
@@ -0,0 +1,8 @@
+[Unit]
+Description=bftpd daemon
+
+[Service]
+ExecStart=/usr/bin/bftpd -i
+StandardInput=socket
+StandardOutput=socket
+StandardError=socket
More information about the arch-commits
mailing list