[Pkg-freeipa-devel] freeipa: Changes to 'master-next'

[Timo Aaltonen]

 debian/changelog                       |    3 +++
 debian/control                         |    2 ++
 debian/freeipa-server-trust-ad.install |    3 ---
 debian/freeipa-server.install          |    3 +++
 debian/patches/series                  |    1 +
 debian/patches/use-httpd-user.diff     |   28 ++++++++++++++++++++++++++++
 6 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit 19c31e1492c96fea40f7df51f5188f266d41b1d6
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 8 01:49:09 2016 +0200

    user-httpd-user.diff: Patch dogtaginstance.py to use HTTPD_USER.

diff --git a/debian/changelog b/debian/changelog
index 26a9785..1822f78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,7 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
     /usr/lib/ipa instead of multiarch path.
   * control, server*.install: Move dirsrv plugins from server-trust-ad
     to server, needed on upgrades even if trust-ad isn't set up.
+  * user-httpd-user.diff: Patch dogtaginstance.py to use HTTPD_USER.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Sat, 03 Oct 2015 08:56:31 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index dfb3893..2432f71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ fix-ipa-conf.diff
 fix-kdcproxy-paths.diff
 fix-ipa-otpd-install.diff
 fix-certmonger-script-install.diff
+use-httpd-user.diff
diff --git a/debian/patches/use-httpd-user.diff b/debian/patches/use-httpd-user.diff
new file mode 100644
index 0000000..76babbf
--- /dev/null
+++ b/debian/patches/use-httpd-user.diff
@@ -0,0 +1,28 @@
+--- a/ipaserver/install/dogtaginstance.py
++++ b/ipaserver/install/dogtaginstance.py
+@@ -34,6 +34,7 @@ from ipalib import errors
+ 
+ from ipaplatform import services
+ from ipaplatform.paths import paths
++from ipaplatform.constants import constants
+ from ipapython import certmonger
+ from ipapython import ipaldap
+ from ipapython import ipautil
+@@ -45,7 +46,7 @@ from ipaserver.install.installutils impo
+ from ipapython.ipa_log_manager import log_mgr
+ 
+ PKI_USER = "pkiuser"
+-
++HTTPD_USER = constants.HTTPD_USER
+ 
+ def get_security_domain():
+     """
+@@ -87,7 +88,7 @@ def export_kra_agent_pem():
+             "--client-cert", filename]
+     ipautil.run(args)
+ 
+-    pent = pwd.getpwnam("apache")
++    pent = pwd.getpwnam(HTTPD_USER)
+     os.chown(filename, 0, pent.pw_gid)
+     os.chmod(filename, 0o440)
+ 

commit 5af9cc2d281ce0d913ae2ead971ba5425a3e44a0
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 8 01:01:12 2016 +0200

    control, server*.install: Move dirsrv plugins from server-trust-ad to server, needed on upgrades even if trust-ad isn't set up.

diff --git a/debian/changelog b/debian/changelog
index 4cd761c..26a9785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,8 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
     /usr/lib/ipa instead of directly under multiarch lib path.
   * fix-certmonger-script-install.diff: Install certmonger scripts under
     /usr/lib/ipa instead of multiarch path.
+  * control, server*.install: Move dirsrv plugins from server-trust-ad
+    to server, needed on upgrades even if trust-ad isn't set up.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Sat, 03 Oct 2015 08:56:31 +0300
 
diff --git a/debian/control b/debian/control
index 3e8852f..535988a 100644
--- a/debian/control
+++ b/debian/control
@@ -68,6 +68,8 @@ Homepage: http://www.freeipa.org
 
 Package: freeipa-server
 Architecture: any
+Breaks: freeipa-server-trust-ad (<< 4.3.0-1)
+Replaces: freeipa-server-trust-ad (<< 4.3.0-1)
 Depends:
  389-ds-base (>= 1.3.4.0),
  acl,
diff --git a/debian/freeipa-server-trust-ad.install b/debian/freeipa-server-trust-ad.install
index 09b659f..5a5a68d 100644
--- a/debian/freeipa-server-trust-ad.install
+++ b/debian/freeipa-server-trust-ad.install
@@ -1,8 +1,5 @@
 etc/dbus-1/system.d/oddjob-ipa-trust.conf
 etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
-usr/lib/*/dirsrv/plugins/libipa_extdom_extop.so
-usr/lib/*/dirsrv/plugins/libipa_sidgen.so
-usr/lib/*/dirsrv/plugins/libipa_sidgen_task.so
 usr/lib/*/samba/pdb/ipasam.so
 usr/lib/ipa/oddjob/com.redhat.idm.trust-fetch-domains
 usr/sbin/ipa-adtrust-install
diff --git a/debian/freeipa-server.install b/debian/freeipa-server.install
index 94ec414..9f87878 100644
--- a/debian/freeipa-server.install
+++ b/debian/freeipa-server.install
@@ -7,6 +7,7 @@ lib/systemd/system/*
 usr/lib/*/dirsrv/plugins/libipa_cldap.so
 usr/lib/*/dirsrv/plugins/libipa_dns.so
 usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so
+usr/lib/*/dirsrv/plugins/libipa_extdom_extop.so
 usr/lib/*/dirsrv/plugins/libipa_lockout.so
 usr/lib/*/dirsrv/plugins/libipa_modrdn.so
 usr/lib/*/dirsrv/plugins/libipa_otp_counter.so
@@ -14,6 +15,8 @@ usr/lib/*/dirsrv/plugins/libipa_otp_lasttoken.so
 usr/lib/*/dirsrv/plugins/libipa_pwd_extop.so
 usr/lib/*/dirsrv/plugins/libipa_range_check.so
 usr/lib/*/dirsrv/plugins/libipa_repl_version.so
+usr/lib/*/dirsrv/plugins/libipa_sidgen.so
+usr/lib/*/dirsrv/plugins/libipa_sidgen_task.so
 usr/lib/*/dirsrv/plugins/libipa_uuid.so
 usr/lib/*/dirsrv/plugins/libipa_winsync.so
 usr/lib/*/dirsrv/plugins/libtopology.so