[Pkg-freeipa-devel] freeipa: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog                              |    3 ++-
 debian/freeipa-client.install                 |    2 ++
 debian/patches/port-ipa-client-automount.diff |   26 ++++++++++++++++++++++++++
 debian/patches/series                         |    1 +
 debian/rules                                  |    2 +-
 5 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 14e33241ab6665b90f1abd6df72cbbdaddf46c67
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Jun 17 13:36:08 2013 +0300

    port-ipa-client-automount.diff: Patch i-c-a so it works on Debian.

diff --git a/debian/changelog b/debian/changelog
index 7010bca..7bd8f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ freeipa (3.2.0-1) UNRELEASED; urgency=low
   * fix-ntpdate-opts.diff: Drop -U from nptdate opts, we don't have
     that.
   * Add support for Debian platform.
+  * port-ipa-client-automount.diff: Patch i-c-a so it works on Debian.
 
   [ Nick Hatch ]
   * Added three patches
diff --git a/debian/patches/port-ipa-client-automount.diff b/debian/patches/port-ipa-client-automount.diff
new file mode 100644
index 0000000..e4ca2f9
--- /dev/null
+++ b/debian/patches/port-ipa-client-automount.diff
@@ -0,0 +1,26 @@
+diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount
+index 3952642..e7b843e 100755
+--- a/ipa-client/ipa-install/ipa-client-automount
++++ b/ipa-client/ipa-install/ipa-client-automount
+@@ -39,10 +39,10 @@ from ipapython.ipa_log_manager import *
+ from ipapython.dn import DN
+ from ipapython import services as ipaservices
+ 
+-AUTOFS_CONF = '/etc/sysconfig/autofs'
++AUTOFS_CONF = '/etc/default/autofs'
+ NSSWITCH_CONF = '/etc/nsswitch.conf'
+ AUTOFS_LDAP_AUTH = '/etc/autofs_ldap_auth.conf'
+-NFS_CONF = '/etc/sysconfig/nfs'
++NFS_CONF = '/etc/default/nfs-common'
+ IDMAPD_CONF = '/etc/idmapd.conf'
+ 
+ def parse_options():
+@@ -309,7 +309,7 @@ def configure_nfs(fstore, statestore):
+     Configure secure NFS
+     """
+     replacevars = {
+-        'SECURE_NFS': 'yes',
++        'NEED_GSSD': 'yes',
+     }
+     ipautil.backup_config_and_replace_variables(fstore,
+         NFS_CONF, replacevars=replacevars)
diff --git a/debian/patches/series b/debian/patches/series
index 74629e6..78391ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ fix-symlink-exclusion.diff
 fix-ldap-conf-path.diff
 check-dbus-before-starting.diff
 add-debian-platform.diff
+port-ipa-client-automount.diff

commit 7601bdd79e44d56e747a88e171b82891b043bedd
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Jun 17 13:17:44 2013 +0300

    use --fail-missing

diff --git a/debian/changelog b/debian/changelog
index b182255..7010bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ freeipa (3.2.0-1) UNRELEASED; urgency=low
   * Add no-testcert.patch to not fail make-testcert.
   * Bump compat and debhelper build-depends to 9.
   * Add missing files to freeipa.install.
-  * Add --list-missing for dh_install.
+  * Add --fail-missing for dh_install.
   * copyright: Updated, with OpenSSL exception.
   * control: Add python-libipa-hbac to build-depends.
   * control: Add ${shlibs:Depends} to python-freeipa depends.
diff --git a/debian/rules b/debian/rules
index a574a75..9747500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ endif
 	# fix permissions
 	find $(CURDIR)/debian/tmp -name "*.mo" -type f -exec chmod -x "{}" \;
 
-	dh_install --list-missing
+	dh_install --fail-missing
 
 %:
 	dh $@ --with quilt,autoreconf,python2

commit 0edc87f39296a5ad37c6744ec6f68d9b530d0d98
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Jun 17 13:13:08 2013 +0300

    add ipa-client-automount to installed files

diff --git a/debian/freeipa-client.install b/debian/freeipa-client.install
index 6ae66de..03aac67 100644
--- a/debian/freeipa-client.install
+++ b/debian/freeipa-client.install
@@ -1,3 +1,4 @@
+usr/sbin/ipa-client-automount
 usr/sbin/ipa-client-install
 usr/sbin/ipa-getkeytab
 usr/sbin/ipa-rmkeytab
@@ -5,6 +6,7 @@ usr/sbin/ipa-join
 usr/share/ipa/ipaclient/ipa.cfg
 usr/share/ipa/ipaclient/ipa.js
 usr/lib/python*/dist-packages/ipaclient/*.py
+usr/share/man/man1/ipa-client-automount.1.gz
 usr/share/man/man1/ipa-client-install.1.gz
 usr/share/man/man1/ipa-getkeytab.1.gz
 usr/share/man/man1/ipa-rmkeytab.1.gz