- versioned Obsoletes

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

diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
index 43ac0dc07aadb58d650dd5385083bcf29e40e3ec..6013e8846179aa4bde2fd9a9beb468771b313b0d 100644 (file)
--- a/ca-certificates-undebianize.patch
+++ b/ca-certificates-undebianize.patch
@@ -1,56 +1,49 @@
-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
-@@ -38,7 +38,7 @@
- CERTSCONF=/etc/ca-certificates.conf
+--- 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
+@@ -28,7 +28,7 @@ CERTSCONF=/etc/ca-certificates.conf
  CERTSDIR=/usr/share/ca-certificates
+ LOCALCERTSDIR=/usr/local/share/ca-certificates
  CERTBUNDLE=ca-certificates.crt
 -ETCCERTSDIR=/etc/ssl/certs
-+ETCCERTSDIR=/etc/certs
- cd $ETCCERTSDIR
- if [ "$fresh" = 1 ]; then
-   echo -n "Clearing symlinks in $ETCCERTSDIR..."
-@@ -88,15 +88,6 @@
-     c_rehash .
-   fi
-   echo "done."
++ETCCERTSDIR=@openssldir@
+ HOOKSDIR=/etc/ca-certificates/update.d
+ 
+ while [ $# -gt 0 ];
+@@ -187,19 +187,4 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
+ 
+ echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
+ 
+-if [ -d "$HOOKSDIR" ]
+-then
 -
--  HOOKSDIR=/etc/ca-certificates/update.d
--  echo -n "Running hooks in $HOOKSDIR...."
+-  echo "Running hooks in $HOOKSDIR..."
 -  VERBOSE_ARG=
--  [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
--  eval run-parts $VERB_ARG --test -- $HOOKSDIR | while read hook; do
--  printf -- "${removed:+$removed\n}${added:+$added\n}" | eval $hook
+-  [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose"
+-  eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read -r hook
+-  do
+-    ( cat "$ADDED"
+-      cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?."
 -  done
 -  echo "done."
- else
-   echo "done."
- fi
-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
+-
+-fi
+-
+ # vim:set et sw=2:
+--- ca-certificates-20130610/sbin/update-ca-certificates.8~    2013-06-11 11:32:35.000000000 +0300
++++ ca-certificates-20130610/sbin/update-ca-certificates.8     2013-06-11 11:54:40.662201388 +0300
 @@ -16,7 +16,7 @@
  .\" .sp <n>    insert n+1 empty lines
  .\" for manpage-specific macros, see man(7)
  .SH NAME
--update-ca-certificates \- update /etc/ssl/certs and certificates.crt
-+update-ca-certificates \- update /etc/certs and certificates.crt
+-update-ca-certificates \- update /etc/ssl/certs and ca-certificates.crt
++update-ca-certificates \- update @openssldir@ and ca-certificates.crt
  .SH SYNOPSIS
  .B update-ca-certificates
  .RI [ options ]
-@@ -26,7 +26,7 @@
- commands.
- This manual page was written for the Debian distribution.
- .PP
--\fBupdate-ca-certificates\fP is a program that updates /etc/ssl/certs
-+\fBupdate-ca-certificates\fP is a program that updates /etc/certs
- directory to hold SSL certificates and generates certificates.crt that is
- single-file version of CA certificates.
- .PP
-@@ -34,11 +34,6 @@
- activated CA certificates under /usr/share/ca-certificates.
- Lines that begin with "#" is comment line. 
- Lines that begin with "!" is deselect, deactivation of the CA certificates. 
+@@ -38,11 +38,6 @@
+ should be one certificate per file, and not multiple certificates in a single
+ file. Then run update-ca-certificates to merge the new certificates into the
+ existing machine store at /etc/ssl/certs.
 -.PP
 -Before terminating, \fBupdate-ca-certificates\fP invokes
 -\fBrun-parts\fP on /etc/ca-certificates/update.d and calls each hook with
@@ -59,19 +52,21 @@ diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebiani
  .SH OPTIONS
  A summary of options is included below.
  .TP
-@@ -49,13 +44,13 @@
- Be verbose. Output \fBc_rehash\fP.
+@@ -61,7 +61,7 @@
+ Be verbose. Output \fBopenssl rehash\fP.
  .TP
  .B \-f, \-\-fresh
 -Fresh updates.  Remove symlinks in /etc/ssl/certs directory.
-+Fresh updates.  Remove symlinks in /etc/certs directory.
- .SH FILES
++Fresh updates.  Remove symlinks in @openssldir@ directory.
  .TP
+ .B \-\-certsconf
+ Change the configuration file. By default, the file
+@@ -84,7 +84,7 @@
  .I /etc/ca-certificates.conf
  A configuration file.
  .TP
 -.I /etc/ssl/certs/ca-certificates.crt
-+.I /etc/certs/ca-certificates.crt
- A single-file version of CA certificates.  This hold
- all CA certificates that you activated in /etc/ca-certificates.conf.
++.I /etc/openssl/ca-certificates.crt
+ A single-file version of CA certificates. This holds all CA certificates
+ that were activated in /etc/ca-certificates.conf.
  .TP