mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 04:16:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/nginx: fix lua module on grsec, add $replaces and $provides

Browse Source
This commit is contained in:
Jakub Jirutka 2016-08-23 13:35:52 +02:00 committed by Timo Teräs
parent c1609f35a9
commit cb84a32c1f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/nginx/APKBUILD
View File

@ -5,7 +5,7 @@
pkgname=nginx
pkgver=1.10.1
pkgrel=6
pkgrel=7
pkgdesc="HTTP and reverse proxy server"
url="http://www.nginx.org/en"
arch="all"
@ -34,6 +34,7 @@ _http_lua_name=lua-nginx-module
_http_lua_ver=0.10.5
_http_lua_dir="$srcdir/$_http_lua_name-$_http_lua_ver"
_http_lua_depends="$pkgname-mod-devel-kit"
_http_lua_provides="$pkgname-lua" # for backward compatibility
_http_upload_progress_name=nginx-upload-progress-module
_http_upload_progress_ver=0.9.2
@ -43,17 +44,18 @@ _http_upload_progress_so="ngx_http_uploadprogress_module.so"
_rtmp_name=nginx-rtmp-module
_rtmp_ver=1.1.9
_rtmp_dir="$srcdir/$_rtmp_name-$_rtmp_ver"
_rtmp_provides="$pkgname-rtmp" # for backward compatibility
depends=""
makedepends="linux-headers gd-dev geoip-dev libxml2-dev libxslt-dev luajit-dev
openssl-dev pcre-dev perl-dev pkgconf zlib-dev"
openssl-dev paxmark pcre-dev perl-dev pkgconf zlib-dev"
pkgusers="nginx"
_grp_ngx="nginx"
_grp_www="www-data"
pkggroups="$_grp_ngx $_grp_www"
install="$pkgname.pre-install $pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-vim"
replaces="$pkgname-common $pkgname-initscripts"
replaces="$pkgname-common $pkgname-initscripts $pkgname-lua $pkgname-rtmp"
source="http://nginx.org/download/$pkgname-$pkgver.tar.gz
$_devel_kit_name-$_devel_kit_ver.tar.gz::https://github.com/simpl/$_devel_kit_name/archive/v$_devel_kit_ver.tar.gz
$_http_echo_name-$_http_echo_ver.tar.gz::https://github.com/openresty/$_http_echo_name/archive/v$_http_echo_ver.tar.gz
@ -156,6 +158,11 @@ package() {
make DESTDIR="$pkgdir" install || return 1
# Disable some PaX protections; this is needed for Lua module.
local paxflags="-m"
[ "$CARCH" = "x86" ] && paxflags="-msp"
paxmark $paxflags "$pkgdir"/usr/sbin/nginx || return 1
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
@ -208,6 +215,7 @@ _module() {
pkgdesc="$pkgdesc (module $name)"
depends="$pkgname $(eval "echo \$_${name}_depends")"
provides="$(eval "echo \$_${name}_provides")"
mkdir -p "$subpkgdir"/$_modules_dir
cd "$subpkgdir"