Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit python-mysql
  • From: root@xxxxxxx (h_root)
  • Date: Sat, 21 Oct 2006 21:37:10 +0200 (CEST)
  • Message-id: <20061021193710.2849484473@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package python-mysql
checked in at Sat Oct 21 21:37:10 CEST 2006.

--------
--- python-mysql/python-mysql.changes 2006-02-28 16:46:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/python-mysql/python-mysql.changes 2006-10-20 15:59:42.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 20 15:57:22 CEST 2006 - jmatejek@xxxxxxx
+
+- update to 1.2.1_p2
+ - support for some new features of mysql 4.1 and 5.0
+- fixes for 64bit bugs due to PEP353
+
+-------------------------------------------------------------------

Old:
----
MySQL-python-1.2.0.tar.bz2

New:
----
MySQL-python-1.2.1_p2-ssize.patch
MySQL-python-1.2.1_p2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-mysql.spec ++++++
--- /var/tmp/diff_new_pack.A4TCKZ/_old 2006-10-21 21:36:59.000000000 +0200
+++ /var/tmp/diff_new_pack.A4TCKZ/_new 2006-10-21 21:36:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-mysql (Version 1.2.0)
+# spec file for package python-mysql (Version 1.2.1_p2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,13 @@

Name: python-mysql
BuildRequires: mysql-devel python-devel
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: Development/Libraries/Python
Autoreqprov: on
-Version: 1.2.0
-Release: 8
+Version: 1.2.1_p2
+Release: 1
Source0: MySQL-python-%{version}.tar.bz2
+Patch0: MySQL-python-1.2.1_p2-ssize.patch
URL: http://sourceforge.net/projects/mysql-python
Summary: An Interface to the Popular MySQL Database Server for Python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,6 +50,7 @@

%prep
%setup -n MySQL-python-%{version}
+%patch0

%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -61,9 +63,13 @@

%files -f INSTALLED_FILES
%defattr(-, root, root)
-%doc doc/* README GPL ChangeLog
+%doc doc/* README ChangeLog

%changelog -n python-mysql
+* Fri Oct 20 2006 - jmatejek@xxxxxxx
+- update to 1.2.1_p2
+ - support for some new features of mysql 4.1 and 5.0
+- fixes for 64bit bugs due to PEP353
* Tue Feb 28 2006 - jmatejek@xxxxxxx
- updated to reflect python changes due to #149809
* Wed Jan 25 2006 - mls@xxxxxxx

++++++ MySQL-python-1.2.1_p2-ssize.patch ++++++
--- _mysql.c
+++ _mysql.c
@@ -220,7 +220,7 @@
PyObject *kwargs) {
static char *kwlist[] = {"args", "groups", NULL};
char **cmd_args_c=NULL, **groups_c=NULL, *s;
- int cmd_argc=0, i, groupc;
+ Py_ssize_t cmd_argc=0, i, groupc;
PyObject *cmd_args=NULL, *groups=NULL, *ret=NULL, *item;

if (_mysql_server_init_done) {
@@ -245,6 +245,10 @@
PyErr_SetString(PyExc_TypeError,
"args could not be sized");
goto finish;
+ } else if (cmd_argc > INT_MAX) {
+ PyErr_SetString(PyExc_ValueError,
+ "more than INT_MAX args, this is unsupported");
+ goto finish;
}
cmd_args_c = (char **) PyMem_Malloc(cmd_argc*sizeof(char *));
for (i=0; i< cmd_argc; i++) {
@@ -270,6 +274,10 @@
PyErr_SetString(PyExc_TypeError,
"groups could not be sized");
goto finish;
+ } else if (groupc > INT_MAX) {
+ PyErr_SetString(PyExc_ValueError,
+ "more than INT_MAX groups, this is unsupported");
+ goto finish;
}
groups_c = (char **) PyMem_Malloc((1+groupc)*sizeof(char *));
for (i=0; i< groupc; i++) {
@@ -392,7 +400,7 @@
Py_INCREF(Py_None);
}
if (PySequence_Check(fun)) {
- int j, n2=PySequence_Size(fun);
+ Py_ssize_t j, n2=PySequence_Size(fun);
PyObject *fun2=NULL;
for (j=0; j<n2; j++) {
PyObject *t = PySequence_GetItem(fun, j);
@@ -1086,7 +1094,7 @@
PyObject *args)
{
PyObject *o=NULL, *d=NULL, *r=NULL, *item, *quoted;
- int i, n;
+ Py_ssize_t i, n;
if (!PyArg_ParseTuple(args, "OO:escape_sequence", &o, &d))
goto error;
if (!PyMapping_Check(d)) {
@@ -1120,7 +1128,7 @@
PyObject *args)
{
PyObject *o=NULL, *d=NULL, *r=NULL, *item, *quoted, *pkey;
- int ppos = 0;
+ Py_ssize_t ppos = 0;
if (!PyArg_ParseTuple(args, "O!O:escape_dict", &PyDict_Type, &o, &d))
goto error;
if (!PyMapping_Check(d)) {

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages