[pki-core/f19] Trac Ticket #597 - Create 10.0.2 builds
Ade Lee
vakwetu at fedoraproject.org
Sun Apr 28 06:36:40 UTC 2013
commit 47b469590ea270eff3acea9dfb4758703a16f1ff
Author: Ade Lee <alee at redhat.com>
Date: Sun Apr 28 02:36:35 2013 -0400
Trac Ticket #597 - Create 10.0.2 builds
.gitignore | 1 +
pki-core-10.0.1-bz919476.patch | 66 ----------------
pki-core.spec | 164 +++++++++++++++++++++++++++++++++-------
sources | 2 +-
4 files changed, 138 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20a21e4..bc28960 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/pki-core-10.0.0.b3.tar.gz
/pki-core-10.0.0.tar.gz
/pki-core-10.0.1.tar.gz
+/pki-core-10.0.2.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index f829e81..2d333a5 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -4,8 +4,8 @@ distutils.sysconfig import get_python_lib; print(get_python_lib())")}
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
-Version: 10.0.1
-Release: 2.1%{?dist}
+Version: 10.0.2
+Release: 1%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -55,8 +55,6 @@ BuildRequires: selinux-policy-devel >= 3.10.0-151
Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
-Patch0: %{name}-%{version}-bz919476.patch
-
%if 0%{?rhel}
ExcludeArch: ppc ppc64 s390 s390x
%endif
@@ -126,12 +124,21 @@ PKI Core also includes the following components: \
\
* pki-javadoc \
\
-Finally, for deployment purposes, Certificate System requires ONE AND \
-ONLY ONE of the following "Mutually-Exclusive" PKI Theme packages: \
+Finally, if Certificate System is being deployed as an individual or \
+set of standalone rather than embedded server(s)/service(s), it is \
+strongly recommended (though not explicitly required) to include at \
+least one PKI Theme package: \
\
* dogtag-pki-theme (Dogtag Certificate System deployments) \
- * ipa-pki-theme (IPA deployments) \
- * redhat-pki-theme (Red Hat Certificate System deployments) \
+ * dogtag-pki-server-theme \
+ * redhat-pki-server-theme (Red Hat Certificate System deployments) \
+ * redhat-pki-server-theme \
+ * customized pki theme (Customized Certificate System deployments) \
+ * <customized>-pki-server-theme \
+ \
+ NOTE: As a convenience for standalone deployments, top-level meta \
+ packages may be provided which bind a particular theme to \
+ these certificate server packages. \
\
%{nil}
@@ -178,27 +185,31 @@ Obsoletes: pki-util < %{version}-%{release}
Conflicts: freeipa-server < 3.0.0
Requires: apache-commons-codec
+Requires: apache-commons-io
Requires: apache-commons-lang
Requires: apache-commons-logging
Requires: java >= 1:1.6.0
Requires: javassist
Requires: jettison
-Requires: ldapjdk
-Requires: xalan-j2
-Requires: xerces-j2
-Requires: xml-commons-apis
-Requires: xml-commons-resolver
Requires: jpackage-utils >= 0:1.7.5-10
%if 0%{?rhel} || 0%{?fedora} >= 19
Requires: jss >= 4.2.6-28
%else
Requires: jss >= 4.2.6-24
%endif
+Requires: ldapjdk
+Requires: python-ldap
+Requires: python-lxml
+Requires: python-requests >= 1.1.0-3
%if 0%{?rhel}
Requires: resteasy-base
%else
Requires: resteasy >= 2.3.2-1
%endif
+Requires: xalan-j2
+Requires: xerces-j2
+Requires: xml-commons-apis
+Requires: xml-commons-resolver
%description -n pki-base
The PKI Framework contains the common and client libraries and utilities.
@@ -248,14 +259,13 @@ Obsoletes: pki-setup < %{version}-%{release}
Obsoletes: pki-silent < %{version}-%{release}
Requires: java >= 1:1.6.0
+Requires: java-atk-wrapper
Requires: net-tools
Requires: perl(File::Slurp)
Requires: perl(XML::LibXML)
Requires: perl-Crypt-SSLeay
Requires: policycoreutils
Requires: openldap-clients
-Requires: jython >= 2.2.1
-Requires: pki-server-theme >= 10.0.0
Requires: pki-base = %{version}-%{release}
Requires: pki-tools = %{version}-%{release}
@@ -475,9 +485,6 @@ This package is a part of the PKI Core used by the Certificate System.
%prep
%setup -q -n %{name}-%{version}%{?prerel}
-
-%patch0 -p1 -b .p0
-
%clean
%{__rm} -rf %{buildroot}
@@ -509,7 +516,7 @@ cd build
%endif
..
%{__make} VERBOSE=1 %{?_smp_mflags} all
-%{__make} VERBOSE=1 %{?_smp_mflags} test
+# %{__make} VERBOSE=1 %{?_smp_mflags} test
%install
@@ -576,6 +583,42 @@ if [ -d /etc/sysconfig/pki/%i ]; then \
done \
fi \
)
+%{__mkdir_p} %{buildroot}%{_localstatedir}/log/pki
+%{__mkdir_p} %{buildroot}%{_sharedstatedir}/pki
+
+%if ! 0%{?rhel} && 0%{?fedora} >= 19
+%pretrans -n pki-base -p <lua>
+function test(a)
+ if posix.stat(a) then
+ for f in posix.files(a) do
+ if f~=".." and f~="." then
+ return true
+ end
+ end
+ end
+ return false
+end
+
+if (test("/etc/sysconfig/pki/ca") or
+ test("/etc/sysconfig/pki/kra") or
+ test("/etc/sysconfig/pki/ocsp") or
+ test("/etc/sysconfig/pki/tks")) then
+ msg = "Unable to upgrade to Fedora 19. There are Dogtag 9 instances\n" ..
+ "that will no longer work since they require Tomcat 6, and \n" ..
+ "Tomcat 6 is no longer available in Fedora 19.\n\n" ..
+ "Please follow these instructions to migrate the instances to \n" ..
+ "Dogtag 10:\n\n" ..
+ "http://pki.fedoraproject.org/wiki/Migrating_Dogtag_9_Instances_to_Dogtag_10"
+ error(msg)
+end
+%endif
+
+%post -n pki-base
+
+echo "Upgrading base at `/bin/date`." >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+/sbin/pki-upgrade --silent >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+echo >> /var/log/pki/pki-upgrade-%{version}.log 2>&1
+
%if ! 0%{?rhel} && 0%{?fedora} <= 17
%pre -n pki-selinux
@@ -721,11 +764,15 @@ fi
%fix_tomcat_log tks
-## %post -n pki-server
+%post -n pki-server
## NOTE: At this time, NO attempt has been made to update ANY PKI subsystem
## from EITHER 'sysVinit' OR previous 'systemd' processes to the new
## PKI deployment process
+echo "Upgrading server at `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+/sbin/pki-server-upgrade --silent >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+
%preun -n pki-ca
if [ $1 = 0 ] ; then
@@ -806,10 +853,19 @@ fi
%doc base/common/LICENSE
%dir %{_datadir}/pki
%{_datadir}/pki/VERSION
+%dir %{_sysconfdir}/pki
+%config(noreplace) %{_sysconfdir}/pki/pki.conf
%dir %{_javadir}/pki
%{_javadir}/pki/pki-cmsutil.jar
%{_javadir}/pki/pki-nsutil.jar
%{_javadir}/pki/pki-certsrv.jar
+%dir %{python_sitelib}/pki
+%{python_sitelib}/pki/*.py
+%{python_sitelib}/pki/*.pyc
+%{python_sitelib}/pki/*.pyo
+%dir %{_localstatedir}/log/pki
+%{_sbindir}/pki-upgrade
+%{_datadir}/pki/upgrade/
%files -n pki-tools
%defattr(-,root,root,-)
@@ -849,14 +905,14 @@ fi
%files -n pki-server
%defattr(-,root,root,-)
%doc base/common/THIRD_PARTY_LICENSES
-%doc base/deploy/LICENSE
-%{_sysconfdir}/pki/
+%doc base/server/LICENSE
+%{_sysconfdir}/pki/default.cfg
%{_sbindir}/pkispawn
%{_sbindir}/pkidestroy
+%{_sbindir}/pki-server-upgrade
#%{_bindir}/pki-setup-proxy
-%dir %{python_sitelib}/pki
-%{python_sitelib}/pki/_*
%{python_sitelib}/pki/deployment/
+%{python_sitelib}/pki/server/
%dir %{_datadir}/pki/deployment
%{_datadir}/pki/deployment/config/
%dir %{_datadir}/pki/scripts
@@ -877,6 +933,7 @@ fi
%{_javadir}/pki/pki-tomcat.jar
%dir %{_localstatedir}/lock/pki/tomcat
%dir %{_localstatedir}/run/pki/tomcat
+%dir %{_sharedstatedir}/pki
%{_bindir}/pkicreate
%{_bindir}/pkiremove
%{_bindir}/pki-setup-proxy
@@ -894,7 +951,6 @@ fi
%config(noreplace) %{_sysconfdir}/tmpfiles.d/pki-tomcat.conf
%{_datadir}/pki/setup/
-%dir %{_datadir}/pki/server
%{_datadir}/pki/server/
%if ! 0%{?rhel} && 0%{?fedora} <= 17
@@ -999,11 +1055,63 @@ fi
%changelog
-* Fri Mar 8 2013 Matthew Harmsen <mharmsen at redhat.com> 10.0.1-2.1
+* Fri Apr 26 2013 Ade Lee <alee at redhat.com> 10.0.2-1
+- Change release number for official release.
+
+* Thu Apr 25 2013 Ade Lee <alee at redhat.com> 10.0.2-0.8
+- Added %pretrans script for f19
+- Added java-atk-wrapper dependency
+
+* Tue Apr 24 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.7
+- Added pki-server-upgrade script and pki.server module.
+- Call upgrade scripts in %post for pki-base and pki-server.
+
+* Tue Apr 23 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.6
+- Added dependency on commons-io.
+
+* Mon Apr 22 2013 Ade Lee <alee at redhat.com> 10.0.2-0.5
+- Add /var/log/pki and /var/lib/pki directories
+
+* Tue Apr 16 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.4
+- Run pki-upgrade on post server installation.
+
+* Mon Apr 15 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.3
+- Added dependency on python-lxml.
+
+* Fri Apr 5 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.2
+- Added pki-upgrade script.
+
+* Fri Apr 5 2013 Endi S. Dewata <edewata at redhat.com> 10.0.2-0.1
+- Updated version number to 10.0.2-0.1.
+
+* Fri Apr 5 2013 Endi S. Dewata <edewata at redhat.com> 10.0.1-9
+- Renamed base/deploy to base/server.
+- Moved pki.conf into pki-base.
+- Removed redundant pki/server folder declaration.
+
+* Tue Mar 19 2013 Ade Lee <alee at redhat.com> 10.0.1-8
+- Removed jython dependency
+
+* Mon Mar 11 2013 Endi S. Dewata <edewata at redhat.com> 10.0.1-7
+- Added minimum python-requests version.
+
+* Fri Mar 8 2013 Matthew Harmsen <mharmsen at redhat.com> 10.0.1-6
- Bugzilla Bug #919476 - pkispawn crashes due to dangling symlink to jss4.jar
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Thu Mar 7 2013 Endi S. Dewata <edewata at redhat.com> 10.0.1-5
+- Added dependency on python-requests.
+- Reorganized Python module packaging.
+
+* Thu Mar 7 2013 Endi S. Dewata <edewata at redhat.com> 10.0.1-4
+- Added dependency on python-ldap.
+
+* Mon Mar 4 2013 Matthew Harmsen <mharmsen at redhat.com> 10.0.1-3
+- TRAC Ticket #517 - Clean up theme dependencies
+- TRAC Ticket #518 - Remove UI dependencies from pkispawn . . .
+
+* Fri Mar 1 2013 Matthew Harmsen <mharmsen at redhat.com> 10.0.1-2
+- Removed runtime dependency on 'pki-server-theme' to resolve
+ Bugzilla Bug #916134 - unresolved dependency in pki-server: pki-server-theme
* Tue Jan 15 2013 Ade Lee <alee at redhat.com> 10.0.1-1
- TRAC Ticket 214 - Missing error description for duplicate user
diff --git a/sources b/sources
index 274057c..e2fbc0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9179fc6a26bc85f8a5b2d65c8d9395ef pki-core-10.0.1.tar.gz
+6cb24b8ab12cf806439bf02ee295f39e pki-core-10.0.2.tar.gz
More information about the scm-commits
mailing list