v2.12r-12

diff --git a/debian/changelog b/debian/changelog
index fbdc4ba4f4fb7c8f54996c842723f82a2750b3d8..ef98a299c7b840427a61570ac01d3cd5266d52f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+util-linux (2.12r-12) unstable; urgency=low
+
+  * drop hwclockfirst.sh, and put hwclock.sh back at 50.  See #50572 and
+    Closes: #342887
+  * Deal with _syscall5 going away.  Patch imported from Ubuntu.
+    Closes: #392236
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 19 Oct 2006 19:01:33 -0600
+
 util-linux (2.12r-11) unstable; urgency=low
 
   * typos in NFSv4 (GSSDLCK didn't have .pid, and the latest

diff --git a/debian/conffiles b/debian/conffiles
index 6ec76383d877b527dc33d7abaf1dbd106e414a2e..fed2b27457eafffbc0f8a2daeaba19f65e15495c 100644 (file)
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -1,2 +1 @@
 /etc/init.d/hwclock.sh
-/etc/init.d/hwclockfirst.sh

diff --git a/debian/patches/00list b/debian/patches/00list
index 7868cc3737c4fee8cea9c4259077febc8043d121..3e4e80694aeca329695262d5a13d7d436b3bf289 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -15,3 +15,4 @@
 #20xgethostname
 #50hurd
 60_opt_O1
+65_llseek-syscall

diff --git a/debian/patches/65_llseek-syscall.dpatch b/debian/patches/65_llseek-syscall.dpatch
new file mode 100755 (executable)
index 0000000..fa83078
--- /dev/null
+++ b/debian/patches/65_llseek-syscall.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 65_llseek-syscall.dpatch by Scott James Remnant <scott@netsplit.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad util-linux-2.12r~/fdisk/llseek.c util-linux-2.12r/fdisk/llseek.c
+--- util-linux-2.12r~/fdisk/llseek.c   2006-08-21 16:26:32.000000000 +0200
++++ util-linux-2.12r/fdisk/llseek.c    2006-08-21 16:26:40.000000000 +0200
+@@ -31,9 +31,11 @@
+ 
+ #ifdef __NR__llseek
+ 
+-static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
+-               unsigned long, offset_low,long long *,result,
+-               unsigned int, origin)
++static int _llseek (unsigned int fd, unsigned long oh,
++                  unsigned long ol, long long *result,
++                  unsigned int origin) {
++      return syscall (__NR__llseek, fd, oh, ol, result, origin);
++}
+ 
+ #else
+ 
+diff -urNad util-linux-2.12r~/fdisk/sfdisk.c util-linux-2.12r/fdisk/sfdisk.c
+--- util-linux-2.12r~/fdisk/sfdisk.c   2005-01-04 23:31:57.000000000 +0100
++++ util-linux-2.12r/fdisk/sfdisk.c    2006-08-21 16:27:54.000000000 +0200
+@@ -178,8 +178,10 @@
+ 
+ #ifndef use_lseek
+ static __attribute__used
+-_syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
+-       loff_t *, res, unsigned int, wh);
++int _llseek (unsigned int fd, ulong hi, ulong lo,
++       loff_t *res, unsigned int wh) {
++      return syscall (__NR__llseek, fd, hi, lo, res, wh);
++}
+ #endif
+ 
+ static int

diff --git a/debian/postinst b/debian/postinst
index 27df538ffcb61f4d4289ead30b3a1790dcdb08f1..287a71379624addc83d18dc323e16d9b43b2295c 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -26,9 +26,9 @@ if [ "$(uname -s)" = "Linux" ]; then
     model=$(uname -m)
     if [ ${model%x} != "s390" ]; then
         update-rc.d -f hwclock.sh remove 2>/dev/null > /dev/null
-        update-rc.d hwclock.sh start 22 S . stop 25 0 6 . > /dev/null
+        update-rc.d hwclock.sh start 50 S . stop 25 0 6 . > /dev/null
         update-rc.d -f hwclockfirst.sh remove 2>/dev/null > /dev/null
-        update-rc.d hwclockfirst.sh start 18 S . > /dev/null
+        #update-rc.d hwclockfirst.sh start 18 S . > /dev/null
     fi
 fi
 

diff --git a/debian/rules b/debian/rules
index 967fc5a4351c3d66dbf199ae65e7cb7d75665c95..7d6ae9b793d7ab62c3d1184ffb83d0e767702c2a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ SBINFILES = disk-utils/mkswap
 
 ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
 ifneq ($(arch),$(nohwclock))
-INITFILES = debian/hwclock.sh debian/hwclockfirst.sh
+INITFILES = debian/hwclock.sh # debian/hwclockfirst.sh
 SBINFILES += hwclock/hwclock
 endif
 BINFILES  += sys-utils/dmesg