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

Stéphane Gaudreault stephane at archlinux.org
Tue Nov 29 08:33:31 EST 2011


    Date: Tuesday, November 29, 2011 @ 08:33:30
  Author: stephane
Revision: 143810

db-move: moved lighttpd from [testing] to [extra] (x86_64)

Added:
  lighttpd/repos/extra-x86_64/PKGBUILD
    (from rev 143804, lighttpd/repos/testing-x86_64/PKGBUILD)
  lighttpd/repos/extra-x86_64/lighttpd.conf
    (from rev 143804, lighttpd/repos/testing-x86_64/lighttpd.conf)
  lighttpd/repos/extra-x86_64/lighttpd.logrotate.d
    (from rev 143804, lighttpd/repos/testing-x86_64/lighttpd.logrotate.d)
  lighttpd/repos/extra-x86_64/lighttpd.rc.d
    (from rev 143804, lighttpd/repos/testing-x86_64/lighttpd.rc.d)
Deleted:
  lighttpd/repos/extra-x86_64/PKGBUILD
  lighttpd/repos/extra-x86_64/lighttpd.conf
  lighttpd/repos/extra-x86_64/lighttpd.logrotate.d
  lighttpd/repos/extra-x86_64/lighttpd.rc.d
  lighttpd/repos/testing-x86_64/

----------------------+
 PKGBUILD             |  132 ++++++++++++------------
 lighttpd.conf        |   24 ++--
 lighttpd.logrotate.d |   12 +-
 lighttpd.rc.d        |  264 ++++++++++++++++++++++++-------------------------
 4 files changed, 217 insertions(+), 215 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-11-29 13:33:29 UTC (rev 143809)
+++ extra-x86_64/PKGBUILD	2011-11-29 13:33:30 UTC (rev 143810)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=lighttpd
-pkgver=1.4.29
-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')
-makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
-optdepends=('libxml2: mod_webdav'
-            'lua: mod_cml/mod_magnet'
-            'libmysqlclient: mod_mysql_vhost'
-            'sqlite3: mod_webdav')
-backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
-options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-md5sums=('e6e67b09986cb504db630b5a86b2dd76'
-         '268386e71f5748dc1d887b9a0ab65589'
-         '913e2157fa78d990c32146f387d44c2b'
-         'acdaa94299e6299cb5085e6d88babeca')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/lighttpd/modules \
-		--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 -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
-	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/
-
-	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 143804, lighttpd/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-11-29 13:33:30 UTC (rev 143810)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=lighttpd
+pkgver=1.4.29
+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')
+makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
+optdepends=('libxml2: mod_webdav'
+            'lua: mod_cml/mod_magnet'
+            'libmysqlclient: mod_mysql_vhost'
+            'sqlite3: mod_webdav')
+backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
+options=('!libtool' 'emptydirs')
+source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
+        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc"
+        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
+md5sums=('e6e67b09986cb504db630b5a86b2dd76'
+         'de2afb4ed6a088fd7fa5f13c387a08f0'
+         '268386e71f5748dc1d887b9a0ab65589'
+         '913e2157fa78d990c32146f387d44c2b'
+         'acdaa94299e6299cb5085e6d88babeca')
+
+build() {
+	cd $srcdir/$pkgname-$pkgver
+
+	./configure --prefix=/usr \
+		--libexecdir=/usr/lib/lighttpd/modules \
+		--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 -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
+	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/
+
+	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	2011-11-29 13:33:29 UTC (rev 143809)
+++ extra-x86_64/lighttpd.conf	2011-11-29 13:33:30 UTC (rev 143810)
@@ -1,12 +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", ".jpg" => "image/jpeg", ".png" => "image/png" )

Copied: lighttpd/repos/extra-x86_64/lighttpd.conf (from rev 143804, lighttpd/repos/testing-x86_64/lighttpd.conf)
===================================================================
--- extra-x86_64/lighttpd.conf	                        (rev 0)
+++ extra-x86_64/lighttpd.conf	2011-11-29 13:33:30 UTC (rev 143810)
@@ -0,0 +1,12 @@
+# 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", ".jpg" => "image/jpeg", ".png" => "image/png" )

Deleted: extra-x86_64/lighttpd.logrotate.d
===================================================================
--- extra-x86_64/lighttpd.logrotate.d	2011-11-29 13:33:29 UTC (rev 143809)
+++ extra-x86_64/lighttpd.logrotate.d	2011-11-29 13:33:30 UTC (rev 143810)
@@ -1,6 +0,0 @@
-/var/log/lighttpd/*log {
-	missingok
-	postrotate
-	/etc/rc.d/lighttpd reload >/dev/null || true
-	endscript
-}

Copied: lighttpd/repos/extra-x86_64/lighttpd.logrotate.d (from rev 143804, lighttpd/repos/testing-x86_64/lighttpd.logrotate.d)
===================================================================
--- extra-x86_64/lighttpd.logrotate.d	                        (rev 0)
+++ extra-x86_64/lighttpd.logrotate.d	2011-11-29 13:33:30 UTC (rev 143810)
@@ -0,0 +1,6 @@
+/var/log/lighttpd/*log {
+	missingok
+	postrotate
+	/etc/rc.d/lighttpd reload >/dev/null || true
+	endscript
+}

Deleted: extra-x86_64/lighttpd.rc.d
===================================================================
--- extra-x86_64/lighttpd.rc.d	2011-11-29 13:33:29 UTC (rev 143809)
+++ extra-x86_64/lighttpd.rc.d	2011-11-29 13:33:30 UTC (rev 143810)
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-pid_file='/var/run/lighttpd/lighttpd-angel.pid'
-
-get_pid() {
-	if [ -r "${pid_file}" ]; then
-		cat "${pid_file}"
-	else
-		pgrep -f /usr/sbin/lighttpd-angel
-	fi
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/lighttpd/lighttpd.conf ]; then
-		stat_append '(/etc/lighttpd/lighttpd.conf not found)'
-		stat_die
-	fi
-
-	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
-		stat_die
-	fi
-
-	local piddir=$(dirname "${pid_file}")
-	if [ ! -d "${piddir}" ]; then
-		install -d -m755 -o http -g http "${piddir}"
-	fi
-
-	stat_done
-}
-
-start() {
-	stat_busy 'Starting lighttpd'
-
-	local PID=$(get_pid)
-	if [ -z "$PID" ]; then
-		nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 &
-		if [ $? -gt 0 ]; then
-			stat_die
-		else
-			echo $! > "${pid_file}"
-			add_daemon lighttpd
-			stat_done
-		fi
-	else
-		stat_die
-	fi
-}
-
-stop() {
-	stat_busy 'Stopping lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-gracefull-stop() {
-	stat_busy 'Stopping lighttpd gracefully'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -INT $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-reload() {
-	stat_busy 'Reloading lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_die
-	else
-		stat_done
-	fi
-}
-
-
-case "$1" in
-	start)
-		test_config
-		start
-		;;
-	stop)
-		test_config
-		stop
-		;;
-	gracefull-stop)
-		test_config
-		stop
-		;;
-	reload)
-		test_config
-		reload
-		;;
-	restart)
-		test_config
-		stop
-		while [ -n "$(get_pid)" ]; do
-			sleep 1
-		done
-		start
-		;;
-	status)
-		stat_busy 'Checking lighttpd status'
-		ck_status lighttpd
-		;;
-	*)
-	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
-esac
-
-exit 0

Copied: lighttpd/repos/extra-x86_64/lighttpd.rc.d (from rev 143804, lighttpd/repos/testing-x86_64/lighttpd.rc.d)
===================================================================
--- extra-x86_64/lighttpd.rc.d	                        (rev 0)
+++ extra-x86_64/lighttpd.rc.d	2011-11-29 13:33:30 UTC (rev 143810)
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+
+pid_file='/var/run/lighttpd/lighttpd-angel.pid'
+
+get_pid() {
+	if [ -r "${pid_file}" ]; then
+		cat "${pid_file}"
+	else
+		pgrep -f /usr/sbin/lighttpd-angel
+	fi
+}
+
+test_config() {
+	stat_busy 'Checking configuration'
+	if [ $(id -u) -ne 0 ]; then
+		stat_append '(This script must be run as root)'
+		stat_die
+	fi
+
+	if [ ! -r /etc/lighttpd/lighttpd.conf ]; then
+		stat_append '(/etc/lighttpd/lighttpd.conf not found)'
+		stat_die
+	fi
+
+	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
+	if [ $? -gt 0 ]; then
+		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
+		stat_die
+	fi
+
+	local piddir=$(dirname "${pid_file}")
+	if [ ! -d "${piddir}" ]; then
+		install -d -m755 -o http -g http "${piddir}"
+	fi
+
+	stat_done
+}
+
+start() {
+	stat_busy 'Starting lighttpd'
+
+	local PID=$(get_pid)
+	if [ -z "$PID" ]; then
+		nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 &
+		if [ $? -gt 0 ]; then
+			stat_die
+		else
+			echo $! > "${pid_file}"
+			add_daemon lighttpd
+			stat_done
+		fi
+	else
+		stat_die
+	fi
+}
+
+stop() {
+	stat_busy 'Stopping lighttpd'
+	local PID=$(get_pid)
+	[ -n "$PID" ] && kill $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		[ -f "${pid_file}" ] && rm -f "${pid_file}"
+		rm_daemon lighttpd
+		stat_done
+	fi
+}
+
+gracefull-stop() {
+	stat_busy 'Stopping lighttpd gracefully'
+	local PID=$(get_pid)
+	[ -n "$PID" ] && kill -INT $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		[ -f "${pid_file}" ] && rm -f "${pid_file}"
+		rm_daemon lighttpd
+		stat_done
+	fi
+}
+
+reload() {
+	stat_busy 'Reloading lighttpd'
+	local PID=$(get_pid)
+	[ -n "$PID" ] && kill -HUP $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_die
+	else
+		stat_done
+	fi
+}
+
+
+case "$1" in
+	start)
+		test_config
+		start
+		;;
+	stop)
+		test_config
+		stop
+		;;
+	gracefull-stop)
+		test_config
+		stop
+		;;
+	reload)
+		test_config
+		reload
+		;;
+	restart)
+		test_config
+		stop
+		while [ -n "$(get_pid)" ]; do
+			sleep 1
+		done
+		start
+		;;
+	status)
+		stat_busy 'Checking lighttpd status'
+		ck_status lighttpd
+		;;
+	*)
+	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
+esac
+
+exit 0



More information about the arch-commits mailing list