From 160da6a882c5caec058652b39d2f5e6e5110f451 Mon Sep 17 00:00:00 2001 From: Elizabeth Jennifer Myers Date: Thu, 3 Feb 2011 20:40:51 +0000 Subject: testing/proftpd: make init scripts actually install. --- testing/proftpd/APKBUILD | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/proftpd/APKBUILD b/testing/proftpd/APKBUILD index b77f36a6d7..84cadd12fe 100644 --- a/testing/proftpd/APKBUILD +++ b/testing/proftpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Elizabeth Jennifer Myers pkgname=proftpd pkgver=1.3.3d -pkgrel=0 +pkgrel=1 pkgdesc="Highly configurable GPL-licensed FTP server software" url="http://www.proftpd.org/" arch="all" @@ -12,7 +12,9 @@ depends_dev="ncurses-dev openssl-dev" makedepends="$depends_dev libtool" install="" subpackages="$pkgname-doc" -source="ftp://ftp.proftpd.org/distrib/source/proftpd-${pkgver}.tar.bz2" +source="ftp://ftp.proftpd.org/distrib/source/proftpd-${pkgver}.tar.bz2 + proftpd.initd + proftpd.confd" _builddir="$srcdir"/"$pkgname"-"$pkgver" @@ -35,6 +37,13 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 + + install -m755 -D "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname || return 1 + install -m644 -D "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname || return 1 } -md5sums="69650e91e05b3a10fa3ac54ee261679b proftpd-1.3.3d.tar.bz2" +md5sums="69650e91e05b3a10fa3ac54ee261679b proftpd-1.3.3d.tar.bz2 +ed5b1659eb95ccda6cdc78e8c3f8b7a5 proftpd.initd +aab5852ac574e87781f1c9c4942e699b proftpd.confd" -- cgit v1.2.3 From d8a593a95c35aa4423c3394b4631480d365c5255 Mon Sep 17 00:00:00 2001 From: Elizabeth Jennifer Myers Date: Fri, 4 Feb 2011 00:03:56 +0000 Subject: testing/proftpd: Add default user stuff. I fail. --- testing/proftpd/proftpd.initd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/proftpd/proftpd.initd b/testing/proftpd/proftpd.initd index 30aae779c1..0af6a9f91a 100644 --- a/testing/proftpd/proftpd.initd +++ b/testing/proftpd/proftpd.initd @@ -14,7 +14,7 @@ start() { ebegin "Starting ${name}" start-stop-daemon --start --quiet \ --pidfile /var/run/${name}.pid \ - --chuid ${sample_user}:${sample_group} \ + --chuid ftp:ftp \ --exec ${daemon} -- ${sample_opts} eend $? } -- cgit v1.2.3 From 3a2b8524dac921901a4b7dfd03d3c5b599901392 Mon Sep 17 00:00:00 2001 From: Elizabeth Jennifer Myers Date: Fri, 4 Feb 2011 04:07:10 +0000 Subject: testing/proftpd: Let the package drop privilege itself. --- testing/proftpd/APKBUILD | 2 +- testing/proftpd/proftpd.initd | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/proftpd/APKBUILD b/testing/proftpd/APKBUILD index 84cadd12fe..d8eac8cc54 100644 --- a/testing/proftpd/APKBUILD +++ b/testing/proftpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Elizabeth Jennifer Myers pkgname=proftpd pkgver=1.3.3d -pkgrel=1 +pkgrel=2 pkgdesc="Highly configurable GPL-licensed FTP server software" url="http://www.proftpd.org/" arch="all" diff --git a/testing/proftpd/proftpd.initd b/testing/proftpd/proftpd.initd index 0af6a9f91a..c20a2543a1 100644 --- a/testing/proftpd/proftpd.initd +++ b/testing/proftpd/proftpd.initd @@ -14,7 +14,6 @@ start() { ebegin "Starting ${name}" start-stop-daemon --start --quiet \ --pidfile /var/run/${name}.pid \ - --chuid ftp:ftp \ --exec ${daemon} -- ${sample_opts} eend $? } -- cgit v1.2.3