diff options
| author | Pierre Habouzit <madcoder@debian.org> | 2008-04-23 21:24:48 +0000 |
|---|---|---|
| committer | Pierre Habouzit <madcoder@debian.org> | 2008-04-23 21:24:48 +0000 |
| commit | e853250468d65cc5ef14a98bcd536e2e2784d12b (patch) | |
| tree | 52a744769d3d9f4b90f60d976826af8bb2230940 | |
| parent | 1731cfb6e90be17467036a2315d1ed5f733ff0be (diff) | |
| download | lighttpd-e853250468d65cc5ef14a98bcd536e2e2784d12b.tar.gz | |
Update patch.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/lighttpd.postinst | 2 | ||||
| -rw-r--r-- | debian/patches/ssl-connection-errors.patch | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 5c9f13d..6199a05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lighttpd (1.4.19-3) unstable; urgency=low + + * Fix /var/cache/lighttpd/uploads permissions in postinst (Closes: 476870). + * Update patches/ssl-connection-errors.patch using upstream r2144, thanks to + upstream for noticing. + + -- Pierre Habouzit <madcoder@debian.org> Sun, 13 Apr 2008 13:27:55 +0200 + lighttpd (1.4.19-2) unstable; urgency=low * Add patches/ssl-connection-errors.patch for CVE-2008-1531 diff --git a/debian/lighttpd.postinst b/debian/lighttpd.postinst index 8caa1fe..94be198 100644 --- a/debian/lighttpd.postinst +++ b/debian/lighttpd.postinst @@ -10,7 +10,7 @@ if [ "$1" = "configure" ]; then fi mkdir -p /var/run/lighttpd > /dev/null 2> /dev/null chown www-data:www-data /var/log/lighttpd /var/run/lighttpd - chown www-data:www-data /var/cache/lighttpd /var/cache/lighttpd/compress + chown www-data:www-data /var/cache/lighttpd /var/cache/lighttpd/compress /var/cache/lighttpd/uploads chmod 0750 /var/log/lighttpd /var/run/lighttpd fi diff --git a/debian/patches/ssl-connection-errors.patch b/debian/patches/ssl-connection-errors.patch index d2f3801..5e25c99 100644 --- a/debian/patches/ssl-connection-errors.patch +++ b/debian/patches/ssl-connection-errors.patch @@ -38,7 +38,7 @@ diff -r ade3eead0e8d -r 82c24356bcd0 src/connections.c + ERR_clear_error(); + if (-1 != (ret = SSL_shutdown(con->ssl))) break; + -+ // fall through ++ /* fall through */ default: - log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", - SSL_get_error(con->ssl, ret), @@ -59,7 +59,7 @@ diff -r ade3eead0e8d -r 82c24356bcd0 src/connections.c + } while((err = ERR_get_error())); + } else { + log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):", -+ ssl_r, r, errno, ++ ssl_r, ret, errno, + strerror(errno)); + } + |