#At file:///home/msvensson/mysql/6.2/ based on revid:martin.skold@stripped
3141 Magnus Blåudd 2010-11-29
BUG#58503 Remove Cluster GPL EXCEPTIONS-CLIENT file
- cherry pick patches for bug#58340 from 5.1-security
- revno:3452.20.19, the original patch
- revno:3530, a follow-up patch
- revno:3532, fix formatting issues in README
modified:
libmysql/Makefile.am
libmysql/Makefile.shared
libmysql/conf_to_src.c
libmysql/dll.c
libmysql/errmsg.c
libmysql/get_password.c
libmysql/libmysql.c
libmysql/manager.c
libmysql_r/Makefile.am
scripts/make_binary_distribution.sh
support-files/mysql.spec.sh
=== modified file 'libmysql/Makefile.am'
--- a/libmysql/Makefile.am 2009-08-25 19:44:04 +0000
+++ b/libmysql/Makefile.am 2010-11-29 10:12:31 +0000
@@ -1,23 +1,21 @@
# Copyright (C) 2000-2004 MySQL AB
-# All rights reserved. Use is subject to license terms.
-#
+#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of version 2 GNU General Public License as
+# published by the Free Software Foundation.
#
-# This program is distributed in the hope that it will be useful,
+# There are special exceptions to the terms and conditions of the GPL as it
+# is applied to this software.
+#
+# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-#
-#
-#
-# The lines above are intentionally left blank
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
#
# This file is public domain and comes with NO WARRANTY of any kind
=== modified file 'libmysql/Makefile.shared'
--- a/libmysql/Makefile.shared 2010-10-06 10:06:47 +0000
+++ b/libmysql/Makefile.shared 2010-11-29 10:12:31 +0000
@@ -1,23 +1,21 @@
# Copyright (C) 2000-2004 MySQL AB
-# All rights reserved. Use is subject to license terms.
-#
+#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of version 2 GNU General Public License as
+# published by the Free Software Foundation.
#
-# This program is distributed in the hope that it will be useful,
+# There are special exceptions to the terms and conditions of the GPL as it
+# is applied to this software.
+#
+# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-#
-#
-#
-# The lines above are intentionally left blank
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
#
# This file is public domain and comes with NO WARRANTY of any kind
=== modified file 'libmysql/conf_to_src.c'
--- a/libmysql/conf_to_src.c 2009-05-26 18:53:34 +0000
+++ b/libmysql/conf_to_src.c 2010-11-29 10:12:31 +0000
@@ -1,10 +1,11 @@
-/*
- Copyright (C) 2000-2004 MySQL AB
- All rights reserved. Use is subject to license terms.
+/* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,10 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-*/
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* can't use -lmysys because this prog is used to create -lstrings */
=== modified file 'libmysql/dll.c'
--- a/libmysql/dll.c 2009-05-26 18:53:34 +0000
+++ b/libmysql/dll.c 2010-11-29 10:12:31 +0000
@@ -1,10 +1,11 @@
-/*
- Copyright (C) 2000-2004 MySQL AB
- All rights reserved. Use is subject to license terms.
+/* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,10 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-*/
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
** Handling initialization of the dll library
=== modified file 'libmysql/errmsg.c'
--- a/libmysql/errmsg.c 2009-05-26 18:53:34 +0000
+++ b/libmysql/errmsg.c 2010-11-29 10:12:31 +0000
@@ -1,10 +1,11 @@
-/*
- Copyright (C) 2000-2004 MySQL AB
- All rights reserved. Use is subject to license terms.
+/* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,10 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-*/
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Error messages for MySQL clients */
/* (Error messages for the daemon are in share/language/errmsg.sys) */
=== modified file 'libmysql/get_password.c'
--- a/libmysql/get_password.c 2009-05-26 18:53:34 +0000
+++ b/libmysql/get_password.c 2010-11-29 10:12:31 +0000
@@ -1,10 +1,11 @@
-/*
- Copyright (C) 2000-2004 MySQL AB
- All rights reserved. Use is subject to license terms.
+/* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,10 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-*/
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
** Ask for a password from tty
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c 2010-10-06 10:06:47 +0000
+++ b/libmysql/libmysql.c 2010-11-29 10:12:31 +0000
@@ -1,10 +1,11 @@
-/*
- Copyright (C) 2000-2004 MySQL AB
- All rights reserved. Use is subject to license terms.
+/* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,10 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-*/
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h>
#include <my_sys.h>
=== modified file 'libmysql/manager.c'
--- a/libmysql/manager.c 2009-05-26 18:53:34 +0000
+++ b/libmysql/manager.c 2010-11-29 10:12:31 +0000
@@ -1,10 +1,11 @@
-/*
- Copyright (C) 2000-2004 MySQL AB
- All rights reserved. Use is subject to license terms.
+/* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,10 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-*/
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h>
#if defined(THREAD)
=== modified file 'libmysql_r/Makefile.am'
--- a/libmysql_r/Makefile.am 2009-05-26 18:53:34 +0000
+++ b/libmysql_r/Makefile.am 2010-11-29 10:12:31 +0000
@@ -1,23 +1,21 @@
# Copyright (C) 2000-2004 MySQL AB
-# All rights reserved. Use is subject to license terms.
-#
+#
# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of version 2 GNU General Public License as
+# published by the Free Software Foundation.
#
-# This program is distributed in the hope that it will be useful,
+# There are special exceptions to the terms and conditions of the GPL as it
+# is applied to this software.
+#
+# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-#
-#
-#
-# The lines above are intentionally left blank
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
#
# This file is public domain and comes with NO WARRANTY of any kind
=== modified file 'scripts/make_binary_distribution.sh'
--- a/scripts/make_binary_distribution.sh 2010-11-26 13:55:54 +0000
+++ b/scripts/make_binary_distribution.sh 2010-11-29 10:12:31 +0000
@@ -1,19 +1,18 @@
#!/bin/sh
# Copyright (C) 2000-2006 MySQL AB
-# All rights reserved. Use is subject to license terms.
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##############################################################################
#
@@ -303,7 +302,9 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; t
# Copy readme and license files
cp README Docs/INSTALL-BINARY $DEST/
- if [ -f LICENSE.mysql ] ; then
+ if [ -f COPYING ] ; then
+ cp COPYING $DEST/
+ elif [ -f LICENSE.mysql ] ; then
cp LICENSE.mysql $DEST/
else
echo "ERROR: no license files found"
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2010-11-26 13:55:54 +0000
+++ b/support-files/mysql.spec.sh 2010-11-29 10:12:31 +0000
@@ -10,9 +10,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
+# along with this program; see the file COPYING. If not, write to the
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
+# MA 02110-1301 USA.
##############################################################################
# Some common macro definitions
@@ -1132,6 +1132,7 @@ fi
# merging BK trees)
##############################################################################
%changelog
+
* Wed Nov 24 2010 Alexander Nozdrin <alexander.nozdrin@stripped>
- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20101129101231-4dozcxr11wy6j0hr.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-6.2 branch (magnus.blaudd:3141) Bug#58340Bug#58503 | Magnus Blåudd | 29 Nov |
