[arch-commits] Commit in proftpd/repos (24 files)
Andrea Scarpino
andrea at archlinux.org
Thu Aug 23 12:54:56 UTC 2012
Date: Thursday, August 23, 2012 @ 08:54:55
Author: andrea
Revision: 165550
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
proftpd/repos/extra-i686/PKGBUILD
(from rev 165549, proftpd/trunk/PKGBUILD)
proftpd/repos/extra-i686/proftpd
(from rev 165549, proftpd/trunk/proftpd)
proftpd/repos/extra-i686/proftpd.conf.d
(from rev 165549, proftpd/trunk/proftpd.conf.d)
proftpd/repos/extra-i686/proftpd.install
(from rev 165549, proftpd/trunk/proftpd.install)
proftpd/repos/extra-i686/proftpd.logrotate
(from rev 165549, proftpd/trunk/proftpd.logrotate)
proftpd/repos/extra-i686/proftpd.service
(from rev 165549, proftpd/trunk/proftpd.service)
proftpd/repos/extra-i686/proftpd.tmpfiles
(from rev 165549, proftpd/trunk/proftpd.tmpfiles)
proftpd/repos/extra-x86_64/PKGBUILD
(from rev 165549, proftpd/trunk/PKGBUILD)
proftpd/repos/extra-x86_64/proftpd
(from rev 165549, proftpd/trunk/proftpd)
proftpd/repos/extra-x86_64/proftpd.conf.d
(from rev 165549, proftpd/trunk/proftpd.conf.d)
proftpd/repos/extra-x86_64/proftpd.install
(from rev 165549, proftpd/trunk/proftpd.install)
proftpd/repos/extra-x86_64/proftpd.logrotate
(from rev 165549, proftpd/trunk/proftpd.logrotate)
proftpd/repos/extra-x86_64/proftpd.service
(from rev 165549, proftpd/trunk/proftpd.service)
proftpd/repos/extra-x86_64/proftpd.tmpfiles
(from rev 165549, proftpd/trunk/proftpd.tmpfiles)
Deleted:
proftpd/repos/extra-i686/PKGBUILD
proftpd/repos/extra-i686/proftpd
proftpd/repos/extra-i686/proftpd.conf.d
proftpd/repos/extra-i686/proftpd.logrotate
proftpd/repos/extra-i686/proftpd.service
proftpd/repos/extra-x86_64/PKGBUILD
proftpd/repos/extra-x86_64/proftpd
proftpd/repos/extra-x86_64/proftpd.conf.d
proftpd/repos/extra-x86_64/proftpd.logrotate
proftpd/repos/extra-x86_64/proftpd.service
--------------------------------+
extra-i686/PKGBUILD | 120 ++++++++++++++++++++-------------------
extra-i686/proftpd | 82 +++++++++++++-------------
extra-i686/proftpd.conf.d | 8 +-
extra-i686/proftpd.install | 3
extra-i686/proftpd.logrotate | 10 +--
extra-i686/proftpd.service | 26 +++-----
extra-i686/proftpd.tmpfiles | 1
extra-x86_64/PKGBUILD | 120 ++++++++++++++++++++-------------------
extra-x86_64/proftpd | 82 +++++++++++++-------------
extra-x86_64/proftpd.conf.d | 8 +-
extra-x86_64/proftpd.install | 3
extra-x86_64/proftpd.logrotate | 10 +--
extra-x86_64/proftpd.service | 26 +++-----
extra-x86_64/proftpd.tmpfiles | 1
14 files changed, 260 insertions(+), 240 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-i686/PKGBUILD 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=proftpd
-pkgver=1.3.4b
-pkgrel=2
-epoch=1
-pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64')
-url="http://www.proftpd.org"
-license=('GPL')
-depends=('libmysqlclient' 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
- 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service')
-md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
- 'e5b9bd78029a15f82994efcb7ed2e9fb'
- 'c439a0a1dbc21b604d8382da87aa021b'
- 'ddb09eb13131becdf0e081eef413116b'
- '71d5932b0461c318ed68c2c0c2660736'
- '2c446f531948c8cc0a1e0fae28f8dfda')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib \
- --disable-pam \
- --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
- --sysconfdir=/etc \
- --localstatedir=/run/proftpd \
- --enable-ctrls \
- --enable-ipv6 \
- --with-includes=/usr/include/mysql:/usr/include/postgresql \
- --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
- --enable-nls \
- --with-systemd
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
- sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
-
- install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
- install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
- install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
- install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
- install -d "${pkgdir}/usr/lib/systemd/system/"
- install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
-}
Copied: proftpd/repos/extra-i686/PKGBUILD (from rev 165549, proftpd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer:
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=proftpd
+pkgver=1.3.4b
+pkgrel=3
+epoch=1
+pkgdesc="A high-performance, scalable FTP server"
+arch=('i686' 'x86_64')
+url="http://www.proftpd.org/"
+license=('GPL')
+depends=('libmysqlclient' 'postgresql-libs')
+backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
+install=${pkgname}.install
+source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
+ 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
+ 'proftpd.tmpfiles')
+md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
+ 'e5b9bd78029a15f82994efcb7ed2e9fb'
+ 'c439a0a1dbc21b604d8382da87aa021b'
+ 'ddb09eb13131becdf0e081eef413116b'
+ '71d5932b0461c318ed68c2c0c2660736'
+ '5709f27ebcbe906e52963ea75e4fde64'
+ '907b149a120b046f05647c73502e23c9')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --disable-pam \
+ --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
+ --sysconfdir=/etc \
+ --localstatedir=/run/proftpd \
+ --enable-ctrls \
+ --enable-ipv6 \
+ --with-includes=/usr/include/mysql:/usr/include/postgresql \
+ --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
+ --enable-nls \
+ --with-systemd
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+ sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
+
+ install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
+ install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
+ install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
+ install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
+
+ install -d "${pkgdir}/usr/lib/systemd/system/"
+ install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
+ install -Dm644 "${srcdir}"/proftpd.tmpfiles \
+ "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf
+
+ # /run is tmpfs
+ rmdir "${pkgdir}"/run/{proftpd,}
+}
Deleted: extra-i686/proftpd
===================================================================
--- extra-i686/proftpd 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-i686/proftpd 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-PROFTPD_ARGS=
-[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting ProFTPd Server"
- /usr/sbin/proftpd ${PROFTPD_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon proftpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ProFTPd Server"
- [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f /run/proftpd/proftpd.pid
- rm_daemon proftpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
Copied: proftpd/repos/extra-i686/proftpd (from rev 165549, proftpd/trunk/proftpd)
===================================================================
--- extra-i686/proftpd (rev 0)
+++ extra-i686/proftpd 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# source application-specific settings
+PROFTPD_ARGS=
+[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Starting ProFTPd Server"
+ /usr/sbin/proftpd ${PROFTPD_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon proftpd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping ProFTPd Server"
+ [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm -f /run/proftpd/proftpd.pid
+ rm_daemon proftpd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
Deleted: extra-i686/proftpd.conf.d
===================================================================
--- extra-i686/proftpd.conf.d 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-i686/proftpd.conf.d 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to proftpd
-#
-PROFTPD_ARGS=""
Copied: proftpd/repos/extra-i686/proftpd.conf.d (from rev 165549, proftpd/trunk/proftpd.conf.d)
===================================================================
--- extra-i686/proftpd.conf.d (rev 0)
+++ extra-i686/proftpd.conf.d 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to proftpd
+#
+PROFTPD_ARGS=""
Copied: proftpd/repos/extra-i686/proftpd.install (from rev 165549, proftpd/trunk/proftpd.install)
===================================================================
--- extra-i686/proftpd.install (rev 0)
+++ extra-i686/proftpd.install 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,3 @@
+post_install() {
+ systemd-tmpfiles --create proftpd.conf
+}
Deleted: extra-i686/proftpd.logrotate
===================================================================
--- extra-i686/proftpd.logrotate 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-i686/proftpd.logrotate 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,5 +0,0 @@
-/var/log/xferlog {
- postrotate
- /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
Copied: proftpd/repos/extra-i686/proftpd.logrotate (from rev 165549, proftpd/trunk/proftpd.logrotate)
===================================================================
--- extra-i686/proftpd.logrotate (rev 0)
+++ extra-i686/proftpd.logrotate 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,5 @@
+/var/log/xferlog {
+ postrotate
+ /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
+ endscript
+}
Deleted: extra-i686/proftpd.service
===================================================================
--- extra-i686/proftpd.service 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-i686/proftpd.service 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,14 +0,0 @@
-[Unit]
-Description = ProFTPD FTP Server
-After = network.target nss-lookup.target local-fs.target remote-fs.target
-
-[Service]
-Type = forking
-PIDFile = /run/proftpd/proftpd.pid
-Environment = PROFTPD_ARGS=
-EnvironmentFile = -/etc/conf.d/proftpd
-ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS
-ExecReload = /bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy = multi-user.target
Copied: proftpd/repos/extra-i686/proftpd.service (from rev 165549, proftpd/trunk/proftpd.service)
===================================================================
--- extra-i686/proftpd.service (rev 0)
+++ extra-i686/proftpd.service 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,12 @@
+[Unit]
+Description=ProFTPD FTP Server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/proftpd/proftpd.pid
+ExecStart=/usr/sbin/proftpd
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy = multi-user.target
Copied: proftpd/repos/extra-i686/proftpd.tmpfiles (from rev 165549, proftpd/trunk/proftpd.tmpfiles)
===================================================================
--- extra-i686/proftpd.tmpfiles (rev 0)
+++ extra-i686/proftpd.tmpfiles 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1 @@
+d /run/proftpd 0755 root root
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-x86_64/PKGBUILD 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=proftpd
-pkgver=1.3.4b
-pkgrel=2
-epoch=1
-pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64')
-url="http://www.proftpd.org"
-license=('GPL')
-depends=('libmysqlclient' 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
- 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service')
-md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
- 'e5b9bd78029a15f82994efcb7ed2e9fb'
- 'c439a0a1dbc21b604d8382da87aa021b'
- 'ddb09eb13131becdf0e081eef413116b'
- '71d5932b0461c318ed68c2c0c2660736'
- '2c446f531948c8cc0a1e0fae28f8dfda')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib \
- --disable-pam \
- --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
- --sysconfdir=/etc \
- --localstatedir=/run/proftpd \
- --enable-ctrls \
- --enable-ipv6 \
- --with-includes=/usr/include/mysql:/usr/include/postgresql \
- --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
- --enable-nls \
- --with-systemd
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
- sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
-
- install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
- install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
- install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
- install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
- install -d "${pkgdir}/usr/lib/systemd/system/"
- install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
-}
Copied: proftpd/repos/extra-x86_64/PKGBUILD (from rev 165549, proftpd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer:
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=proftpd
+pkgver=1.3.4b
+pkgrel=3
+epoch=1
+pkgdesc="A high-performance, scalable FTP server"
+arch=('i686' 'x86_64')
+url="http://www.proftpd.org/"
+license=('GPL')
+depends=('libmysqlclient' 'postgresql-libs')
+backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
+install=${pkgname}.install
+source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
+ 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
+ 'proftpd.tmpfiles')
+md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
+ 'e5b9bd78029a15f82994efcb7ed2e9fb'
+ 'c439a0a1dbc21b604d8382da87aa021b'
+ 'ddb09eb13131becdf0e081eef413116b'
+ '71d5932b0461c318ed68c2c0c2660736'
+ '5709f27ebcbe906e52963ea75e4fde64'
+ '907b149a120b046f05647c73502e23c9')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --disable-pam \
+ --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
+ --sysconfdir=/etc \
+ --localstatedir=/run/proftpd \
+ --enable-ctrls \
+ --enable-ipv6 \
+ --with-includes=/usr/include/mysql:/usr/include/postgresql \
+ --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
+ --enable-nls \
+ --with-systemd
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+ sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
+
+ install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
+ install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
+ install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
+ install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
+
+ install -d "${pkgdir}/usr/lib/systemd/system/"
+ install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
+ install -Dm644 "${srcdir}"/proftpd.tmpfiles \
+ "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf
+
+ # /run is tmpfs
+ rmdir "${pkgdir}"/run/{proftpd,}
+}
Deleted: extra-x86_64/proftpd
===================================================================
--- extra-x86_64/proftpd 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-x86_64/proftpd 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-PROFTPD_ARGS=
-[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting ProFTPd Server"
- /usr/sbin/proftpd ${PROFTPD_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon proftpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ProFTPd Server"
- [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f /run/proftpd/proftpd.pid
- rm_daemon proftpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
Copied: proftpd/repos/extra-x86_64/proftpd (from rev 165549, proftpd/trunk/proftpd)
===================================================================
--- extra-x86_64/proftpd (rev 0)
+++ extra-x86_64/proftpd 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# source application-specific settings
+PROFTPD_ARGS=
+[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Starting ProFTPd Server"
+ /usr/sbin/proftpd ${PROFTPD_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon proftpd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping ProFTPd Server"
+ [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm -f /run/proftpd/proftpd.pid
+ rm_daemon proftpd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
Deleted: extra-x86_64/proftpd.conf.d
===================================================================
--- extra-x86_64/proftpd.conf.d 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-x86_64/proftpd.conf.d 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to proftpd
-#
-PROFTPD_ARGS=""
Copied: proftpd/repos/extra-x86_64/proftpd.conf.d (from rev 165549, proftpd/trunk/proftpd.conf.d)
===================================================================
--- extra-x86_64/proftpd.conf.d (rev 0)
+++ extra-x86_64/proftpd.conf.d 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to proftpd
+#
+PROFTPD_ARGS=""
Copied: proftpd/repos/extra-x86_64/proftpd.install (from rev 165549, proftpd/trunk/proftpd.install)
===================================================================
--- extra-x86_64/proftpd.install (rev 0)
+++ extra-x86_64/proftpd.install 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,3 @@
+post_install() {
+ systemd-tmpfiles --create proftpd.conf
+}
Deleted: extra-x86_64/proftpd.logrotate
===================================================================
--- extra-x86_64/proftpd.logrotate 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-x86_64/proftpd.logrotate 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,5 +0,0 @@
-/var/log/xferlog {
- postrotate
- /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
Copied: proftpd/repos/extra-x86_64/proftpd.logrotate (from rev 165549, proftpd/trunk/proftpd.logrotate)
===================================================================
--- extra-x86_64/proftpd.logrotate (rev 0)
+++ extra-x86_64/proftpd.logrotate 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,5 @@
+/var/log/xferlog {
+ postrotate
+ /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
+ endscript
+}
Deleted: extra-x86_64/proftpd.service
===================================================================
--- extra-x86_64/proftpd.service 2012-08-23 12:53:57 UTC (rev 165549)
+++ extra-x86_64/proftpd.service 2012-08-23 12:54:55 UTC (rev 165550)
@@ -1,14 +0,0 @@
-[Unit]
-Description = ProFTPD FTP Server
-After = network.target nss-lookup.target local-fs.target remote-fs.target
-
-[Service]
-Type = forking
-PIDFile = /run/proftpd/proftpd.pid
-Environment = PROFTPD_ARGS=
-EnvironmentFile = -/etc/conf.d/proftpd
-ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS
-ExecReload = /bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy = multi-user.target
Copied: proftpd/repos/extra-x86_64/proftpd.service (from rev 165549, proftpd/trunk/proftpd.service)
===================================================================
--- extra-x86_64/proftpd.service (rev 0)
+++ extra-x86_64/proftpd.service 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1,12 @@
+[Unit]
+Description=ProFTPD FTP Server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/proftpd/proftpd.pid
+ExecStart=/usr/sbin/proftpd
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy = multi-user.target
Copied: proftpd/repos/extra-x86_64/proftpd.tmpfiles (from rev 165549, proftpd/trunk/proftpd.tmpfiles)
===================================================================
--- extra-x86_64/proftpd.tmpfiles (rev 0)
+++ extra-x86_64/proftpd.tmpfiles 2012-08-23 12:54:55 UTC (rev 165550)
@@ -0,0 +1 @@
+d /run/proftpd 0755 root root
More information about the arch-commits
mailing list