packages: mysql-workbench/PLD_Linux_(MySQL_Package).xml, mysql-workbench/my...
glen
glen at pld-linux.org
Fri May 11 19:51:56 CEST 2012
Author: glen Date: Fri May 11 17:51:56 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- update deps
---- Files affected:
packages/mysql-workbench:
PLD_Linux_(MySQL_Package).xml (1.1 -> 1.2) , mysql-workbench.spec (1.44 -> 1.45) , bashism.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml
diff -u packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml:1.1 packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml:1.2
--- packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml:1.1 Fri May 11 18:33:56 2012
+++ packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml Fri May 11 19:51:51 2012
@@ -8,7 +8,7 @@
<value type="string" key="sys.mysqld.stop">/sbin/service mysql stop</value>
<value type="string" key="sys.mysqld.status">ps -C mysqld -o pid=</value>
<value type="int" key="sys.usesudo">1</value>
- <value type="int" key="sys.usesudostatus">0</value>
+ <value type="int" key="sys.usesudostatus">1</value>
<value type="string" key="sys.sudo">/usr/bin/sudo -p EnterPasswordHere /bin/sh -c</value>
<value type="string" key="sys.system">Linux</value>
================================================================
Index: packages/mysql-workbench/mysql-workbench.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.44 packages/mysql-workbench/mysql-workbench.spec:1.45
--- packages/mysql-workbench/mysql-workbench.spec:1.44 Fri May 11 19:41:32 2012
+++ packages/mysql-workbench/mysql-workbench.spec Fri May 11 19:51:51 2012
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a
Name: mysql-workbench
Version: 5.2.38
-Release: 1
+Release: 1.5
License: GPL v2
Group: Applications/Databases
Source0: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}-src.tar.gz
@@ -17,6 +17,7 @@
Patch5: pld-profile.patch
Patch6: get_local_ip_list.patch
Patch7: log_slow_queries.patch
+Patch8: bashism.patch
URL: http://wb.mysql.com/
BuildRequires: OpenGL-devel
BuildRequires: autoconf
@@ -89,6 +90,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
cp -p '%{SOURCE1}' res/mysql.profiles
%build
@@ -145,6 +147,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45 2012/05/11 17:51:51 glen
+- update deps
+
Revision 1.44 2012/05/11 17:41:32 glen
- alternative slow log configration param
@@ -152,7 +157,7 @@
- fix ipconfig callout
Revision 1.42 2012/05/11 16:33:56 glen
-,- add pld server type
+- add pld server type
- update desktop stuff
- drop deprecated gnome-vfs (we use shared mime info)
================================================================
Index: packages/mysql-workbench/bashism.patch
diff -u /dev/null packages/mysql-workbench/bashism.patch:1.1
--- /dev/null Fri May 11 19:51:56 2012
+++ packages/mysql-workbench/bashism.patch Fri May 11 19:51:51 2012
@@ -0,0 +1,65 @@
+--- mysql-workbench-gpl-5.2.38-src/./frontend/linux/workbench/mysql-workbench.in~ 2012-02-21 18:53:41.000000000 +0200
++++ mysql-workbench-gpl-5.2.38-src/./frontend/linux/workbench/mysql-workbench.in 2012-05-11 20:35:21.219997098 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # Uncomment the following line if you're having trouble with gnome-keyring lockups.
+ # This will cause passwords to be stored only temporarily for the session.
+--- mysql-workbench-gpl-5.2.38-src/./modules/wb.utils/wb_utils_grt.py~ 2012-02-21 18:53:37.000000000 +0200
++++ mysql-workbench-gpl-5.2.38-src/./modules/wb.utils/wb_utils_grt.py 2012-05-11 20:37:19.872151306 +0300
+@@ -114,7 +114,7 @@
+ subprocess.Popen(command, shell = True)
+ else:
+ command = """mysql \\"-u%s\\" \\"-h%s\\" -P%i %s -p %s""" % (user, host, port, socket, schema)
+- subprocess.call(["/bin/bash", "-c", "%s -e \"%s\" &" % (get_linux_terminal_program(), command)])
++ subprocess.call(["/bin/sh", "-c", "%s -e \"%s\" &" % (get_linux_terminal_program(), command)])
+
+
+ # Utilities only work in Py 2.6
+@@ -160,14 +160,14 @@
+ f.write('echo "The following MySQL Utilities are available:"\n')
+ f.write('echo $MYSQL_UTILITIES_COMMANDS\n')
+ f.write('rm -f "%s"\n' % setup_script)
+- f.write('bash -i\n')
++ f.write('sh -i\n')
+ f.close()
+ os.chmod(setup_script, 0700)
+
+ if 'konsole' in term:
+- subprocess.call([term, "-e", "/bin/bash", setup_script])
++ subprocess.call([term, "-e", "/bin/sh", setup_script])
+ else:
+- subprocess.call(["/bin/bash", "-c", "%s -e %s &" % (term, setup_script)])
++ subprocess.call(["/bin/sh", "-c", "%s -e %s &" % (term, setup_script)])
+
+
+ class CheckForUpdateThread(threading.Thread):
+--- mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/frontend/wb_admin_grt.py~ 2012-02-21 18:53:37.000000000 +0200
++++ mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/frontend/wb_admin_grt.py 2012-05-11 20:38:09.431110024 +0300
+@@ -120,9 +120,9 @@
+ try:
+ if not server_instance.serverInfo["sys.sudo"]:
+ # don't break settings that were working perfectly before, assume a valid default
+- server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/bash -c"
++ server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/sh -c"
+ except:
+- server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/bash -c"
++ server_instance.serverInfo["sys.sudo"] = "/usr/bin/sudo -p EnterPasswordHere /bin/sh -c"
+
+ app = App.get()
+ try:
+--- mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_server_management.py~ 2012-02-21 18:53:36.000000000 +0200
++++ mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_server_management.py 2012-05-11 20:39:04.223601285 +0300
+@@ -141,9 +141,9 @@
+ raise Exception("WBA: Internal error, unexpected character in script to be executed")
+
+ if not as_admin:
+- result = pexpect.run("/bin/bash -c '" + script + "'", withexitstatus=True)
++ result = pexpect.run("/bin/sh -c '" + script + "'", withexitstatus=True)
+ else:
+- child = pexpect.spawn("/bin/bash -c '" + script + "'") # script should already have sudo prefix
++ child = pexpect.spawn("/bin/sh -c '" + script + "'") # script should already have sudo prefix
+ try:
+ child.expect('assword', timeout=10)
+ if admin_password is not None:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/mysql-workbench/mysql-workbench.spec?r1=1.44&r2=1.45
More information about the pld-cvs-commit
mailing list