OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Mar-2003 12:16:45 Branch: OPENPKG_1_STABLE Handle: 2003031911164400 Modified files: (Branch: OPENPKG_1_STABLE) openpkg-src/mysql mysql.patch mysql.spec Log: added missing fix from mysql 3.23.56 Summary: Revision Changes Path 1.3.2.2 +31 -2 openpkg-src/mysql/mysql.patch 1.49.2.3 +1 -1 openpkg-src/mysql/mysql.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/mysql/mysql.patch ============================================================================ $ cvs diff -u -r1.3.2.1 -r1.3.2.2 mysql.patch --- openpkg-src/mysql/mysql.patch 18 Mar 2003 10:47:09 -0000 1.3.2.1 +++ openpkg-src/mysql/mysql.patch 19 Mar 2003 11:16:44 -0000 1.3.2.2 @@ -134,8 +134,16 @@ fi echo "Please report any problems with the @scriptdir@/mysqlbug script!" --- mysys/default.c.dist Thu Jan 16 13:39:26 2003 -+++ mysys/default.c Thu Jan 16 13:39:37 2003 -@@ -48,7 +48,7 @@ ++++ mysys/default.c Wed Mar 19 01:25:09 2003 +@@ -39,6 +39,7 @@ + #include "mysys_priv.h" + #include "m_string.h" + #include "m_ctype.h" ++#include <my_dir.h> + + char *defaults_extra_file=0; + +@@ -48,7 +49,7 @@ #ifdef __WIN__ "C:/", #else @@ -144,6 +152,27 @@ #endif #ifdef DATADIR DATADIR, +@@ -241,6 +242,20 @@ + { + strmov(name,config_file); + } ++ fn_format(name,name,"","",4); ++#if !defined(__WIN__) && !defined(OS2) ++ { ++ MY_STAT stat_info; ++ if (!my_stat(name,&stat_info,MYF(0))) ++ return 0; ++ if (stat_info.st_mode & S_IWOTH) /* ignore world-writeable files */ ++ { ++ fprintf(stderr, "warning: World-writeable config file %s is ignored\n", ++ name); ++ return 0; ++ } ++ } ++#endif + if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0)))) + return 0; /* Ignore wrong files */ + --- mysys/my_copy.c.dist Tue Mar 18 10:17:00 2003 +++ mysys/my_copy.c Tue Mar 18 10:17:20 2003 @@ -32,17 +32,29 @@ @@ . patch -p0 <<'@@ .' Index: openpkg-src/mysql/mysql.spec ============================================================================ $ cvs diff -u -r1.49.2.2 -r1.49.2.3 mysql.spec --- openpkg-src/mysql/mysql.spec 18 Mar 2003 10:47:09 -0000 1.49.2.2 +++ openpkg-src/mysql/mysql.spec 19 Mar 2003 11:16:44 -0000 1.49.2.3 @@ -37,7 +37,7 @@ Group: Database License: GPL Version: %{V_major}.%{V_minor} -Release: 1.20030318 +Release: 1.20030319 # package options %option with_berkeleydb yes @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]