[pkg-lighttpd] r327 - in lighttpd/trunk/debian: . patches

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2008-04-23 21:24:48 +0000 (Wed, 23 Apr 2008)
New Revision: 327

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.postinst
   lighttpd/trunk/debian/patches/ssl-connection-errors.patch
Log:
Update patch.



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-04-13 11:27:54 UTC (rev 326)
+++ lighttpd/trunk/debian/changelog	2008-04-23 21:24:48 UTC (rev 327)
@@ -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 at 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

Modified: lighttpd/trunk/debian/lighttpd.postinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.postinst	2008-04-13 11:27:54 UTC (rev 326)
+++ lighttpd/trunk/debian/lighttpd.postinst	2008-04-23 21:24:48 UTC (rev 327)
@@ -10,7 +10,7 @@
 	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
 

Modified: lighttpd/trunk/debian/patches/ssl-connection-errors.patch
===================================================================
--- lighttpd/trunk/debian/patches/ssl-connection-errors.patch	2008-04-13 11:27:54 UTC (rev 326)
+++ lighttpd/trunk/debian/patches/ssl-connection-errors.patch	2008-04-23 21:24:48 UTC (rev 327)
@@ -38,7 +38,7 @@
 +					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 @@
 +							} 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));
 +						}
 +