[Pkg-sks-commit] r201 - in sks/trunk/sks/debian: . patches

[Christoph Martin]

Author: chrism
Date: 2009-07-17 09:07:18 +0000 (Fri, 17 Jul 2009)
New Revision: 201

Added:
   sks/trunk/sks/debian/patches/509-content-types
   sks/trunk/sks/debian/patches/510-allowed-chars
Modified:
   sks/trunk/sks/debian/changelog
Log:
releasing version 1.1.0-8

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2009-07-15 22:51:11 UTC (rev 200)
+++ sks/trunk/sks/debian/changelog	2009-07-17 09:07:18 UTC (rev 201)
@@ -1,3 +1,12 @@
+sks (1.1.0-8) unstable; urgency=low
+
+  * Teach dbserver about content-type for .html.
+  * Allow - in filenames for webserver.
+  * closes: #505014
+  * thanks to Peter Palfrader <weasel at debian.org>
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Thu, 16 Jul 2009 23:33:21 +0200
+
 sks (1.1.0-7) unstable; urgency=low
 
   * fix patch for PIDDIR

Added: sks/trunk/sks/debian/patches/509-content-types
===================================================================
--- sks/trunk/sks/debian/patches/509-content-types	                        (rev 0)
+++ sks/trunk/sks/debian/patches/509-content-types	2009-07-17 09:07:18 UTC (rev 201)
@@ -0,0 +1,11 @@
+diff -ruN sks-1.1.0-old/dbserver.ml sks-1.1.0/dbserver.ml
+--- sks-1.1.0-old/dbserver.ml	2008-11-08 15:58:54.803687000 +0000
++++ sks-1.1.0/dbserver.ml	2008-11-08 15:59:37.333809983 +0000
+@@ -370,6 +370,7 @@
+       ".gif", "image/gif";
+       ".ico", "image/x-icon";
+       ".png", "image/png";
++      ".html", "text/html";
+       ".txt", "text/plain"; 
+     ]
+ 

Added: sks/trunk/sks/debian/patches/510-allowed-chars
===================================================================
--- sks/trunk/sks/debian/patches/510-allowed-chars	                        (rev 0)
+++ sks/trunk/sks/debian/patches/510-allowed-chars	2009-07-17 09:07:18 UTC (rev 201)
@@ -0,0 +1,12 @@
+diff -ruN sks-1.1.0-old/dbserver.ml sks-1.1.0/dbserver.ml
+--- sks-1.1.0-old/dbserver.ml	2008-11-08 16:12:22.376045000 +0000
++++ sks-1.1.0/dbserver.ml	2008-11-08 16:12:59.014429214 +0000
+@@ -348,7 +348,7 @@
+ 
+   let is_safe char = 
+     (char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z') || 
+-    (char >= '0' && char <= '9') || (char = '.')
++    (char >= '0' && char <= '9') || (char = '.') || (char = '-')
+     
+ 
+   let verify_web_fname fname =