diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/lighttpd/APKBUILD | 26 | ||||
| -rw-r--r-- | main/lighttpd/automake-1.12.patch | 21 | ||||
| -rw-r--r-- | main/lighttpd/lighttpd.post-install | 4 |
3 files changed, 40 insertions, 11 deletions
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD index 832409f8b5..c6b8207999 100644 --- a/main/lighttpd/APKBUILD +++ b/main/lighttpd/APKBUILD @@ -2,13 +2,15 @@ pkgname=lighttpd pkgver=1.4.30 _streamver=2.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="a secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" arch="all" license="custom" -install="$pkgname.pre-install $pkgname.post-install" +install="$pkgname.pre-install" depends= +pkgusers="lighttpd" +pkggroups="lighttpd" makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig automake autoconf openldap-dev libxml2-dev sqlite-dev libev-dev" source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.bz2 @@ -23,12 +25,19 @@ source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.ta mod_cgi.conf mod_fastcgi.conf mod_fastcgi_fpm.conf + + automake-1.12.patch " subpackages="$pkgname-doc $pkgname-mod_auth $pkgname-mod_h264_streaming $pkgname-mod_webdav" prepare() { cd "$srcdir"/$pkgname-$pkgver + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done # copy over the mod-h264-streaming mod # http://h264.code-shop.com/trac/wiki/Mod-H264-Streaming-Lighttpd-Version2#DownloadLighttpd1.4.191.4.20andother1.4.x @@ -42,7 +51,7 @@ mod_h264_streaming_la_SOURCES = mod_h264_streaming.c moov.c mod_h264_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_h264_streaming_la_LIBADD = \$(common_libadd) __EOF__ - aclocal -I m4 && autoconf && automake + aclocal -I m4 && autoconf && automake --add-missing } build() { @@ -75,10 +84,12 @@ package() { rm "$pkgdir"/usr/lib/lighttpd/*.la || return 1 # create dirs - install -d -m755 "$pkgdir"/var/run/lighttpd/ \ - "$pkgdir"/var/log/lighttpd/ \ + install -d -m755 -o lighttpd -g lighttpd \ + "$pkgdir"/var/run/lighttpd/ \ + "$pkgdir"/var/log/lighttpd/ || return 1 + install -d -m755 \ "$pkgdir"/etc/lighttpd/ \ - "$pkgdir"/var/www/localhost/htdocs + "$pkgdir"/var/www/localhost/htdocs || return 1 # lighttpd install -D -m755 "$srcdir"/lighttpd.initd "$pkgdir"/etc/init.d/lighttpd @@ -137,4 +148,5 @@ ad091c9157134890499f26d170352c9f lighttpd.logrotate fef397e7bcf1b741dea211a555e1803c mime-types.conf 9c1407e95f62ed22da66c4ef5f69c3b5 mod_cgi.conf f3363e39832f1b6678468b482d121afb mod_fastcgi.conf -aee5947a1abf380b0685a534ca384b42 mod_fastcgi_fpm.conf" +aee5947a1abf380b0685a534ca384b42 mod_fastcgi_fpm.conf +c15606d3158d4010e6fa8e01409b40cf automake-1.12.patch" diff --git a/main/lighttpd/automake-1.12.patch b/main/lighttpd/automake-1.12.patch new file mode 100644 index 0000000000..c248c49709 --- /dev/null +++ b/main/lighttpd/automake-1.12.patch @@ -0,0 +1,21 @@ +--- ./configure.ac.orig ++++ ./configure.ac +@@ -24,6 +24,8 @@ + AC_PROG_LN_S + AC_PROG_MAKE_SET + ++AM_PROG_AR ++ + dnl check environment + AC_AIX + AC_ISC_POSIX +@@ -37,9 +39,6 @@ + AM_CONDITIONAL(NO_RDYNAMIC, test x$NO_RDYNAMIC = xyes) + + AC_EXEEXT +- +-dnl more automake stuff +-AM_C_PROTOTYPES + + dnl libtool + AC_DISABLE_STATIC diff --git a/main/lighttpd/lighttpd.post-install b/main/lighttpd/lighttpd.post-install deleted file mode 100644 index 5b116a6375..0000000000 --- a/main/lighttpd/lighttpd.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -chown lighttpd:lighttpd /var/*/lighttpd -exit 0 |