summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2009-02-20 09:15:27 +0100
committerTreeve Jelbert2009-02-20 09:15:27 +0100
commit104d3d4715e19faa20bbcecb39a6df4c853a7704 (patch)
treef9f7f431b97e11e1b974f52164fbef7fed084b81
parent9a3419ce57e1863f449c62a9295e6411a2160d92 (diff)
parent86978705f54f6efdfe66c37878755b68b4f72d49 (diff)
Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xdatabase/mysql/DETAILS2
-rw-r--r--database/mysql/HISTORY7
-rwxr-xr-xdatabase/mysql/PRE_BUILD3
-rw-r--r--database/mysql/big_tables.patch18
-rwxr-xr-xdoc/docbook-xsl/DETAILS2
-rw-r--r--doc/docbook-xsl/HISTORY3
-rw-r--r--doc/docbook-xsl/docbook-xsl-1.74.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--doc/docbook-xsl/docbook-xsl-1.74.2.tar.bz2.sigbin0 -> 287 bytes
-rw-r--r--graphics-libs/mesalib/HISTORY4
-rwxr-xr-xgraphics-libs/mesalib/PRE_BUILD1
-rwxr-xr-xnet/dhcpcd/DETAILS8
-rw-r--r--net/dhcpcd/HISTORY3
12 files changed, 44 insertions, 7 deletions
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index 0bf2ad203a..c0702ba01f 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -3,7 +3,7 @@ if [ "$OLD" == "y" ];then
VERSION=4.1.22
SECURITY_PATCH=4
else
- VERSION=5.0.75
+ VERSION=5.0.77
SECURITY_PATCH=3
fi
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index bf99e838ff..2075bc76ae 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,9 @@
+2009-02-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 5.0.77
+ * big_tables.patch: added, apply the patch to kill the warn about
+ max_join_size value on 32bit systems
+ * PRE_BUILD: apply the patch
+
2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org
* PRE_SUB_DEPENDS, SUB_DEPENDS: switched subdepends to uppercase
(fixed bug #15054)
@@ -405,4 +411,3 @@
added --with-mysqld-ldflags=-all-static to configure, in order
to build mysql statically. Performance gain is approx 13%
chown -R mysql.mysql /var/lib/mysql for correct ownership
-
diff --git a/database/mysql/PRE_BUILD b/database/mysql/PRE_BUILD
index db6414aa1f..c0f708d327 100755
--- a/database/mysql/PRE_BUILD
+++ b/database/mysql/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+patch -p0 < "$SPELL_DIRECTORY/big_tables.patch" &&
+
sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in
diff --git a/database/mysql/big_tables.patch b/database/mysql/big_tables.patch
new file mode 100644
index 0000000000..c1ac81fcbf
--- /dev/null
+++ b/database/mysql/big_tables.patch
@@ -0,0 +1,18 @@
+--- include/my_base.h.orig 2009-01-30 00:42:12.000000000 +0300
++++ include/my_base.h 2009-02-20 02:06:46.452883556 +0300
+@@ -41,6 +41,15 @@
+ #endif /* stdin */
+ #include <my_list.h>
+
++/*
++ Clean workaround for inconsistent BIG_TABLES define issue
++ http://bugs.mysql.com/35346
++ Author: Antony Curtis, patch created by Arjen Lentz
++*/
++
++#undef BIG_TABLES
++#define BIG_TABLES 1
++
+ /* The following is bits in the flag parameter to ha_open() */
+
+ #define HA_OPEN_ABORT_IF_LOCKED 0 /* default */
diff --git a/doc/docbook-xsl/DETAILS b/doc/docbook-xsl/DETAILS
index a6fd7429d4..1b152f6f30 100755
--- a/doc/docbook-xsl/DETAILS
+++ b/doc/docbook-xsl/DETAILS
@@ -1,5 +1,5 @@
SPELL=docbook-xsl
- VERSION=1.74.1
+ VERSION=1.74.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/docbook/$SOURCE
diff --git a/doc/docbook-xsl/HISTORY b/doc/docbook-xsl/HISTORY
index 9490d65df1..a32b5b4b81 100644
--- a/doc/docbook-xsl/HISTORY
+++ b/doc/docbook-xsl/HISTORY
@@ -1,3 +1,6 @@
+2009-02-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.74.2
+
2009-02-18 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.74.1
diff --git a/doc/docbook-xsl/docbook-xsl-1.74.1.tar.bz2.sig b/doc/docbook-xsl/docbook-xsl-1.74.1.tar.bz2.sig
deleted file mode 100644
index 6403aa1bf8..0000000000
--- a/doc/docbook-xsl/docbook-xsl-1.74.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/doc/docbook-xsl/docbook-xsl-1.74.2.tar.bz2.sig b/doc/docbook-xsl/docbook-xsl-1.74.2.tar.bz2.sig
new file mode 100644
index 0000000000..cacd010683
--- /dev/null
+++ b/doc/docbook-xsl/docbook-xsl-1.74.2.tar.bz2.sig
Binary files differ
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index c4f43728b4..6363f2e78d 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2009-02-20 Juuso Alasuutari <iuso@sourcemage.org>
+ * PRE_BUILD: Fix git build by changing to $SOURCE_DIRECTORY
+ before running ./autogen.sh.
+
2009-02-09 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DEPENDS: removed smgl-gl_select
* FINAL: using internal glselect
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 58adf3718e..c668c6130f 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -31,5 +31,6 @@ cd ${SOURCE_DIRECTORY}/src/glw &&
sedit "s:/X11R6::g" Makefile &&
if [[ $MESALIB_GIT == y ]]; then
+ cd "$SOURCE_DIRECTORY" &&
./autogen.sh
fi
diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index 8047c54e1d..685a3520f6 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,10 +1,10 @@
SPELL=dhcpcd
if [[ $DHCPCD_DEVEL == y ]]; then
- VERSION=4.0.10
- SOURCE_HASH=sha512:993d374a8224f992c19f903aef79767b4578df480c61099970ca5492cfbe3241709bf047a6fcbfd451d2b718a7bc655c0dce9bbb3e692314da9be2152155b9c3
+ VERSION=4.0.11
+ SOURCE_HASH=sha512:a957e93c400ace84476ccb8d719aec49b9a900fe9ff25c2648c0a52ef90027aa2cf07dfdae22e54566e9926720a082d19bcb455936ebb3a4bdf4a21598e44e7a
else
- VERSION=4.0.10
- SOURCE_HASH=sha512:993d374a8224f992c19f903aef79767b4578df480c61099970ca5492cfbe3241709bf047a6fcbfd451d2b718a7bc655c0dce9bbb3e692314da9be2152155b9c3
+ VERSION=4.0.11
+ SOURCE_HASH=sha512:a957e93c400ace84476ccb8d719aec49b9a900fe9ff25c2648c0a52ef90027aa2cf07dfdae22e54566e9926720a082d19bcb455936ebb3a4bdf4a21598e44e7a
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index b52a6062a6..a5ba145d29 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2009-02-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 4.0.11
+
2009-02-04 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.0.10