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

Tue Oct 4 21:37:14 UTC 2016

debian/changelog                         |   14 ++++++++++---
 debian/control                           |    5 +++-
 debian/patches/add-debian-platform.diff  |    2 -
 debian/patches/fix-ipa-otpd-service.diff |   11 ++++++++++
 debian/patches/series                    |    1 
 debian/tests/control                     |    7 ++++++
 debian/tests/server-install              |   32 +++++++++++++++++++++++++++++++
 7 files changed, 67 insertions(+), 5 deletions(-)

New commits:
commit 95811751902b9037e23fc1fffb7fa7fb22dc29de
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Oct 5 00:36:29 2016 +0300

    releasing package freeipa version 4.3.2-2

diff --git a/debian/changelog b/debian/changelog
index 6f301ca..65d8e44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-freeipa (4.3.2-2) UNRELEASED; urgency=medium
+freeipa (4.3.2-2) unstable; urgency=medium
 
   * copyright: Since ffb9a09a0d all original code should be GPL-3+, so
     drop some exceptions.
@@ -11,7 +11,7 @@ freeipa (4.3.2-2) UNRELEASED; urgency=medium
   * tests: Add simple autopkgtest to check that ipa-server-install
     works.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 15 Sep 2016 23:41:03 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 05 Oct 2016 00:35:51 +0300
 
 freeipa (4.3.2-1) experimental; urgency=medium
 

commit 687414e8e7ef0266fdf03a62cd54c2058f79d8d3
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Oct 5 00:35:50 2016 +0300

    tests: Add simple autopkgtest to check that ipa-server-install works.

diff --git a/debian/changelog b/debian/changelog
index b0f779a..6f301ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ freeipa (4.3.2-2) UNRELEASED; urgency=medium
     #1628884)
   * add-debian-platform.diff: Fix libsofthsm2.so install path.
   * control: Bump dep on softhsm2 due to changed lib install path.
+  * tests: Add simple autopkgtest to check that ipa-server-install
+    works.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 15 Sep 2016 23:41:03 +0300
 
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..55fb645
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,7 @@
+Tests: server-install
+Depends:
+ @,
+Restrictions:
+ allow-stderr,
+ isolation-container,
+ needs-root,
diff --git a/debian/tests/server-install b/debian/tests/server-install
new file mode 100644
index 0000000..f12eb22
--- /dev/null
+++ b/debian/tests/server-install
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# hack for lxc
+IP=`ip route get 1.1.1.1 | awk '{print $NF; exit}'`
+HOSTNAME=`cat /etc/hosts| grep '127.0.1.1' | awk '{print $NF; exit}'`
+echo "$IP $HOSTNAME.debci $HOSTNAME" >> /etc/hosts
+
+if [ ! -d /etc/systemd/system/pki-tomcatd.target.wants ]; then
+    echo "WHOOPS: Creating /etc/systemd/system/pki-tomcatd.target.wants"
+    mkdir /etc/systemd/system/pki-tomcatd.target.wants
+fi
+if [ ! -d /etc/systemd/system/pki-tomcatd-nuxwdog.target.wants ]; then
+    echo "WHOOPS: Creating /etc/systemd/system/pki-tomcatd-nuxwdog.target.wants"
+    mkdir /etc/systemd/system/pki-tomcatd-nuxwdog.target.wants
+fi
+
+ipa-server-install \
+	-U \
+	-r DEBCI \
+	-n debci \
+	-p Secret123 \
+	-a Secret123 \
+	--ip-address=$IP \
+	--setup-dns \
+	--no-forwarders \
+	--hostname=$HOSTNAME.debci
+
+
+if [ $? != 0 ]; then
+    echo ">>>>> IPASERVER log >>>>>>>"
+    cat /var/log/ipaserver-install.log
+fi

commit 0ef5833e32590db41698c27f4a771bc4ab581ff9
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Oct 5 00:29:11 2016 +0300

    control: Bump dep on softhsm2 due to changed lib install path.

diff --git a/debian/changelog b/debian/changelog
index ec9b85c..b0f779a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ freeipa (4.3.2-2) UNRELEASED; urgency=medium
   * fix-ipa-otpd-service.diff: Use correct path for ipa-otpd. (LP:
     #1628884)
   * add-debian-platform.diff: Fix libsofthsm2.so install path.
+  * control: Bump dep on softhsm2 due to changed lib install path.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 15 Sep 2016 23:41:03 +0300
 
diff --git a/debian/control b/debian/control
index 8fafab1..af2dabb 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Depends:
  python-ldap (>= 2.4.22),
  python-systemd,
  slapi-nis (>= 0.54.2),
- softhsm2,
+ softhsm2 (>= 2.1.0-2),
  systemd-sysv,
  ${misc:Depends},
  ${python:Depends},

commit 0b7a9ba08b86ecb3032bca747b9345f13619292f
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Oct 4 10:21:16 2016 +0300

    add-debian-platform.diff: Fix libsofthsm2.so install path.

diff --git a/debian/changelog b/debian/changelog
index 0184a10..ec9b85c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ freeipa (4.3.2-2) UNRELEASED; urgency=medium
     to ensure they get installed. (LP: #1600513)
   * fix-ipa-otpd-service.diff: Use correct path for ipa-otpd. (LP:
     #1628884)
+  * add-debian-platform.diff: Fix libsofthsm2.so install path.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 15 Sep 2016 23:41:03 +0300
 
diff --git a/debian/patches/add-debian-platform.diff b/debian/patches/add-debian-platform.diff
index 19aa825..af51086 100644
--- a/debian/patches/add-debian-platform.diff
+++ b/debian/patches/add-debian-platform.diff
@@ -229,7 +229,7 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +    BIND_LDAP_DNS_ZONE_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/master/"
 +#   USR_LIB_DIRSRV = "/usr/lib/dirsrv"
 +#   LIB_FIREFOX = "/usr/lib/firefox"
-+    LIBSOFTHSM2_SO = "/usr/lib/%s/softhsm/libsofthsm2.so" % MULTIARCH
++    LIBSOFTHSM2_SO = "/usr/lib/softhsm/libsofthsm2.so"
 +    LIB_SYSTEMD_SYSTEMD_DIR = "/lib/systemd/system/"
 +#   BIND_LDAP_SO_64 = "/usr/lib64/bind/ldap.so"
 +#   USR_LIB_DIRSRV_64 = "/usr/lib64/dirsrv"

commit 8c4264511113bd2aefca4ff94df0e953a1025c2f
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Sep 30 00:48:44 2016 +0300

    fix-ipa-otpd-service.diff: Use correct path for ipa-otpd. (LP: #1628884)

diff --git a/debian/changelog b/debian/changelog
index 6f10a0d..0184a10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ freeipa (4.3.2-2) UNRELEASED; urgency=medium
     drop some exceptions.
   * control: Add libnss-sss, libpam-sss and libsss-sudo to client depends
     to ensure they get installed. (LP: #1600513)
+  * fix-ipa-otpd-service.diff: Use correct path for ipa-otpd. (LP:
+    #1628884)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 15 Sep 2016 23:41:03 +0300
 
diff --git a/debian/patches/fix-ipa-otpd-service.diff b/debian/patches/fix-ipa-otpd-service.diff
new file mode 100644
index 0000000..4ed614e
--- /dev/null
+++ b/debian/patches/fix-ipa-otpd-service.diff
@@ -0,0 +1,11 @@
+--- a/daemons/ipa-otpd/ipa-otpd at .service.in
++++ b/daemons/ipa-otpd/ipa-otpd at .service.in
+@@ -3,7 +3,7 @@ Description=ipa-otpd service
+ 
+ [Service]
+ EnvironmentFile=@sysconfdir@/ipa/default.conf
+-ExecStart=@libexecdir@/ipa-otpd $ldap_uri
++ExecStart=@libexecdir@/ipa/ipa-otpd $ldap_uri
+ StandardInput=socket
+ StandardOutput=socket
+ StandardError=syslog
diff --git a/debian/patches/series b/debian/patches/series
index ae18109..16d988a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ fix-named-conf-template.diff
 fix-memcached.diff
 fix-oddjobs.diff
 purge-firefox-extension.diff
+fix-ipa-otpd-service.diff

commit bf1d35e501ead6c28278a04650d8246280b7d15d
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Sep 19 13:32:49 2016 +0300

    control: Add libnss-sss, libpam-sss and libsss-sudo to client depends to ensure they get installed. (LP: #1600513)

diff --git a/debian/changelog b/debian/changelog
index 53c6f72..6f10a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ freeipa (4.3.2-2) UNRELEASED; urgency=medium
 
   * copyright: Since ffb9a09a0d all original code should be GPL-3+, so
     drop some exceptions.
+  * control: Add libnss-sss, libpam-sss and libsss-sudo to client depends
+    to ensure they get installed. (LP: #1600513)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 15 Sep 2016 23:41:03 +0300
 
diff --git a/debian/control b/debian/control
index bd19629..8fafab1 100644
--- a/debian/control
+++ b/debian/control
@@ -184,7 +184,10 @@ Depends:
  krb5-user,
  libcurl3 (>= 7.22.0),
  libnss3-tools,
+ libnss-sss,
+ libpam-sss,
  libsasl2-modules-gssapi-mit,
+ libsss-sudo,
  libxmlrpc-core-c3 (>= 1.16.33-3.1ubuntu5),
  ntp,
  oddjob-mkhomedir,

