[freeipa/f18] - Rebase to upstream 3.0.1 - Set minimum Requires of pki-* to 10.0.0-0.52.b3 - Set minimum Requires
rcritten
rcritten at fedoraproject.org
Tue Nov 13 22:22:05 UTC 2012
commit 05044f7d515dea68095cb8f92881372f34eb65e3
Author: Rob Crittenden <rcritten at redhat.com>
Date: Tue Nov 13 17:21:28 2012 -0500
- Rebase to upstream 3.0.1
- Set minimum Requires of pki-* to 10.0.0-0.52.b3
- Set minimum Requires of bind-dyndb-ldap to 2.3-2
- Add patch to provide explicit user name for Dogtag installation scripts
.gitignore | 1 +
...xplicit-user-name-for-Dogtag-installation.patch | 35 ++++++++++++++++++++
0001-Use-TLS-for-CA-replication.patch | 26 --------------
freeipa.spec | 22 ++++++++----
sources | 2 +-
5 files changed, 51 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95af362..200ccb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/freeipa-3.0.0.rc1.tar.gz
/freeipa-3.0.0.rc2.tar.gz
/freeipa-3.0.0.tar.gz
+/freeipa-3.0.1.tar.gz
diff --git a/0001-Provide-explicit-user-name-for-Dogtag-installation.patch b/0001-Provide-explicit-user-name-for-Dogtag-installation.patch
new file mode 100644
index 0000000..bfc30b3
--- /dev/null
+++ b/0001-Provide-explicit-user-name-for-Dogtag-installation.patch
@@ -0,0 +1,35 @@
+From 60fd66d8960397f25b847f415930488018e8cfc0 Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <pviktori at redhat.com>
+Date: Mon, 12 Nov 2012 09:53:14 -0500
+Subject: [PATCH] Provide explicit user name for Dogtag installation scripts
+
+Dogtag 10 is changing its defaults, so we need to explicitly provide
+the 'admin' user name to keep current functionality.
+---
+ ipaserver/install/cainstance.py | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
+index 1f950b990ca88af82619919b50d6bafb0e35ec96..163f5c86bba8ca17223e3697f25e1919fe4577a4 100644
+--- a/ipaserver/install/cainstance.py
++++ b/ipaserver/install/cainstance.py
+@@ -612,6 +612,8 @@ class CAInstance(service.Service):
+ "pki_client_database_purge": "False",
+ "pki_client_pkcs12_password": self.admin_password,
+ "pki_security_domain_name": self.domain_name,
++ "pki_admin_name": "admin",
++ "pki_admin_uid": "admin",
+ "pki_admin_email": "root at localhost",
+ "pki_admin_password": self.admin_password,
+ "pki_admin_nickname": "ipa-ca-agent",
+@@ -651,6 +653,7 @@ class CAInstance(service.Service):
+ "pki_clone_pkcs12_path": "/tmp/ca.p12",
+ "pki_security_domain_hostname": self.master_host,
+ "pki_security_domain_https_port": "443",
++ "pki_security_domain_user": "admin",
+ "pki_security_domain_password": self.admin_password,
+ "pki_clone_replication_security": "TLS",
+ "pki_clone_uri": \
+--
+1.7.7.6
+
diff --git a/freeipa.spec b/freeipa.spec
index 8b0a16f..477f75d 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -11,11 +11,11 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
%global POLICYCOREUTILSVER 2.1.12-5
%global gettext_domain ipa
-%global VERSION 3.0.0
+%global VERSION 3.0.1
Name: freeipa
-Version: 3.0.0
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
Summary: The Identity, Policy and Audit system
Group: System Environment/Base
@@ -24,7 +24,7 @@ URL: http://www.freeipa.org/
Source0: http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: 0001-Use-TLS-for-CA-replication.patch
+Patch1: 0001-Provide-explicit-user-name-for-Dogtag-installation.patch
%if ! %{ONLY_CLIENT}
BuildRequires: 389-ds-base-devel >= 1.2.11.14
@@ -114,9 +114,9 @@ Requires(post): systemd-units
Requires: selinux-policy >= 3.11.1-43
Requires(post): selinux-policy-base
Requires: slapi-nis >= 0.40
-Requires: pki-ca >= pki-ca-10.0.0-0.46.b1
-Requires: pki-silent >= 10.0.0-0.46.b1
-Requires: pki-setup >= 10.0.0-0.46.b1
+Requires: pki-ca >= 10.0.0-0.52.b3
+Requires: pki-silent >= 10.0.0-0.52.b3
+Requires: pki-setup >= 10.0.0-0.52.b3
Requires: tomcat >= 7.0.29
Requires: dogtag-pki-common-theme
Requires: dogtag-pki-ca-theme
@@ -133,7 +133,7 @@ Requires: policycoreutils >= %{POLICYCOREUTILSVER}
# We have a soft-requires on bind. It is an optional part of
# IPA but if it is configured we need a way to require versions
# that work for us.
-Conflicts: bind-dyndb-ldap < 1.1.0-0.16.rc1
+Conflicts: bind-dyndb-ldap < 2.3-2
Conflicts: bind < 9.9.1-10.P3
# mod_proxy provides a single API to communicate over SSL. If mod_ssl
@@ -744,6 +744,12 @@ fi
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%changelog
+* Tue Nov 13 2012 Rob Crittenden <rcritten at redhat.com> - 3.0.1-1
+- Rebase to upstream 3.0.1
+- Set minimum Requires of pki-* to 10.0.0-0.52.b3
+- Set minimum Requires of bind-dyndb-ldap to 2.3-2
+- Add patch to provide explicit user name for Dogtag installation scripts
+
* Thu Oct 24 2012 Rob Crittenden <rcritten at redhat.com> - 3.0.0-3
- Set minimum Requires of selinux-policy to 3.11.1-43. It now owns
pki-selinux policy.
diff --git a/sources b/sources
index aaa6393..12cb8ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d80d320f13fa5944eda5112b085cfb51 freeipa-3.0.0.tar.gz
+ef33361c26cb696b24bb3520a490a879 freeipa-3.0.1.tar.gz
More information about the scm-commits
mailing list