From d94ad2b9a15adde1b673a4f1e905d2acb649e823 Mon Sep 17 00:00:00 2001
From: Michael Shuler <michael@pbandjelly.org>
Date: Sun, 19 Oct 2014 10:36:49 -0500
Subject: [PATCH] 20141019 (patches unapplied)

Imported using git-ubuntu import.
---
 debian/changelog                | 18 ++++++++++++++++++
 debian/control                  |  4 ++--
 debian/copyright                | 10 ++++++++--
 debian/source/lintian-overrides |  3 +++
 sbin/update-ca-certificates     | 24 +++++++++++++-----------
 5 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 debian/source/lintian-overrides

diff --git a/debian/changelog b/debian/changelog
index cb26e16..fc50716 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+ca-certificates (20141019) unstable; urgency=medium
+
+  * debian/copyright:
+    Add coverage for all files reported by lintian
+    file-without-copyright-information warning.
+  * debian/source/lintian-overrides:
+    Add file-without-copyright-information override for SPI certificate file.
+  * sbin/update-ca-certificates:
+    Restore SELinux label after generating ca-certificates.crt file.
+    Thanks to Laurent Bigonville for the patch.  Closes: #742957
+    Tidy indentation whitespace.
+    Thanks to Antonio Terceiro for the patch.  Closes: #742663
+  * debian/control:
+    Update to Standards-Version: 3.9.6 (no other changes needed).
+    Update Vcs-Browser link to cgit URL.
+
+ -- Michael Shuler <michael@pbandjelly.org>  Sun, 19 Oct 2014 10:36:49 -0500
+
 ca-certificates (20140927) unstable; urgency=medium
 
   * Update Mozilla certificate authority bundle to version 2.1.
diff --git a/debian/control b/debian/control
index 65e0244..c270f38 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders: Raphael Geissert <geissert@debian.org>,
            Christian Perrier <bubulle@debian.org>
 Build-Depends: debhelper (>= 8), po-debconf
 Build-Depends-Indep: python
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/collab-maint/ca-certificates.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ca-certificates.git
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/ca-certificates.git
 
 Package: ca-certificates
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index e43654a..a43d7ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,16 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://ftp.debian.org/debian/pool/main/c/ca-certificates/
 
-Files: sbin/update-ca-certificates
-       mozilla/certdata2pem.py
+Files: debian/*
+       examples/*
+       Makefile
+       mozilla/*
+       sbin/*
+       spi-inc.org/Makefile
 Copyright: 2003 Fumitoshi UKAI <ukai@debian.or.jp>
            2009 Philipp Kern <pkern@debian.org>
+           2011 Michael Shuler <michael@pbandjelly.org>
+           Various Debian Contributors
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..2332383
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# Ignore file-without-copyright-information on SPI certificate file.
+# There is no upstream copyright or license.
+ca-certificates source: file-without-copyright-information spi-inc.org/spi-cacert-2008.crt
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index 021a3c7..9303b07 100755
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -26,13 +26,13 @@ fresh=0
 while [ $# -gt 0 ];
 do
   case $1 in
-  --verbose|-v)
-  	verbose=1;;
-  --fresh|-f)
-	fresh=1;;
-  --help|-h|*)
-	echo "$0: [--verbose] [--fresh]"
-	exit;;
+    --verbose|-v)
+      verbose=1;;
+    --fresh|-f)
+      fresh=1;;
+    --help|-h|*)
+      echo "$0: [--verbose] [--fresh]"
+      exit;;
   esac
   shift
 done
@@ -88,13 +88,13 @@ if [ "$fresh" = 1 ]; then
   echo -n "Clearing symlinks in $ETCCERTSDIR..."
   find . -type l -print | while read symlink
   do
-     case $(readlink $symlink) in
-     $CERTSDIR*) rm -f $symlink;;
-     esac
+    case $(readlink $symlink) in
+      $CERTSDIR*) rm -f $symlink;;
+    esac
   done
   find . -type l -print | while read symlink
   do
-     test -f $symlink || rm -f $symlink
+    test -f $symlink || rm -f $symlink
   done
   echo "done."
 fi
@@ -146,6 +146,8 @@ fi
 
 chmod 0644 "$TEMPBUNDLE"
 mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
+# Restore proper SELinux label after moving the file
+[ -x /sbin/restorecon ] && /sbin/restorecon "$CERTBUNDLE" >/dev/null 2>&1
 
 echo "$ADDED_CNT added, $REMOVED_CNT removed; done."