cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 4.0.21 release:

Browse Source 
- Fix mysqlhotcopy insecure temporary file creation
- Fix bug in remote connections caused by libwrap [1]

PR:		ports/70889 [1]
Submitted by:	Andreas Haakh <andreas.haakh@ib-haakh.de> [1]
Patch by:	peadar [1]
Approved by:	portmgr (marcus)
This commit is contained in:
Alex Dupre 2004-09-21 21:09:31 +00:00
parent 8795b919c3
commit 1a10f13b7c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=118329
9 changed files with 113 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
databases/mysql40-server/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME?= mysql
PORTVERSION= 4.0.20
PORTVERSION= 4.0.21
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
@ -28,8 +28,7 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_GNOME= lthack
USE_LIBTOOL_VER= 13
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@ -65,7 +64,7 @@ CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
.include <bsd.port.pre.mk>
.if ${MACHINE_ARCH} == "i386"
.if ${ARCH} == "i386"
CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
.endif
.if defined(WITH_LINUXTHREADS)

4
databases/mysql40-server/distinfo
View File

@ -1,2 +1,2 @@
MD5 (mysql-4.0.20.tar.gz) = 7c75ac74e23396bd228dbc2c2d1131df
SIZE (mysql-4.0.20.tar.gz) = 13807983
MD5 (mysql-4.0.21.tar.gz) = 0a3dae16519afa5e59d8b9e252181243
SIZE (mysql-4.0.21.tar.gz) = 14107388

10
databases/mysql40-server/files/patch-Makefile.in
View File

@ -1,13 +1,13 @@
--- Makefile.in.orig Sun Dec 14 22:24:01 2003
+++ Makefile.in Wed Dec 17 09:09:31 2003
@@ -210,11 +210,7 @@
--- Makefile.in.orig Tue Sep 7 00:30:02 2004
+++ Makefile.in Wed Sep 15 14:22:23 2004
@@ -279,11 +279,7 @@
# These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING
EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
-SUBDIRS = . include @docs_dirs@ @readline_dir@ \
- @thread_dirs@ pstack @sql_client_dirs@ \
- @sql_server_dirs@ scripts man tests \
- BUILD @netware_dir@ os2 @libmysqld_dirs@ \
- BUILD netware os2 @libmysqld_dirs@ \
- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+SUBDIRS =

27
databases/mysql40-server/files/patch-configure
View File

@ -1,16 +1,15 @@
--- configure.orig Tue May 18 11:12:39 2004
+++ configure Tue May 18 11:14:27 2004
@@ -18816,9 +18816,6 @@
--- configure.orig Tue Sep 7 00:30:08 2004
+++ configure Wed Sep 15 15:18:33 2004
@@ -18793,8 +18793,6 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
# Prevent multiple expansion
-# Ensure that we have --preserve-dup-deps defines, otherwise we get link
-# problems of 'mysql' with CXX=g++
-LIBTOOL="$LIBTOOL --preserve-dup-deps"
#AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC
@@ -19970,43 +19967,8 @@
@@ -19972,43 +19970,8 @@
echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
PS=$ac_cv_path_PS
@ -54,7 +53,7 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -23603,8 +23565,8 @@
@@ -23615,8 +23578,8 @@
# Some system specific hacks
#
@ -63,9 +62,9 @@
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -33605,7 +33567,7 @@
# workaround for Sun Forte/x86 see BUG#4681
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
@@ -33651,7 +33614,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;
esac

39
databases/mysql40-server/files/patch-sql::Makefile.in Normal file
View File

@ -0,0 +1,39 @@
--- sql/Makefile.in.orig Tue Sep 7 00:30:06 2004
+++ sql/Makefile.in Mon Sep 20 08:34:53 2004
@@ -348,7 +348,8 @@
sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
slave.cc sql_repl.cc sql_union.cc \
mini_client.cc mini_client_errors.c \
- stacktrace.c repl_failsafe.h repl_failsafe.cc
+ stacktrace.c repl_failsafe.h repl_failsafe.cc \
+ mylibwrap.c
gen_lex_hash_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
@@ -399,7 +400,7 @@
sql_analyse.$(OBJEXT) sql_cache.$(OBJEXT) slave.$(OBJEXT) \
sql_repl.$(OBJEXT) sql_union.$(OBJEXT) mini_client.$(OBJEXT) \
mini_client_errors.$(OBJEXT) stacktrace.$(OBJEXT) \
- repl_failsafe.$(OBJEXT)
+ repl_failsafe.$(OBJEXT) mylibwrap.$(OBJEXT)
mysqld_OBJECTS = $(am_mysqld_OBJECTS)
mysqld_DEPENDENCIES = ../myisam/libmyisam.a ../myisammrg/libmyisammrg.a \
../heap/libheap.a ../vio/libvio.a ../mysys/libmysys.a \
@@ -452,7 +453,8 @@
@AMDEP_TRUE@ ./$(DEPDIR)/sql_update.Po ./$(DEPDIR)/sql_yacc.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/table.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/thr_malloc.Po ./$(DEPDIR)/time.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po
+@AMDEP_TRUE@ ./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/mylibwrap.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -629,6 +631,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
distclean-depend:
-rm -rf ./$(DEPDIR)

23
databases/mysql40-server/files/patch-sql::mylibwrap.c Normal file
View File

@ -0,0 +1,23 @@
--- sql/mylibwrap.c.orig Thu Jan 1 01:00:00 1970
+++ sql/mylibwrap.c Sun Sep 19 15:37:22 2004
@@ -0,0 +1,20 @@
+#include <tcpd.h>
+#include "mylibwrap.h"
+
+void
+my_fromhost(struct request_info *req)
+{
+ fromhost(req);
+}
+
+int
+my_hosts_access(struct request_info *req)
+{
+ return hosts_access(req);
+}
+
+char *
+my_eval_client(struct request_info *req)
+{
+ return eval_client(req);
+}

12
databases/mysql40-server/files/patch-sql::mylibwrap.h Normal file
View File

@ -0,0 +1,12 @@
--- sql/mylibwrap.h.orig Thu Jan 1 01:00:00 1970
+++ sql/mylibwrap.h Sun Sep 19 15:04:21 2004
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void my_fromhost(struct request_info *);
+extern int my_hosts_access(struct request_info *);
+extern char *my_eval_client(struct request_info *);
+#ifdef __cplusplus
+}
+#endif

23
databases/mysql40-server/files/patch-sql::mysqld.cc
View File

@ -1,12 +1,19 @@
--- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003
+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003
@@ -104,7 +104,8 @@
--- sql/mysqld.cc.orig Tue Sep 7 00:29:37 2004
+++ sql/mysqld.cc Mon Sep 20 08:37:21 2004
@@ -107,15 +107,7 @@
int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING;
-#ifdef __STDC__
+#include <osreldate.h>
+#if defined(__STDC__) && __FreeBSD_version < 500000
#define my_fromhost(A) fromhost(A)
#define my_hosts_access(A) hosts_access(A)
#define my_eval_client(A) eval_client(A)
-#define my_fromhost(A) fromhost(A)
-#define my_hosts_access(A) hosts_access(A)
-#define my_eval_client(A) eval_client(A)
-#else
-#define my_fromhost(A) fromhost()
-#define my_hosts_access(A) hosts_access()
-#define my_eval_client(A) eval_client()
-#endif
+#include "mylibwrap.h"
#endif /* HAVE_LIBWRAP */
#ifdef HAVE_SYS_MMAN_H

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

@ -136,6 +136,7 @@ share/mysql/korean/errmsg.txt
share/mysql/mi_test_all
share/mysql/mi_test_all.res
share/mysql/my-huge.cnf
share/mysql/my-innodb-heavy-4G.cnf
share/mysql/my-large.cnf
share/mysql/my-medium.cnf
share/mysql/my-small.cnf