Upgrade of mariadb to 5.2.5 Please apply patch from ports/156377 before this one. New files: files/patch-sql::mysqld.cc and files/patch-extra::yassl::src::yassl_error.cpp from https://bugs.launchpad.net/maria/+bug/729059 to let mariadb compile correctly. --- mariadb-5.2.5.diff begins here --- diff -ruN mariadb-5.2.4/Makefile mariadb/Makefile --- mariadb-5.2.4/Makefile 2011-04-27 16:48:59.284715000 +0200 +++ mariadb/Makefile 2011-04-27 15:16:33.882360000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= mariadb -PORTVERSION= 5.2.4 +PORTVERSION= 5.2.5 CATEGORIES= databases MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ @@ -18,11 +18,11 @@ http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ MAINTAINER= dgeo@centrale-marseille.fr -COMMENT= A database server that offers drop-in replacement functionality for MySQL +COMMENT= A database server - drop-in replacement functionality for MySQL LICENSE= GPLv2 -CONFLICTS= mysql-server-[0-9]* mysql-client-[0-9]* +CONFLICTS= mysql-server-[0-9]* mysql-client-[0-9]* mysql-scripts-[0-9]* CONFIGURE_ARGS= --with-embedded-server DATADIR= ${PREFIX}/share/mysql @@ -97,9 +97,9 @@ @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)." - @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')." - @${ECHO} " WITH_COLLATION=collate Define default collation (latin1_swedish_ci)." + @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (def: latin1 selected: ${WITH_CHARSET})." + @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (selected: ${WITH_XCHARSET})." + @${ECHO} " WITH_COLLATION=collate Define default collation (def: latin1_swedish_ci selected: ${WITH_COLLATION})." @${ECHO} "" post-patch: diff -ruN mariadb-5.2.4/distinfo mariadb/distinfo --- mariadb-5.2.4/distinfo 2011-01-08 09:11:02.000000000 +0100 +++ mariadb/distinfo 2011-04-27 14:30:08.038530000 +0200 @@ -1,2 +1,2 @@ -SHA256 (mariadb-5.2.4.tar.gz) = 1aadddbe8e6d230ad16173b812d24801c493fe96c82d6bb36541e0138e5025dc -SIZE (mariadb-5.2.4.tar.gz) = 24964617 +SHA256 (mariadb-5.2.5.tar.gz) = 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1 +SIZE (mariadb-5.2.5.tar.gz) = 24925585 diff -ruN mariadb-5.2.4/files/patch-extra::yassl::src::yassl_error.cpp mariadb/files/patch-extra::yassl::src::yassl_error.cpp --- mariadb-5.2.4/files/patch-extra::yassl::src::yassl_error.cpp 1970-01-01 01:00:00.000000000 +0100 +++ mariadb/files/patch-extra::yassl::src::yassl_error.cpp 2011-04-27 14:42:16.650931000 +0200 @@ -0,0 +1,13 @@ +--- extra/yassl/src/yassl_error.cpp 2010-04-28 12:52:24 +0000 ++++ extra/yassl/src/yassl_error.cpp 2011-03-01 17:03:38 +0000 +@@ -128,7 +128,7 @@ + break; + + case badVersion_error : +- strncpy(buffer, "protocl version mismatch", max); ++ strncpy(buffer, "protocol version mismatch", max); + break; + + case compress_error : + + diff -ruN mariadb-5.2.4/files/patch-sql::mysqld.cc mariadb/files/patch-sql::mysqld.cc --- mariadb-5.2.4/files/patch-sql::mysqld.cc 1970-01-01 01:00:00.000000000 +0100 +++ mariadb/files/patch-sql::mysqld.cc 2011-04-27 14:42:36.862940000 +0200 @@ -0,0 +1,14 @@ +--- sql/mysqld.cc 2011-02-28 17:39:30 +0000 ++++ sql/mysqld.cc 2011-03-04 10:39:27 +0000 +@@ -744,9 +744,7 @@ + /* Static variables */ + + static bool kill_in_progress, segfaulted; +-#ifdef HAVE_STACKTRACE + static my_bool opt_stack_trace; +-#endif /* HAVE_STACKTRACE */ + static my_bool opt_bootstrap, opt_myisam_log; + static int cleanup_done; + static ulong opt_specialflag, opt_myisam_block_size; + + --- mariadb-5.2.5.diff ends here ---
refactored a bit: selections of available engines by OPTIONS. A new file more: pkg-message -- *geoffroy desvernay*
Responsible Changed From-To: freebsd-ports-bugs->beech I'll take it
This port required some clean-up. This diff is against the tree including ports/156377. Please review and approve. -- --------------------------------------------------------------------------------------- Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org /"\ ASCII Ribbon Campaign | FreeBSD Since 4.x \ / - NO HTML/RTF in e-mail | http://people.freebsd.org/~beech X - NO Word docs in e-mail | Skype: akbeech / \ - http://www.FreeBSD.org/releases/8.2R/announce.html ---------------------------------------------------------------------------------------
My mail prog is dropping attachments, try this. This port required some clean-up. This diff is against the tree including ports/156377. Please review and approve. -- --------------------------------------------------------------------------------------- Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org /"\ ASCII Ribbon Campaign | FreeBSD Since 4.x \ / - NO HTML/RTF in e-mail | http://people.freebsd.org/~beech X - NO Word docs in e-mail | Skype: akbeech / \ - http://www.FreeBSD.org/releases/8.2R/announce.html ---------------------------------------------------------------------------------------
Approved, thanks ! -- *geoffroy desvernay*
beech 2011-04-29 16:24:57 UTC FreeBSD ports repository Modified files: databases/mariadb Makefile distinfo pkg-plist Added files: databases/mariadb pkg-message databases/mariadb/files patch-extra::yassl::src::yassl_error.cpp patch-sql::mysqld.cc Log: -Upgrade of mariadb to 5.2.5 -Fix pkg-plist PR: ports/156681 Submitted by: Desvernay Geoffroy (dgeo@centrale-marseille.fr)(maintainer) Approved by: itetcu (mentor)(implicit) Revision Changes Path 1.5 +162 -6 ports/databases/mariadb/Makefile 1.3 +2 -2 ports/databases/mariadb/distinfo 1.1 +13 -0 ports/databases/mariadb/files/patch-extra::yassl::src::yassl_error.cpp (new) 1.1 +14 -0 ports/databases/mariadb/files/patch-sql::mysqld.cc (new) 1.1 +5 -0 ports/databases/mariadb/pkg-message (new) 1.3 +116 -50 ports/databases/mariadb/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, Thanks!