[arch-commits] Commit in lighttpd/repos (24 files)

Pierre Schmitz pierre at nymeria.archlinux.org
Fri Nov 15 09:39:54 UTC 2013


    Date: Friday, November 15, 2013 @ 10:39:54
  Author: pierre
Revision: 199543

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  lighttpd/repos/extra-i686/PKGBUILD
    (from rev 199542, lighttpd/trunk/PKGBUILD)
  lighttpd/repos/extra-i686/lighttpd.conf
    (from rev 199542, lighttpd/trunk/lighttpd.conf)
  lighttpd/repos/extra-i686/lighttpd.install
    (from rev 199542, lighttpd/trunk/lighttpd.install)
  lighttpd/repos/extra-i686/lighttpd.logrotate.d
    (from rev 199542, lighttpd/trunk/lighttpd.logrotate.d)
  lighttpd/repos/extra-i686/lighttpd.service
    (from rev 199542, lighttpd/trunk/lighttpd.service)
  lighttpd/repos/extra-i686/lighttpd.tmpfiles
    (from rev 199542, lighttpd/trunk/lighttpd.tmpfiles)
  lighttpd/repos/extra-x86_64/PKGBUILD
    (from rev 199542, lighttpd/trunk/PKGBUILD)
  lighttpd/repos/extra-x86_64/lighttpd.conf
    (from rev 199542, lighttpd/trunk/lighttpd.conf)
  lighttpd/repos/extra-x86_64/lighttpd.install
    (from rev 199542, lighttpd/trunk/lighttpd.install)
  lighttpd/repos/extra-x86_64/lighttpd.logrotate.d
    (from rev 199542, lighttpd/trunk/lighttpd.logrotate.d)
  lighttpd/repos/extra-x86_64/lighttpd.service
    (from rev 199542, lighttpd/trunk/lighttpd.service)
  lighttpd/repos/extra-x86_64/lighttpd.tmpfiles
    (from rev 199542, lighttpd/trunk/lighttpd.tmpfiles)
Deleted:
  lighttpd/repos/extra-i686/PKGBUILD
  lighttpd/repos/extra-i686/lighttpd.conf
  lighttpd/repos/extra-i686/lighttpd.install
  lighttpd/repos/extra-i686/lighttpd.logrotate.d
  lighttpd/repos/extra-i686/lighttpd.service
  lighttpd/repos/extra-i686/lighttpd.tmpfiles
  lighttpd/repos/extra-x86_64/PKGBUILD
  lighttpd/repos/extra-x86_64/lighttpd.conf
  lighttpd/repos/extra-x86_64/lighttpd.install
  lighttpd/repos/extra-x86_64/lighttpd.logrotate.d
  lighttpd/repos/extra-x86_64/lighttpd.service
  lighttpd/repos/extra-x86_64/lighttpd.tmpfiles

-----------------------------------+
 /PKGBUILD                         |  188 ++++++++++++++++++++++++++++++++++++
 /lighttpd.conf                    |   44 ++++++++
 /lighttpd.install                 |   18 +++
 /lighttpd.logrotate.d             |   18 +++
 /lighttpd.service                 |   24 ++++
 /lighttpd.tmpfiles                |    4 
 extra-i686/PKGBUILD               |   71 -------------
 extra-i686/lighttpd.conf          |   22 ----
 extra-i686/lighttpd.install       |    9 -
 extra-i686/lighttpd.logrotate.d   |    9 -
 extra-i686/lighttpd.service       |   12 --
 extra-i686/lighttpd.tmpfiles      |    2 
 extra-x86_64/PKGBUILD             |   71 -------------
 extra-x86_64/lighttpd.conf        |   22 ----
 extra-x86_64/lighttpd.install     |    9 -
 extra-x86_64/lighttpd.logrotate.d |    9 -
 extra-x86_64/lighttpd.service     |   12 --
 extra-x86_64/lighttpd.tmpfiles    |    2 
 18 files changed, 296 insertions(+), 250 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-i686/PKGBUILD	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=lighttpd
-pkgver=1.4.33
-pkgrel=2
-pkgdesc='A secure, fast, compliant and very flexible web-server'
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://www.lighttpd.net/"
-depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd')
-makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
-optdepends=('libxml2: mod_webdav'
-            'lua51: mod_cml/mod_magnet'
-            'libmariadbclient: mod_mysql_vhost'
-            'sqlite: mod_webdav')
-backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
-options=('emptydirs')
-install='lighttpd.install'
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
-        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
-sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
-            'SKIP'
-            '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
-            'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
-            'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
-            '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--sbindir=/usr/bin \
-		--libdir=/usr/lib/lighttpd/ \
-		--sysconfdir=/etc/lighttpd \
-		--with-mysql \
-		--with-ldap \
-		--with-attr \
-		--with-openssl \
-		--with-kerberos5 \
-		--without-fam \
-		--with-webdav-props \
-		--with-webdav-locks \
-		--with-gdbm \
-		--with-memcache \
-		--with-lua
-	make
-}
-
-check() {
-	cd $srcdir/$pkgname-$pkgver
-	make check
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make DESTDIR=$pkgdir install
-
-	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
-	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
-	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
-	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf
-	install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service
-
-	pushd doc/config >/dev/null
-	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
-	popd >/dev/null
-
-	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}

Copied: lighttpd/repos/extra-i686/PKGBUILD (from rev 199542, lighttpd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=lighttpd
+pkgver=1.4.33
+pkgrel=3
+pkgdesc='A secure, fast, compliant and very flexible web-server'
+license=('custom')
+arch=('i686' 'x86_64')
+url="http://www.lighttpd.net/"
+depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd')
+makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
+optdepends=('libxml2: mod_webdav'
+            'lua51: mod_cml/mod_magnet'
+            'libmariadbclient: mod_mysql_vhost'
+            'sqlite: mod_webdav')
+backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
+options=('emptydirs')
+install='lighttpd.install'
+source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
+        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch.asc"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch.asc"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch.asc"
+        'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
+sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
+            'SKIP'
+            '87792bcf62a554ac094263b931a8ae369d975b7e6bf83778f8f0a6c0ff31b979'
+            'SKIP'
+            '1772cae2a0678c93dd5fa54f2622a563c3eb0a0047ba2a6648a5680d50d3bfde'
+            'SKIP'
+            'babf177f2e88a1444550825ce8e8ad1a95dbc78cfaa59c2c3f121ccbb37799d2'
+            'SKIP'
+            '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
+            'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
+            'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
+            '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
+
+prepare() {
+	cd $srcdir/$pkgname-$pkgver
+
+	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_02.txt
+	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_setuid.patch
+	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_03.txt
+	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_fam_use_after_free.patch
+	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_01.txt
+	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_ssl_sni.patch
+}
+
+build() {
+	cd $srcdir/$pkgname-$pkgver
+
+	./configure --prefix=/usr \
+		--sbindir=/usr/bin \
+		--libdir=/usr/lib/lighttpd/ \
+		--sysconfdir=/etc/lighttpd \
+		--with-mysql \
+		--with-ldap \
+		--with-attr \
+		--with-openssl \
+		--with-kerberos5 \
+		--without-fam \
+		--with-webdav-props \
+		--with-webdav-locks \
+		--with-gdbm \
+		--with-memcache \
+		--with-lua
+	make
+}
+
+check() {
+	cd $srcdir/$pkgname-$pkgver
+	make check
+}
+
+package() {
+	cd $srcdir/$pkgname-$pkgver
+	make DESTDIR=$pkgdir install
+
+	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
+	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
+	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
+	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf
+	install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service
+
+	pushd doc/config >/dev/null
+	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
+	popd >/dev/null
+
+	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}

Deleted: extra-i686/lighttpd.conf
===================================================================
--- extra-i686/lighttpd.conf	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-i686/lighttpd.conf	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,22 +0,0 @@
-# This is a minimal example config
-# See /usr/share/doc/lighttpd
-# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
-
-server.port		= 80
-server.username		= "http"
-server.groupname	= "http"
-server.document-root	= "/srv/http"
-server.errorlog		= "/var/log/lighttpd/error.log"
-dir-listing.activate	= "enable"
-index-file.names	= ( "index.html" )
-mimetype.assign		= (
-				".html" => "text/html",
-				".txt" => "text/plain",
-				".css" => "text/css",
-				".js" => "application/x-javascript",
-				".jpg" => "image/jpeg",
-				".jpeg" => "image/jpeg",
-				".gif" => "image/gif",
-				".png" => "image/png",
-				"" => "application/octet-stream"
-			)

Copied: lighttpd/repos/extra-i686/lighttpd.conf (from rev 199542, lighttpd/trunk/lighttpd.conf)
===================================================================
--- extra-i686/lighttpd.conf	                        (rev 0)
+++ extra-i686/lighttpd.conf	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,22 @@
+# This is a minimal example config
+# See /usr/share/doc/lighttpd
+# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
+
+server.port		= 80
+server.username		= "http"
+server.groupname	= "http"
+server.document-root	= "/srv/http"
+server.errorlog		= "/var/log/lighttpd/error.log"
+dir-listing.activate	= "enable"
+index-file.names	= ( "index.html" )
+mimetype.assign		= (
+				".html" => "text/html",
+				".txt" => "text/plain",
+				".css" => "text/css",
+				".js" => "application/x-javascript",
+				".jpg" => "image/jpeg",
+				".jpeg" => "image/jpeg",
+				".gif" => "image/gif",
+				".png" => "image/png",
+				"" => "application/octet-stream"
+			)

Deleted: extra-i686/lighttpd.install
===================================================================
--- extra-i686/lighttpd.install	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-i686/lighttpd.install	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,9 +0,0 @@
-post_install() {
-	if [[ ! -d run/lighttpd ]]; then
-		usr/bin/systemd-tmpfiles --create lighttpd.conf
-	fi
-}
-
-post_upgrade() {
-	post_install
-}

Copied: lighttpd/repos/extra-i686/lighttpd.install (from rev 199542, lighttpd/trunk/lighttpd.install)
===================================================================
--- extra-i686/lighttpd.install	                        (rev 0)
+++ extra-i686/lighttpd.install	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,9 @@
+post_install() {
+	if [[ ! -d run/lighttpd ]]; then
+		usr/bin/systemd-tmpfiles --create lighttpd.conf
+	fi
+}
+
+post_upgrade() {
+	post_install
+}

Deleted: extra-i686/lighttpd.logrotate.d
===================================================================
--- extra-i686/lighttpd.logrotate.d	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-i686/lighttpd.logrotate.d	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,9 +0,0 @@
-/var/log/lighttpd/*log {
-	missingok
-	copytruncate
-	notifempty
-	sharedscripts
-	postrotate
-		systemctl reload lighttpd.service || true
-	endscript
-}

Copied: lighttpd/repos/extra-i686/lighttpd.logrotate.d (from rev 199542, lighttpd/trunk/lighttpd.logrotate.d)
===================================================================
--- extra-i686/lighttpd.logrotate.d	                        (rev 0)
+++ extra-i686/lighttpd.logrotate.d	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,9 @@
+/var/log/lighttpd/*log {
+	missingok
+	copytruncate
+	notifempty
+	sharedscripts
+	postrotate
+		systemctl reload lighttpd.service || true
+	endscript
+}

Deleted: extra-i686/lighttpd.service
===================================================================
--- extra-i686/lighttpd.service	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-i686/lighttpd.service	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,12 +0,0 @@
-[Unit]
-Description=A secure, fast, compliant and very flexible web-server
-After=syslog.target network.target
-
-[Service]
-PrivateTmp=true
-ExecStart=/usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
-ExecReload=/bin/kill -HUP $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target

Copied: lighttpd/repos/extra-i686/lighttpd.service (from rev 199542, lighttpd/trunk/lighttpd.service)
===================================================================
--- extra-i686/lighttpd.service	                        (rev 0)
+++ extra-i686/lighttpd.service	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,12 @@
+[Unit]
+Description=A secure, fast, compliant and very flexible web-server
+After=syslog.target network.target
+
+[Service]
+PrivateTmp=true
+ExecStart=/usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-i686/lighttpd.tmpfiles
===================================================================
--- extra-i686/lighttpd.tmpfiles	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-i686/lighttpd.tmpfiles	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,2 +0,0 @@
-d /run/lighttpd 755 http http -
-d /var/cache/lighttpd 755 http http 10d

Copied: lighttpd/repos/extra-i686/lighttpd.tmpfiles (from rev 199542, lighttpd/trunk/lighttpd.tmpfiles)
===================================================================
--- extra-i686/lighttpd.tmpfiles	                        (rev 0)
+++ extra-i686/lighttpd.tmpfiles	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,2 @@
+d /run/lighttpd 755 http http -
+d /var/cache/lighttpd 755 http http 10d

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-x86_64/PKGBUILD	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=lighttpd
-pkgver=1.4.33
-pkgrel=2
-pkgdesc='A secure, fast, compliant and very flexible web-server'
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://www.lighttpd.net/"
-depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd')
-makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
-optdepends=('libxml2: mod_webdav'
-            'lua51: mod_cml/mod_magnet'
-            'libmariadbclient: mod_mysql_vhost'
-            'sqlite: mod_webdav')
-backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
-options=('emptydirs')
-install='lighttpd.install'
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
-        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
-sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
-            'SKIP'
-            '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
-            'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
-            'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
-            '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--sbindir=/usr/bin \
-		--libdir=/usr/lib/lighttpd/ \
-		--sysconfdir=/etc/lighttpd \
-		--with-mysql \
-		--with-ldap \
-		--with-attr \
-		--with-openssl \
-		--with-kerberos5 \
-		--without-fam \
-		--with-webdav-props \
-		--with-webdav-locks \
-		--with-gdbm \
-		--with-memcache \
-		--with-lua
-	make
-}
-
-check() {
-	cd $srcdir/$pkgname-$pkgver
-	make check
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make DESTDIR=$pkgdir install
-
-	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
-	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
-	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
-	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf
-	install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service
-
-	pushd doc/config >/dev/null
-	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
-	popd >/dev/null
-
-	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}

Copied: lighttpd/repos/extra-x86_64/PKGBUILD (from rev 199542, lighttpd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,94 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=lighttpd
+pkgver=1.4.33
+pkgrel=3
+pkgdesc='A secure, fast, compliant and very flexible web-server'
+license=('custom')
+arch=('i686' 'x86_64')
+url="http://www.lighttpd.net/"
+depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd')
+makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
+optdepends=('libxml2: mod_webdav'
+            'lua51: mod_cml/mod_magnet'
+            'libmariadbclient: mod_mysql_vhost'
+            'sqlite: mod_webdav')
+backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
+options=('emptydirs')
+install='lighttpd.install'
+source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
+        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch.asc"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch.asc"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch"
+        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch.asc"
+        'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
+sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
+            'SKIP'
+            '87792bcf62a554ac094263b931a8ae369d975b7e6bf83778f8f0a6c0ff31b979'
+            'SKIP'
+            '1772cae2a0678c93dd5fa54f2622a563c3eb0a0047ba2a6648a5680d50d3bfde'
+            'SKIP'
+            'babf177f2e88a1444550825ce8e8ad1a95dbc78cfaa59c2c3f121ccbb37799d2'
+            'SKIP'
+            '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
+            'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
+            'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
+            '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
+
+prepare() {
+	cd $srcdir/$pkgname-$pkgver
+
+	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_02.txt
+	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_setuid.patch
+	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_03.txt
+	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_fam_use_after_free.patch
+	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_01.txt
+	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_ssl_sni.patch
+}
+
+build() {
+	cd $srcdir/$pkgname-$pkgver
+
+	./configure --prefix=/usr \
+		--sbindir=/usr/bin \
+		--libdir=/usr/lib/lighttpd/ \
+		--sysconfdir=/etc/lighttpd \
+		--with-mysql \
+		--with-ldap \
+		--with-attr \
+		--with-openssl \
+		--with-kerberos5 \
+		--without-fam \
+		--with-webdav-props \
+		--with-webdav-locks \
+		--with-gdbm \
+		--with-memcache \
+		--with-lua
+	make
+}
+
+check() {
+	cd $srcdir/$pkgname-$pkgver
+	make check
+}
+
+package() {
+	cd $srcdir/$pkgname-$pkgver
+	make DESTDIR=$pkgdir install
+
+	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
+	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
+	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
+	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf
+	install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service
+
+	pushd doc/config >/dev/null
+	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
+	popd >/dev/null
+
+	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}

Deleted: extra-x86_64/lighttpd.conf
===================================================================
--- extra-x86_64/lighttpd.conf	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-x86_64/lighttpd.conf	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,22 +0,0 @@
-# This is a minimal example config
-# See /usr/share/doc/lighttpd
-# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
-
-server.port		= 80
-server.username		= "http"
-server.groupname	= "http"
-server.document-root	= "/srv/http"
-server.errorlog		= "/var/log/lighttpd/error.log"
-dir-listing.activate	= "enable"
-index-file.names	= ( "index.html" )
-mimetype.assign		= (
-				".html" => "text/html",
-				".txt" => "text/plain",
-				".css" => "text/css",
-				".js" => "application/x-javascript",
-				".jpg" => "image/jpeg",
-				".jpeg" => "image/jpeg",
-				".gif" => "image/gif",
-				".png" => "image/png",
-				"" => "application/octet-stream"
-			)

Copied: lighttpd/repos/extra-x86_64/lighttpd.conf (from rev 199542, lighttpd/trunk/lighttpd.conf)
===================================================================
--- extra-x86_64/lighttpd.conf	                        (rev 0)
+++ extra-x86_64/lighttpd.conf	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,22 @@
+# This is a minimal example config
+# See /usr/share/doc/lighttpd
+# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
+
+server.port		= 80
+server.username		= "http"
+server.groupname	= "http"
+server.document-root	= "/srv/http"
+server.errorlog		= "/var/log/lighttpd/error.log"
+dir-listing.activate	= "enable"
+index-file.names	= ( "index.html" )
+mimetype.assign		= (
+				".html" => "text/html",
+				".txt" => "text/plain",
+				".css" => "text/css",
+				".js" => "application/x-javascript",
+				".jpg" => "image/jpeg",
+				".jpeg" => "image/jpeg",
+				".gif" => "image/gif",
+				".png" => "image/png",
+				"" => "application/octet-stream"
+			)

Deleted: extra-x86_64/lighttpd.install
===================================================================
--- extra-x86_64/lighttpd.install	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-x86_64/lighttpd.install	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,9 +0,0 @@
-post_install() {
-	if [[ ! -d run/lighttpd ]]; then
-		usr/bin/systemd-tmpfiles --create lighttpd.conf
-	fi
-}
-
-post_upgrade() {
-	post_install
-}

Copied: lighttpd/repos/extra-x86_64/lighttpd.install (from rev 199542, lighttpd/trunk/lighttpd.install)
===================================================================
--- extra-x86_64/lighttpd.install	                        (rev 0)
+++ extra-x86_64/lighttpd.install	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,9 @@
+post_install() {
+	if [[ ! -d run/lighttpd ]]; then
+		usr/bin/systemd-tmpfiles --create lighttpd.conf
+	fi
+}
+
+post_upgrade() {
+	post_install
+}

Deleted: extra-x86_64/lighttpd.logrotate.d
===================================================================
--- extra-x86_64/lighttpd.logrotate.d	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-x86_64/lighttpd.logrotate.d	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,9 +0,0 @@
-/var/log/lighttpd/*log {
-	missingok
-	copytruncate
-	notifempty
-	sharedscripts
-	postrotate
-		systemctl reload lighttpd.service || true
-	endscript
-}

Copied: lighttpd/repos/extra-x86_64/lighttpd.logrotate.d (from rev 199542, lighttpd/trunk/lighttpd.logrotate.d)
===================================================================
--- extra-x86_64/lighttpd.logrotate.d	                        (rev 0)
+++ extra-x86_64/lighttpd.logrotate.d	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,9 @@
+/var/log/lighttpd/*log {
+	missingok
+	copytruncate
+	notifempty
+	sharedscripts
+	postrotate
+		systemctl reload lighttpd.service || true
+	endscript
+}

Deleted: extra-x86_64/lighttpd.service
===================================================================
--- extra-x86_64/lighttpd.service	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-x86_64/lighttpd.service	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,12 +0,0 @@
-[Unit]
-Description=A secure, fast, compliant and very flexible web-server
-After=syslog.target network.target
-
-[Service]
-PrivateTmp=true
-ExecStart=/usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
-ExecReload=/bin/kill -HUP $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target

Copied: lighttpd/repos/extra-x86_64/lighttpd.service (from rev 199542, lighttpd/trunk/lighttpd.service)
===================================================================
--- extra-x86_64/lighttpd.service	                        (rev 0)
+++ extra-x86_64/lighttpd.service	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,12 @@
+[Unit]
+Description=A secure, fast, compliant and very flexible web-server
+After=syslog.target network.target
+
+[Service]
+PrivateTmp=true
+ExecStart=/usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-x86_64/lighttpd.tmpfiles
===================================================================
--- extra-x86_64/lighttpd.tmpfiles	2013-11-15 09:38:30 UTC (rev 199542)
+++ extra-x86_64/lighttpd.tmpfiles	2013-11-15 09:39:54 UTC (rev 199543)
@@ -1,2 +0,0 @@
-d /run/lighttpd 755 http http -
-d /var/cache/lighttpd 755 http http 10d

Copied: lighttpd/repos/extra-x86_64/lighttpd.tmpfiles (from rev 199542, lighttpd/trunk/lighttpd.tmpfiles)
===================================================================
--- extra-x86_64/lighttpd.tmpfiles	                        (rev 0)
+++ extra-x86_64/lighttpd.tmpfiles	2013-11-15 09:39:54 UTC (rev 199543)
@@ -0,0 +1,2 @@
+d /run/lighttpd 755 http http -
+d /var/cache/lighttpd 755 http http 10d




More information about the arch-commits mailing list