r883 - in glibc-package/trunk/debian: . patches
Author: gotom
Date: 2005-04-16 08:46:56 +0000 (Sat, 16 Apr 2005)
New Revision: 883
Added:
glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch
Modified:
glibc-package/trunk/debian/changelog
Log:
- Khalid Aziz <khalid_aziz@hp.com>:
- debian/patches/glibc232-clock_settime.dpatch: Fix clock_settime
always fails with EINVAL. (Closes: #304668)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-04-14 15:04:26 UTC (rev 882)
+++ glibc-package/trunk/debian/changelog 2005-04-16 08:46:56 UTC (rev 883)
@@ -37,6 +37,9 @@
- debian/po/pl.po: Add Polish debconf translation. (Closes: #294444)
- Matti Polla <mpo@iki.fi>:
- debian/po/fi.po: Add Finnish debconf translation. (Closes: #303816)
+ - Khalid Aziz <khalid_aziz@hp.com>:
+ - debian/patches/glibc232-clock_settime.dpatch: Fix clock_settime
+ always fails with EINVAL. (Closes: #304668)
-- GOTO Masanori <gotom@debian.org> Mon, 14 Feb 2005 09:26:26 +0900
Added: glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch 2005-04-14 15:04:26 UTC (rev 882)
+++ glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch 2005-04-16 08:46:56 UTC (rev 883)
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: There is a typo in clock_settime which causes
+# DP: any and every call to clock_settime to terminate with EINVAL.
+# DP: Related bugs: #304668: calls to clock_settime() fail with "invalid argument" error always
+# DP: Dpatch author: Khalid Aziz <khalid.aziz@hp.com>
+# DP: Patch author:
+# DP: Upstream status: In CVS
+# DP: Status Details:
+# DP: Date: 2005-04-13
+
+PATCHLEVEL=1
+
+if [ $# -ne 2 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
+ -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+--- glibc-2.3.2/sysdeps/unix/clock_settime.c 2005-04-13 10:51:46.299187007 -0600
++++ glibc-2.3.2-settime_fix/sysdeps/unix/clock_settime.c 2005-04-13 10:51:32.786491860 -0600
+@@ -64,8 +64,8 @@ clock_settime (clockid_t clock_id, const
+ retval = settimeofday (&tv, NULL); \
+ } while (0)
+
+-#ifdef SYSDEP_GETTIME
+- SYSDEP_GETTIME;
++#ifdef SYSDEP_SETTIME
++ SYSDEP_SETTIME;
+ #endif
+
+ #ifndef HANDLED_REALTIME
Reply to: