fix-ntpdate-opts.diff: Drop -U from nptdate opts, we don't have that.

debian/changelog

@@ -35,5 +35,7 @@ freeipa (3.1.2-1) UNRELEASED; urgency=low
     platform specific path.
   * fix-install-layout.diff: Pass an option to setup-client.py to
     install the python bits to the correct path.
+  * fix-ntpdate-opts.diff: Drop -U from nptdate opts, we don't have
+    that.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 01 Nov 2011 10:52:25 -0400

debian/patches/fix-ntpdate-opts.diff

@@ -0,0 +1,13 @@
+Our ntp isn't patched to drop privileges.
+
+--- a/ipa-client/ipaclient/ntpconf.py
++++ b/ipa-client/ipaclient/ntpconf.py
+@@ -147,7 +147,7 @@ def synconce_ntp(server_fqdn):
+     if os.path.exists(ntpdate):
+         # retry several times -- logic follows /etc/init.d/ntpdate
+         # implementation
+-        cmd = [ntpdate, "-U", "ntp", "-s", "-b", "-v", server_fqdn]
++        cmd = [ntpdate, "-s", "-b", "-v", server_fqdn]
+         for retry in range(0, 3):
+             try:
+                 ipautil.run(cmd)

debian/patches/series

@@ -7,3 +7,4 @@ no-test-lang.diff
 correct-python-path.diff
 dont-search-platform-path.diff
 fix-install-layout.diff
+fix-ntpdate-opts.diff