Author: drazzib Date: 2012-05-24 20:21:54 +0000 (Thu, 24 May 2012) New Revision: 16064
Added: tags/ca-certificates-java/20120524/ tags/ca-certificates-java/20120524/UpdateCertificates.java tags/ca-certificates-java/20120524/debian/changelog tags/ca-certificates-java/20120524/debian/jks-keystore.hook.in tags/ca-certificates-java/20120524/debian/postinst.in tags/ca-certificates-java/20120524/debian/rules Removed: tags/ca-certificates-java/20120524/UpdateCertificates.java tags/ca-certificates-java/20120524/debian/changelog tags/ca-certificates-java/20120524/debian/jks-keystore.hook.in tags/ca-certificates-java/20120524/debian/postinst.in tags/ca-certificates-java/20120524/debian/preinst tags/ca-certificates-java/20120524/debian/rules Log: [svn-buildpackage] Tagging ca-certificates-java 20120524 Deleted: tags/ca-certificates-java/20120524/UpdateCertificates.java =================================================================== --- trunk/ca-certificates-java/UpdateCertificates.java 2012-05-20 10:39:27 UTC (rev 16059) +++ tags/ca-certificates-java/20120524/UpdateCertificates.java 2012-05-24 20:21:54 UTC (rev 16064) @@ -1,150 +0,0 @@ -/* - * Copyright (C) 2011 Torsten Werner <twer...@debian.org> - * - * This code is a re-implementation of the idea from Ludwig Nussel found in - * http://gitorious.org/opensuse/ca-certificates/blobs/master/keystore.java - * for the Debian operating system. It updates the global JVM keystore. - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.security.GeneralSecurityException; -import java.security.KeyStore; -import java.security.cert.Certificate; -import java.security.cert.CertificateFactory; - -public class UpdateCertificates { - private static char[] password = null; - private static KeyStore keystore = null; - private static CertificateFactory certFactory = null; - - public static void main(String[] args) throws IOException, GeneralSecurityException { - String passwordString = "changeit"; - if (args.length == 2 && args[0].equals("-storepass")) { - passwordString = args[1]; - } - else if (args.length > 0) { - System.err.println("Usage: java UpdateCertificates [-storepass <password>]"); - System.exit(1); - } - password = passwordString.toCharArray(); - keystore = createKeyStore(); - certFactory = CertificateFactory.getInstance("X.509"); - processChanges(new InputStreamReader(System.in)); - writeKeyStore(); - } - - private static KeyStore createKeyStore() throws GeneralSecurityException, IOException { - KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); - File certInputFile = new File ("/etc/ssl/certs/java/cacerts"); - FileInputStream certInputStream = null; - if (certInputFile.canRead()) { - certInputStream = new FileInputStream(certInputFile); - } - try { - ks.load(certInputStream, password); - } - catch (IOException e) { - System.err.println("Cannot open Java keystore. Is the password correct? Message:\n " + - e.getMessage()); - System.exit(1); - } - if (certInputStream != null) { - certInputStream.close(); - } - return ks; - } - - private static void processChanges(Reader reader) - throws IOException, GeneralSecurityException { - String line; - BufferedReader bufferedStdinReader = new BufferedReader(reader); - while((line = bufferedStdinReader.readLine()) != null) { - parseLine(line); - } - } - - private static void deleteAlias(String alias) throws GeneralSecurityException { - if (keystore.containsAlias(alias)) { - System.out.println("Removing " + alias); - keystore.deleteEntry(alias); - } - } - - private static void parseLine(String line) - throws GeneralSecurityException, IOException { - String path = line.substring(1); - String filename = path.substring(path.lastIndexOf("/") + 1); - String alias = "debian:" + filename; - if(line.startsWith("+")) { - Certificate cert = createCertificate(path); - if (cert == null) { - return; - } - if(keystore.containsAlias(alias)) { - System.out.println("Replacing " + alias); - keystore.deleteEntry(alias); - } - else { - System.out.println("Adding " + alias); - } - keystore.setCertificateEntry(alias, cert); - } - else if (line.startsWith("-")) { - deleteAlias(alias); - // Remove old non-prefixed aliases, too. This code should be - // removed after the release of Wheezy. - deleteAlias(filename); - } - else { - System.err.println("Unknown input: " + line); - } - } - - private static Certificate createCertificate(String path) { - Certificate cert = null; - try { - FileInputStream certFile = new FileInputStream(path); - cert = certFactory.generateCertificate(certFile); - certFile.close(); - } - catch (Exception e) { - System.err.println("Warning: there was a problem reading the certificate file " + - path + ". Message:\n " + e.getMessage()); - } - return cert; - } - - private static void writeKeyStore() throws GeneralSecurityException { - try { - FileOutputStream certOutputFile = new FileOutputStream("/etc/ssl/certs/java/cacerts"); - keystore.store(certOutputFile, password); - certOutputFile.close(); - } - catch (IOException e) { - System.err.println("There was a problem saving the new Java keystore. Message:\n " + - e.getMessage()); - System.exit(1); - } - } -} Copied: tags/ca-certificates-java/20120524/UpdateCertificates.java (from rev 16063, trunk/ca-certificates-java/UpdateCertificates.java) =================================================================== --- tags/ca-certificates-java/20120524/UpdateCertificates.java (rev 0) +++ tags/ca-certificates-java/20120524/UpdateCertificates.java 2012-05-24 20:21:54 UTC (rev 16064) @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2011 Torsten Werner <twer...@debian.org> + * + * This code is a re-implementation of the idea from Ludwig Nussel found in + * http://gitorious.org/opensuse/ca-certificates/blobs/master/keystore.java + * for the Debian operating system. It updates the global JVM keystore. + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.security.GeneralSecurityException; +import java.security.KeyStore; +import java.security.cert.Certificate; +import java.security.cert.CertificateFactory; + +public class UpdateCertificates { + private static char[] password = null; + private static KeyStore keystore = null; + private static CertificateFactory certFactory = null; + + public static void main(String[] args) throws IOException, GeneralSecurityException { + String passwordString = "changeit"; + if (args.length == 2 && args[0].equals("-storepass")) { + passwordString = args[1]; + } + else if (args.length > 0) { + System.err.println("Usage: java UpdateCertificates [-storepass <password>]"); + System.exit(1); + } + password = passwordString.toCharArray(); + keystore = createKeyStore(); + certFactory = CertificateFactory.getInstance("X.509"); + // Force reading of inputstream int UTF-8 + processChanges(new InputStreamReader(System.in, "UTF8")); + writeKeyStore(); + } + + private static KeyStore createKeyStore() throws GeneralSecurityException, IOException { + KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); + File certInputFile = new File ("/etc/ssl/certs/java/cacerts"); + FileInputStream certInputStream = null; + if (certInputFile.canRead()) { + certInputStream = new FileInputStream(certInputFile); + } + try { + ks.load(certInputStream, password); + } + catch (IOException e) { + System.err.println("Cannot open Java keystore. Is the password correct? Message:\n " + + e.getMessage()); + System.exit(1); + } + if (certInputStream != null) { + certInputStream.close(); + } + return ks; + } + + private static void processChanges(Reader reader) + throws IOException, GeneralSecurityException { + String line; + BufferedReader bufferedStdinReader = new BufferedReader(reader); + while((line = bufferedStdinReader.readLine()) != null) { + parseLine(line); + } + } + + private static void deleteAlias(String alias) throws GeneralSecurityException { + if (keystore.containsAlias(alias)) { + System.out.println("Removing " + alias); + keystore.deleteEntry(alias); + } + } + + private static void parseLine(String line) + throws GeneralSecurityException, IOException { + String path = line.substring(1); + String filename = path.substring(path.lastIndexOf("/") + 1); + String alias = "debian:" + filename; + if(line.startsWith("+")) { + Certificate cert = createCertificate(path); + if (cert == null) { + return; + } + if(keystore.containsAlias(alias)) { + System.out.println("Replacing " + alias); + keystore.deleteEntry(alias); + } + else { + System.out.println("Adding " + alias); + } + keystore.setCertificateEntry(alias, cert); + } + else if (line.startsWith("-")) { + deleteAlias(alias); + // Remove old non-prefixed aliases, too. This code should be + // removed after the release of Wheezy. + deleteAlias(filename); + } + else { + System.err.println("Unknown input: " + line); + } + } + + private static Certificate createCertificate(String path) { + Certificate cert = null; + try { + FileInputStream certFile = new FileInputStream(path); + cert = certFactory.generateCertificate(certFile); + certFile.close(); + } + catch (Exception e) { + System.err.println("Warning: there was a problem reading the certificate file " + + path + ". Message:\n " + e.getMessage()); + } + return cert; + } + + private static void writeKeyStore() throws GeneralSecurityException { + try { + FileOutputStream certOutputFile = new FileOutputStream("/etc/ssl/certs/java/cacerts"); + keystore.store(certOutputFile, password); + certOutputFile.close(); + } + catch (IOException e) { + System.err.println("There was a problem saving the new Java keystore. Message:\n " + + e.getMessage()); + System.exit(1); + } + } +} Deleted: tags/ca-certificates-java/20120524/debian/changelog =================================================================== --- trunk/ca-certificates-java/debian/changelog 2012-05-20 10:39:27 UTC (rev 16059) +++ tags/ca-certificates-java/20120524/debian/changelog 2012-05-24 20:21:54 UTC (rev 16064) @@ -1,178 +0,0 @@ -ca-certificates-java (20120225) unstable; urgency=low - - [ Steve Langasek ] - * debian/jks-keystore.hook: If we *don't* find libnss3 / libnss3-1d, - don't remove files from the filesystem in do_cleanup(), - since this has a nasty tendency of nuking system libraries. - LP: #855171. - * debian/preinst, debian/postinst: when upgrading from version - 20110912ubuntu1, disable the buggy hook script early to prevent it from - being run before our new version is configured; and re-enable the script - in the postinst. LP: #855246. - - [ Matthias Klose ] - * Mark as Multi-Arch: foreign. - * Adjust the libnss3-1d versioned dependency. - - [ Damien Raude-Morvan ] - * Add myself to Uploaders. - * Use dh_gencontrol and dpkg-vendor to allow: - - New substvar ${nss:Depends} for libnss3-1d versionning. - - New @NSS_LIB@ parameter for debian/*.in files. - * Bump Standards-Version to 3.9.3: - - Add recommended build-arch / build-indep targets. - - -- Damien Raude-Morvan <draz...@debian.org> Sat, 25 Feb 2012 15:06:32 +0100 - -ca-certificates-java (20111223) unstable; urgency=low - - * Support new multiarch JRE packages in postinst. - - -- Torsten Werner <twer...@debian.org> Fri, 23 Dec 2011 13:46:15 +0100 - -ca-certificates-java (20110912) unstable; urgency=low - - * Support new multiarch JRE packages in jks-keystore. (Closes: #641306) - * Support OpenJDK 7. (Closes: #641305) - - -- Torsten Werner <twer...@debian.org> Mon, 12 Sep 2011 21:23:22 +0200 - -ca-certificates-java (20110816) unstable; urgency=low - - * Upgrade Recommends: libnss3-1d to a versioned Depends due to multiarch - changes. (Closes: #635571) - * Use the locale C.UTF-8 for the hook script to be more robust. - - -- Torsten Werner <twer...@debian.org> Tue, 16 Aug 2011 11:00:33 +0200 - -ca-certificates-java (20110531) unstable; urgency=low - - * Prepare for multiarch libnss3 update. - - -- Matthias Klose <d...@ubuntu.com> Tue, 31 May 2011 15:20:52 +0200 - -ca-certificates-java (20110426) unstable; urgency=low - - * Test for existing file in postinst before copying it. (Closes: #624152) - * Add Vcs headers to debian/control. - - -- Torsten Werner <twer...@debian.org> Tue, 26 Apr 2011 09:23:03 +0200 - -ca-certificates-java (20110425) unstable; urgency=low - - * Add Java code to update the keystore and support UTF-8 encoded filenames. - (Closes: #607245, #623671) - * Change Maintainer to Debian Java Maintainers and add myself to Uploaders. - * Update Build-Depends. - * Replace old inconsistent keystore aliases. (Closes: #623888) - * Add support for openjdk-7 and remove support for old cacao VM. - * Add a NEWS file explaining the update. - * Update README.Debian. - - -- Torsten Werner <twer...@debian.org> Mon, 25 Apr 2011 15:28:55 +0200 - -ca-certificates-java (20100412) unstable; urgency=low - - * Upload to unstable. - - -- Matthias Klose <d...@ubuntu.com> Mon, 12 Apr 2010 03:15:47 +0200 - -ca-certificates-java (20100406ubuntu1) lucid; urgency=low - - * Make the installation and import of certificates more robust, - if the NSS based security provider is disabled or not built. - - -- Matthias Klose <d...@ubuntu.com> Sun, 11 Apr 2010 20:54:43 +0200 - -ca-certificates-java (20100406) unstable; urgency=low - - * Explicitely fail the installation, if /proc is not mounted. - Currently required by the java tools, changed in OpenJDK7. - Closes: #576453. LP: #556044. - * Print name of JVM in case of errors. - * Set priority to optional, set section to java. Closes: #566855. - * Remove /etc/ssl/certs on package purge, if empty. Closes: #566853. - - -- Matthias Klose <d...@debian.org> Tue, 06 Apr 2010 21:41:39 +0200 - -ca-certificates-java (20091021) unstable; urgency=low - - * Clarify output for keytool errors (although it shouldnn't be - necessary anymore). Closes: #540490. - - -- Matthias Klose <d...@ubuntu.com> Wed, 21 Oct 2009 22:00:53 +0200 - -ca-certificates-java (20090928) karmic; urgency=low - - * Rebuild with OpenJDK supporting PKCS11 cryptography, rebuild with - ca-certificates 20090814. - - -- Matthias Klose <d...@ubuntu.com> Mon, 28 Sep 2009 16:47:09 +0200 - -ca-certificates-java (20090629) unstable; urgency=low - - * debian/rules, debian/postinst, debian/jks-keystore.hook: Filter out - SHA384withECDSA certificates since keytool won't support them. - LP: #392104, closes: #534520. - * Fix typo in hook. Closes: #534533. - * Use java6-runtime-headless as alternative dependency. Closes: #512293. - - -- Matthias Klose <d...@ubuntu.com> Mon, 29 Jun 2009 11:27:59 +0200 - -ca-certificates-java (20081028) unstable; urgency=low - - * Ignore LANG and LC_ALL setting when running keytool. LP: #289934. - - -- Matthias Klose <d...@debian.org> Tue, 28 Oct 2008 07:20:16 +0100 - -ca-certificates-java (20081027) unstable; urgency=medium - - * Merge from Ubuntu: - - Don't try to import certificates, which are listed in - /etc/ca-certificates.conf, but not available on the system. - Just warn about those. LP: #289091. - - Need to run keytool, when the jre is unpacked, but not yet configured. - Create a temporary jvm.cfg for the time in that postinst and the - jks-keystore.hook are run, and remove it afterwards. LP: #289199. - - -- Matthias Klose <d...@debian.org> Mon, 27 Oct 2008 13:58:14 +0100 - -ca-certificates-java (20081024) unstable; urgency=low - - * Install /etc/default/cacerts with mode 600. - - -- Matthias Klose <d...@debian.org> Fri, 24 Oct 2008 15:10:48 +0200 - -ca-certificates-java (20081022) unstable; urgency=low - - * debian/jks-keystore.hook: - - Don't stop after first error during the update. LP: #244412. - Closes: #489748. - - Call keytool with -noprompt. - * On initial install, add locally added certificates. LP: #244410. - Closes: #489748. - * Install /etc/default/cacerts to set options: - - storepass, holding the password for the keystore. - - updates, to enable/disable updates of the keystore. - * Only use the keytool command from OpenJDK or Sun Java. Closes: #496587. - - -- Matthias Klose <d...@ubuntu.com> Wed, 22 Oct 2008 20:51:24 +0200 - -ca-certificates-java (20080712) unstable; urgency=low - - * Upload to main. - - -- Matthias Klose <d...@ubuntu.com> Sat, 12 Jul 2008 12:19:00 +0200 - -ca-certificates-java (20080711) unstable; urgency=low - - * debian/jks-keystore.hook: Fix typo. Closes: #489747, LP: #244408. - - -- Matthias Klose <d...@ubuntu.com> Fri, 11 Jul 2008 20:38:04 +0200 - -ca-certificates-java (20080514) unstable; urgency=low - - * Initial release. - - -- Matthias Klose <d...@ubuntu.com> Mon, 02 Jun 2008 14:52:46 +0000 - Copied: tags/ca-certificates-java/20120524/debian/changelog (from rev 16063, trunk/ca-certificates-java/debian/changelog) =================================================================== --- tags/ca-certificates-java/20120524/debian/changelog (rev 0) +++ tags/ca-certificates-java/20120524/debian/changelog 2012-05-24 20:21:54 UTC (rev 16064) @@ -0,0 +1,207 @@ +ca-certificates-java (20120524) unstable; urgency=low + + [ Marc Deslauriers ] + * debian/preinst, debian/postinst: remove the 20110912ubuntu1 work-around + since it is no longer needed. + * debian/postinst: don't put a symlink in / if jvm doesn't contain nss + configuration. (Closes: #665754, #665749). + * debian/postinst: force migration to new alias names again. The + migration was supposed to occur on upgrades to Oneiric, but failed + because of an NSS error. + * debian/postinst: forcibly remove diginotar cert. It could be left + behind under certain circumstances. (LP: #920758) + * debian/postinst: also look for jvm in multiarch locations (LP: #962378) + * debian/postinst: retrigger first_install to properly get cert store. + + [ James Page ] + * d/rules: Ensure java is built with source/target == 1.6 for backwards + compatibility with openjdk-6. + + [ Damien Raude-Morvan ] + * Sync handling of nss.cfg between debian/jks-keystore.hook.in and + debian/postinst.in. + * Merge changes from Ubuntu (Thanks to James Page and Marc Deslauriers). + * Improve handling of certificate with UTF-8 filenames: + - UpdateCertificates: Force read System.in with UTF-8 + - debian/postinst: Set LC_CTYPE to C.UTF-8 + + -- Damien Raude-Morvan <draz...@debian.org> Tue, 22 May 2012 23:41:41 +0200 + +ca-certificates-java (20120225) unstable; urgency=low + + [ Steve Langasek ] + * debian/jks-keystore.hook: If we *don't* find libnss3 / libnss3-1d, + don't remove files from the filesystem in do_cleanup(), + since this has a nasty tendency of nuking system libraries. + LP: #855171. + * debian/preinst, debian/postinst: when upgrading from version + 20110912ubuntu1, disable the buggy hook script early to prevent it from + being run before our new version is configured; and re-enable the script + in the postinst. LP: #855246. + + [ Matthias Klose ] + * Mark as Multi-Arch: foreign. + * Adjust the libnss3-1d versioned dependency. + + [ Damien Raude-Morvan ] + * Add myself to Uploaders. + * Use dh_gencontrol and dpkg-vendor to allow: + - New substvar ${nss:Depends} for libnss3-1d versionning. + - New @NSS_LIB@ parameter for debian/*.in files. + * Bump Standards-Version to 3.9.3: + - Add recommended build-arch / build-indep targets. + + -- Damien Raude-Morvan <draz...@debian.org> Sat, 25 Feb 2012 15:06:32 +0100 + +ca-certificates-java (20111223) unstable; urgency=low + + * Support new multiarch JRE packages in postinst. + + -- Torsten Werner <twer...@debian.org> Fri, 23 Dec 2011 13:46:15 +0100 + +ca-certificates-java (20110912) unstable; urgency=low + + * Support new multiarch JRE packages in jks-keystore. (Closes: #641306) + * Support OpenJDK 7. (Closes: #641305) + + -- Torsten Werner <twer...@debian.org> Mon, 12 Sep 2011 21:23:22 +0200 + +ca-certificates-java (20110816) unstable; urgency=low + + * Upgrade Recommends: libnss3-1d to a versioned Depends due to multiarch + changes. (Closes: #635571) + * Use the locale C.UTF-8 for the hook script to be more robust. + + -- Torsten Werner <twer...@debian.org> Tue, 16 Aug 2011 11:00:33 +0200 + +ca-certificates-java (20110531) unstable; urgency=low + + * Prepare for multiarch libnss3 update. + + -- Matthias Klose <d...@ubuntu.com> Tue, 31 May 2011 15:20:52 +0200 + +ca-certificates-java (20110426) unstable; urgency=low + + * Test for existing file in postinst before copying it. (Closes: #624152) + * Add Vcs headers to debian/control. + + -- Torsten Werner <twer...@debian.org> Tue, 26 Apr 2011 09:23:03 +0200 + +ca-certificates-java (20110425) unstable; urgency=low + + * Add Java code to update the keystore and support UTF-8 encoded filenames. + (Closes: #607245, #623671) + * Change Maintainer to Debian Java Maintainers and add myself to Uploaders. + * Update Build-Depends. + * Replace old inconsistent keystore aliases. (Closes: #623888) + * Add support for openjdk-7 and remove support for old cacao VM. + * Add a NEWS file explaining the update. + * Update README.Debian. + + -- Torsten Werner <twer...@debian.org> Mon, 25 Apr 2011 15:28:55 +0200 + +ca-certificates-java (20100412) unstable; urgency=low + + * Upload to unstable. + + -- Matthias Klose <d...@ubuntu.com> Mon, 12 Apr 2010 03:15:47 +0200 + +ca-certificates-java (20100406ubuntu1) lucid; urgency=low + + * Make the installation and import of certificates more robust, + if the NSS based security provider is disabled or not built. + + -- Matthias Klose <d...@ubuntu.com> Sun, 11 Apr 2010 20:54:43 +0200 + +ca-certificates-java (20100406) unstable; urgency=low + + * Explicitely fail the installation, if /proc is not mounted. + Currently required by the java tools, changed in OpenJDK7. + Closes: #576453. LP: #556044. + * Print name of JVM in case of errors. + * Set priority to optional, set section to java. Closes: #566855. + * Remove /etc/ssl/certs on package purge, if empty. Closes: #566853. + + -- Matthias Klose <d...@debian.org> Tue, 06 Apr 2010 21:41:39 +0200 + +ca-certificates-java (20091021) unstable; urgency=low + + * Clarify output for keytool errors (although it shouldnn't be + necessary anymore). Closes: #540490. + + -- Matthias Klose <d...@ubuntu.com> Wed, 21 Oct 2009 22:00:53 +0200 + +ca-certificates-java (20090928) karmic; urgency=low + + * Rebuild with OpenJDK supporting PKCS11 cryptography, rebuild with + ca-certificates 20090814. + + -- Matthias Klose <d...@ubuntu.com> Mon, 28 Sep 2009 16:47:09 +0200 + +ca-certificates-java (20090629) unstable; urgency=low + + * debian/rules, debian/postinst, debian/jks-keystore.hook: Filter out + SHA384withECDSA certificates since keytool won't support them. + LP: #392104, closes: #534520. + * Fix typo in hook. Closes: #534533. + * Use java6-runtime-headless as alternative dependency. Closes: #512293. + + -- Matthias Klose <d...@ubuntu.com> Mon, 29 Jun 2009 11:27:59 +0200 + +ca-certificates-java (20081028) unstable; urgency=low + + * Ignore LANG and LC_ALL setting when running keytool. LP: #289934. + + -- Matthias Klose <d...@debian.org> Tue, 28 Oct 2008 07:20:16 +0100 + +ca-certificates-java (20081027) unstable; urgency=medium + + * Merge from Ubuntu: + - Don't try to import certificates, which are listed in + /etc/ca-certificates.conf, but not available on the system. + Just warn about those. LP: #289091. + - Need to run keytool, when the jre is unpacked, but not yet configured. + Create a temporary jvm.cfg for the time in that postinst and the + jks-keystore.hook are run, and remove it afterwards. LP: #289199. + + -- Matthias Klose <d...@debian.org> Mon, 27 Oct 2008 13:58:14 +0100 + +ca-certificates-java (20081024) unstable; urgency=low + + * Install /etc/default/cacerts with mode 600. + + -- Matthias Klose <d...@debian.org> Fri, 24 Oct 2008 15:10:48 +0200 + +ca-certificates-java (20081022) unstable; urgency=low + + * debian/jks-keystore.hook: + - Don't stop after first error during the update. LP: #244412. + Closes: #489748. + - Call keytool with -noprompt. + * On initial install, add locally added certificates. LP: #244410. + Closes: #489748. + * Install /etc/default/cacerts to set options: + - storepass, holding the password for the keystore. + - updates, to enable/disable updates of the keystore. + * Only use the keytool command from OpenJDK or Sun Java. Closes: #496587. + + -- Matthias Klose <d...@ubuntu.com> Wed, 22 Oct 2008 20:51:24 +0200 + +ca-certificates-java (20080712) unstable; urgency=low + + * Upload to main. + + -- Matthias Klose <d...@ubuntu.com> Sat, 12 Jul 2008 12:19:00 +0200 + +ca-certificates-java (20080711) unstable; urgency=low + + * debian/jks-keystore.hook: Fix typo. Closes: #489747, LP: #244408. + + -- Matthias Klose <d...@ubuntu.com> Fri, 11 Jul 2008 20:38:04 +0200 + +ca-certificates-java (20080514) unstable; urgency=low + + * Initial release. + + -- Matthias Klose <d...@ubuntu.com> Mon, 02 Jun 2008 14:52:46 +0000 + Deleted: tags/ca-certificates-java/20120524/debian/jks-keystore.hook.in =================================================================== --- trunk/ca-certificates-java/debian/jks-keystore.hook.in 2012-05-20 10:39:27 UTC (rev 16059) +++ tags/ca-certificates-java/20120524/debian/jks-keystore.hook.in 2012-05-24 20:21:54 UTC (rev 16064) @@ -1,78 +0,0 @@ -#! /bin/sh - -set -e - -# use the locale C.UTF-8 -unset LC_ALL -LC_CTYPE=C.UTF-8 -export LC_CTYPE - -storepass='changeit' -if [ -f /etc/default/cacerts ]; then - . /etc/default/cacerts -fi - -echo "" -if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then - echo "updates of cacerts keystore disabled." - exit 0 -fi - -if ! mountpoint -q /proc; then - echo >&2 "the keytool command requires a mounted proc fs (/proc)." - exit 1 -fi - -for jdir in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do - if [ -x $jdir/bin/java ]; then - break - fi -done -export JAVA_HOME=$jdir -PATH=$JAVA_HOME/bin:$PATH - -temp_jvm_cfg= -if [ ! -f /etc/$jvm/jvm.cfg ]; then - # the jre is not yet configured, but jvm.cfg is needed to run it - temp_jvm_cfg=/etc/$jvm/jvm.cfg - mkdir -p /etc/$jvm - printf -- "-server KNOWN\n" > $temp_jvm_cfg -fi - -if dpkg-query --version >/dev/null; then - nsspkg=$(dpkg-query -L @NSS_LIB@ | sed -n 's,\(.*\)/libnss3\.so$,\1,p') - nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' $jdir/jre/lib/security/nss.cfg) - if [ "$nsspkg" != "$nssjdk" ]; then - ln -sf $nsspkg/libnss3.so $nssjdk/ - fi - softokn3pkg=$(dpkg-query -L @NSS_LIB@ | sed -n 's,\(.*\)/libsoftokn3\.so$,\1,p') - if [ "$softokn3pkg" != "$nssjdk" ]; then - ln -sf $softokn3pkg/libsoftokn3.so $nssjdk/ - fi -fi - -do_cleanup() -{ - [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg - if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ] - then - rm -f $nssjdk/libnss3.so - fi - if [ -n "$softokn3pkg" ] && [ -n "$nssjdk" ] \ - && [ "$softokn3pkg" != "$nssjdk" ] - then - rm -f $nssjdk/libsoftokn3.so - fi -} - -CLASSPATH=/usr/share/ca-certificates-java -export CLASSPATH - -if java UpdateCertificates -storepass "$storepass"; then - do_cleanup -else - do_cleanup - exit 1 -fi - -echo "done." Copied: tags/ca-certificates-java/20120524/debian/jks-keystore.hook.in (from rev 16063, trunk/ca-certificates-java/debian/jks-keystore.hook.in) =================================================================== --- tags/ca-certificates-java/20120524/debian/jks-keystore.hook.in (rev 0) +++ tags/ca-certificates-java/20120524/debian/jks-keystore.hook.in 2012-05-24 20:21:54 UTC (rev 16064) @@ -0,0 +1,81 @@ +#!/bin/sh + +set -e + +# use the locale C.UTF-8 +unset LC_ALL +LC_CTYPE=C.UTF-8 +export LC_CTYPE + +storepass='changeit' +if [ -f /etc/default/cacerts ]; then + . /etc/default/cacerts +fi + +arch=`dpkg --print-architecture` + +echo "" +if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then + echo "updates of cacerts keystore disabled." + exit 0 +fi + +if ! mountpoint -q /proc; then + echo >&2 "the keytool command requires a mounted proc fs (/proc)." + exit 1 +fi + +for jvm in java-6-openjdk-$arch java-6-openjdk \ + java-7-openjdk-$arch java-7-openjdk java-6-sun; do +if [ -x /usr/lib/jvm/$jvm/bin/java ]; then + break +fi +done +export JAVA_HOME=/usr/lib/jvm/$jvm +PATH=$JAVA_HOME/bin:$PATH + +temp_jvm_cfg= +if [ ! -f /etc/${jvm%-$arch}/jvm-$arch.cfg ]; then + # the jre is not yet configured, but jvm.cfg is needed to run it + temp_jvm_cfg=/etc/${jvm%-$arch}/jvm-$arch.cfg + mkdir -p /etc/${jvm%-$arch} + printf -- "-server KNOWN\n" > $temp_jvm_cfg +fi + +if dpkg-query --version >/dev/null; then + nsspkg=$(dpkg-query -L @NSS_LIB@ | sed -n 's,\(.*\)/libnss3\.so$,\1,p') + nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/${jvm%-$arch}/security/nss.cfg) + if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]; then + ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so + fi + softokn3pkg=$(dpkg-query -L @NSS_LIB@ | sed -n 's,\(.*\)/libsoftokn3\.so$,\1,p') + if [ -n "$softokn3pkg" ] && [ -n "$nssjdk" ] && [ "$softokn3pkg" != "$nssjdk" ]; then + ln -sf $softokn3pkg/libsoftokn3.so $nssjdk/libsoftokn3.so + fi +fi + +do_cleanup() +{ + [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg + if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ] + then + rm -f $nssjdk/libnss3.so + fi + if [ -n "$softokn3pkg" ] && [ -n "$nssjdk" ] \ + && [ "$softokn3pkg" != "$nssjdk" ] + then + rm -f $nssjdk/libsoftokn3.so + fi +} + +CLASSPATH=/usr/share/ca-certificates-java +export CLASSPATH + +if java UpdateCertificates -storepass "$storepass"; then + do_cleanup +else + do_cleanup + exit 1 +fi + +echo "done." Deleted: tags/ca-certificates-java/20120524/debian/postinst.in =================================================================== --- trunk/ca-certificates-java/debian/postinst.in 2012-05-20 10:39:27 UTC (rev 16059) +++ tags/ca-certificates-java/20120524/debian/postinst.in 2012-05-24 20:21:54 UTC (rev 16064) @@ -1,110 +0,0 @@ -#!/bin/bash - -set -e - -# Disable a critically buggy hook script during upgrade; to be removed -# after oneiric release -if [ "$2" = 20110912ubuntu1 ] && [ -e /etc/ca-certificates/update.d/jks-keystore ] -then - chmod +x /etc/ca-certificates/update.d/jks-keystore -fi - -storepass='changeit' -if [ -f /etc/default/cacerts ]; then - . /etc/default/cacerts -fi - -setup_path() -{ - for JAVA_HOME in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do - if [ -x $JAVA_HOME/bin/java ]; then - break - fi - done - jvm=$(basename $JAVA_HOME | sed 's,-openjdk-.*,-openjdk,') # multiarch fixup - PATH=$JAVA_HOME/bin:$PATH - - CLASSPATH=/usr/share/ca-certificates-java - export CLASSPATH -} - -first_install() -{ - if which dpkg-query --version >/dev/null; then - nsspkg=$(dpkg-query -L @NSS_LIB@ | sed -n 's,\(.*\)/libnss3\.so$,\1,p') - nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/$jvm/security/nss.cfg) - if [ "$nsspkg" != "$nssjdk" ]; then - ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so - fi - fi - - find /etc/ssl/certs -name \*.pem | \ - while read filename; do - alias=$(basename $filename .pem | tr A-Z a-z | tr -cs a-z0-9 _) - alias=${alias%*_} - if [ -n "$FIXOLD" ]; then - echo "-${alias}" - echo "-${alias}_pem" - fi - echo "+${filename}" - done | \ - java UpdateCertificates -storepass "$storepass" - echo "done." -} - -do_cleanup() -{ - [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg - if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ] - then - rm -f $nssjdk/libnss3.so - fi -} - -case "$1" in - configure) - if dpkg --compare-versions "$2" le "20100412"; then - FIXOLD="true" - if [ -e /etc/ssl/certs/java/cacerts ]; then - cp -f /etc/ssl/certs/java/cacerts /etc/ssl/certs/java/cacerts.dpkg-old - fi - fi - if [ -z "$2" -o -n "$FIXOLD" ]; then - setup_path - - if ! mountpoint -q /proc; then - echo >&2 "the keytool command requires a mounted proc fs (/proc)." - exit 1 - fi - - if [ ! -f /etc/$jvm/jvm.cfg ]; then - # the jre is not yet configured, but jvm.cfg is needed to run it - temp_jvm_cfg=/etc/$jvm/jvm.cfg - mkdir -p /etc/$jvm - printf -- "-server KNOWN\n" > $temp_jvm_cfg - fi - - if first_install; then - do_cleanup - else - do_cleanup - exit 1 - fi - fi - chmod 600 /etc/default/cacerts || true - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 - - Copied: tags/ca-certificates-java/20120524/debian/postinst.in (from rev 16063, trunk/ca-certificates-java/debian/postinst.in) =================================================================== --- tags/ca-certificates-java/20120524/debian/postinst.in (rev 0) +++ tags/ca-certificates-java/20120524/debian/postinst.in 2012-05-24 20:21:54 UTC (rev 16064) @@ -0,0 +1,118 @@ +#!/bin/bash + +set -e + +# use the locale C.UTF-8 +unset LC_ALL +LC_CTYPE=C.UTF-8 +export LC_CTYPE + +storepass='changeit' +if [ -f /etc/default/cacerts ]; then + . /etc/default/cacerts +fi + +arch=`dpkg --print-architecture` + +setup_path() +{ + for jvm in java-6-openjdk-$arch java-6-openjdk \ + java-7-openjdk-$arch java-7-openjdk java-6-sun; do + if [ -x /usr/lib/jvm/$jvm/bin/java ]; then + break + fi + done + export JAVA_HOME=/usr/lib/jvm/$jvm + PATH=$JAVA_HOME/bin:$PATH + + CLASSPATH=/usr/share/ca-certificates-java + export CLASSPATH +} + +first_install() +{ + if which dpkg-query --version >/dev/null; then + nsspkg=$(dpkg-query -L @NSS_LIB@ | sed -n 's,\(.*\)/libnss3\.so$,\1,p') + nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/${jvm%-$arch}/security/nss.cfg) + if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]; then + ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so + fi + fi + + # Forcibly remove diginotar cert (LP: #920758) + if [ -n "$FIXOLD" ]; then + echo -e "-diginotar_root_ca\n-diginotar_root_ca_pem" | \ + java UpdateCertificates -storepass "$storepass" + fi + + find /etc/ssl/certs -name \*.pem | \ + while read filename; do + alias=$(basename $filename .pem | tr A-Z a-z | tr -cs a-z0-9 _) + alias=${alias%*_} + if [ -n "$FIXOLD" ]; then + echo "-${alias}" + echo "-${alias}_pem" + fi + echo "+${filename}" + done | \ + java UpdateCertificates -storepass "$storepass" + echo "done." +} + +do_cleanup() +{ + [ -z "$temp_jvm_cfg" ] || rm -f $temp_jvm_cfg + if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ] + then + rm -f $nssjdk/libnss3.so + fi +} + +case "$1" in + configure) + if dpkg --compare-versions "$2" lt "20110912ubuntu6"; then + FIXOLD="true" + if [ -e /etc/ssl/certs/java/cacerts ]; then + cp -f /etc/ssl/certs/java/cacerts /etc/ssl/certs/java/cacerts.dpkg-old + fi + fi + if [ -z "$2" -o -n "$FIXOLD" ]; then + setup_path + + if ! mountpoint -q /proc; then + echo >&2 "the keytool command requires a mounted proc fs (/proc)." + exit 1 + fi + + temp_jvm_cfg= + if [ ! -f /etc/${jvm%-$arch}/jvm-$arch.cfg ]; then + # the jre is not yet configured, but jvm.cfg is needed to run it + temp_jvm_cfg=/etc/${jvm%-$arch}/jvm-$arch.cfg + mkdir -p /etc/${jvm%-$arch} + printf -- "-server KNOWN\n" > $temp_jvm_cfg + fi + + if first_install; then + do_cleanup + else + do_cleanup + exit 1 + fi + fi + chmod 600 /etc/default/cacerts || true + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + + Deleted: tags/ca-certificates-java/20120524/debian/preinst =================================================================== --- trunk/ca-certificates-java/debian/preinst 2012-05-20 10:39:27 UTC (rev 16059) +++ tags/ca-certificates-java/20120524/debian/preinst 2012-05-24 20:21:54 UTC (rev 16064) @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -# Disable a critically buggy hook script during upgrade; to be removed -# after oneiric release -if [ "$2" = 20110912ubuntu1 ] && [ -e /etc/ca-certificates/update.d/jks-keystore ] -then - chmod -x /etc/ca-certificates/update.d/jks-keystore -fi - -#DEBHELPER# - Deleted: tags/ca-certificates-java/20120524/debian/rules =================================================================== --- trunk/ca-certificates-java/debian/rules 2012-05-20 10:39:27 UTC (rev 16059) +++ tags/ca-certificates-java/20120524/debian/rules 2012-05-24 20:21:54 UTC (rev 16064) @@ -1,75 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) - SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.9+ckbi-1.82-0ubuntu3~)" - nss_lib = libnss3 -else - SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.10-2~)" - nss_lib = libnss3-1d -endif - -JAVA_HOME := /usr/lib/jvm/default-java - -d = debian/ca-certificates-java - -build-arch: build -build-indep: build -build: build-stamp -build-stamp: - dh_testdir - $(JAVA_HOME)/bin/javac UpdateCertificates.java - touch $@ - -clean: - dh_testdir - dh_testroot - $(RM) build-stamp UpdateCertificates.class - dh_clean - for f in debian/*.in; do \ - f2=$$(echo $$f | sed ';s/\.in$$//'); \ - rm -f $$f2; \ - done - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs \ - usr/share/ca-certificates-java \ - etc/default \ - etc/ssl/certs/java \ - etc/ca-certificates/update.d - for f in debian/*.in; do \ - f2=$$(echo $$f | sed 's/\.in$$//'); \ - sed -e 's/@NSS_LIB@/$(nss_lib)/g' \ - $$f > $$f2; \ - done - install -m755 debian/jks-keystore.hook \ - $(d)/etc/ca-certificates/update.d/jks-keystore - install -m600 debian/default \ - $(d)/etc/default/cacerts - dh_install UpdateCertificates.class /usr/share/ca-certificates-java/ - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol -- $(SUBSTVARS) - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do by default. - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install Copied: tags/ca-certificates-java/20120524/debian/rules (from rev 16063, trunk/ca-certificates-java/debian/rules) =================================================================== --- tags/ca-certificates-java/20120524/debian/rules (rev 0) +++ tags/ca-certificates-java/20120524/debian/rules 2012-05-24 20:21:54 UTC (rev 16064) @@ -0,0 +1,75 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) + SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.9+ckbi-1.82-0ubuntu3~)" + nss_lib = libnss3 +else + SUBSTVARS = -Vnss:Depends="libnss3-1d (>= 3.12.10-2~)" + nss_lib = libnss3-1d +endif + +JAVA_HOME := /usr/lib/jvm/default-java + +d = debian/ca-certificates-java + +build-arch: build +build-indep: build +build: build-stamp +build-stamp: + dh_testdir + $(JAVA_HOME)/bin/javac -source 1.6 -target 1.6 UpdateCertificates.java + touch $@ + +clean: + dh_testdir + dh_testroot + $(RM) build-stamp UpdateCertificates.class + dh_clean + for f in debian/*.in; do \ + f2=$$(echo $$f | sed ';s/\.in$$//'); \ + rm -f $$f2; \ + done + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs \ + usr/share/ca-certificates-java \ + etc/default \ + etc/ssl/certs/java \ + etc/ca-certificates/update.d + for f in debian/*.in; do \ + f2=$$(echo $$f | sed 's/\.in$$//'); \ + sed -e 's/@NSS_LIB@/$(nss_lib)/g' \ + $$f > $$f2; \ + done + install -m755 debian/jks-keystore.hook \ + $(d)/etc/ca-certificates/update.d/jks-keystore + install -m600 debian/default \ + $(d)/etc/default/cacerts + dh_install UpdateCertificates.class /usr/share/ca-certificates-java/ + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol -- $(SUBSTVARS) + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits