Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (83a63a9a73da1e33d4c02c052fe2457c32ca00c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (83a63a9a73da1e33d4c02c052fe2457c32ca00c7)
  • Date: Mon, 13 Oct 2008 14:35:02 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/glibc/HISTORY | 5 +++++
libs/glibc/PRE_BUILD | 5 ++++-
libs/glibc/localtime.patch | 18 ++++++++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 83a63a9a73da1e33d4c02c052fe2457c32ca00c7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

glibc: Do not overwrite /etc/localtime (Bug #14548)

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index b163b8a..23ba8f9 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2008-10-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply localtime.patch for NPTL-based glibc
+ * localtime.patch: Do not overwrite /etc/localtime
+ Fixes Bug #14548
+
2008-09-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Set default version to show when unconfigured

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 67e3dcf..efdd22b 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -7,7 +7,10 @@ persistent_remove GLIBC_LIBIDN_DIR
&&
local GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION &&

if [ "$GLIBC_NPTL" = "y" ]; then
- cd $SOURCE_DIRECTORY &&
+ cd $SOURCE_DIRECTORY &&
+ patch $SOURCE_DIRECTORY/timezone/Makefile \
+ $SCRIPT_DIRECTORY/localtime.patch &&
+
if [ "$GLIBC_USEIDN" = "y" ]; then
#
# Unpack glibc-libidn
diff --git a/libs/glibc/localtime.patch b/libs/glibc/localtime.patch
new file mode 100644
index 0000000..12dd911
--- /dev/null
+++ b/libs/glibc/localtime.patch
@@ -0,0 +1,18 @@
+#
+# If /etc/localtime is a symlink, `test -r` fails and we get
+# http://bugs.sourcemage.org/show_bug.cgi?id=14548
+#
+# Signed-off-by: Eric Sandall <sandalle AT sourcemage.org>
+#
+diff -Naur glibc-2.7.orig/timezone/Makefile glibc-2.7/timezone/Makefile
+--- glibc-2.7.orig/timezone/Makefile 2008-10-12 23:17:37.971435756 -0700
++++ glibc-2.7/timezone/Makefile 2008-10-12 23:27:14.785187504 -0700
+@@ -144,7 +144,7 @@
+ $(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \
+ $(+force)
+ $(make-target-directory)
+- if test -r $@; then \
++ if test -r $@ || test -h $@; then \
+ echo Site timezone NOT reset to Factory.; \
+ else \
+ rm -f $@T; \



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (83a63a9a73da1e33d4c02c052fe2457c32ca00c7), Eric Sandall, 10/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page