mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

databases/mariadb101-server: Update to 10.1.21

Browse Source 
- Update to 10.1.21
  - Fix patches that no longer cleanly apply
  - Rename patches to new naming scheme

MFH:		2017Q1
Security:	4d2f9d09-ddb7-11e6-a9a5-b499baebfeaf
This commit is contained in:
Bernard Spil 2017-01-18 20:19:36 +00:00
parent c9c7fbef89
commit eaa122ead1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=431824
8 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
databases/mariadb101-client/Makefile
View File

@ -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

31
databases/mariadb101-client/files/patch-mysys_my__default.c
View File

@ -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

4
databases/mariadb101-server/Makefile
View File

@ -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}/ \

6
databases/mariadb101-server/distinfo
View File

@ -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

8
databases/mariadb101-server/files/patch-mysys_ssl-my_crypt.cc → databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
View File

@ -1,6 +1,6 @@
--- mysys_ssl/my_crypt.cc.orig 2016-08-29 16:38:54.000000000 +0200
+++ mysys_ssl/my_crypt.cc 2016-10-17 19:14:45.146531847 +0200
@@ -275,10 +275,14 @@
--- 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
@ -15,7 +15,7 @@
/*
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 @@
@@ -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;

33
databases/mariadb101-server/files/patch-mysys_my__default.c
View File

@ -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

10
databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh
View File

@ -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

1
databases/mariadb101-server/pkg-plist
View File

@ -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