diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/nginx-lua/APKBUILD | 26 | ||||
| -rw-r--r-- | testing/nginx-lua/musl-sysctl-header.patch | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | testing/nginx-lua/nginx.initd | 73 |
3 files changed, 32 insertions, 79 deletions
diff --git a/testing/nginx-lua/APKBUILD b/testing/nginx-lua/APKBUILD index ebbd0a828..0000e9c0a 100644 --- a/testing/nginx-lua/APKBUILD +++ b/testing/nginx-lua/APKBUILD @@ -5,9 +5,9 @@ pkgname=nginx-lua _pkgname=nginx -pkgver=1.4.7 +pkgver=1.6.0 _ngx_devel_kit_ver=0.2.19 -_ngx_lua_ver=0.9.6 +_ngx_lua_ver=0.9.7 pkgrel=0 pkgdesc="lightweight HTTP and reverse proxy server with Lua support" url="http://www.nginx.org" @@ -21,7 +21,6 @@ source="http://nginx.org/download/$_pkgname-$pkgver.tar.gz lua-nginx-module-$_ngx_lua_ver.tar.gz::https://github.com/chaoslawful/lua-nginx-module/archive/v$_ngx_lua_ver.tar.gz musl-crypt-fix.patch - musl-sysctl-header.patch ipv6.patch nginx.initd @@ -83,27 +82,24 @@ package() { install -m644 -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="aee151d298dcbfeb88b3f7dd3e7a4d17 nginx-1.4.7.tar.gz +md5sums="8efa354f1c3c2ccf434a50d3fbe82340 nginx-1.6.0.tar.gz 09a18178adca7b5674129d8100ce4f68 nginx-devel-kit-0.2.19.tar.gz -3e67307b02b947710017bc890a378ff3 lua-nginx-module-0.9.6.tar.gz +c6cd8cf0fd36fbb6a3e74791040333f7 lua-nginx-module-0.9.7.tar.gz 3aeb488921109e60d02ed64d36790aeb musl-crypt-fix.patch -6e68a20796af57c92eece27f06480917 musl-sysctl-header.patch 801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch -4faf8dff6ff1490edae1688baf1b2abb nginx.initd +a00403a764478f5459d850bb387ca19b nginx.initd 8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate" -sha256sums="23b8ff4a76817090678f91b0efbfcef59a93492f6612dc8370c44c1f1ce1b626 nginx-1.4.7.tar.gz +sha256sums="943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a nginx-1.6.0.tar.gz 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 nginx-devel-kit-0.2.19.tar.gz -2a7a4ffd30cac58277b78821faf7ad4d4c520759f5a7976b29d4ce918926ff91 lua-nginx-module-0.9.6.tar.gz +c2a3a3240dd55274b00f7efc8f35598d77861663f01a720a28a52131b824b691 lua-nginx-module-0.9.7.tar.gz 8c398640bd379c1c6a2fafcd2b3848a72902e47924e8e2490b312c141eec5d70 musl-crypt-fix.patch -4d6ad528e7b1b6946d4387389eaa3aa1c66c7da3062909a75d9b2cf3524a5536 musl-sysctl-header.patch a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b ipv6.patch -34e9b1dbb9f5fe4d71f7469ded3eb98fac02f57ecfbfd04ba623099766b4709c nginx.initd +67df748bd7ef4f3c3b5eef9dd7e3b352ef671dd7cfb9db56e096eed77a442d67 nginx.initd cea0c6f8de55a4c3a3eccc57910de1c3116634082c8e5b660630fb927a29f38d nginx.logrotate" -sha512sums="219c23bb1216f2a65b56a989ea87bed00b50506f7faa726508ede59747d0dd2fb7f7636cc10704c08550fa7da79b3ce1bae8876a6aac97c6e2b4797129887af5 nginx-1.4.7.tar.gz +sha512sums="715b3aa6012e2e29f3b4e6affff4641de0958faa25c0acedb8091b0f4c8506a8912a7e507bcb1f89fc5fe0a1233ab7770dc6ed742698874f43af72b7d08e48f7 nginx-1.6.0.tar.gz 915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657 nginx-devel-kit-0.2.19.tar.gz -7161af5c8767f81ab02dbe449377127bb24e4e74bc5a1d01f66913baaff5af435e0a7dcc219837be3508acfa7dfb01ca106b25c70078bbe465c317ec0870eb79 lua-nginx-module-0.9.6.tar.gz +cd4718d7e8a8bf260d18d6d5aa10d8a07072fea3e6efc04d6775f20681080937fb093dc555e9b9a1560074a19522a099a391149057c365c4cda20532c6219c56 lua-nginx-module-0.9.7.tar.gz 21114c775e4bdd1f7b8b9abc143284945e96ed1d8c49904ddf918abad87b16253f918ba47976cd2df32f0fdb8a7dad399d4200e879db2da6cf93a28aab236a75 musl-crypt-fix.patch -708879a25b530ee8836e21bc9fd5ef7aad006e0fb236c8ec4b37b169f66fcc95012c14e8bb7502f3956e82047bc3374fced89c8fff0678d5850c7c0ec3e997ef musl-sysctl-header.patch 68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f ipv6.patch -e153ff131ca5a62f01744c45e97421db0776be518a84a8d09896955a996e5a0133c03cdfa7ac6b03bad75b5cbb839f49dcccbb210843010da42445706f239a12 nginx.initd +9c6b357c460998187d7a26c0f3c8abc69c91b523a6f340c1f6ed3c863101a39eeb61e92b4cfec6a04af2b495c354c33f232ce5e59ed29edd6855e430ca73d168 nginx.initd 01b77cff16f6e8bfd7fa1d4d20f625bbcddd08f0509173452d060c342c93dc315a7b0560f4734323a5d29ea294de0491f2e3f32e5337574e1a28ebc005eceea8 nginx.logrotate" diff --git a/testing/nginx-lua/musl-sysctl-header.patch b/testing/nginx-lua/musl-sysctl-header.patch deleted file mode 100644 index e851cbd74..000000000 --- a/testing/nginx-lua/musl-sysctl-header.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/os/unix/ngx_linux_config.h.orig -+++ ./src/os/unix/ngx_linux_config.h -@@ -51,7 +51,9 @@ - #include <malloc.h> /* memalign() */ - #include <limits.h> /* IOV_MAX */ - #include <sys/ioctl.h> -+#ifdef __GLIBC__ - #include <sys/sysctl.h> -+#endif - #include <crypt.h> - #include <sys/utsname.h> /* uname() */ - diff --git a/testing/nginx-lua/nginx.initd b/testing/nginx-lua/nginx.initd index 7e82a56f7..ce2b7b8bb 100644..100755 --- a/testing/nginx-lua/nginx.initd +++ b/testing/nginx-lua/nginx.initd @@ -1,9 +1,6 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.init-r2,v 1.1 2010/01/03 19:51:41 djc Exp $ -extra_started_commands="upgrade reload" +extra_started_commands="reload" extra_commands="configtest" depend() { @@ -11,63 +8,35 @@ depend() { use dns logger netmount } +CONFFILE=${CONFFILE:-/etc/nginx/${SVCNAME}.conf} +PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + mkdir -p /tmp/nginx + /usr/sbin/nginx -c ${CONFFILE} -t + eend $? "failed, please correct errors above" +} + start() { configtest || return 1 - ebegin "Starting nginx" - start-stop-daemon --start --pidfile /var/run/nginx.pid \ - --exec /usr/sbin/nginx -- -c /etc/nginx/nginx.conf - eend $? "Failed to start nginx" + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --pidfile "${PIDFILE}" \ + --exec /usr/sbin/nginx -- -c ${CONFFILE} -g "pid ${PIDFILE};" + eend $? "Failed to start ${SVCNAME}" } stop() { configtest || return 1 - ebegin "Stopping nginx" - start-stop-daemon --stop --pidfile /var/run/nginx.pid - eend $? "Failed to stop nginx" - rm -f /var/run/nginx.pid + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile "${PIDFILE}" + eend $? "Failed to stop ${SVCNAME}" + rm -f "${PIDFILE}" } reload() { configtest || return 1 - ebegin "Refreshing nginx' configuration" - kill -HUP `cat /var/run/nginx.pid` &>/dev/null + ebegin "Refreshing ${SVCNAME} configuration" + kill -HUP $(cat "${PIDFILE}") &>/dev/null eend $? "Failed to reload nginx" } - -upgrade() { - configtest || return 1 - ebegin "Upgrading nginx" - - einfo "Sending USR2 to old binary" - kill -USR2 `cat /var/run/nginx.pid` &>/dev/null - - einfo "Sleeping 3 seconds before pid-files checking" - sleep 3 - - if [ ! -f /var/run/nginx.pid.oldbin ]; then - eerror "File with old pid not found" - return 1 - fi - - if [ ! -f /var/run/nginx.pid ]; then - eerror "New binary failed to start" - return 1 - fi - - einfo "Sleeping 3 seconds before WINCH" - sleep 3 ; kill -WINCH `cat /var/run/nginx.pid.oldbin` - - einfo "Sending QUIT to old binary" - kill -QUIT `cat /var/run/nginx.pid.oldbin` - - einfo "Upgrade completed" - - eend $? "Upgrade failed" -} - -configtest() { - ebegin "Checking nginx' configuration" - mkdir -p /tmp/nginx - /usr/sbin/nginx -c /etc/nginx/nginx.conf -t - eend $? "failed, please correct errors above" -} |