- pidgin todo

[packages/ca-certificates.git] / ca-certificates-undebianize.patch

diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
index a53fd967f3a3d5019dcc229840585deafb8926ae..225da7442ad14d0d89a009f35ad79ffc243e286b 100644 (file)
--- a/ca-certificates-undebianize.patch
+++ b/ca-certificates-undebianize.patch
@@ -1,15 +1,23 @@
-diff -ur ca-certificates/sbin/update-ca-certificates ca-certificates-undebianize/sbin/update-ca-certificates
---- ca-certificates/sbin/update-ca-certificates        2008-04-11 20:47:29.000000000 +0200
-+++ ca-certificates-undebianize/sbin/update-ca-certificates    2008-11-01 12:17:37.000000000 +0100
+--- ca-certificates-undebianize/sbin/update-ca-certificates    2008-11-01 12:17:37.000000000 +0100
++++ ca-certificates-20090814/sbin/update-ca-certificates       2010-05-05 14:03:33.683398895 +0300
 @@ -38,7 +38,7 @@
  CERTSDIR=/usr/share/ca-certificates
  LOCALCERTSDIR=/usr/local/share/ca-certificates
  CERTBUNDLE=ca-certificates.crt
 -ETCCERTSDIR=/etc/ssl/certs
-+ETCCERTSDIR=/etc/openssl/certs
++ETCCERTSDIR=@openssldir@
  
  cleanup() {
    rm -f "$TEMPBUNDLE"
+@@ -57,7 +57,7 @@
+ REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
+ 
+ # Adds a certificate to the list of trusted ones.  This includes a symlink
+-# in /etc/ssl/certs to the certificate file and its inclusion into the
++# in @openssldir@ to the certificate file and its inclusion into the
+ # bundle.
+ add() {
+   CERT="$1"
 @@ -88,16 +88,6 @@
  fi
  
@@ -27,7 +35,6 @@ diff -ur ca-certificates/sbin/update-ca-certificates ca-certificates-undebianize
  echo "done."
  
  # vim:set et sw=2:
-diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebianize/sbin/update-ca-certificates.8
 --- ca-certificates/sbin/update-ca-certificates.8      2008-04-11 20:47:29.000000000 +0200
 +++ ca-certificates-undebianize/sbin/update-ca-certificates.8  2008-11-01 12:18:14.000000000 +0100
 @@ -16,7 +16,7 @@
@@ -35,7 +42,7 @@ diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebiani
  .\" for manpage-specific macros, see man(7)
  .SH NAME
 -update-ca-certificates \- update /etc/ssl/certs and certificates.crt
-+update-ca-certificates \- update /etc/openssl/certs and ca-certificates.crt
++update-ca-certificates \- update @openssldir@ and ca-certificates.crt
  .SH SYNOPSIS
  .B update-ca-certificates
  .RI [ options ]
@@ -44,7 +51,7 @@ diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebiani
  .PP
  \fBupdate-ca-certificates\fP is a program that updates the directory
 -/etc/ssl/certs to hold SSL certificates and generates certificates.crt,
-+/etc/openssl/certs to hold SSL certificates and generates certificates.crt,
++@openssldir@ to hold SSL certificates and generates certificates.crt,
  a concatenated single-file list of certificates.
  .PP
  It reads the file /etc/ca-certificates.conf. Each line gives a pathname of
@@ -65,7 +72,7 @@ diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebiani
  .TP
  .B \-f, \-\-fresh
 -Fresh updates.  Remove symlinks in /etc/ssl/certs directory.
-+Fresh updates.  Remove symlinks in /etc/openss/certs directory.
++Fresh updates.  Remove symlinks in @openssldir@ directory.
  .SH FILES
  .TP
  .I /etc/ca-certificates.conf