diff -u lighttpd-1.4.15/debian/control lighttpd-1.4.15/debian/control --- lighttpd-1.4.15/debian/control +++ lighttpd-1.4.15/debian/control @@ -1,14 +1,15 @@ Source: lighttpd Section: web Priority: optional -Maintainer: Debian lighttpd maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian lighttpd maintainers Uploaders: Krzysztof Krzyzaniak (eloy) , Torsten Marek , Franz Pletz -Build-Depends: debhelper (>= 5.0.0), cdbs, mime-support, libssl-dev, zlib1g-dev, libbz2-dev, libattr1-dev, libpcre3-dev, libmysqlclient15-dev, libldap2-dev, libfcgi-dev, libgdbm-dev, libmemcache-dev, liblua5.1-0-dev, dpatch, patchutils, pkg-config, uuid-dev, libsqlite3-dev, libxml2-dev, perl +Build-Depends: debhelper (>= 5.0.0), cdbs, mime-support, libssl-dev, zlib1g-dev, libbz2-dev, libattr1-dev, libpcre3-dev, libmysqlclient15-dev, libldap2-dev, libfcgi-dev, libgdbm-dev, libmemcache-dev, liblua5.1-0-dev, dpatch, patchutils, pkg-config, uuid-dev, libsqlite3-dev, libxml2-dev, perl, libgamin-dev Standards-Version: 3.7.2.1 Package: lighttpd Architecture: any -Depends: ${shlibs:Depends}, lsb-base (>= 3.0-3), mime-support, perl +Depends: ${shlibs:Depends}, lsb-base (>= 3.0-3), mime-support, libterm-readline-perl-perl Provides: httpd, httpd-cgi Suggests: openssl, rrdtool, apache2-utils Recommends: php4-cgi | php5-cgi diff -u lighttpd-1.4.15/debian/rules lighttpd-1.4.15/debian/rules --- lighttpd-1.4.15/debian/rules +++ lighttpd-1.4.15/debian/rules @@ -10,7 +10,7 @@ --with-openssl --with-pcre --with-bz2 --with-ldap \ --with-mysql --with-memcache --with-lua=lua5.1\ --with-gdbm --with-attr --with-webdav-locks\ - --with-webdav-props + --with-webdav-props --with-fam configure/lighttpd:: -mkdir debian/conf-enabled diff -u lighttpd-1.4.15/debian/changelog lighttpd-1.4.15/debian/changelog --- lighttpd-1.4.15/debian/changelog +++ lighttpd-1.4.15/debian/changelog @@ -1,3 +1,14 @@ +lighttpd (1.4.15-1.1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add fam/gamin stat cache engine support. + - Replace Depends: on perl with Depends: on libterm-readline-perl-perl. + - Make sure that upgrades succeed, even if we can't restart lighttpd. + - Clean environment in init.d script. + - Update maintainer field in debian/control. + + -- Michele Angrisano Sat, 21 Jul 2007 01:40:36 +0200 + lighttpd (1.4.15-1.1) unstable; urgency=low * Non-maintainer upload. @@ -6,6 +17,17 @@ -- Pierre Habouzit Fri, 20 Jul 2007 11:04:07 +0200 +lighttpd (1.4.15-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Add fam/gamin stat cache engine support + - Clean environment in init.d script + - Replace Depends: on perl with Depends: on libterm-readline-perl-perl + - Make sure that upgrades succeed, even if we can't restart lighttpd + - DebianMaintainerField update + + -- Soren Hansen Tue, 1 May 2007 13:15:59 +0200 + lighttpd (1.4.15-1) unstable; urgency=low * New upstream release (closes: #419131) @@ -27,6 +49,39 @@ -- Krzysztof Krzyzaniak (eloy) Thu, 8 Mar 2007 22:18:42 +0100 +lighttpd (1.4.13-9ubuntu4) feisty; urgency=low + + * Added LDAP connection leak fix from Debian (Bug: #413917) + - debian/patches/03_ldap_leak_bugfix.dpatch + * Added security fixes from 1.4.14 (Closes LP: #106416) + - Remote DOS in CRLF parsing (CVE-2007-1869) + debian/patches/04_security_crlf_parsing_dos.dpatch + - DOS with files with mtime 0 (CVE-2007-1870) + debian/patches/05_security_zero_mtime_crash.dpatch + + -- Lukas Fittl Sat, 14 Apr 2007 05:26:10 +0200 + +lighttpd (1.4.13-9ubuntu3) feisty; urgency=low + + * Make sure that upgrades succeed, even if we can't restart lighttpd + (LP: #86882) + + -- Soren Hansen Thu, 29 Mar 2007 01:10:06 +0200 + +lighttpd (1.4.13-9ubuntu2) feisty; urgency=low + + * Add fam/gamin stat cache engine support (Closes: LP#80818) + + -- Soren Hansen Mon, 19 Feb 2007 13:09:19 +0100 + +lighttpd (1.4.13-9ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Clean environment in init.d script + - Replace Depends: on perl with Depends: on libterm-readline-perl-perl + + -- Adrien Cunin Sat, 13 Jan 2007 21:38:05 +0100 + lighttpd (1.4.13-9) unstable; urgency=low * debian/lighttpd.default - removed, it is not ready yet. We'll back after @@ -41,6 +96,14 @@ -- Krzysztof Krzyzaniak (eloy) Tue, 2 Jan 2007 13:23:25 +0100 +lighttpd (1.4.13-7ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Clean environment in init.d script + - Replace Depends: on perl with Depends: on libterm-readline-perl-perl + + -- Soren Hansen Sat, 30 Dec 2006 16:22:11 +0100 + lighttpd (1.4.13-7) unstable; urgency=low [ Franz Pletz ] @@ -69,6 +132,25 @@ -- Franz Pletz Fri, 8 Dec 2006 16:15:27 +0100 +lighttpd (1.4.13-6ubuntu3) feisty; urgency=low + + * Fix typo in init-script + + -- Soren Hansen Wed, 13 Dec 2006 11:52:54 +0100 + +lighttpd (1.4.13-6ubuntu2) feisty; urgency=low + + * Clean the environment before starting. Fixes: LP#53840 + + -- Soren Hansen Sun, 10 Dec 2006 16:18:55 +0100 + +lighttpd (1.4.13-6ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Replace Depends: on perl with Depends: on libterm-readline-perl-perl + + -- Soren Hansen Fri, 8 Dec 2006 14:40:42 +0100 + lighttpd (1.4.13-6) unstable; urgency=low * debian/lighttpd.postinst: change only permission for /var/log/lighttpd/ @@ -122,6 +204,14 @@ -- Krzysztof Krzyzaniak (eloy) Mon, 9 Oct 2006 10:28:32 +0200 +lighttpd (1.4.13~r1370-1ubuntu1) edgy; urgency=low + + * Merge from Debian unstable (Closes: Malone #64900). Remaining changes: + - Add an additional dependency on libterm-readline-perl-perl + (Malone #43895) + + -- Lukas Fittl Tue, 10 Oct 2006 13:57:38 +0200 + lighttpd (1.4.13~r1370-1) unstable; urgency=low * New upstream release (closes: #390877) (closes: #389911) @@ -144,6 +234,13 @@ -- Krzysztof Krzyzaniak (eloy) Tue, 12 Sep 2006 19:17:41 +0200 +lighttpd (1.4.12~20060907-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable: + -> Keep the additional dependency on libterm-readline-perl-perl. + + -- Jeremie Corbier Fri, 22 Sep 2006 19:16:08 -0700 + lighttpd (1.4.12~20060907-1) unstable; urgency=low * New upstream release @@ -174,6 +271,17 @@ -- Krzysztof Krzyzaniak (eloy) Mon, 28 Aug 2006 13:06:25 +0200 +lighttpd (1.4.11-7ubuntu1) edgy; urgency=low + + * Merge from debian unstable: + -> Restore B-D on libmemcache-dev. + -> Keep the additional dependency on libterm-readline-perl-perl. + * debian/patches: + -> Add 02_mod_ssl_post_fix.dpatch: fix a stall with POST requests between + 8317 and 16381 bytes long when mod_ssl is enabled. + + -- Jeremie Corbier Thu, 17 Aug 2006 13:07:50 +0200 + lighttpd (1.4.11-7) unstable; urgency=low * debian/create-mime.assign.pl - catchup error when /etc/mime.types is not @@ -221,6 +329,27 @@ -- Torsten Marek Sun, 9 Apr 2006 15:51:51 +0200 +lighttpd (1.4.11-3ubuntu3) dapper; urgency=low + + * debian/control + + Added depends on libterm-readline-perl-perl. (Closes: Malone #43895) + + -- Chuck Short Wed, 10 May 2006 18:11:24 -0400 + +lighttpd (1.4.11-3ubuntu2) dapper; urgency=low + + * Rebuild against the new libmysqlclient15off with correct symbols. + + -- Adam Conrad Thu, 6 Apr 2006 15:10:02 +1000 + +lighttpd (1.4.11-3ubuntu1) dapper; urgency=low + + * Sync with Debian: + + Removed B-D on libmemcache-dev as we don't have it in dapper, needs to be + re-enabled for dapper+1 + + -- Sebastian Dröge Mon, 27 Mar 2006 13:52:44 +0200 + lighttpd (1.4.11-3) unstable; urgency=low * debian/lighttpd.conf - added dir-listing.encoding = "utf-8", suggested diff -u lighttpd-1.4.15/debian/init.d lighttpd-1.4.15/debian/init.d --- lighttpd-1.4.15/debian/init.d +++ lighttpd-1.4.15/debian/init.d @@ -15,6 +15,8 @@ DESC="web server" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME +ENV="env -i LANG=C PATH=/usr/local/bin:/usr/bin:/bin" +SSD="/sbin/start-stop-daemon" DAEMON_OPTS="-f /etc/lighttpd/lighttpd.conf" @@ -27,7 +29,7 @@ case "$1" in start) log_daemon_msg "Starting $DESC" $NAME - if ! start-stop-daemon --start --quiet\ + if ! $ENV $SSD --start --quiet\ --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS ; then log_end_msg 1 else @@ -36,7 +38,7 @@ ;; stop) log_daemon_msg "Stopping $DESC" $NAME - if start-stop-daemon --quiet --stop --oknodo --retry 30\ + if $SSD --quiet --stop --oknodo --retry 30\ --pidfile $PIDFILE --exec $DAEMON; then rm -f $PIDFILE log_end_msg 0 @@ -46,9 +48,9 @@ ;; reload) log_daemon_msg "Reloading $DESC configuration" $NAME - if start-stop-daemon --stop --signal 2 --oknodo --retry 30\ + if $SSD --stop --signal 2 --oknodo --retry 30\ --quiet --pidfile $PIDFILE --exec $DAEMON; then - if start-stop-daemon --start --quiet \ + if $ENV $SSD --start --quiet \ --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS ; then log_end_msg 0 else diff -u lighttpd-1.4.15/debian/lighttpd.postinst lighttpd-1.4.15/debian/lighttpd.postinst --- lighttpd-1.4.15/debian/lighttpd.postinst +++ lighttpd-1.4.15/debian/lighttpd.postinst @@ -13,5 +13,12 @@ fi -#DEBHELPER# +if [ -x "/etc/init.d/lighttpd" ]; then + update-rc.d lighttpd defaults >/dev/null + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d lighttpd start || true + else + /etc/init.d/lighttpd start || true + fi +fi exit 0