[packages/ca-certificates.git] / ca-certificates-etc-certs.patch

--- ca-certificates-20140223/sbin/update-ca-certificates~	2014-03-14 12:55:24.000000000 +0200
+++ ca-certificates-20140223/sbin/update-ca-certificates	2014-03-14 14:38:31.587876211 +0200
@@ -37,8 +37,8 @@
 default=0
 CERTSCONF=/etc/ca-certificates.conf
 CERTSDIR=/usr/share/ca-certificates
-LOCALCERTSDIR=/usr/local/share/ca-certificates
-CERTBUNDLE=ca-certificates.crt
+LOCALCERTSDIR=/etc/certs
+CERTBUNDLE=/etc/certs/ca-certificates.crt
 ETCCERTSDIR=@openssldir@
 HOOKSDIR=/etc/ca-certificates/update.d
 
@@ -52,7 +52,7 @@
 
 # Helper files.  (Some of them are not simple arrays because we spawn
 # subshells later on.)
-TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new"
+TEMPBUNDLE="${CERTBUNDLE}.new"
 ADDED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
 REMOVED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
 
@@ -62,7 +62,7 @@
 # bundle.
 add() {
   CERT="$1"
-  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
+  PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed -e 's/.crt$//' -e 's/ /_/g' \
                                                   -e 's/[()]/=/g' \
                                                   -e 's/,/_/g').pem"
   if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
@@ -74,7 +74,7 @@
 
 remove() {
   CERT="$1"
-  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
+  PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed 's/.crt$//').pem"
   if test -L "$PEM"
   then
     rm -f "$PEM"
@@ -111,24 +111,18 @@
 
 sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read -r crt
 do
-  if ! test -f "$CERTSDIR/$crt"
+  if test -f "$CERTSDIR/$crt"
+   then
+    add "$CERTSDIR/$crt"
+  elif test -f "$LOCALCERTSDIR/$crt"
   then
-    echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
+    add "$LOCALCERTSDIR/$crt"
+  else
+    echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
     continue
   fi
-  add "$CERTSDIR/$crt"
 done
 
-# Now process certificate authorities installed by the local system
-# administrator.
-if [ -d "$LOCALCERTSDIR" ]
-then
-  find -L "$LOCALCERTSDIR" -type f -name '*.crt' | sort | while read -r crt
-  do
-    add "$crt"
-  done
-fi
-
 ADDED_CNT=$(wc -l < "$ADDED")
 REMOVED_CNT=$(wc -l < "$REMOVED")
Commit	Line	Data
	1	--- ca-certificates-20140223/sbin/update-ca-certificates~ 2014-03-14 12:55:24.000000000 +0200
	2	+++ ca-certificates-20140223/sbin/update-ca-certificates 2014-03-14 14:38:31.587876211 +0200
	3	@@ -37,8 +37,8 @@
	4	default=0
	5	CERTSCONF=/etc/ca-certificates.conf
	6	CERTSDIR=/usr/share/ca-certificates
	7	-LOCALCERTSDIR=/usr/local/share/ca-certificates
	8	-CERTBUNDLE=ca-certificates.crt
	9	+LOCALCERTSDIR=/etc/certs
	10	+CERTBUNDLE=/etc/certs/ca-certificates.crt
	11	ETCCERTSDIR=@openssldir@
	12	HOOKSDIR=/etc/ca-certificates/update.d
	13
	14	@@ -52,7 +52,7 @@
	15
	16	# Helper files. (Some of them are not simple arrays because we spawn
	17	# subshells later on.)
	18	-TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new"
	19	+TEMPBUNDLE="${CERTBUNDLE}.new"
	20	ADDED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
	21	REMOVED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
	22
	23	@@ -62,7 +62,7 @@
	24	# bundle.
	25	add() {
	26	CERT="$1"
	27	- PEM="$ETCCERTSDIR/$(basename "$CERT" .crt \| sed -e 's/ /_/g' \
	28	+ PEM="$ETCCERTSDIR/$(basename "$CERT" .pem \| sed -e 's/.crt$//' -e 's/ /_/g' \
	29	-e 's/[()]/=/g' \
	30	-e 's/,/_/g').pem"
	31	if ! test -e "$PEM" \|\| [ "$(readlink "$PEM")" != "$CERT" ]
	32	@@ -74,7 +74,7 @@
	33
	34	remove() {
	35	CERT="$1"
	36	- PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
	37	+ PEM="$ETCCERTSDIR/$(basename "$CERT" .pem \| sed 's/.crt$//').pem"
	38	if test -L "$PEM"
	39	then
	40	rm -f "$PEM"
	41	@@ -111,24 +111,18 @@
	42
	43	sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" \| while read -r crt
	44	do
	45	- if ! test -f "$CERTSDIR/$crt"
	46	+ if test -f "$CERTSDIR/$crt"
	47	+ then
	48	+ add "$CERTSDIR/$crt"
	49	+ elif test -f "$LOCALCERTSDIR/$crt"
	50	then
	51	- echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
	52	+ add "$LOCALCERTSDIR/$crt"
	53	+ else
	54	+ echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
	55	continue
	56	fi
	57	- add "$CERTSDIR/$crt"
	58	done
	59
	60	-# Now process certificate authorities installed by the local system
	61	-# administrator.
	62	-if [ -d "$LOCALCERTSDIR" ]
	63	-then
	64	- find -L "$LOCALCERTSDIR" -type f -name '*.crt' \| sort \| while read -r crt
	65	- do
	66	- add "$crt"
	67	- done
	68	-fi
	69	-
	70	ADDED_CNT=$(wc -l < "$ADDED")
	71	REMOVED_CNT=$(wc -l < "$REMOVED")
	72