Hello community, here is the log from the commit of package ca-certificates for openSUSE:Factory checked in at 2013-06-25 09:36:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ca-certificates (Old) and /work/SRC/openSUSE:Factory/.ca-certificates.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ca-certificates" Changes: -------- --- /work/SRC/openSUSE:Factory/ca-certificates/ca-certificates.changes 2012-05-08 12:25:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ca-certificates.new/ca-certificates.changes 2013-06-25 14:38:53.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 20 09:15:52 UTC 2013 - [email protected] + +- use p11-kit to generate the files + +------------------------------------------------------------------- Old: ---- GPL-2.0.txt certbundle.run java.run keystore.java update-ca-certificates update-ca-certificates.8 New: ---- ca-certificates-1_201306200949.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates.spec ++++++ --- /var/tmp/diff_new_pack.p3QIV1/_old 2013-06-25 14:38:54.000000000 +0200 +++ /var/tmp/diff_new_pack.p3QIV1/_new 2013-06-25 14:38:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ca-certificates # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,154 +15,109 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%bcond_without java BuildRequires: openssl -%if %{with java} -BuildRequires: gcc-java -BuildRequires: fastjar -%endif +BuildRequires: p11-kit-devel Name: ca-certificates %define ssletcdir %{_sysconfdir}/ssl -%define etccadir %{ssletcdir}/certs %define cabundle /var/lib/ca-certificates/ca-bundle.pem -%define usrcadir %{_datadir}/ca-certificates +%define sslcerts %{ssletcdir}/certs +Version: 1_201306200949 +Release: 0 +Summary: Utilities for system wide CA certificate installation License: GPL-2.0+ Group: Productivity/Networking/Security -Version: 1 -Release: 12 -Summary: Utilities for system wide CA certificate installation -Source0: update-ca-certificates -Source1: update-ca-certificates.8 -Source2: GPL-2.0.txt -Source3: certbundle.run -Source4: keystore.java -Source5: java.run +Source0: ca-certificates-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://gitorious.org/opensuse/ca-certificates +Url: https://github.com/openSUSE/ca-certificates # Requires: openssl +Requires: p11-kit-tools # needed for %post -Requires: coreutils +Requires(post): coreutils openssl p11-kit-tools Recommends: ca-certificates-mozilla # we need to obsolete openssl-certs to make sure it's files are # gone when a package providing actual certificates gets # installed (bnc#594434). Obsoletes: openssl-certs < 0.9.9 +# no need for a separate Java package anymore. The bundle is +# created by C code. +Obsoletes: java-ca-certificates = 1 +Provides: java-ca-certificates = %version-%release BuildArch: noarch -%if %{with java} - -%package -n java-ca-certificates -License: GPL-2.0+ -Group: Productivity/Networking/Security -Summary: Utilities CA certificate import to gcj -Requires(post): ca-certificates -Supplements: packageand(gcj-compat:ca-certificates) -Supplements: packageand(java-1_6_0-openjdk:ca-certificates) -Supplements: packageand(java-1_6_0-sun:ca-certificates) -%endif - %description Utilities for system wide CA certificate installation -%if %{with java} - -%description -n java-ca-certificates -Utilities for CA certificate installation for gcj and openjdk Java -%endif - %prep -%setup -qcT -install -m 755 %{SOURCE0} . -install -m 644 %{SOURCE1} . -install -m 644 %{SOURCE2} COPYING +%setup -q %build -%if %{with java} -gcj -C %SOURCE4 -d . -# emulate -e option of jar for fastjar -cat <<EOF > MANIFEST.MF -Manifest-Version: 1.0 -Created-By: 0.98 -Main-Class: keystore -EOF -fastjar cfm keystore.jar MANIFEST.MF keystore*.class -%endif %install -mkdir -p %{buildroot}/%{etccadir} -mkdir -p %{buildroot}/%{usrcadir} -mkdir -p %{buildroot}/%{_sbindir} -mkdir -p %{buildroot}/%{_mandir}/man8 -mkdir -p %{buildroot}/etc/ca-certificates/update.d -mkdir -p %{buildroot}%{_prefix}/lib/ca-certificates/update.d +%make_install +install -d m 755 %{buildroot}%{trustdir_cfg}/{anchors,blacklist} +install -d m 755 %{buildroot}%{trustdir_static}/{anchors,blacklist} +install -d m 755 %{buildroot}/etc/ssl/certs +install -d m 755 %{buildroot}/etc/ca-certificates/update.d +install -d m 755 %{buildroot}%{_prefix}/lib/ca-certificates/update.d +install -d m 755 %{buildroot}/var/lib/ca-certificates/pem +install -d m 755 %{buildroot}/var/lib/ca-certificates/openssl install -D -m 644 /dev/null %{buildroot}/%{cabundle} -install -m 644 /dev/null %{buildroot}/etc/ca-certificates.conf -install -m 755 %{SOURCE3} %{buildroot}%{_prefix}/lib/ca-certificates/update.d -install -m 755 %{SOURCE5} %{buildroot}%{_prefix}/lib/ca-certificates/update.d +install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem -install -m 755 update-ca-certificates %{buildroot}/%{_sbindir} -install -m 644 update-ca-certificates.8 %{buildroot}/%{_mandir}/man8 -install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/ca-bundle.pem -%if %{with java} -mkdir -p %{buildroot}%{_prefix}/lib/ca-certificates/java -install -m 644 keystore.jar %{buildroot}%{_prefix}/lib/ca-certificates/java -install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts -install -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/gcj-cacerts -%endif - %post -# this is just needed for those updating Factory, -# can be removed before 11.3 -if [ "$1" -ge 1 ]; then - rm -f /etc/ca-certificates/update.d/certbundle.run +if [ -s /etc/ca-certificates.conf ]; then + while read line; do + [ ${line#\!} != "$line" ] || continue + cert="${line#\!*/}" + ln -s /usr/share/ca-certificates/anchors/"$cert" %{trustdir_cfg}/blacklist + done < /etc/ca-certificates.conf + echo "/etc/ca-certificates.conf converted and saved as /etc/ca-certificates.conf.rpmsave" + mv /etc/ca-certificates.conf /etc/ca-certificates.conf.rpmsave fi # force rebuilding all certificate stores. # This also makes sure we update the hash links in /etc/ssl/certs # as openssl changed the hash format between 0.9.8 and 1.0 update-ca-certificates -f || true -%if %{with java} - -%post -n java-ca-certificates -update-ca-certificates || true -%endif +%postun +if [ "$1" -eq 0 ]; then + rm -rf /var/lib/ca-certificates/{pem,openssl} +fi %clean rm -rf %{buildroot} %files %defattr(-, root, root) -%dir %{usrcadir} -%dir %{etccadir} -%doc COPYING -%ghost %config(noreplace) /etc/ca-certificates.conf +%doc COPYING README +%dir %{pkidir_cfg} +%dir %{trustdir_cfg} +%dir %{trustdir_cfg}/anchors +%dir %{trustdir_cfg}/blacklist +%dir %{pkidir_static} +%dir %{trustdir_static} +%dir %{trustdir_static}/anchors +%dir %{trustdir_static}/blacklist +%dir /etc/ssl/certs %{ssletcdir}/ca-bundle.pem %ghost %{cabundle} +%ghost /var/lib/ca-certificates/java-cacerts %dir /etc/ca-certificates %dir /etc/ca-certificates/update.d %dir %{_prefix}/lib/ca-certificates %dir %{_prefix}/lib/ca-certificates/update.d %dir /var/lib/ca-certificates -%{_prefix}/lib/ca-certificates/update.d/certbundle.run +%dir /var/lib/ca-certificates/pem +%dir /var/lib/ca-certificates/openssl %{_sbindir}/update-ca-certificates %{_mandir}/man8/update-ca-certificates.8* -%ghost /var/lib/ca-certificates/ca-bundle.pem - -%if %{with java} - -%files -n java-ca-certificates -%defattr(-, root, root) -%dir %{_prefix}/lib/ca-certificates/java %{_prefix}/lib/ca-certificates/update.d/java.run -%{_prefix}/lib/ca-certificates/java/keystore.jar -%ghost /var/lib/ca-certificates/java-cacerts -%ghost /var/lib/ca-certificates/gcj-cacerts -%endif +%{_prefix}/lib/ca-certificates/update.d/certbundle.run +%{_prefix}/lib/ca-certificates/update.d/etc_ssl.run +%{_prefix}/lib/ca-certificates/update.d/openssl.run %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
