summaryrefslogtreecommitdiffstats
path: root/databases/percona55-server
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2004-09-24 16:21:27 +0000
committerale <ale@FreeBSD.org>2004-09-24 16:21:27 +0000
commit030410a85ff989400a9ab46aaecad364aec587f6 (patch)
treeee943f3c1eb07400aa1c8bfdbfb29bce380ad780 /databases/percona55-server
parenta4e424c1991136e676c5d006554a4dca05069ea8 (diff)
downloadFreeBSD-ports-030410a85ff989400a9ab46aaecad364aec587f6.zip
FreeBSD-ports-030410a85ff989400a9ab46aaecad364aec587f6.tar.gz
- Fix mysqlhotdump vulnerability
- Fix plist (don't install .la files) Approved by: portmgr (marcus)
Diffstat (limited to 'databases/percona55-server')
-rw-r--r--databases/percona55-server/Makefile5
-rw-r--r--databases/percona55-server/files/patch-configure18
-rw-r--r--databases/percona55-server/files/patch-scripts::mysqlhotcopy.sh49
3 files changed, 60 insertions, 12 deletions
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 6f0c34e..cc535fc 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -29,8 +29,7 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql50-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}
@@ -67,7 +66,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)
diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
index ec52ce4..9eed468 100644
--- a/databases/percona55-server/files/patch-configure
+++ b/databases/percona55-server/files/patch-configure
@@ -1,14 +1,14 @@
--- configure.orig Sun Dec 21 19:03:09 2003
+++ configure Wed Dec 24 10:40:53 2003
-@@ -9069,7 +9070,7 @@
- ;;
- esac
- fi
--HOSTNAME=$ac_cv_path_HOSTNAME
-+HOSTNAME="$ac_cv_path_HOSTNAME -s"
-
- if test -n "$HOSTNAME"; then
- echo "$as_me:$LINENO: result: $HOSTNAME" >&5
+@@ -8128,8 +8128,6 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS;
+
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+ # Prevent multiple expansion
+
@@ -9261,43 +9262,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
diff --git a/databases/percona55-server/files/patch-scripts::mysqlhotcopy.sh b/databases/percona55-server/files/patch-scripts::mysqlhotcopy.sh
new file mode 100644
index 0000000..19d4395
--- /dev/null
+++ b/databases/percona55-server/files/patch-scripts::mysqlhotcopy.sh
@@ -0,0 +1,49 @@
+--- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003
++++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004
+@@ -7,6 +7,7 @@
+ use File::Path;
+ use DBI;
+ use Sys::Hostname;
++use File::Temp;
+
+ =head1 NAME
+
+@@ -607,7 +608,6 @@
+ sub copy_index
+ {
+ my ($method, $files, $source, $target) = @_;
+- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$";
+
+ print "Copying indices for ".@$files." files...\n" unless $opt{quiet};
+ foreach my $file (@$files)
+@@ -633,23 +633,23 @@
+ }
+ close OUTPUT || die "Error on close of $to: $!\n";
+ }
+- elsif ($opt{method} eq 'scp')
++ elsif ($opt{method} =~ /^scp\b/)
+ {
+- my $tmp=$tmpfile;
+- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n";
+- if (syswrite(OUTPUT,$buff) != length($buff))
++ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir);
++ die "Can\'t create/open file in $opt_tmpdir\n";
++ if (syswrite($fh,$buff) != length($buff))
+ {
+ die "Error when writing data to $tmp: $!\n";
+ }
+- close OUTPUT || die "Error on close of $tmp: $!\n";
+- safe_system("scp $tmp $to");
++ close $fh || die "Error on close of $tmp: $!\n";
++ safe_system("$opt{method} $tmp $to");
++ unlink $tmp;
+ }
+ else
+ {
+ die "Can't use unsupported method '$opt{method}'\n";
+ }
+ }
+- unlink "$tmpfile" if ($opt{method} eq 'scp');
+ }
+
+
OpenPOWER on IntegriCloud