- up to 20150426

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

diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
index b557139a0d35bc706d807b5cf090ec5e9e08c27f..125661e6bcad8a55ebe654c9c927e83bb0a4d2de 100644 (file)
--- a/ca-certificates-undebianize.patch
+++ b/ca-certificates-undebianize.patch
@@ -1,39 +1,33 @@
 --- 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
 --- 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 @@
+@@ -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=@openssldir@
  CERTSDIR=/usr/share/ca-certificates
  LOCALCERTSDIR=/usr/local/share/ca-certificates
  CERTBUNDLE=ca-certificates.crt
 -ETCCERTSDIR=/etc/ssl/certs
 +ETCCERTSDIR=@openssldir@

+ HOOKSDIR=/etc/ca-certificates/update.d

  
  

- 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
+ while [ $# -gt 0 ];
+@@ -187,19 +187,4 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE"

  
  echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
  
  echo "$ADDED_CNT added, $REMOVED_CNT removed; done."

--
--HOOKSDIR=/etc/ca-certificates/update.d
--echo -n "Running hooks in $HOOKSDIR...."
--VERBOSE_ARG=
--[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
--eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
--do
--  ( cat $ADDED
--    cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
--done
- echo "done."

  
  

+-if [ -d "$HOOKSDIR" ]
+-then
+-
+-  echo "Running hooks in $HOOKSDIR..."
+-  VERBOSE_ARG=
+-  [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose"
+-  eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook
+-  do
+-    ( cat "$ADDED"
+-      cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?."
+-  done
+-  echo "done."
+-
+-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
  # 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


@@ -41,17 +35,17 @@
  .\" .sp <n>    insert n+1 empty lines
  .\" for manpage-specific macros, see man(7)
  .SH NAME
  .\" .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/ssl/certs and ca-certificates.crt

 +update-ca-certificates \- update @openssldir@ and ca-certificates.crt
  .SH SYNOPSIS
  .B update-ca-certificates
  .RI [ options ]
 +update-ca-certificates \- update @openssldir@ and ca-certificates.crt
  .SH SYNOPSIS
  .B update-ca-certificates
  .RI [ options ]

-@@ -26,7 +26,7 @@
- This manual page was written for the Debian distribution.
+@@ -26,7 +26,7 @@ This manual page documents briefly the
+ command.

  .PP
  \fBupdate-ca-certificates\fP is a program that updates the directory
  .PP
  \fBupdate-ca-certificates\fP is a program that updates the directory

--/etc/ssl/certs to hold SSL certificates and generates certificates.crt,
-+@openssldir@ to hold SSL certificates and generates certificates.crt,
+-/etc/ssl/certs to hold SSL certificates and generates ca-certificates.crt,
++@openssldir@ to hold SSL certificates and generates ca-certificates.crt,

  a concatenated single-file list of certificates.
  .PP
  It reads the file /etc/ca-certificates.conf. Each line gives a pathname of
  a concatenated single-file list of certificates.
  .PP
  It reads the file /etc/ca-certificates.conf. Each line gives a pathname of