[Pkg-cups-devel] r515 - cupsys/trunk/debian

[Martin Pitt]

Author: mpitt
Date: Mon Aug  6 13:12:38 2007
New Revision: 515

Log:
* Use ssl-cert's "snakeoil" SSL certificate by default: (Closes: #402370)
  - debian/control: Add ssl-cert dependency.
  - debian/cupsys.postinst: Symlink snakeoil SSL certificate if present, and
    there is none present yet.

Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/control
   cupsys/trunk/debian/cupsys.postinst

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Mon Aug  6 13:12:38 2007
@@ -45,8 +45,12 @@
      Lenny.
   * debian/cupsys.{pre,post}inst: Remove obsolete transition bits.
   * Remove obsolete debian/patches/05_avoidunknowngroup.dpatch.
+  * Use ssl-cert's "snakeoil" SSL certificate by default: (Closes: #402370)
+    - debian/control: Add ssl-cert dependency.
+    - debian/cupsys.postinst: Symlink snakeoil SSL certificate if present, and
+      there is none present yet.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 02 Aug 2007 14:56:01 +0200
+ -- Martin Pitt <mpitt at debian.org>  Mon, 06 Aug 2007 15:07:12 +0200
 
 cupsys (1.2.12-1) unstable; urgency=low
 

Modified: cupsys/trunk/debian/control
==============================================================================
--- cupsys/trunk/debian/control	(original)
+++ cupsys/trunk/debian/control	Mon Aug  6 13:12:38 2007
@@ -50,7 +50,7 @@
 Priority: optional
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common
+Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common,  ssl-cert (>= 1.0.11)
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters

Modified: cupsys/trunk/debian/cupsys.postinst
==============================================================================
--- cupsys/trunk/debian/cupsys.postinst	(original)
+++ cupsys/trunk/debian/cupsys.postinst	Mon Aug  6 13:12:38 2007
@@ -122,6 +122,14 @@
 	  ln -s /opt/share/ppd /usr/share/ppd/2-third-party
 	fi
 
+        # symlink snakeoil SSL certificate if present
+        if [ -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
+        fi 
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)