diff options
author | Rene Ladan <rene@FreeBSD.org> | 2019-04-04 16:37:29 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2019-04-04 16:37:29 +0000 |
commit | cc5fe2dd620082c6185b6968505daa180908270f (patch) | |
tree | 4cee0f81cfd6da29fc9cf44ab5caf8f38bcb7006 /databases/mariadb100-client/files/patch-mysys_my__default.c | |
parent | Update xfce4-parole to 1.0.2 (diff) |
Remove expired ports:
2019-03-25 chinese/reciteword: depends on audio/esound
2019-03-31 comms/conserver: Superseeded by comms/conserver-com
2019-03-24 databases/flamerobin: Abandonware since 2009, does not work with newer version of wxGTK
2019-04-01 databases/mariadb100-client: Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/)
2019-04-01 databases/mariadb100-server: Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/)
2019-03-12 devel/physfs-devel: is the same as devel/physfs, serving no purpose
2019-03-20 devel/py-construct28: Latest upstream version is in ports tree devel/py-construct
2019-03-31 devel/xtoolchain-llvm40: No supported release uses this version
2019-03-31 devel/xtoolchain-llvm50: No supported release uses this version
2019-03-31 finance/aqmoney: no longer maintained upstream
2019-03-31 finance/openhbci: no longer maintained upstream
2019-03-31 graphics/py-exiv2: py-exiv2 has been deprecated in favour of GExiv2
2019-04-04 mail/dbmail22: Please use mail/dbmail which uses latest version of 3.X
2019-03-31 net/rubygem-fog-google17: Use net/rubygem-fog-google instead
2019-03-31 ports-mgmt/bsdadminscripts: Upstream stale nearly 10 years, no longer works properly, use ports-mgmt/bsdadminscripts2 instead
2019-03-24 www/mod_md-devel: Use the module that is shipped with Apache 2.4
2019-03-25 x11/xbelld: Depends on audio/esound
Notes
Notes:
svn path=/head/; revision=497852
Diffstat (limited to 'databases/mariadb100-client/files/patch-mysys_my__default.c')
-rw-r--r-- | databases/mariadb100-client/files/patch-mysys_my__default.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/databases/mariadb100-client/files/patch-mysys_my__default.c b/databases/mariadb100-client/files/patch-mysys_my__default.c deleted file mode 100644 index 70ab3073cf64..000000000000 --- a/databases/mariadb100-client/files/patch-mysys_my__default.c +++ /dev/null @@ -1,52 +0,0 @@ ---- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC -+++ mysys/my_default.c -@@ -786,7 +786,7 @@ static int search_default_file_with_ext( - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -804,6 +804,14 @@ 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); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1068,7 +1076,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); - } - } - } -@@ -1229,13 +1238,10 @@ static const char **init_default_directo - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - |