[Pkg-cups-devel] r263 - cupsys/branches/cups-1.2-ubuntu/debian

[Martin Pitt]

Author: mpitt
Date: Thu Jun 15 19:04:00 2006
New Revision: 263

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst

Log:
* snakeoil SSL certificate support:
  - debian/cupsys.postinst: Symlink snakeoil SSL certificate/key to
    /etc/cups/ssl/ and put cupsys into ssl-cert on upgrades or fresh
    installs.
  - debian/control: Depend on ssl-cert.

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	Thu Jun 15 19:04:00 2006
@@ -4,8 +4,13 @@
   * Removed debian/patches/svn*.dpatch, these were backported from 1.2.1 in
     1.2.0-0ubuntu3.
   * Do not build libcupsys2-gnutls10 any more (it was a transitional package).
+  * snakeoil SSL certificate support:
+    - debian/cupsys.postinst: Symlink snakeoil SSL certificate/key to
+      /etc/cups/ssl/ and put cupsys into ssl-cert on upgrades or fresh
+      installs.
+    - debian/control: Depend on ssl-cert.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 15 Jun 2006 20:44:38 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 15 Jun 2006 20:54:51 +0200
 
 cupsys (1.2.1-3) UNRELEASED-unstable; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control	Thu Jun 15 19:04:00 2006
@@ -49,7 +49,7 @@
 Priority: optional
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3)
+Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), ssl-cert (>= 1.0.11)
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	Thu Jun 15 19:04:00 2006
@@ -203,6 +203,18 @@
 	if [ -d /var/cache/cups ]; then
 	    chown -R cupsys:lp /var/cache/cups || true
 	fi
+	
+	# symlink snakeoil SSL certificate if present
+	if dpkg --compare-versions "$2" le "1.2.1-2ubuntu1" && \
+	    [ -e /etc/ssl/certs/ssl-cert-snakeoil.pem -a \
+	      -e /etc/ssl/private/ssl-cert-snakeoil.key -a \
+	      -n "`getent group ssl-cert`" -a \
+	      ! -e /etc/cups/ssl/server.crt -a \
+	      ! -e /etc/cups/ssl/server.key ]; then 
+	     ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/cups/ssl/server.crt
+	     ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/cups/ssl/server.key
+	     adduser cupsys ssl-cert
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)