diff options
Diffstat (limited to 'main/apache2/APKBUILD')
-rw-r--r-- | main/apache2/APKBUILD | 71 |
1 files changed, 34 insertions, 37 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index b530772aa4..2a235dee0e 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=httpd pkgver=2.4.37 pkgrel=1 pkgdesc="A high performance Unix-based HTTP server" -url="http://httpd.apache.org/" +url="https://httpd.apache.org/" arch="all" license="Apache-2.0" depends="" @@ -78,7 +78,7 @@ prepare() { for i in $source; do case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$(basename $i) || return 1;; + *.patch) msg $i; patch -p1 -i "$srcdir"/$(basename $i);; esac done @@ -126,23 +126,21 @@ build() { --enable-exception-hook \ --enable-dav \ --enable-dav-fs \ - --enable-dav-lock \ - || return 1 - make || return 1 + --enable-dav-lock + make } package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" install # config rm -r "$pkgdir"/etc/apache2/extra/httpd-vhosts.conf \ - "$pkgdir"/etc/apache2/original || return 1 - mv "$pkgdir"/etc/apache2/extra "$pkgdir"/etc/apache2/conf.d || return 1 + "$pkgdir"/etc/apache2/original + mv "$pkgdir"/etc/apache2/extra "$pkgdir"/etc/apache2/conf.d for file in "$pkgdir"/etc/apache2/conf.d/httpd-*; do mv "$file" \ - "$(dirname $file)/${file#$pkgdir/etc/apache2/conf.d/httpd-}" || \ - return 1 + "$(dirname $file)/${file#$pkgdir/etc/apache2/conf.d/httpd-}" done sed -Ei \ 's:^(\t?#?LoadModule .+ )lib/apache2/:\1modules/:;ta;b;:a;s/^#?LoadModule (dav.*|lbmethod_.+|.*ldap|lua|proxy.*|ssl|xml2enc)_module //;tb;b;:b;d' \ @@ -150,14 +148,14 @@ package() { # init scripts and logrotate install -D -m755 "$srcdir"/apache2.initd \ - "$pkgdir"/etc/init.d/apache2 || return 1 + "$pkgdir"/etc/init.d/apache2 install -D -m644 "$srcdir"/apache2.logrotate \ - "$pkgdir"/etc/logrotate.d/apache2 || return 1 + "$pkgdir"/etc/logrotate.d/apache2 install -D -m644 "$srcdir"/apache2.confd \ - "$pkgdir"/etc/conf.d/apache2 || return 1 + "$pkgdir"/etc/conf.d/apache2 - install -d "$pkgdir"/var/www || return 1 - install -d -m 2750 -g wheel "$pkgdir"/var/log/apache2 || return 1 + install -d "$pkgdir"/var/www + install -d -m 2750 -g wheel "$pkgdir"/var/log/apache2 ln -fs /var/log/apache2 "$pkgdir"/var/www/logs ln -fs /run/apache2 "$pkgdir"/var/www/run ln -fs /usr/lib/apache2 "$pkgdir"/var/www/modules @@ -168,7 +166,6 @@ package() { for i in prefork event worker; do if ! [ -e "$pkgdir"/usr/lib/apache2/mod_mpm_$i.so ]; then error "$i MPM was not built" - return 1 fi done } @@ -206,12 +203,12 @@ dev() { # install apxs utility install -d "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/apxs \ - "$subpkgdir"/usr/bin/apxs || return 1 + "$subpkgdir"/usr/bin/apxs install -d "$subpkgdir"/usr/share/apache2 mv "$pkgdir"/usr/share/apache2/build \ - "$subpkgdir"/usr/share/apache2/ || return 1 + "$subpkgdir"/usr/share/apache2/ } doc() { @@ -222,7 +219,7 @@ _error() { pkgdesc="Apache Multi Language Custom Error Documents" install -d "$subpkgdir"/usr/share/apache2 mv "$pkgdir"/usr/share/apache2/error \ - "$subpkgdir"/usr/share/apache2/ || return 1 + "$subpkgdir"/usr/share/apache2/ _mv_conf multilang-errordoc } @@ -230,7 +227,7 @@ http2() { pkgdesc="HTTP/2 transport layer for the Apache HTTP Server" install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_http2.so \ - "$subpkgdir"/usr/lib/apache2 || return 1 + "$subpkgdir"/usr/lib/apache2 _load_mods } @@ -238,7 +235,7 @@ icons() { pkgdesc="Apache Public Domain Icons" install -d "$subpkgdir"/usr/share/apache2 mv "$pkgdir"/usr/share/apache2/icons \ - "$subpkgdir"/usr/share/apache2/ || return 1 + "$subpkgdir"/usr/share/apache2/ _mv_conf autoindex } @@ -263,23 +260,23 @@ ctl() { ssl() { pkgdesc="SSL/TLS module for the Apache HTTP Server" install="apache2-ssl.post-install" - depends="apache2 libressl" + depends="apache2 openssl" - install -d "$subpkgdir"/usr/lib/apache2 || return 1 + install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_ssl.so \ - "$subpkgdir"/usr/lib/apache2/mod_ssl.so || return 1 - _mv_conf ssl || return 1 - install -d "$subpkgdir"/etc/ssl/apache2 || return 1 + "$subpkgdir"/usr/lib/apache2/mod_ssl.so + _mv_conf ssl + install -d "$subpkgdir"/etc/ssl/apache2 } ldap() { pkgdesc="LDAP authentication/authorization module for the Apache HTTP Server" - url="http://httpd.apache.org/docs/2.4/mod/mod_authnz_ldap.html" + url="https://httpd.apache.org/docs/2.4/mod/mod_authnz_ldap.html" depends="apache2 apr-util-ldap" - install -d "$subpkgdir"/usr/lib/apache2 || return 1 + install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_*ldap.so \ - "$subpkgdir"/usr/lib/apache2/ || return 1 + "$subpkgdir"/usr/lib/apache2/ _load_mods } @@ -288,29 +285,29 @@ webdav() { depends="apache2" replaces="apache2" - install -d "$subpkgdir"/usr/lib/apache2 || return 1 + install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_dav*.so \ - "$subpkgdir"/usr/lib/apache2/ || return 1 + "$subpkgdir"/usr/lib/apache2/ _mv_conf dav } proxy_html() { pkgdesc="HTML and XML content filters for the Apache HTTP Server" depends="apache2" - install -d "$subpkgdir"/usr/lib/apache2 || return 1 + install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_proxy_html.so \ "$pkgdir"/usr/lib/apache2/mod_xml2enc.so \ - "$subpkgdir"/usr/lib/apache2/ || return 1 + "$subpkgdir"/usr/lib/apache2/ _mv_conf proxy-html } proxy() { pkgdesc="Proxy modules for the Apache HTTP Server" depends="apache2" - install -d "$subpkgdir"/usr/lib/apache2 || return 1 + install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_proxy*.so \ "$pkgdir"/usr/lib/apache2/mod_lbmethod_*.so \ - "$subpkgdir"/usr/lib/apache2/ || return 1 + "$subpkgdir"/usr/lib/apache2/ _load_mod watchdog _load_mods @@ -319,9 +316,9 @@ proxy() { _lua() { pkgdesc="Lua support for the Apache HTTP server" depends="apache2" - install -d "$subpkgdir"/usr/lib/apache2 || return 1 + install -d "$subpkgdir"/usr/lib/apache2 mv "$pkgdir"/usr/lib/apache2/mod_lua.so \ - "$subpkgdir"/usr/lib/apache2/ || return 1 + "$subpkgdir"/usr/lib/apache2/ _load_mods } sha512sums="e802915801bbe885a65dada04b0116d145b293fabfff734dddb61a79ca1c6d65326f51155d1b864b093c3ec00d0bdfdf1401ab55677bae1ea3da1d199d7bcad4 httpd-2.4.37.tar.bz2 |