svn commit: r432537 - in branches/2017Q1/databases: mariadb101-client mariadb101-client/files mariadb101-server mariadb101-server/files
Bernard Spil
brnrd at FreeBSD.org
Thu Jan 26 20:01:10 UTC 2017
Author: brnrd
Date: Thu Jan 26 20:01:07 2017
New Revision: 432537
URL: https://svnweb.freebsd.org/changeset/ports/432537
Log:
MFH: r431824
databases/mariadb101-server: Update to 10.1.21
- Update to 10.1.21
- Fix patches that no longer cleanly apply
- Rename patches to new naming scheme
Security: 4d2f9d09-ddb7-11e6-a9a5-b499baebfeaf
Approved by: ports-secteam (feld)
Added:
branches/2017Q1/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
- copied unchanged from r431824, head/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
Deleted:
branches/2017Q1/databases/mariadb101-server/files/patch-mysys_ssl-my_crypt.cc
Modified:
branches/2017Q1/databases/mariadb101-client/Makefile
branches/2017Q1/databases/mariadb101-client/files/patch-mysys_my__default.c
branches/2017Q1/databases/mariadb101-server/Makefile
branches/2017Q1/databases/mariadb101-server/distinfo
branches/2017Q1/databases/mariadb101-server/files/patch-mysys_my__default.c
branches/2017Q1/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
branches/2017Q1/databases/mariadb101-server/pkg-plist
Directory Properties:
branches/2017Q1/ (props changed)
Modified: branches/2017Q1/databases/mariadb101-client/Makefile
==============================================================================
--- branches/2017Q1/databases/mariadb101-client/Makefile Thu Jan 26 19:59:45 2017 (r432536)
+++ branches/2017Q1/databases/mariadb101-client/Makefile Thu Jan 26 20:01:07 2017 (r432537)
@@ -20,6 +20,7 @@ CLIENT_ONLY= yes
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/wsrep*
+ ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper
${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
Modified: branches/2017Q1/databases/mariadb101-client/files/patch-mysys_my__default.c
==============================================================================
--- branches/2017Q1/databases/mariadb101-client/files/patch-mysys_my__default.c Thu Jan 26 19:59:45 2017 (r432536)
+++ branches/2017Q1/databases/mariadb101-client/files/patch-mysys_my__default.c Thu Jan 26 20:01:07 2017 (r432537)
@@ -1,14 +1,5 @@
---- mysys/my_default.c.orig 2016-03-24 09:12:11 UTC
+--- mysys/my_default.c.orig 2017-01-17 19:38:25 UTC
+++ mysys/my_default.c
-@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
-
- /* Which directories are searched for options (and in which order) */
-
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
- static const char **default_directories = NULL;
-
@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
{
MY_STAT stat_info;
@@ -18,32 +9,40 @@
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
+@@ -803,6 +803,22 @@ static int search_default_file_with_ext(
if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
return 1; /* Ignore wrong files */
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
-+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+ name,name);
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
++ }
++
++ if (strstr(name, "/etc") == name)
++ {
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
+ goto err;
+ }
+
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
{
line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
+@@ -1067,7 +1083,8 @@ void my_print_default_files(const char *
if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
*end++= '.';
strxmov(end, conf_file, *ext, " ", NullS);
- fputs(name, stdout);
+ if (strstr(name, "/etc") != name)
-+ fputs(name, stdout);
++ fputs(name, stdout);
}
}
}
-@@ -1223,13 +1232,10 @@ static const char **init_default_directo
+@@ -1228,13 +1245,10 @@ static const char **init_default_directo
#else
Modified: branches/2017Q1/databases/mariadb101-server/Makefile
==============================================================================
--- branches/2017Q1/databases/mariadb101-server/Makefile Thu Jan 26 19:59:45 2017 (r432536)
+++ branches/2017Q1/databases/mariadb101-server/Makefile Thu Jan 26 20:01:07 2017 (r432537)
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.1.20
-PORTREVISION= 1
+PORTVERSION= 10.1.21
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
Modified: branches/2017Q1/databases/mariadb101-server/distinfo
==============================================================================
--- branches/2017Q1/databases/mariadb101-server/distinfo Thu Jan 26 19:59:45 2017 (r432536)
+++ branches/2017Q1/databases/mariadb101-server/distinfo Thu Jan 26 20:01:07 2017 (r432537)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481835914
-SHA256 (mariadb-10.1.20.tar.gz) = c24e83f24d674d9912319f9e9422f093c8ca6be1721a4380cbd74792b89ba0b9
-SIZE (mariadb-10.1.20.tar.gz) = 61312731
+TIMESTAMP = 1484755161
+SHA256 (mariadb-10.1.21.tar.gz) = 5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490
+SIZE (mariadb-10.1.21.tar.gz) = 61406584
Copied: branches/2017Q1/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc (from r431824, head/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q1/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc Thu Jan 26 20:01:07 2017 (r432537, copy of r431824, head/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc)
@@ -0,0 +1,25 @@
+--- mysys_ssl/my_crypt.cc.orig 2017-01-17 19:38:25 UTC
++++ mysys_ssl/my_crypt.cc
+@@ -275,10 +275,14 @@ int my_random_bytes(uchar* buf, int num)
+ return MY_AES_OK;
+ }
+ #else
++#include <openssl/opensslv.h>
+ #include <openssl/rand.h>
+
+ int my_random_bytes(uchar *buf, int num)
+ {
++#if defined(LIBRESSL_VERSION_NUMBER)
++ arc4random_buf(buf, num);
++#else
+ /*
+ Unfortunately RAND_bytes manual page does not provide any guarantees
+ in relation to blocking behavior. Here we explicitly use SSLeay random
+@@ -288,6 +292,7 @@ int my_random_bytes(uchar *buf, int num)
+ RAND_METHOD *rand = RAND_SSLeay();
+ if (rand == NULL || rand->bytes(buf, num) != 1)
+ return MY_AES_OPENSSL_ERROR;
++#endif
+ return MY_AES_OK;
+ }
+ #endif
Modified: branches/2017Q1/databases/mariadb101-server/files/patch-mysys_my__default.c
==============================================================================
--- branches/2017Q1/databases/mariadb101-server/files/patch-mysys_my__default.c Thu Jan 26 19:59:45 2017 (r432536)
+++ branches/2017Q1/databases/mariadb101-server/files/patch-mysys_my__default.c Thu Jan 26 20:01:07 2017 (r432537)
@@ -1,16 +1,5 @@
-Obey hier(7)
-
---- mysys/my_default.c.orig 2016-03-24 09:12:11 UTC
+--- mysys/my_default.c.orig 2017-01-17 19:38:25 UTC
+++ mysys/my_default.c
-@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
-
- /* Which directories are searched for options (and in which order) */
-
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
- static const char **default_directories = NULL;
-
@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
{
MY_STAT stat_info;
@@ -20,32 +9,40 @@ Obey hier(7)
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
+@@ -803,6 +803,22 @@ static int search_default_file_with_ext(
if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
return 1; /* Ignore wrong files */
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
-+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+ name,name);
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
++ }
++
++ if (strstr(name, "/etc") == name)
++ {
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
+ goto err;
+ }
+
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
{
line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
+@@ -1067,7 +1083,8 @@ void my_print_default_files(const char *
if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
*end++= '.';
strxmov(end, conf_file, *ext, " ", NullS);
- fputs(name, stdout);
+ if (strstr(name, "/etc") != name)
-+ fputs(name, stdout);
++ fputs(name, stdout);
}
}
}
-@@ -1223,13 +1232,10 @@ static const char **init_default_directo
+@@ -1228,13 +1245,10 @@ static const char **init_default_directo
#else
Modified: branches/2017Q1/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
==============================================================================
--- branches/2017Q1/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh Thu Jan 26 19:59:45 2017 (r432536)
+++ branches/2017Q1/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh Thu Jan 26 20:01:07 2017 (r432537)
@@ -1,8 +1,6 @@
-Obey hier(7)
-
---- scripts/mysqld_safe.sh.orig 2015-10-15 15:43:45 UTC
+--- scripts/mysqld_safe.sh.orig 2017-01-18 20:11:42 UTC
+++ scripts/mysqld_safe.sh
-@@ -558,10 +558,10 @@ fi
+@@ -581,10 +581,10 @@ fi
if test -z "$MYSQL_HOME"
then
@@ -15,12 +13,12 @@ Obey hier(7)
$DATADIR/my.cnf
IGNORING $DATADIR/my.cnf"
-@@ -570,7 +570,7 @@ IGNORING $DATADIR/my.cnf"
+@@ -593,7 +593,7 @@ IGNORING $DATADIR/my.cnf"
then
log_error "WARNING: Found $DATADIR/my.cnf
The data directory is a deprecated location for my.cnf, please move it to
-$MY_BASEDIR_VERSION/my.cnf"
+$MY_BASEDIR_VERSION/etc/my.cnf"
+ unsafe_my_cnf=1
MYSQL_HOME=$DATADIR
else
- MYSQL_HOME=$MY_BASEDIR_VERSION
Modified: branches/2017Q1/databases/mariadb101-server/pkg-plist
==============================================================================
--- branches/2017Q1/databases/mariadb101-server/pkg-plist Thu Jan 26 19:59:45 2017 (r432536)
+++ branches/2017Q1/databases/mariadb101-server/pkg-plist Thu Jan 26 20:01:07 2017 (r432537)
@@ -24,6 +24,7 @@ bin/mysql_zap
bin/mysqlbug
bin/mysqld_multi
bin/mysqld_safe
+bin/mysqld_safe_helper
bin/mysqldumpslow
bin/mysqlhotcopy
bin/mysqltest
More information about the svn-ports-all
mailing list