diff --git a/debian/NEWS b/debian/NEWS index 5ba16f0..a7c465e 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,6 +1,29 @@ +ca-certificates (20120212) unstable; urgency=low + + Update mozilla/certdata.txt to version 1.81 + Certificates added (+) and removed (-): + + "Security Communication RootCA2" + + "EC-ACC" + + "Hellenic Academic and Research Institutions RootCA 2011" + - "Verisign Class 2 Public Primary Certification Authority" + - "Verisign Class 4 Public Primary Certification Authority - G2" + - "TC TrustCenter, Germany, Class 2 CA" + - "TC TrustCenter, Germany, Class 3 CA" + + -- Michael Shuler Sun, 12 Feb 2012 15:12:59 -0600 + +ca-certificates (20111211) unstable; urgency=low + + Remove French Government IGC/A CA certificates. The RSA certificate is + included in the Mozilla bundle and the DSA certificate is not in use. + Remove expired signet.pl CAs. + Remove expired brasil.gov.br CA. + + -- Michael Shuler Sun, 11 Dec 2011 19:05:32 -0600 + ca-certificates (20111025) unstable; urgency=low - * Update mozilla/certdata.txt to latest (NSS branch version 1.64.2.13) + Update mozilla/certdata.txt to latest (NSS branch version 1.64.2.13) Certificates added (+) and removed (-): + "AffirmTrust Commercial" + "AffirmTrust Networking" @@ -28,7 +51,7 @@ ca-certificates (20111025) unstable; urgency=low - "IPS Timestamping root" - "Thawte Personal Freemail CA" - "Thawte Time Stamping CA" - * Update CAcert-Class 3-Subroot-certificate Closes: #630232 + Update CAcert-Class 3-Subroot-certificate Closes: #630232 -- Michael Shuler Sun, 23 Oct 2011 23:16:57 -0500 diff --git a/debian/changelog b/debian/changelog index f344f17..eed8513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +ca-certificates (20120623) unstable; urgency=low + + * Add Polish translation, thanks to Michał Kułach. Closes: #660002 + * Add Turkish translation, thanks to Atila KOÇ. Closes: #661785 + * Correct update-ca-certificates(8) alignment Closes: #666932 + * Add note to update-ca-certificates(8) about .crt extension needed for + CA certificates in /usr/local/share/ca-certificates Closes: #595279 + * Update mozilla/certdata.txt to version 1.83 + Mozilla Public License updated to v2.0 + (no added/removed CAs) + * Update debian/copyright to: + - reflect MPL v2.0 update for mozilla/certdata.txt + - specify GPL-2 instead of GPL symlink + * Update debian/NEWS with added/removed certs from 20111211 and 20120212 + * Update to Standards-Version: 3.9.3 (no changes needed) + + -- Michael Shuler Sat, 23 Jun 2012 09:16:54 -0500 + ca-certificates (20120212) unstable; urgency=low * Update mozilla/certdata.txt to version 1.81 diff --git a/debian/config b/debian/config index 7b88061..43b2027 100644 --- a/debian/config +++ b/debian/config @@ -5,7 +5,7 @@ set -e action="$1" cur_version="$2" -this_version='20120112' +this_version='20120623' pt_BR_fixed_version="20080616" if test -f /etc/ca-certificates.conf; then diff --git a/debian/control b/debian/control index 8c1b271..5ef776e 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Raphael Geissert , Christian Perrier Build-Depends: debhelper (>= 8), po-debconf Build-Depends-Indep: python -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/collab-maint/ca-certificates.git Vcs-Browser: http://git.debian.org/?p=collab-maint/ca-certificates.git diff --git a/debian/copyright b/debian/copyright index 5318b43..01cab33 100644 --- a/debian/copyright +++ b/debian/copyright @@ -31,38 +31,386 @@ mozilla/certdata2pem.py: (based on a Ruby script by Fumitoshi UKAI) Licensed under the same license as sbin/update-ca-certificates. -CA certificates from Mozilla as follows: -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. +mozilla/certdata.txt: + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + On Debian GNU/Linux systems, the complete text of the GNU General Public -License can be found in '/usr/share/common-licenses/GPL'. +License can be found in '/usr/share/common-licenses/GPL-2'. +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/debian/po/pl.po b/debian/po/pl.po new file mode 100644 index 0000000..eab25a8 --- /dev/null +++ b/debian/po/pl.po @@ -0,0 +1,119 @@ +# Translation of ca-certificates debconf templates to Polish. +# Copyright (C) 2011 +# This file is distributed under the same license as the ca-certificates package. +# +# Michał Kułach , 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n" +"POT-Creation-Date: 2011-10-22 14:41+0200\n" +"PO-Revision-Date: 2012-02-14 01:22+0100\n" +"Last-Translator: Michał Kułach \n" +"Language-Team: Polish \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#. Type: title +#. Description +#: ../templates:2001 +msgid "ca-certificates configuration" +msgstr "Konfiguracja ca-certificates" + +#. Type: select +#. Choices +#: ../templates:3001 +msgid "yes" +msgstr "tak" + +#. Type: select +#. Choices +#: ../templates:3001 +msgid "no" +msgstr "nie" + +#. Type: select +#. Choices +#: ../templates:3001 +msgid "ask" +msgstr "pytaj" + +#. Type: select +#. Description +#: ../templates:3002 +msgid "Trust new certificates from certificate authorities?" +msgstr "Ufać nowym certyfikatom urzędów certyfikacji?" + +#. Type: select +#. Description +#: ../templates:3002 +msgid "" +"This package may install new CA (Certificate Authority) certificates when " +"upgrading. You may want to check such new CA certificates and select only " +"certificates that you trust." +msgstr "" +"Pakiet może instalować nowe certyfikaty urzędów certyfikacji (ang. " +"Certificate Authority - CA) podczas aktualizacji. Można zechcieć sprawdzać " +"nowe certyfikaty i wybierać tylko zaufane." + +#. Type: select +#. Description +#: ../templates:3002 +msgid "" +" - yes: new CA certificates will be trusted and installed;\n" +" - no : new CA certificates will not be installed by default;\n" +" - ask: prompt for each new CA certificate." +msgstr "" +" - tak: nowe certyfikaty CA będą zaufane i instalowane;\n" +" - nie: nowe certyfikaty CA nie będą domyślnie instalowane;\n" +" - pytaj: pytaj o każdy nowy certyfikat CA." + +#. Type: multiselect +#. Description +#: ../templates:4001 +msgid "New certificates to activate:" +msgstr "Nowe certyfikaty do aktywowania:" + +#. Type: multiselect +#. Description +#: ../templates:4001 +msgid "" +"During upgrades, new certificates will be added. Please choose those you " +"trust." +msgstr "" +"Podczas aktualizacji dodano nowe certyfikaty. Proszę wybrać te, którym się " +"ufa." + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "Certificates to activate:" +msgstr "Certyfikaty do aktywowania:" + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "" +"This package installs common CA (Certificate Authority) certificates in /usr/" +"share/ca-certificates." +msgstr "" +"Pakiet instaluje wspólne certyfikaty urzędów certyfikacji (ang. Certificate " +"Authority) w /usr/share/ca-certificates." + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "" +"Please select the certificate authorities you trust so that their " +"certificates are installed into /etc/ssl/certs. They will be compiled into a " +"single /etc/ssl/certs/ca-certificates.crt file." +msgstr "" +"Proszę wybrać zaufane urzędy certyfikacji, których certyfikaty są instalowane " +"w /etc/ssl/certs. Zostaną one skompilowane do jednego pliku " +"/etc/ssl/certs/ca-certificates.crt." + diff --git a/debian/po/tr.po b/debian/po/tr.po new file mode 100644 index 0000000..17c92d0 --- /dev/null +++ b/debian/po/tr.po @@ -0,0 +1,96 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Atila KOÇ , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: ca-certificates\n" +"Report-Msgid-Bugs-To: ca-certificates@packages.debian.org\n" +"POT-Creation-Date: 2011-10-22 14:41+0200\n" +"PO-Revision-Date: 2012-02-21 20:35+0200\n" +"Last-Translator: Atila KOÇ \n" +"Language-Team: Turkish \n" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: title +#. Description +#: ../templates:2001 +msgid "ca-certificates configuration" +msgstr "ca-certificates yapılandırması" + +#. Type: select +#. Choices +#: ../templates:3001 +msgid "yes" +msgstr "evet" + +#. Type: select +#. Choices +#: ../templates:3001 +msgid "no" +msgstr "hayır" + +#. Type: select +#. Choices +#: ../templates:3001 +msgid "ask" +msgstr "sor" + +#. Type: select +#. Description +#: ../templates:3002 +msgid "Trust new certificates from certificate authorities?" +msgstr "Sertifika yetkililerinin yeni sertifikalarına güvenilsin mi?" + +#. Type: select +#. Description +#: ../templates:3002 +msgid "This package may install new CA (Certificate Authority) certificates when upgrading. You may want to check such new CA certificates and select only certificates that you trust." +msgstr "Bu paket yükseltme sırasında yeni bir Sertifika Yetkilisi (SY) kurabilir. Olası yeni SY sertifikalarını denetlemek ve yalnızca güvendiğiniz sertifikaları kullanmak isteyebilirsiniz." + +#. Type: select +#. Description +#: ../templates:3002 +msgid "" +" - yes: new CA certificates will be trusted and installed;\n" +" - no : new CA certificates will not be installed by default;\n" +" - ask: prompt for each new CA certificate." +msgstr "" +" - evet: yeni SY sertifikalarına güvenilecek ve kurulacak;\n" +" - hayır: öntanımlı olarak yeni SY sertifikaları kurulmayacak;\n" +" - sor: her yeni SY sertifikası için görüş istenecek." + +#. Type: multiselect +#. Description +#: ../templates:4001 +msgid "New certificates to activate:" +msgstr "Etkinleştirilecek yeni sertifikalar:" + +#. Type: multiselect +#. Description +#: ../templates:4001 +msgid "During upgrades, new certificates will be added. Please choose those you trust." +msgstr "Yükseltmeler sırasında yeni sertifikalar eklenecektir. Lütfen güvendiklerinizi seçiniz." + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "Certificates to activate:" +msgstr "Etkinleştirilecek sertifikalar:" + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "This package installs common CA (Certificate Authority) certificates in /usr/share/ca-certificates." +msgstr "Bu paket /usr/share/ca-certificates dizinine yaygın SY (Sertifika Yetkilisi) sertifikalarını kurar." + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "Please select the certificate authorities you trust so that their certificates are installed into /etc/ssl/certs. They will be compiled into a single /etc/ssl/certs/ca-certificates.crt file." +msgstr "Lütfen güvendiğiniz sertifika yetkililerini seçiniz. Güvendiğiniz yetkililerin sertifikaları /etc/ssl/certs dizinine kurulacak ve aynı zamanda /etc/ssl/certs/ca-certificates.crt dosyasında toplanacaktır." + diff --git a/mozilla/certdata.txt b/mozilla/certdata.txt index 4bfd09b..68490fd 100644 --- a/mozilla/certdata.txt +++ b/mozilla/certdata.txt @@ -1,40 +1,8 @@ # -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1994-2000 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.81 $ $Date: 2012/01/17 22:02:37 $" +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.83 $ $Date: 2012/04/25 14:49:29 $" # # certdata.txt @@ -23413,3 +23381,65 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# Explicitly Distrust "MITM subCA 1 issued by Trustwave", Bug 724929 +# Issuer: E=ca@trustwave.com,CN="Trustwave Organization Issuing CA, Level 2",O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US +# Serial Number: 1800000005 (0x6b49d205) +# Not Before: Apr 7 15:37:15 2011 GMT +# Not After : Apr 4 15:37:15 2021 GMT +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "MITM subCA 1 issued by Trustwave" +CKA_ISSUER MULTILINE_OCTAL +\060\201\253\061\013\060\011\006\003\125\004\006\023\002\125\123 +\061\021\060\017\006\003\125\004\010\023\010\111\154\154\151\156 +\157\151\163\061\020\060\016\006\003\125\004\007\023\007\103\150 +\151\143\141\147\157\061\041\060\037\006\003\125\004\012\023\030 +\124\162\165\163\164\167\141\166\145\040\110\157\154\144\151\156 +\147\163\054\040\111\156\143\056\061\063\060\061\006\003\125\004 +\003\023\052\124\162\165\163\164\167\141\166\145\040\117\162\147 +\141\156\151\172\141\164\151\157\156\040\111\163\163\165\151\156 +\147\040\103\101\054\040\114\145\166\145\154\040\062\061\037\060 +\035\006\011\052\206\110\206\367\015\001\011\001\026\020\143\141 +\100\164\162\165\163\164\167\141\166\145\056\143\157\155 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\004\153\111\322\005 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# Explicitly Distrust "MITM subCA 2 issued by Trustwave", Bug 724929 +# Issuer: E=ca@trustwave.com,CN="Trustwave Organization Issuing CA, Level 2",O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US +# Serial Number: 1800000006 (0x6b49d206) +# Not Before: Apr 18 21:09:30 2011 GMT +# Not After : Apr 15 21:09:30 2021 GMT +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "MITM subCA 2 issued by Trustwave" +CKA_ISSUER MULTILINE_OCTAL +\060\201\253\061\013\060\011\006\003\125\004\006\023\002\125\123 +\061\021\060\017\006\003\125\004\010\023\010\111\154\154\151\156 +\157\151\163\061\020\060\016\006\003\125\004\007\023\007\103\150 +\151\143\141\147\157\061\041\060\037\006\003\125\004\012\023\030 +\124\162\165\163\164\167\141\166\145\040\110\157\154\144\151\156 +\147\163\054\040\111\156\143\056\061\063\060\061\006\003\125\004 +\003\023\052\124\162\165\163\164\167\141\166\145\040\117\162\147 +\141\156\151\172\141\164\151\157\156\040\111\163\163\165\151\156 +\147\040\103\101\054\040\114\145\166\145\154\040\062\061\037\060 +\035\006\011\052\206\110\206\367\015\001\011\001\026\020\143\141 +\100\164\162\165\163\164\167\141\166\145\056\143\157\155 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\004\153\111\322\006 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py index 773ce0d..5cc8f4c 100644 --- a/mozilla/certdata2pem.py +++ b/mozilla/certdata2pem.py @@ -121,7 +121,7 @@ for obj in objects: .replace('(', '=')\ .replace(')', '=')\ .replace(',', '_') + '.crt' - fname = fname.decode('string_escape') + fname = fname.decode('string_escape') f = open(fname, 'w') f.write("-----BEGIN CERTIFICATE-----\n") f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64))) diff --git a/sbin/update-ca-certificates.8 b/sbin/update-ca-certificates.8 index 65aa7de..987d250 100644 --- a/sbin/update-ca-certificates.8 +++ b/sbin/update-ca-certificates.8 @@ -65,8 +65,9 @@ all CA certificates that you activated in /etc/ca-certificates.conf. .TP .I /usr/share/ca-certificates Directory of CA certificates. +.TP .I /usr/local/share/ca-certificates -Directory of local CA certificates. +Directory of local CA certificates (with .crt extension). .SH SEE ALSO .BR c_rehash (1), .SH AUTHOR