r26416 - in /desktop/unstable/system-tools-backends/debian: changelog patches/04_empty_ntp.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jan 24 21:03:17 2011
New Revision: 26416

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26416
Log:
04_empty_ntp.patch: stolen from upstream git. Don’t create an empty 
ntp.conf file. Closes: #397648.

Added:
    desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch
Modified:
    desktop/unstable/system-tools-backends/debian/changelog
    desktop/unstable/system-tools-backends/debian/patches/series

Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=26416&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/changelog [utf-8] Mon Jan 24 21:03:17 2011
@@ -1,7 +1,13 @@
 system-tools-backends (2.10.1-3) UNRELEASED; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * debian/patches/03_hostname.patch:
     - Forwarded upstream, add header.
+
+  [ Josselin Mouette ]
+  * 04_empty_ntp.patch: stolen from upstream git. Don’t create an empty 
+    ntp.conf file. Closes: #397648.
+
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 18 Dec 2010 01:38:12 +0000
 

Added: desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch?rev=26416&op=file
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch (added)
+++ desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch [utf-8] Mon Jan 24 21:03:17 2011
@@ -1,0 +1,28 @@
+From 3a6c2f9d5b024bab6ac9e6b6ef5e41d9197286a6 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson at canonical.com>
+Date: Mon, 06 Dec 2010 13:15:23 +0000
+Subject: bgo#449267 - Don't create empty NTP configuration files
+
+If /etc/ntp.conf (or the platform equivalent) doesn't exist, then merely
+synchronising the clock in time-admin would create it as an empty file.
+This caused other time syncing problems later (see e.g.
+https://bugs.launchpad.net/bugs/83604).
+---
+diff --git a/Time/NTP.pm b/Time/NTP.pm
+index e7be3a9..026ba3e 100644
+--- a/Time/NTP.pm
++++ b/Time/NTP.pm
+@@ -75,6 +75,11 @@ sub ntp_conf_replace
+   my ($line_key, $val, $rest);
+   my ($n, $ret);
+ 
++  # If config file does not exist, and no server has to be written,
++  # don't create and empty file that will confuse package managers.
++  # Notably, this avoids creating an empty file when simply running ntpdate.
++  return if (!&Utils::File::exists ($file) && !@$value);
++
+   &Utils::Report::enter ();
+   &Utils::Report::do_report ("replace_split", $key, $file);
+ 
+--
+cgit v0.8.3-6-g21f6

Modified: desktop/unstable/system-tools-backends/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/series?rev=26416&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/series [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/patches/series [utf-8] Mon Jan 24 21:03:17 2011
@@ -1,3 +1,4 @@
 01_kfreebsd.diff
 02ubuntu_chmod_network_interfaces_when_using_key.patch
 03_hostname.patch
+04_empty_ntp.patch