diff options
-rw-r--r-- | main/nginx/APKBUILD | 36 | ||||
-rw-r--r-- | main/nginx/nginx.confd | 6 | ||||
-rw-r--r-- | main/nginx/nginx.initd | 2 |
3 files changed, 36 insertions, 8 deletions
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index 9260e094e7..5a4ecf089e 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -19,7 +19,7 @@ pkgname=nginx # NOTE: Upgrade only to even-numbered versions (e.g. 1.14.z, 1.16.z)! # Odd-numbered versions are mainline (development) versions. pkgver=1.16.1 -pkgrel=2 +pkgrel=3 # Revision of nginx-tests to use for check(). _tests_hgrev=40e5f2a0a238 _njs_ver=0.3.5 @@ -57,7 +57,7 @@ _grp_ngx="nginx" _grp_www="www-data" pkggroups="$_grp_ngx $_grp_www" install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade" -subpackages="$pkgname-doc $pkgname-vim::noarch" +subpackages="$pkgname-debug $pkgname-doc $pkgname-vim::noarch" replaces="$pkgname-common $pkgname-initscripts $pkgname-lua $pkgname-rtmp" source="https://nginx.org/download/$pkgname-$pkgver.tar.gz $pkgname-tests-$_tests_hgrev.tar.gz::https://hg.nginx.org/nginx-tests/archive/$_tests_hgrev.tar.gz @@ -66,6 +66,7 @@ source="https://nginx.org/download/$pkgname-$pkgver.tar.gz default.conf $pkgname.logrotate $pkgname.initd + $pkgname.confd " builddir="$srcdir/$pkgname-$pkgver" @@ -176,9 +177,7 @@ prepare() { rm -f "$srcdir"/nginx-tests-*/upstream_ip_hash_ipv6.t } -build() { - cd "$builddir" - +_build() { export LUAJIT_LIB="$(pkgconf --variable=libdir luajit)" export LUAJIT_INC="$(pkgconf --variable=includedir luajit)" ./configure \ @@ -229,11 +228,22 @@ build() { --with-stream_ssl_preread_module \ \ --add-dynamic-module="$srcdir/njs-$_njs_ver/nginx" \ - $_extra_flags + $_extra_flags \ + "$@" make } +build() { + cd "$builddir" + + _build --with-debug + mv objs objs-debug + + make clean + _build +} + check() { msg "Running nginx tests..." cd "$srcdir"/nginx-tests-* @@ -253,6 +263,7 @@ package() { local paxflags="-m" [ "$CARCH" = "x86" ] && paxflags="-msp" paxmark $paxflags "$pkgdir"/usr/sbin/nginx + paxmark $paxflags objs-debug/nginx install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README @@ -268,6 +279,7 @@ package() { install -Dm644 "$srcdir"/nginx.conf ./etc/$pkgname/nginx.conf install -Dm644 "$srcdir"/default.conf ./etc/$pkgname/conf.d/default.conf install -Dm755 "$srcdir"/$pkgname.initd ./etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd ./etc/conf.d/$pkgname install -Dm644 "$srcdir"/$pkgname.logrotate ./etc/logrotate.d/$pkgname install -dm755 ./etc/$pkgname/modules @@ -288,6 +300,15 @@ package() { rm -rf ./run ./etc/$pkgname/*.default } +# http://nginx.org/en/docs/debugging_log.html +debug() { + pkgdesc="nginx built with support for debugging log" + depends="$pkgname=$pkgver-r$pkgrel" + options="!strip" + + install -Dm755 "$builddir"/objs-debug/nginx "$subpkgdir"/usr/sbin/nginx-debug +} + vim() { pkgdesc="$pkgdesc (vim syntax)" install_if="vim $pkgname=$pkgver-r$pkgrel" @@ -324,7 +345,8 @@ e7e11b5ed8703adac1d4fb3b8e82731f868eb6c1cad405e9664f3761733ebfaa9a122517ac78cf4e ac7e3153ab698b4cde077f0d5d7ac0a58897927eb36cf3b58cb01268ca0296f1d589c0a5b4f889b96b5b4a57bef05b17c59be59a9d7c4d7a3d3be58f101f7f41 nginx.conf 0907f69dc2d3dc1bad3a04fb6673f741f1a8be964e22b306ef9ae2f8e736e1f5733a8884bfe54f3553fff5132a0e5336716250f54272c3fec2177d6ba16986f3 default.conf 09b110693e3f4377349ccea3c43cb8199c8579ee351eae34283299be99fdf764b0c1bddd552e13e4d671b194501618b29c822e1ad53b34101a73a63954363dbb nginx.logrotate -eb183860cd511361346e4079c1fcf470985e1c3b2a034a57f8b2a92ba851fed99256261f9b779770a5f57e3750e9e71bd1550a9d19ad9bf3a4d288864f0374a2 nginx.initd +ee10a5687740dde0c3d18d8b3555f49fcdc6abfc0a3bc2de1de3be0e99951a346fe8027d916aab73071ecd4e2c50871e7c867aca3a7a0fd16e3374c5caed1c57 nginx.initd +0b9b9ed01ac077e334c034faa2679f6e26740fb3362eebf8cef82d22b2af2a3faaa53bae3c9e14af51cbf64720a7c66431905ca5cc43f978366456cc4e3b7f4a nginx.confd 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614 ngx_devel_kit-0.3.0.tar.gz 1f6c15b148856e5d258ed804b8340ae286e8ef925128ba230c59c24c3412c60e58952be4511e8360695cb5301268a9a3407760b0887323e6f46ccc9e81a73642 ngx_cache_purge-2.5.tar.gz c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b echo-nginx-module-0.61.tar.gz diff --git a/main/nginx/nginx.confd b/main/nginx/nginx.confd new file mode 100644 index 0000000000..dd9ddf5269 --- /dev/null +++ b/main/nginx/nginx.confd @@ -0,0 +1,6 @@ +# Configuration for /etc/init.d/nginx + +# The nginx binary to run. If you want to use debugging log, install package +# "nginx-debug" and set this variable to "/usr/sbin/nginx-debug". +# See http://nginx.org/en/docs/debugging_log.html for more information. +#command="/usr/sbin/nginx" diff --git a/main/nginx/nginx.initd b/main/nginx/nginx.initd index 603f91e632..976e59f5d5 100644 --- a/main/nginx/nginx.initd +++ b/main/nginx/nginx.initd @@ -6,7 +6,7 @@ extra_started_commands="reload reopen upgrade" cfgfile=${cfgfile:-/etc/nginx/nginx.conf} pidfile=/run/nginx/nginx.pid -command=/usr/sbin/nginx +command=${command:-/usr/sbin/nginx} command_args="-c $cfgfile" required_files="$cfgfile" |