ports/171227: [MAINTAINER] databases/mariadb-server: upstream upgrade
geoffroy desvernay
dgeo at centrale-marseille.fr
Sun Sep 2 19:10:14 UTC 2012
The following reply was made to PR ports/171227; it has been noted by GNATS.
From: geoffroy desvernay <dgeo at centrale-marseille.fr>
To: bug-followup at FreeBSD.org, dgeo at centrale-marseille.fr
Cc:
Subject: Re: ports/171227: [MAINTAINER] databases/mariadb-server: upstream
upgrade
Date: Sun, 02 Sep 2012 21:01:44 +0200
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig38F1F1A0A7F8FCE5377F80DA
Content-Type: multipart/mixed;
boundary="------------000106090601060406030407"
This is a multi-part message in MIME format.
--------------000106090601060406030407
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
merging upstream version upgrade with this patch: please commit this one =
:)
--=20
geoffroy desvernay
--------------000106090601060406030407
Content-Type: text/x-diff;
name="mariadb-port-5.3.7-5.3.8.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="mariadb-port-5.3.7-5.3.8.diff"
=3D=3D=3D> Generating patch
=3D=3D=3D> Viewing diff with more
diff -ruN --exclude=3DCVS ../mariadb-server.orig/Makefile ./Makefile
--- ../mariadb-server.orig/Makefile 2012-06-18 02:07:28.000000000 +0200
+++ ./Makefile 2012-09-02 19:08:08.000000000 +0200
@@ -5,8 +5,7 @@
# $FreeBSD: ports/databases/mariadb-server/Makefile,v 1.18 2012/06/18 00=
:07:28 sylvio Exp $
=20
PORTNAME=3D mariadb
-PORTVERSION=3D 5.3.7
-PORTREVISION?=3D 0
+PORTVERSION=3D 5.3.8
CATEGORIES=3D databases ipv6
MASTER_SITES=3D http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERS=
ION}/kvm-tarbake-jaunty-x86/ \
http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-ta=
rbake-jaunty-x86/ \
@@ -52,7 +51,7 @@
=20
.if !defined(MARIADB_CLIENT_SLAVE)
CONFIGURE_ARGS+=3D --with-libevent=3D${LOCALBASE}
-LIB_DEPENDS+=3D event-1.4:${PORTSDIR}/devel/libevent
+LIB_DEPENDS+=3D event-1:${PORTSDIR}/devel/libevent
=20
MAN1=3D innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \=
myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \
@@ -69,7 +68,7 @@
ARCHIVE "Archive storage plugin" On \
BLACKHOLE "Blackhole storage engine" On \
SPHINX "SE client for Sphinx search daemon" On \
- FEDX "FederatedX storage engine (Federated replacement)" On \
+ FEDX "FederatedX (new) storage engine" On \
FEDERATED "Federated (old) storage engine" Off \
XTRADB "XtraDB (InnoDB replacement) engine" On \
INNODB "InnoDB (old) engine" Off \
@@ -78,7 +77,8 @@
PARTITION "Partitioning support" Off \
HANDLERSOCKET "HandlerSocket support" On \
NDB "Enable NDB support (implies PARTITION)" Off \
- EXAMPLES "Example engine,daemon and ftsearch plugins" Off
+ EXAMPLES "Example engine,daemon and ftsearch plugins" Off \
+ MAXKEY "Change max key length from 1000 to 4000" Off
.endif # .if !defined(MARIADB_CLIENT_SLAVE)
=20
.include <bsd.port.options.mk>
@@ -179,7 +179,7 @@
.if defined(WITH_OQGRAPH)
CONFIGURE_ARGS+=3D --with-plugin-oqgraph
PLIST_SUB+=3D OQGRAPH=3D""
-LIB_DEPENDS+=3D boost_system.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=3D boost_system:${PORTSDIR}/devel/boost-libs
PLUGINS+=3D oqgraph
.else
CONFIGURE_ARGS+=3D --without-plugin-oqgraph
@@ -220,6 +220,9 @@
.else
PLIST_SUB+=3D STATIC=3D""
.endif
+.if defined(WITH_MAXKEY)
+EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch-include__my_handler.h
+.endif
.endif # .if !defined(MARIADB_CLIENT_SLAVE)
=20
.if defined(WITH_CHARSET) && ${WITH_CHARSET} !=3D ""
@@ -259,7 +262,7 @@
@${ECHO} " Other built-in charsets (default: complex, selected: ${WITH=
_XCHARSET})."
@${ECHO} ''
=20
-EXTRA_PATCHES=3D ${FILESDIR}/scripts__Makefile.in
+EXTRA_PATCHES+=3D ${FILESDIR}/scripts__Makefile.in
MDB_SERVER_SUBDIRS=3D include @docs_dirs@ sql-common libservices mysys s=
trings dbug ${MDB_EXTRA_SUBDIRS} unittest cmd-line-utils libmysql scripts=
@sql_server_dirs@ @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files=
=20
post-patch:
diff -ruN --exclude=3DCVS ../mariadb-server.orig/distinfo ./distinfo
--- ../mariadb-server.orig/distinfo 2012-06-18 02:07:28.000000000 +0200
+++ ./distinfo 2012-09-02 19:02:51.000000000 +0200
@@ -1,2 +1,2 @@
-SIZE (mariadb-5.3.7.tar.gz) =3D 26741196
-SHA256 (mariadb-5.3.7.tar.gz) =3D 463386ca84128a162e63137c8f6666859b94e2=
abf490b6ab2306f846a13fe9bc
+SHA256 (mariadb-5.3.8.tar.gz) =3D ba175431eb8e5d21f0a3cfac11fe4296ccb92a=
b4fd920ff4e907a45b7fb342ed
+SIZE (mariadb-5.3.8.tar.gz) =3D 26798886
diff -ruN --exclude=3DCVS ../mariadb-server.orig/files/extra-patch-includ=
e__my_handler.h ./files/extra-patch-include__my_handler.h
--- ../mariadb-server.orig/files/extra-patch-include__my_handler.h 1970-0=
1-01 01:00:00.000000000 +0100
+++ ./files/extra-patch-include__my_handler.h 2012-09-02 19:01:58.0000000=
00 +0200
@@ -0,0 +1,11 @@
+--- include/my_handler.h.orig 2012-08-30 21:44:42.000000000 +0200
++++ include/my_handler.h 2012-08-30 21:45:23.000000000 +0200
+@@ -34,7 +34,7 @@
+ But beware the dependency of HA_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_=
LENGTH.
+ */
+=20
+-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes =
*/
++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes =
*/
+ #define HA_MAX_KEY_SEG 32 /* Max segments for key=
*/
+=20
+ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)=20
=3D=3D=3D> Done
--------------000106090601060406030407--
--------------enig38F1F1A0A7F8FCE5377F80DA
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBCAAGBQJQQ60YAAoJEC0NWrh8JT1SjnwH/RDs5BDC6e7ALVMiVbE2PX91
UBMVxuXnt3hN7ZIrSb6S4IC/sFuTDP6lmOTL4suRL4qaVPHGHfUt77D90DBfueZ1
Q16tu7SSJmAiniki8aVCFR7lsMInJ7/gkVbHck7466HtyRFoFDDAIlK2ITDdna5+
Ie46KOR2Ue9xN0/chLvlEAa/V7hrphn/oeES94/GUZJfld+S5w1ZhDm/e6LKG8vs
P8j+Z9KsPgL62Cim1aBj5JfP5Yko+uKtbUxK2golh8J52XBDuWOWgxs8C+7gc3W5
ixYoQeCSXLElnsvN/FSUIWpuE0VMAx/hfpaPLItG6gvXPfYPHkhrviZ53lqKBLU=
=WvjO
-----END PGP SIGNATURE-----
--------------enig38F1F1A0A7F8FCE5377F80DA--
More information about the freebsd-ports-bugs
mailing list