Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.26 grimoire by Jaka Kranjc (218d6ff0cc5adf1d0dbe354f6b99f173a348dc24)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.26 grimoire by Jaka Kranjc (218d6ff0cc5adf1d0dbe354f6b99f173a348dc24)
  • Date: Tue, 14 Oct 2008 06:17:43 -0500

GIT changes to stable-rc-0.26 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

gnome2-libs/goffice/CONFLICTS | 4 ++--
gnome2-libs/goffice/HISTORY | 4 ++++
libs/glibc/HISTORY | 5 +++++
libs/glibc/PRE_BUILD | 5 ++++-
libs/glibc/localtime.patch | 18 ++++++++++++++++++
php-pear/php/BUILD | 2 +-
php-pear/php/HISTORY | 3 +++
7 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit 218d6ff0cc5adf1d0dbe354f6b99f173a348dc24
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

goffice: Auto-conflict with deprecated spells (Bug #14828)

(cherry-picked from commit 7e6e41ccbedec7442b16e3afddd5ee208a754322)

commit b4f609cb3e88f830cab1b8f50d57cfea6251870e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

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

(cherry-picked from commit 83a63a9a73da1e33d4c02c052fe2457c32ca00c7)

commit f850136bf649c72306868dfffa407e28c8e3e04e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

php-pear/php: fix building of IMAP extension with SSL (Bug #14779)

(cherry-picked from commit 5022c97fbe5b95ee3cbab78819f8f4cce3d4a6cf)

diff --git a/gnome2-libs/goffice/CONFLICTS b/gnome2-libs/goffice/CONFLICTS
index d2334a6..3b93106 100755
--- a/gnome2-libs/goffice/CONFLICTS
+++ b/gnome2-libs/goffice/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts goffice-0.5 &&
-conflicts goffice-0.6
+conflicts goffice-0.5 y &&
+conflicts goffice-0.6 y
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index eefb84a..3b8dc64 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,7 @@
+2008-10-14 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflict with deprecated packages
+ Fixes Bug #14828
+
2008-09-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.5

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 100755
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; \
diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index a368c6e..9a453e8 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -8,7 +8,7 @@ if list_find "${OPTS}" "--enable-cgi" || list_find "${OPTS}"
"--enable-fastcgi";
fi &&

# Setup SSL IMAP if desired
-if list_find "${OPTS}" "--with-imap"; then
+if list_find "${OPTS}" "--with-imap=${INSTALL_ROOT}/usr"; then
# Setup SSL IMAP if desired
local CCLIENT=$(get_spell_provider $SPELL C-CLIENT) &&

diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 5798568..df6bc80 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2008-10-08 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD: fix building of IMAP extension with SSL (Bug #14799)
+
2008-09-06 Elisamuel Resto <ryuji AT sourcemage.org>
* DEPENDS: added tidy as a optional dependency




  • [SM-Commit] GIT changes to stable-rc-0.26 grimoire by Jaka Kranjc (218d6ff0cc5adf1d0dbe354f6b99f173a348dc24), Jaka Kranjc, 10/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page