[Pkg-cups-devel] r211 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Tue Apr 25 18:25:20 2006
New Revision: 211

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/14_dont_force_ssl.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
Log:
* Add debian/patches/14_dont_force_ssl.dpatch: Upstream now requires
  encryption by default for accessing /admin/, but our GUI frontends do not
  yet cope with that. Disable SSL requirement for now to revert to the old
  behaviour.



Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Tue Apr 25 18:25:20 2006
@@ -8,6 +8,10 @@
     later when the issue is sorted out with upstream.
   * Update patches for new upstream release.
   * Remove debian/patches/20_httpGetHostname_crash.dpatch, fixed upstream.
+  * Add debian/patches/14_dont_force_ssl.dpatch: Upstream now requires
+    encryption by default for accessing /admin/, but our GUI frontends do not
+    yet cope with that. Disable SSL requirement for now to revert to the old
+    behaviour.
   * debian/patches/08_cupsd.conf.conf.d.dpatch:
     - Set "BrowseAddress @LOCAL"; without this, sending browsing information
       does not work (Browsing still has to be enabled). Since enable_browsing
@@ -26,13 +30,13 @@
     - Fix browse.conf parsing to set the correct debconf default value, so
       that the browse setting is not reset to 'off' on upgrades.
       Closes: LP#38704
-  * Add debian/patches/57_svn_5461.dpatch: 
+  * Add debian/patches/57_svn_5461.dpatch:
     - Properly HTML-quote the printer name so that names containing e. g. '+'
       work properly in the web interface.
     - Upstream svn commit 5461.
     - Closes: LP#37018
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 25 Apr 2006 19:49:48 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 25 Apr 2006 20:09:37 +0200
 
 cupsys (1.1.99.rc2-0ubuntu2) dapper; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	Tue Apr 25 18:25:20 2006
@@ -12,6 +12,7 @@
 11_pam.dpatch
 12_quiesce_ipp_logging.dpatch
 13_default_log_warn.dpatch
+14_dont_force_ssl.dpatch
 19_cupsaccept.dpatch
 26_modprobe.dpatch
 44_fixconfdirperms.dpatch

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/14_dont_force_ssl.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/14_dont_force_ssl.dpatch	Tue Apr 25 18:25:20 2006
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_dont_force_ssl.dpatch by  <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cups-1.2-ubuntu~/conf/cupsd.conf.in cups-1.2-ubuntu/conf/cupsd.conf.in
+--- cups-1.2-ubuntu~/conf/cupsd.conf.in	2006-04-25 20:05:27.000000000 +0200
++++ cups-1.2-ubuntu/conf/cupsd.conf.in	2006-04-25 20:09:04.000000000 +0200
+@@ -33,7 +33,6 @@
+ 
+ # Restrict access to the admin pages...
+ <Location /admin>
+- at ENCRYPTION_REQUIRED@
+   Order allow,deny
+   Allow localhost
+ </Location>