Skip to Content.
Sympa Menu

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

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 (03202ae8eb396543597cc2b00a6befdd0ed12bba)
  • Date: Sun, 12 Apr 2009 04:23:25 -0500

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

database/mysql/DEPENDS | 15 +++++++++++----
database/mysql/DETAILS | 5 ++---
database/mysql/HISTORY | 6 ++++++
database/mysql/PREPARE | 2 +-
database/mysql/UP_TRIGGERS | 16 ++++++++++++++++
5 files changed, 36 insertions(+), 8 deletions(-)

New commits:
commit 03202ae8eb396543597cc2b00a6befdd0ed12bba
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mysql: Updated to 5.1.32
Old is now 5.0.77 and new is 5.1.32
Old 4.1.22 has been removed
5.1.x uses --with-ssl instead of --with-openssl
Recast spells using the old libmysqlclient.so.15
library from 5.0.x

diff --git a/database/mysql/DEPENDS b/database/mysql/DEPENDS
index d17c92f..6c691a2 100755
--- a/database/mysql/DEPENDS
+++ b/database/mysql/DEPENDS
@@ -3,10 +3,17 @@ depends perl &&
depends procps &&
depends g++ &&

-optional_depends openssl \
- "--with-openssl" \
- "--without-openssl" \
- "for OpenSSL support" &&
+if [[ "$OLD" == "y" ]]; then
+ optional_depends openssl \
+ "--with-openssl" \
+ "--without-openssl" \
+ "for OpenSSL support"
+else
+ optional_depends openssl \
+ "--with-ssl" \
+ "--without-ssl" \
+ "for OpenSSL support"
+fi &&

if ! list_find "$MSQL_ENGINES" "none" && list_find "$MSQL_ENGINES"
"BerkeleyDB"; then
depends db "--with-berkeley-db"
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index c0702ba..ec99c77 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -1,10 +1,9 @@
SPELL=mysql
if [ "$OLD" == "y" ];then
- VERSION=4.1.22
- SECURITY_PATCH=4
-else
VERSION=5.0.77
SECURITY_PATCH=3
+else
+ VERSION=5.1.32
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 0d6ecb8..21d46e4 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,9 @@
+2009-04-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Old is now 5.0.x and new is 5.1.x
+ * DEPENDS: 5.1.x uses --with-ssl instead of --with-openssl
+ * UP_TRIGGERS: Recast spells using the old libmysqlclient.so.15
library
+ from 5.0.x
+
2009-04-07 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added openssl a opt dep

diff --git a/database/mysql/PREPARE b/database/mysql/PREPARE
index 74a520a..aecd36e 100755
--- a/database/mysql/PREPARE
+++ b/database/mysql/PREPARE
@@ -1 +1 @@
-config_query OLD "Build old 4.1.X series?" n
+config_query OLD "Build old 5.0.X series?" n
diff --git a/database/mysql/UP_TRIGGERS b/database/mysql/UP_TRIGGERS
new file mode 100755
index 0000000..000b21c
--- /dev/null
+++ b/database/mysql/UP_TRIGGERS
@@ -0,0 +1,16 @@
+# up_trigger everything on update to 5.1.32 as most stuff links to
libmysqlclient.so.15 from version 5.0.77
+
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
+ message "This is a possibly incompatible update of libmysql..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libmysqlclient.so.15"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (03202ae8eb396543597cc2b00a6befdd0ed12bba), Eric Sandall, 04/12/2009

Archive powered by MHonArc 2.6.24.

Top of Page