From 82fe514bc8a3d0ae6824e8bffce19616e5600540 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 24 Jul 2013 12:11:19 -0500 Subject: [PATCH] Use system CA certificate bundle instead of local TDE version on Debian and Ubuntu systems This resolves Bug 1106 --- debian/lenny/tdelibs/debian/tdelibs-data-trinity.install | 1 - debian/lenny/tdelibs/debian/tdelibs-data-trinity.links | 1 + debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install | 1 - debian/squeeze/tdelibs/debian/tdelibs-data-trinity.links | 1 + debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install | 1 - debian/wheezy/tdelibs/debian/tdelibs-data-trinity.links | 1 + ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install | 1 - ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links | 1 + ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install | 1 - ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links | 1 + ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install | 1 - ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links | 1 + 12 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 debian/lenny/tdelibs/debian/tdelibs-data-trinity.links create mode 100644 debian/squeeze/tdelibs/debian/tdelibs-data-trinity.links create mode 100644 debian/wheezy/tdelibs/debian/tdelibs-data-trinity.links create mode 100644 ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links create mode 100644 ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links create mode 100644 ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install index dc0365e10..d59d33605 100644 --- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install +++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.links b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install index dc0365e10..d59d33605 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install +++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.links b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt diff --git a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install index dc0365e10..d59d33605 100644 --- a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install +++ b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.links b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install index dc0365e10..d59d33605 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install index dc0365e10..d59d33605 100644 --- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt diff --git a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install index dc0365e10..d59d33605 100644 --- a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt