diff options
author | Jaka Kranjc | 2008-10-14 13:16:15 +0200 |
---|---|---|
committer | Jaka Kranjc | 2008-10-14 13:16:15 +0200 |
commit | b4f609cb3e88f830cab1b8f50d57cfea6251870e (patch) | |
tree | b140cbf5b258f50a8f9490720acde3debe91107c | |
parent | f850136bf649c72306868dfffa407e28c8e3e04e (diff) |
glibc: Do not overwrite /etc/localtime (Bug #14548)
(cherry-picked from commit 83a63a9a73da1e33d4c02c052fe2457c32ca00c7)
-rw-r--r-- | libs/glibc/HISTORY | 5 | ||||
-rwxr-xr-x | libs/glibc/PRE_BUILD | 5 | ||||
-rwxr-xr-x | libs/glibc/localtime.patch | 18 |
3 files changed, 27 insertions, 1 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index b163b8af4c..23ba8f9e97 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,3 +1,8 @@ +2008-10-13 Eric Sandall <sandalle@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@sourcemage.org> * DETAILS: Set default version to show when unconfigured diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index 67e3dcf8f2..efdd22b4ed 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 100755 index 0000000000..12dd911f31 --- /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@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; \ |