diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-12-15 14:00:19 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-12-15 14:00:28 +0200 |
| commit | b265647eeac594387bedb034415ae1d6bf5b742c (patch) | |
| tree | b885bb31e247002102dc97469077307632092a51 /main | |
| parent | 81b1706c0f35d00f6053ef096c3461e32ce7fc62 (diff) | |
| download | aports-b265647eeac594387bedb034415ae1d6bf5b742c.tar.bz2 aports-b265647eeac594387bedb034415ae1d6bf5b742c.tar.xz | |
main/apache2: remove LoadModule directives of separately packaged modules
Diffstat (limited to 'main')
| -rw-r--r-- | main/apache2/APKBUILD | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index 3e80b9a369..64bb47a47b 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -3,7 +3,7 @@ pkgname=apache2 _pkgreal=httpd pkgver=2.4.17 -pkgrel=3 +pkgrel=4 pkgdesc="A high performance Unix-based HTTP server" url="http://httpd.apache.org/" arch="all" @@ -124,7 +124,7 @@ package() { return 1 done sed -Ei \ - 's:^(#?LoadModule .+ )lib/apache2(/.+)$:\1modules\2:;ta;b;:a;s/^#?LoadModule (lbmethod_.+|proxy.*|xml2enc)_module //;tb;b;:b;d' \ + 's:^(#?LoadModule .+ )lib/apache2/:\1modules/:;ta;b;:a;s/^#?LoadModule (dav.*|lbmethod_.+|.*ldap|lua|proxy.*|ssl|xml2enc)_module //;tb;b;:b;d' \ "$pkgdir"/etc/apache2/httpd.conf # init scripts and logrotate @@ -238,8 +238,7 @@ webdav() { replaces="apache2" install -d "$subpkgdir"/usr/lib/apache2 || return 1 - mv "$pkgdir"/usr/lib/apache2/mod_dav.so \ - "$pkgdir"/usr/lib/apache2/mod_dav_*.so \ + mv "$pkgdir"/usr/lib/apache2/mod_dav*.so \ "$subpkgdir"/usr/lib/apache2/ || return 1 _mv_conf dav } @@ -248,8 +247,8 @@ proxy_html() { pkgdesc="HTML and XML content filters for the Apache HTTP Server" depends="apache2" install -d "$subpkgdir"/usr/lib/apache2 || return 1 - mv "$pkgdir"/usr/lib/apache2/*_proxy_html.so \ - "$pkgdir"/usr/lib/apache2/*xml2enc*.so \ + mv "$pkgdir"/usr/lib/apache2/mod_proxy_html.so \ + "$pkgdir"/usr/lib/apache2/mod_xml2enc.so \ "$subpkgdir"/usr/lib/apache2/ || return 1 _mv_conf proxy-html } @@ -258,8 +257,8 @@ proxy() { pkgdesc="Proxy modules for the Apache HTTP Server" depends="apache2" install -d "$subpkgdir"/usr/lib/apache2 || return 1 - mv "$pkgdir"/usr/lib/apache2/*_proxy*.so \ - "$pkgdir"/usr/lib/apache2/*_lbmethod*.so \ + mv "$pkgdir"/usr/lib/apache2/mod_proxy*.so \ + "$pkgdir"/usr/lib/apache2/mod_lbmethod_*.so \ "$subpkgdir"/usr/lib/apache2/ || return 1 install -D -m644 "$srcdir"/proxy.conf \ "$subpkgdir"/etc/apache2/conf.d/proxy.conf || return 1 @@ -269,7 +268,7 @@ _lua() { pkgdesc="Lua support for the Apache HTTP server" depends="apache2" install -d "$subpkgdir"/usr/lib/apache2 || return 1 - mv "$pkgdir"/usr/lib/apache2/*_lua.so \ + mv "$pkgdir"/usr/lib/apache2/mod_lua.so \ "$subpkgdir"/usr/lib/apache2/ || return 1 install -D -m644 "$srcdir"/lua.conf \ "$subpkgdir"/etc/apache2/conf.d/lua.conf || return 1 |