- Replace dead MASTER_SITE [1]

- Fix mysqlbug vulnerability [2]
- Bump PORTREVISION

PR:		ports/66671 [1]
Submitted by:	Roman Neuhauser <neuhauser@chello.cz> [1],
		roam [2]

22 files changed, 113 insertions, 15 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index f1927d46952b..70066f76c17e 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-3.23/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-3.23/ \
 		http://www.mysql.cz/Downloads/MySQL-3.23/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-3.23/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-3.23/ \
+		http://mysql.proserve.nl/Downloads/MySQL-3.23/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-3.23/
 PKGNAMESUFFIX?=	-server
 
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index de54d2d0ad48..e34a3b8160da 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 93ebbf69515f..a6fef3195356 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \
 		http://www.mysql.cz/Downloads/MySQL-4.1/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \
+		http://mysql.proserve.nl/Downloads/MySQL-4.1/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
diff --git a/databases/mysql41-server/files/patch-scripts::mysqlbug.sh b/databases/mysql41-server/files/patch-scripts::mysqlbug.sh
new file mode 100644
index 000000000000..fa26d2206310
--- /dev/null
+++ b/databases/mysql41-server/files/patch-scripts::mysqlbug.sh
@@ -0,0 +1,14 @@
+--- scripts/mysqlbug.sh.orig	Tue May 18 10:20:19 2004
++++ scripts/mysqlbug.sh	Fri May 14 02:53:22 2004
+@@ -254,9 +254,9 @@
+ if cmp -s $TEMP $TEMP.x
+ then
+   echo "File not changed, no bug report submitted."
+-  cp $TEMP /tmp/failed-mysql-bugreport
++  mv -f $TEMP /tmp/failed-mysql-bugreport
+   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
+-  echo "If you use this remember that the first lines of the report now is a lie.."
++  echo "If you use this remember that the first lines of the report are now a lie.."
+   exit 1
+ fi
+ 
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 704759cd7716..75d3af17afbc 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 1567fd2de22d..6f0c34ecd24c 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \
 		http://www.mysql.cz/Downloads/MySQL-5.0/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-5.0/ \
+		http://mysql.proserve.nl/Downloads/MySQL-5.0/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
diff --git a/databases/mysql50-server/files/patch-scripts::mysqlbug.sh b/databases/mysql50-server/files/patch-scripts::mysqlbug.sh
new file mode 100644
index 000000000000..fa26d2206310
--- /dev/null
+++ b/databases/mysql50-server/files/patch-scripts::mysqlbug.sh
@@ -0,0 +1,14 @@
+--- scripts/mysqlbug.sh.orig	Tue May 18 10:20:19 2004
++++ scripts/mysqlbug.sh	Fri May 14 02:53:22 2004
+@@ -254,9 +254,9 @@
+ if cmp -s $TEMP $TEMP.x
+ then
+   echo "File not changed, no bug report submitted."
+-  cp $TEMP /tmp/failed-mysql-bugreport
++  mv -f $TEMP /tmp/failed-mysql-bugreport
+   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
+-  echo "If you use this remember that the first lines of the report now is a lie.."
++  echo "If you use this remember that the first lines of the report are now a lie.."
+   exit 1
+ fi
+ 
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 704759cd7716..75d3af17afbc 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 1567fd2de22d..6f0c34ecd24c 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \
 		http://www.mysql.cz/Downloads/MySQL-5.0/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-5.0/ \
+		http://mysql.proserve.nl/Downloads/MySQL-5.0/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
diff --git a/databases/mysql51-server/files/patch-scripts::mysqlbug.sh b/databases/mysql51-server/files/patch-scripts::mysqlbug.sh
new file mode 100644
index 000000000000..fa26d2206310
--- /dev/null
+++ b/databases/mysql51-server/files/patch-scripts::mysqlbug.sh
@@ -0,0 +1,14 @@
+--- scripts/mysqlbug.sh.orig	Tue May 18 10:20:19 2004
++++ scripts/mysqlbug.sh	Fri May 14 02:53:22 2004
+@@ -254,9 +254,9 @@
+ if cmp -s $TEMP $TEMP.x
+ then
+   echo "File not changed, no bug report submitted."
+-  cp $TEMP /tmp/failed-mysql-bugreport
++  mv -f $TEMP /tmp/failed-mysql-bugreport
+   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
+-  echo "If you use this remember that the first lines of the report now is a lie.."
++  echo "If you use this remember that the first lines of the report are now a lie.."
+   exit 1
+ fi
+ 
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 704759cd7716..75d3af17afbc 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 1567fd2de22d..6f0c34ecd24c 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \
 		http://www.mysql.cz/Downloads/MySQL-5.0/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-5.0/ \
+		http://mysql.proserve.nl/Downloads/MySQL-5.0/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
diff --git a/databases/mysql54-server/files/patch-scripts::mysqlbug.sh b/databases/mysql54-server/files/patch-scripts::mysqlbug.sh
new file mode 100644
index 000000000000..fa26d2206310
--- /dev/null
+++ b/databases/mysql54-server/files/patch-scripts::mysqlbug.sh
@@ -0,0 +1,14 @@
+--- scripts/mysqlbug.sh.orig	Tue May 18 10:20:19 2004
++++ scripts/mysqlbug.sh	Fri May 14 02:53:22 2004
+@@ -254,9 +254,9 @@
+ if cmp -s $TEMP $TEMP.x
+ then
+   echo "File not changed, no bug report submitted."
+-  cp $TEMP /tmp/failed-mysql-bugreport
++  mv -f $TEMP /tmp/failed-mysql-bugreport
+   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
+-  echo "If you use this remember that the first lines of the report now is a lie.."
++  echo "If you use this remember that the first lines of the report are now a lie.."
+   exit 1
+ fi
+ 
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 704759cd7716..75d3af17afbc 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 1567fd2de22d..6f0c34ecd24c 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \
 		http://www.mysql.cz/Downloads/MySQL-5.0/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-5.0/ \
+		http://mysql.proserve.nl/Downloads/MySQL-5.0/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
diff --git a/databases/mysql55-server/files/patch-scripts::mysqlbug.sh b/databases/mysql55-server/files/patch-scripts::mysqlbug.sh
new file mode 100644
index 000000000000..fa26d2206310
--- /dev/null
+++ b/databases/mysql55-server/files/patch-scripts::mysqlbug.sh
@@ -0,0 +1,14 @@
+--- scripts/mysqlbug.sh.orig	Tue May 18 10:20:19 2004
++++ scripts/mysqlbug.sh	Fri May 14 02:53:22 2004
+@@ -254,9 +254,9 @@
+ if cmp -s $TEMP $TEMP.x
+ then
+   echo "File not changed, no bug report submitted."
+-  cp $TEMP /tmp/failed-mysql-bugreport
++  mv -f $TEMP /tmp/failed-mysql-bugreport
+   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
+-  echo "If you use this remember that the first lines of the report now is a lie.."
++  echo "If you use this remember that the first lines of the report are now a lie.."
+   exit 1
+ fi
+ 
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 704759cd7716..75d3af17afbc 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 1567fd2de22d..6f0c34ecd24c 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \
 		http://www.mysql.cz/Downloads/MySQL-5.0/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-5.0/ \
+		http://mysql.proserve.nl/Downloads/MySQL-5.0/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
diff --git a/databases/mysql60-server/files/patch-scripts::mysqlbug.sh b/databases/mysql60-server/files/patch-scripts::mysqlbug.sh
new file mode 100644
index 000000000000..fa26d2206310
--- /dev/null
+++ b/databases/mysql60-server/files/patch-scripts::mysqlbug.sh
@@ -0,0 +1,14 @@
+--- scripts/mysqlbug.sh.orig	Tue May 18 10:20:19 2004
++++ scripts/mysqlbug.sh	Fri May 14 02:53:22 2004
+@@ -254,9 +254,9 @@
+ if cmp -s $TEMP $TEMP.x
+ then
+   echo "File not changed, no bug report submitted."
+-  cp $TEMP /tmp/failed-mysql-bugreport
++  mv -f $TEMP /tmp/failed-mysql-bugreport
+   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
+-  echo "If you use this remember that the first lines of the report now is a lie.."
++  echo "If you use this remember that the first lines of the report are now a lie.."
+   exit 1
+ fi
+ 
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 704759cd7716..75d3af17afbc 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 1567fd2de22d..6f0c34ecd24c 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \
 		http://www.mysql.cz/Downloads/MySQL-5.0/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-5.0/ \
+		http://mysql.proserve.nl/Downloads/MySQL-5.0/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
diff --git a/databases/percona55-server/files/patch-scripts::mysqlbug.sh b/databases/percona55-server/files/patch-scripts::mysqlbug.sh
new file mode 100644
index 000000000000..fa26d2206310
--- /dev/null
+++ b/databases/percona55-server/files/patch-scripts::mysqlbug.sh
@@ -0,0 +1,14 @@
+--- scripts/mysqlbug.sh.orig	Tue May 18 10:20:19 2004
++++ scripts/mysqlbug.sh	Fri May 14 02:53:22 2004
+@@ -254,9 +254,9 @@
+ if cmp -s $TEMP $TEMP.x
+ then
+   echo "File not changed, no bug report submitted."
+-  cp $TEMP /tmp/failed-mysql-bugreport
++  mv -f $TEMP /tmp/failed-mysql-bugreport
+   echo "The raw bug report exists in /tmp/failed-mysql-bugreport"
+-  echo "If you use this remember that the first lines of the report now is a lie.."
++  echo "If you use this remember that the first lines of the report are now a lie.."
+   exit 1
+ fi
+