1

[alpine-aports] [PATCH] main/fcgiwrap: fix permissions on rundir

Details
Message ID
<20181221210659.31290-1-sir@cmpwn.com>
Sender timestamp
1545426419
DKIM signature
missing
Download raw message
Patch: +10 -5
Also addresses the linting errors which tend to grow on stale packages.
---
 main/fcgiwrap/APKBUILD       | 14 +++++++++-----
 main/fcgiwrap/fcgiwrap.initd |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/main/fcgiwrap/APKBUILD b/main/fcgiwrap/APKBUILD
index f89b98b83c..e87c54e4c5 100644
--- a/main/fcgiwrap/APKBUILD
+++ b/main/fcgiwrap/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer:
+# Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=fcgiwrap
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple server for running CGI applications over FastCGI"
 url="https://github.com/gnosek/fcgiwrap"
 arch="all"
@@ -10,10 +10,9 @@ pkgusers="fcgiwrap"
 pkggroups="www-data"
 install="$pkgname.pre-install"
 makedepends="$depends_dev autoconf libtool automake fcgi-dev"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
 	$pkgname.initd"
-
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
@@ -26,6 +25,11 @@ build() {
 	make
 }
 
+check() {
+	cd "$builddir"
+	./fcgiwrap -h >/dev/null
+}
+
 package() {
 	cd "$builddir"
 	mkdir -p "$pkgdir"/var/run/fcgiwrap
@@ -35,4 +39,4 @@ package() {
 }
 
 sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc  fcgiwrap-1.1.0.tar.gz
-b12afb8e54e7fb9f01bab74895bcffb49993fac1fc1091576c096d5a325abfd6579eb3dd9ec82aabc6dddb26dac584d216b5d0823cd802fd1d9078e82d883b12  fcgiwrap.initd"
+96cd7febc4da598762baf32a7864cabbd7dd9bc019107f41b588bcf5b9b9064f6efa0d0f3721ff352b92beabe2e8ae11e84615c5185bf09b7f8aa07a59031ca9  fcgiwrap.initd"
diff --git a/main/fcgiwrap/fcgiwrap.initd b/main/fcgiwrap/fcgiwrap.initd
index f5faa7dfd9..f2deb38227 100644
--- a/main/fcgiwrap/fcgiwrap.initd
+++ b/main/fcgiwrap/fcgiwrap.initd
@@ -16,6 +16,7 @@ depend() {
 }
 
 start() {
+	checkpath --directory --owner fcgiwrap:www-data ${pidfile%/*}
 	ebegin "Starting ${name}"
 	start-stop-daemon --exec ${command} \
 		--pidfile ${pidfile} --make-pidfile \
-- 
2.19.2



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20181224155301.393cff73@ncopa-desktop.copa.dup.pw>
In-Reply-To
<20181221210659.31290-1-sir@cmpwn.com> (view parent)
Sender timestamp
1545663181
DKIM signature
missing
Download raw message
Aw,

I missed this while refactoring the init.d script. Sorry.

-nc

On Fri, 21 Dec 2018 16:06:59 -0500
Drew DeVault <sir@cmpwn.com> wrote:

> Also addresses the linting errors which tend to grow on stale packages.
> ---
>  main/fcgiwrap/APKBUILD       | 14 +++++++++-----
>  main/fcgiwrap/fcgiwrap.initd |  1 +
>  2 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/main/fcgiwrap/APKBUILD b/main/fcgiwrap/APKBUILD
> index f89b98b83c..e87c54e4c5 100644
> --- a/main/fcgiwrap/APKBUILD
> +++ b/main/fcgiwrap/APKBUILD
> @@ -1,7 +1,7 @@
> -# Maintainer:
> +# Maintainer: Drew DeVault <sir@cmpwn.com>
>  pkgname=fcgiwrap
>  pkgver=1.1.0
> -pkgrel=2
> +pkgrel=3
>  pkgdesc="Simple server for running CGI applications over FastCGI"
>  url="https://github.com/gnosek/fcgiwrap"
>  arch="all"
> @@ -10,10 +10,9 @@ pkgusers="fcgiwrap"
>  pkggroups="www-data"
>  install="$pkgname.pre-install"
>  makedepends="$depends_dev autoconf libtool automake fcgi-dev"
> -subpackages="$pkgname-doc"
> +subpackages="$pkgname-doc $pkgname-openrc"
>  source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
>  	$pkgname.initd"
> -
>  builddir="$srcdir/$pkgname-$pkgver"
>  
>  build() {
> @@ -26,6 +25,11 @@ build() {
>  	make
>  }
>  
> +check() {
> +	cd "$builddir"
> +	./fcgiwrap -h >/dev/null
> +}
> +
>  package() {
>  	cd "$builddir"
>  	mkdir -p "$pkgdir"/var/run/fcgiwrap
> @@ -35,4 +39,4 @@ package() {
>  }
>  
>  sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc  fcgiwrap-1.1.0.tar.gz
> -b12afb8e54e7fb9f01bab74895bcffb49993fac1fc1091576c096d5a325abfd6579eb3dd9ec82aabc6dddb26dac584d216b5d0823cd802fd1d9078e82d883b12  fcgiwrap.initd"
> +96cd7febc4da598762baf32a7864cabbd7dd9bc019107f41b588bcf5b9b9064f6efa0d0f3721ff352b92beabe2e8ae11e84615c5185bf09b7f8aa07a59031ca9  fcgiwrap.initd"
> diff --git a/main/fcgiwrap/fcgiwrap.initd b/main/fcgiwrap/fcgiwrap.initd
> index f5faa7dfd9..f2deb38227 100644
> --- a/main/fcgiwrap/fcgiwrap.initd
> +++ b/main/fcgiwrap/fcgiwrap.initd
> @@ -16,6 +16,7 @@ depend() {
>  }
>  
>  start() {
> +	checkpath --directory --owner fcgiwrap:www-data ${pidfile%/*}
>  	ebegin "Starting ${name}"
>  	start-stop-daemon --exec ${command} \
>  		--pidfile ${pidfile} --make-pidfile \



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---