diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-10 13:43:00 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-08-10 13:43:00 +0000 |
commit | 2276aee4cf2241399059411099baa7709519024e (patch) | |
tree | 59134c8b54eb38fa08041419b49643d9ce7b1529 | |
parent | c82268523e28a998de4dce38b842b25c4ba4ffd2 (diff) | |
download | alpine_aports-2276aee4cf2241399059411099baa7709519024e.tar.bz2 alpine_aports-2276aee4cf2241399059411099baa7709519024e.tar.xz alpine_aports-2276aee4cf2241399059411099baa7709519024e.zip |
main/apache2: move ldapconfig to -ldap subpackage
and fix -dev dependencies
fixes #401
-rw-r--r-- | main/apache2/APKBUILD | 8 | ||||
-rw-r--r-- | main/apache2/httpd.conf | 2 | ||||
-rw-r--r-- | main/apache2/ldap.conf | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index a18fe7f202..101c0f660e 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=apache2 | 2 | pkgname=apache2 |
3 | pkgver=2.2.16 | 3 | pkgver=2.2.16 |
4 | pkgrel=2 | 4 | pkgrel=3 |
5 | pkgdesc="A high performance Unix-based HTTP server" | 5 | pkgdesc="A high performance Unix-based HTTP server" |
6 | url="http://httpd.apache.org/" | 6 | url="http://httpd.apache.org/" |
7 | license="APACHE" | 7 | license="APACHE" |
@@ -27,6 +27,7 @@ source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2 | |||
27 | apache2.initd | 27 | apache2.initd |
28 | httpd.conf | 28 | httpd.conf |
29 | ssl.conf | 29 | ssl.conf |
30 | ldap.conf | ||
30 | alpine.layout" | 31 | alpine.layout" |
31 | 32 | ||
32 | prepare() { | 33 | prepare() { |
@@ -142,6 +143,7 @@ package() { | |||
142 | # include the builddir and apxs in -dev package | 143 | # include the builddir and apxs in -dev package |
143 | dev() { | 144 | dev() { |
144 | default_dev | 145 | default_dev |
146 | depends="$depends perl apr-util-dev" | ||
145 | install -d "$subpkgdir"/usr/share/apache2/ \ | 147 | install -d "$subpkgdir"/usr/share/apache2/ \ |
146 | "$subpkgdir"/usr/sbin | 148 | "$subpkgdir"/usr/sbin |
147 | mv "$pkgdir"/usr/sbin/apxs "$subpkgdir"/usr/sbin/ || return 1 | 149 | mv "$pkgdir"/usr/sbin/apxs "$subpkgdir"/usr/sbin/ || return 1 |
@@ -173,6 +175,7 @@ ldap() { | |||
173 | depends="apache2" | 175 | depends="apache2" |
174 | install -d "$subpkgdir"/usr/lib/apache2 | 176 | install -d "$subpkgdir"/usr/lib/apache2 |
175 | mv "$pkgdir"/usr/lib/apache2/mod_*ldap*.so "$subpkgdir"/usr/lib/apache2 | 177 | mv "$pkgdir"/usr/lib/apache2/mod_*ldap*.so "$subpkgdir"/usr/lib/apache2 |
178 | install -m644 -D "$srcdir"/ldap.conf "$subpkgdir"/etc/apache2/conf.d/ldap.conf | ||
176 | } | 179 | } |
177 | 180 | ||
178 | md5sums="c8ff2a07c884300bc7766a2e7f662d33 httpd-2.2.16.tar.bz2 | 181 | md5sums="c8ff2a07c884300bc7766a2e7f662d33 httpd-2.2.16.tar.bz2 |
@@ -188,6 +191,7 @@ d9667fcd2ffecc63e446edd4d6666731 10-nice.patch | |||
188 | e322b5211e49511cac6e40c86af1b1da apache2.confd | 191 | e322b5211e49511cac6e40c86af1b1da apache2.confd |
189 | 75fe4138b98fcffd01b8c8c077b944f3 apache2.logrotate | 192 | 75fe4138b98fcffd01b8c8c077b944f3 apache2.logrotate |
190 | 0261136ff734c3ae8dcf878a46ed5830 apache2.initd | 193 | 0261136ff734c3ae8dcf878a46ed5830 apache2.initd |
191 | 769748b26d008f427678ac2bbc7ab171 httpd.conf | 194 | 1dfc079be3fec873b67bca19b60c56b1 httpd.conf |
192 | 5d0d024ca43571b863874ab871b2c109 ssl.conf | 195 | 5d0d024ca43571b863874ab871b2c109 ssl.conf |
196 | b70fe826486043e3953cfe21f9e6fa16 ldap.conf | ||
193 | c66ff5f70260d5266e6803a59b39bd7f alpine.layout" | 197 | c66ff5f70260d5266e6803a59b39bd7f alpine.layout" |
diff --git a/main/apache2/httpd.conf b/main/apache2/httpd.conf index fab84b80ba..88d983a9b2 100644 --- a/main/apache2/httpd.conf +++ b/main/apache2/httpd.conf | |||
@@ -160,8 +160,6 @@ LoadModule authz_owner_module modules/mod_authz_owner.so | |||
160 | LoadModule authz_groupfile_module modules/mod_authz_groupfile.so | 160 | LoadModule authz_groupfile_module modules/mod_authz_groupfile.so |
161 | LoadModule authz_dbm_module modules/mod_authz_dbm.so | 161 | LoadModule authz_dbm_module modules/mod_authz_dbm.so |
162 | LoadModule authz_default_module modules/mod_authz_default.so | 162 | LoadModule authz_default_module modules/mod_authz_default.so |
163 | LoadModule ldap_module modules/mod_ldap.so | ||
164 | LoadModule authnz_ldap_module modules/mod_authnz_ldap.so | ||
165 | LoadModule include_module modules/mod_include.so | 163 | LoadModule include_module modules/mod_include.so |
166 | LoadModule log_config_module modules/mod_log_config.so | 164 | LoadModule log_config_module modules/mod_log_config.so |
167 | LoadModule logio_module modules/mod_logio.so | 165 | LoadModule logio_module modules/mod_logio.so |
diff --git a/main/apache2/ldap.conf b/main/apache2/ldap.conf new file mode 100644 index 0000000000..81fe42fa0f --- /dev/null +++ b/main/apache2/ldap.conf | |||
@@ -0,0 +1,2 @@ | |||
1 | LoadModule ldap_module modules/mod_ldap.so | ||
2 | LoadModule authnz_ldap_module modules/mod_authnz_ldap.so | ||