[Pkg-mysql-commits] r888 - in branches/sid-5.0/debian: . additions patches
Christian Hammers
ch at alioth.debian.org
Sun Jun 24 22:21:08 UTC 2007
tags 430018 pending
thanks
Author: ch
Date: 2007-06-24 22:21:08 +0000 (Sun, 24 Jun 2007)
New Revision: 888
Added:
branches/sid-5.0/debian/additions/mysql-license-dummy.1
branches/sid-5.0/debian/additions/mysqld-license-dummy.1
Removed:
branches/sid-5.0/debian/patches/19_man__documentation_reference.dpatch
branches/sid-5.0/debian/patches/26_man__mysqldump.dpatch
Modified:
branches/sid-5.0/debian/README.Maintainer
branches/sid-5.0/debian/additions/mysqlmanager.1
branches/sid-5.0/debian/changelog
branches/sid-5.0/debian/mysql-client-5.0.files
branches/sid-5.0/debian/mysql-server-5.0.files
branches/sid-5.0/debian/patches/00list
branches/sid-5.0/debian/patches/45_warn-CLI-passwords.dpatch
branches/sid-5.0/debian/rules
Log:
* Removed all manpages as they are no licensed under the GPL and
redistribution is not permitted (Closes: #430018).
Modified: branches/sid-5.0/debian/README.Maintainer
===================================================================
--- branches/sid-5.0/debian/README.Maintainer 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/README.Maintainer 2007-06-24 22:21:08 UTC (rev 888)
@@ -13,6 +13,7 @@
tar xzf mysql-$NEW.tar.gz
mv mysql-$NEW mysql-dfsg-5.0-$NEW.orig
rm -rf mysql-dfsg-5.0-$NEW.orig/Docs/
+rm -rf mysql-dfsg-5.0-$NEW.orig/man/
tar czf mysql-dfsg-5.0_$NEW.orig.tar.gz mysql-dfsg-5.0-$NEW.orig
rm -rf mysql-dfsg-5.0-$NEW.orig
Added: branches/sid-5.0/debian/additions/mysql-license-dummy.1
===================================================================
--- branches/sid-5.0/debian/additions/mysql-license-dummy.1 (rev 0)
+++ branches/sid-5.0/debian/additions/mysql-license-dummy.1 2007-06-24 22:21:08 UTC (rev 888)
@@ -0,0 +1,15 @@
+.TH mysql 1 "21 June 2007" "MySQL 5.0" "MySQL database"
+.SH NAME
+mysql \- MySQL database programs
+.SH COPYRIGHT
+MySQL decided to release the documentation, even the manpages, under a
+license which does not allow Debian to redistribute it.
+Feel free to contact MySQL at <docs at mysql.com> if you would like to share your
+opinion on the matter :)
+.SH "SEE ALSO"
+For more information start the program with '--help' or
+refer to the MySQL Reference Manual which
+is available online at http://dev.mysql.com/doc/.
+.SH AUTHOR
+This manpage was written by Christian Hammers <ch at debian.org>.
+.\" end of man page
Added: branches/sid-5.0/debian/additions/mysqld-license-dummy.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqld-license-dummy.1 (rev 0)
+++ branches/sid-5.0/debian/additions/mysqld-license-dummy.1 2007-06-24 22:21:08 UTC (rev 888)
@@ -0,0 +1,15 @@
+.TH mysql 1 "21 June 2007" "MySQL 5.0" "MySQL database"
+.SH NAME
+mysql \- MySQL database programs
+.SH COPYRIGHT
+MySQL decided to release the documentation, even the manpages, under a
+license which does not allow Debian to redistribute it.
+Feel free to contact MySQL at <docs at mysql.com> if you would like to share your
+opinion on the matter :)
+.SH "SEE ALSO"
+For more information start the program with '--help' or
+refer to the MySQL Reference Manual which
+is available online at http://dev.mysql.com/doc/.
+.SH AUTHOR
+This manpage was written by Christian Hammers <ch at debian.org>.
+.\" end of man page
Modified: branches/sid-5.0/debian/additions/mysqlmanager.1
===================================================================
--- branches/sid-5.0/debian/additions/mysqlmanager.1 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/additions/mysqlmanager.1 2007-06-24 22:21:08 UTC (rev 888)
@@ -45,5 +45,5 @@
is available in the package mysql-doc-4.1 or on the MySQL
homepage www.mysql.com.
.SH AUTHOR
-This manpage was created by Christian Hammers <ch at debian.org>
+This manpage was written by Christian Hammers <ch at debian.org>
using help2man.
Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/changelog 2007-06-24 22:21:08 UTC (rev 888)
@@ -1,9 +1,13 @@
-mysql-dfsg-5.0 (5.0.41-3) UNRELEASED; urgency=low
+mysql-dfsg-5.0 (5.0.41-3) unstable; urgency=high
- * NOT RELEASED YET
- * Fix for CVE-2007-2691: DROP/RENAME TABLE statements (closes: #424778).
+ [sean finney]
+ * SECURITY:
+ Fix for CVE-2007-2691: DROP/RENAME TABLE statements (closes: #424778).
+ [Christian Hammers]
+ * Removed all manpages as they are no licensed under the GPL and
+ redistribution is not permitted (Closes: #430018).
- -- sean finney <seanius at debian.org> Thu, 17 May 2007 19:56:38 +0200
+ -- Christian Hammers <ch at debian.org> Sun, 24 Jun 2007 21:12:42 +0200
mysql-dfsg-5.0 (5.0.41-2) unstable; urgency=low
@@ -181,8 +185,6 @@
mysql-dfsg-5.0 (5.0.32-4) unstable; urgency=high
-=======
->>>>>>> .merge-right.r875
[Christian Hammers]
* Changed minimum required version in dh_makeshlibs to 5.0.27-1 as
5.0.26 had an ABI breakage in it!
Modified: branches/sid-5.0/debian/mysql-client-5.0.files
===================================================================
--- branches/sid-5.0/debian/mysql-client-5.0.files 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/mysql-client-5.0.files 2007-06-24 22:21:08 UTC (rev 888)
@@ -23,6 +23,7 @@
usr/bin/mysql_waitpid
usr/sbin/mysqlmanager
usr/share/lintian/overrides/mysql-client-5.0
+usr/share/man/man1/mysql-license-dummy.1
usr/share/man/man1/innotop.1
usr/share/man/man1/myisam_ftdump.1
usr/share/man/man1/mysql.1
Modified: branches/sid-5.0/debian/mysql-server-5.0.files
===================================================================
--- branches/sid-5.0/debian/mysql-server-5.0.files 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/mysql-server-5.0.files 2007-06-24 22:21:08 UTC (rev 888)
@@ -45,6 +45,7 @@
usr/share/doc/mysql-server-5.0/
usr/share/lintian/overrides/mysql-server-5.0
usr/share/man/man1/comp_err.1
+usr/share/man/man1/mysqld-license-dummy.1
usr/share/man/man1/msql2mysql.1
usr/share/man/man1/myisamchk.1
usr/share/man/man1/myisamlog.1
Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/patches/00list 2007-06-24 22:21:08 UTC (rev 888)
@@ -1,8 +1,6 @@
01_MAKEFILES__Docs_Images_Makefile.in.dpatch
01_MAKEFILES__Docs_Makefile.in.dpatch
-19_man__documentation_reference.dpatch
25_mysys__default.c.dpatch
-26_man__mysqldump.dpatch
37_scripts__mysqld_safe.sh__syslog.dpatch
38_scripts__mysqld_safe.sh__signals.dpatch
41_scripts__mysql_install_db.sh__no_test.dpatch
Deleted: branches/sid-5.0/debian/patches/19_man__documentation_reference.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/19_man__documentation_reference.dpatch 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/patches/19_man__documentation_reference.dpatch 2007-06-24 22:21:08 UTC (rev 888)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_man__documentation_reference.dpatch by <seanius at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
---- old/man/mysql.1.orig 2005-11-21 23:49:47.380110189 +0100
-+++ new/man/mysql.1 2005-11-21 23:52:11.699034270 +0100
-@@ -958,6 +958,13 @@
- For more information, please refer to the MySQL Reference Manual,
- which may already be installed locally and which is also available
- online at http://dev.mysql.com/doc/.
-+.PP
-+NOTE: Unfortunately this documentation is not
-+released under a license that makes Debian able to redistribute it (not
-+even legally!), so there is no package available with this documentation.
-+Feel free to contact mysql if you'd like to share your opinion on the
-+matter :)
-+
- .SH AUTHOR
- MySQL AB (http://www.mysql.com/).
- This software comes with no warranty.
Deleted: branches/sid-5.0/debian/patches/26_man__mysqldump.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/26_man__mysqldump.dpatch 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/patches/26_man__mysqldump.dpatch 2007-06-24 22:21:08 UTC (rev 888)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: See http://bugs.mysql.com/bug.php?id=22282
-
- at DPATCH@
-
---- old/man/mysqldump.1 2006-08-24 18:15:37.000000000 +0200
-+++ new/man/mysqldump.1 2006-09-12 21:50:22.000000000 +0200
-@@ -45,7 +45,8 @@
- To get a list of the options your version of
- \fBmysqldump\fR
- supports, execute
--\fBmysqldump \-\-help\fR.
-+\fBmysqldump \-\-help\fR. You can disable options with
-+e.g. \fB\-\-extended\-insert=0\fR.
- .PP
- If you run
- \fBmysqldump\fR
Modified: branches/sid-5.0/debian/patches/45_warn-CLI-passwords.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/45_warn-CLI-passwords.dpatch 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/patches/45_warn-CLI-passwords.dpatch 2007-06-24 22:21:08 UTC (rev 888)
@@ -159,114 +159,6 @@
=item -h, --host=#
---- old/man/mysql.1.orig 2005-11-14 19:20:56.000000000 +0100
-+++ new/man/mysql.1 2005-11-22 00:24:20.664501909 +0100
-@@ -235,8 +236,8 @@
- the section called \(lq\\FBMYSQL\\FR COMMANDS\(rq.
- .TP
- \(bu
--\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
--\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
-+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR,
-+\fB\-p[\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR
- .sp
- The password to use when connecting to the server. If you use the short option form (\fB\-p\fR), you
- \fIcannot\fR
---- old/man/mysqlaccess.1.orig 2005-11-14 19:20:56.000000000 +0100
-+++ new/man/mysqlaccess.1 2005-11-22 00:26:35.936574563 +0100
-@@ -95,8 +95,8 @@
- clauses.
- .TP
- \(bu
--\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
--\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
-+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR,
-+\fB\-p[\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR
- .sp
- The password to use when connecting to the server. If you omit the
- \fIpassword\fR
-@@ -133,8 +134,8 @@
- Undo the most recent changes to the temporary grant tables.
- .TP
- \(bu
--\fB\-\-spassword[=\fR\fB\fIpassword\fR\fR\fB]\fR,
--\fB\-P[\fR\fB\fIpassword\fR\fR\fB]\fR
-+\fB\-\-spassword[=\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR,
-+\fB\-P[\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR
- .sp
- The password to use when connecting to the server as the superuser. If you omit the
- \fIpassword\fR
---- old/man/mysqladmin.1.orig 2005-11-14 19:20:56.000000000 +0100
-+++ new/man/mysqladmin.1 2005-11-22 00:27:59.937759146 +0100
-@@ -313,8 +313,8 @@
- Connect to the MySQL server on the given host.
- .TP
- \(bu
--\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
--\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
-+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR,
-+\fB\-p[\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR
- .sp
- The password to use when connecting to the server. If you use the short option form (\fB\-p\fR), you
- \fIcannot\fR
---- old/man/mysqld_multi.1.orig 2005-11-14 19:20:56.000000000 +0100
-+++ new/man/mysqld_multi.1 2005-11-22 00:29:16.837157196 +0100
-@@ -43,6 +43,7 @@
- .nf
- shell> \fBmysqld_multi [\fR\fB\fIoptions\fR\fR\fB] {start|stop|report} [\fR\fB\fIGNR\fR\fR\fB[,\fR\fB\fIGNR\fR\fR\fB] ...]\fR
- .fi
-+WARNING: Providing a password on command line is insecure as it is visible through /proc to anyone for a short time.
- .RE
- .PP
- start,
-@@ -158,7 +159,7 @@
- Print log information to stdout rather than to the log file. By default, output goes to the log file.
- .TP
- \(bu
--\fB\-\-password=\fR\fB\fIpassword\fR\fR
-+\fB\-\-password=\fR\fB\fIpassword\fR\fR\ (INSECURE)
- .sp
- The password of the MySQL account to use when invoking
- \fBmysqladmin\fR. Note that the password value is not optional for this option, unlike for other MySQL programs.
---- old/man/mysqldump.1.orig 2005-11-14 19:20:56.000000000 +0100
-+++ new/man/mysqldump.1 2005-11-22 00:30:11.533015718 +0100
-@@ -401,8 +402,8 @@
- \fB\-\-skip\-quick\fR.
- .TP
- \(bu
--\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
--\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
-+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR,
-+\fB\-p[\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR
- .sp
- The password to use when connecting to the server. If you use the short option form (\fB\-p\fR), you
- \fIcannot\fR
---- old/man/mysql_fix_privilege_tables.1.orig 2005-11-14 19:20:56.000000000 +0100
-+++ new/man/mysql_fix_privilege_tables.1 2005-11-22 00:31:24.831483491 +0100
-@@ -11,7 +11,9 @@
- mysql_fix_privilege_tables \- upgrade MySQL system tables
- .SH "SYNOPSIS"
- .HP 52
--\fBmysql_fix_privilege_tables \-\-password=\fR\fB\fIroot_password\fR\fR
-+\fBmysql_fix_privilege_tables \-\-password=\fR\fB\fIroot_password\fR\fR\ (INSECURE)
-+.PP
-+WARNING: Providing a password on command line is insecure as it is visible through /proc to anyone for a short time.
- .SH "DESCRIPTION"
- .PP
- Some releases of MySQL introduce changes to the structure of the system tables in the
---- old/man/mysqlshow.1.orig 2005-11-14 19:20:56.000000000 +0100
-+++ new/man/mysqlshow.1 2005-11-22 00:32:05.535631432 +0100
-@@ -100,8 +101,8 @@
- Show table indexes.
- .TP
- \(bu
--\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
--\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
-+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR,
-+\fB\-p[\fR\fB\fIpassword\fR\fR\fB\ (INSECURE)]\fR
- .sp
- The password to use when connecting to the server. If you use the short option form (\fB\-p\fR), you
- \fIcannot\fR
--- old/scripts/mysql_explain_log.sh 2007-02-20 18:49:37.000000000 +0100
+++ new/scripts/mysql_explain_log.sh 2007-03-22 22:32:26.000000000 +0100
@@ -341,6 +341,9 @@
Modified: branches/sid-5.0/debian/rules
===================================================================
--- branches/sid-5.0/debian/rules 2007-06-24 22:18:58 UTC (rev 887)
+++ branches/sid-5.0/debian/rules 2007-06-24 22:21:08 UTC (rev 888)
@@ -106,6 +106,7 @@
--without-ndb-test \
--with-embedded-server \
--with-embedded-privilege-control \
+ --without-man \
--with-ndb-docs'
# --sysconfdir=/etc/mysql -- Appends /etc/mysql after ~/ in the my.cnf search patch!
@@ -171,13 +172,17 @@
dh_clean -k
dh_installdirs
- # some self written manpages which hopefully
- # gets overwritten sooner or later with upstreams
+ # this is stupid, if mysql-server symlinks point to something in the
+ # mysql-client package they get not compressed and end up stale
mkdir -p $(TMP)/usr/share/man/man1/
mkdir -p $(TMP)/usr/share/man/man8/
- cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
- ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanager-pwgen.1
- ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanagerc.1
+ for i in `grep /man/man1/ debian/mysql-client*.files`; do ln -sf mysql-license-dummy.1 $(TMP)/usr/share/man/man1/`basename $$i`; done
+ for i in `grep /man/man1/ debian/mysql-server*.files`; do ln -sf mysqld-license-dummy.1 $(TMP)/usr/share/man/man1/`basename $$i`; done
+ for i in `grep /man/man8/ debian/mysql-server*.files`; do ln -sf ../man1/mysqld-license-dummy.1 $(TMP)/usr/share/man/man8/`basename $$i`; done
+ # some self written manpages which hopefully get added upstream
+ cp --no-dereference --remove-destination debian/additions/*.1 $(TMP)/usr/share/man/man1/
+ ln -sf mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanager-pwgen.1
+ ln -sf mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanagerc.1
# make install (trailing slash needed for innobase)
$(MAKE) install DESTDIR=$(TMP)/
More information about the Pkg-mysql-commits
mailing list