diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-13 10:43:29 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-13 10:43:29 +0200 |
commit | 435c057e31699c734b0aabb46c2d9a4f647f1367 (patch) | |
tree | ef2aff16463c36475e3e39c59f27a4c4fa94303c /extra/lighttpd | |
parent | 4e93709c6f760c133cf59fe25e8a3b81e6326d0f (diff) | |
parent | 66cb4a487ad73063c6b000279a5d5558fb7603f5 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/espeakup/PKGBUILD
community/lxnm/PKGBUILD
community/notmuch/PKGBUILD
community/pidgin-lwqq/PKGBUILD
community/python2-numexpr/PKGBUILD
core/systemd/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/fakechroot/PKGBUILD
extra/fsarchiver/PKGBUILD
extra/gifsicle/PKGBUILD
extra/i8kutils/PKGBUILD
extra/msmtp/PKGBUILD
extra/xfce4-power-manager/PKGBUILD
Diffstat (limited to 'extra/lighttpd')
-rw-r--r-- | extra/lighttpd/PKGBUILD | 9 | ||||
-rw-r--r-- | extra/lighttpd/lighttpd.service | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index acfdcb4cb..24ca572a3 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $ +# $Id: PKGBUILD 185242 2013-05-12 10:58:13Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.32 -pkgrel=4 +pkgrel=5 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64' 'mips64el') @@ -21,16 +21,17 @@ source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver} "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1' - '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7' + 'SKIP' '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' - '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696') + '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --libdir=/usr/lib/lighttpd/ \ --sysconfdir=/etc/lighttpd \ --with-mysql \ diff --git a/extra/lighttpd/lighttpd.service b/extra/lighttpd/lighttpd.service index b80db7695..568948dda 100644 --- a/extra/lighttpd/lighttpd.service +++ b/extra/lighttpd/lighttpd.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] PrivateTmp=true -ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf +ExecStart=/usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGINT |