[Erp5-report] r26105 - in /spec/mandriva: erp5-ERP5/ erp5-PluggableAuthService/ python2.4-4...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Mar 20 09:16:14 CET 2009


Author: kazuhiko
Date: Fri Mar 20 09:16:13 2009
New Revision: 26105

URL: http://svn.erp5.org?rev=26105&view=rev
Log:
revise for Mandriva 2009.1

Added:
    spec/mandriva/python2.4-4Suite-XML/4Suite-XML-1.0.2-format-security.patch
    spec/mandriva/python2.4-ctypes/ctypes-1.0.2-format-security.patch
Modified:
    spec/mandriva/erp5-ERP5/erp5-ERP5.spec
    spec/mandriva/erp5-PluggableAuthService/erp5-PluggableAuthService.spec
    spec/mandriva/python2.4-4Suite-XML/python2.4-4Suite-XML.spec
    spec/mandriva/python2.4-ctypes/python2.4-ctypes.spec

Modified: spec/mandriva/erp5-ERP5/erp5-ERP5.spec
URL: http://svn.erp5.org/spec/mandriva/erp5-ERP5/erp5-ERP5.spec?rev=26105&r1=26104&r2=26105&view=diff
==============================================================================
--- spec/mandriva/erp5-ERP5/erp5-ERP5.spec [utf8] (original)
+++ spec/mandriva/erp5-ERP5/erp5-ERP5.spec [utf8] Fri Mar 20 09:16:13 2009
@@ -1,6 +1,6 @@
 %define product ERP5
 %define version 5.4
-%define release 2
+%define release 3
 
 %define rpm_prefix erp5
 %define zope_home     %{_prefix}/lib/erp5
@@ -30,6 +30,9 @@
 #----------------------------------------------------------------------
 %prep
 %setup -q -c
+%if %mdkversion >= 200910
+sed -i -e 's,/usr/bin/python2.5,/usr/bin/python,' ERP5/bin/genbt5list
+%endif
 
 %build
 
@@ -68,6 +71,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Mar 12 2009 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 5.4-3nxd2009.0
+- use python2.6 for genbt5list script on Mandriva 2009.1
+
 * Thu Mar 12 2009 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 5.4-2nxd2009.0
 - add 'Requires: python2.4-chardet'
 

Modified: spec/mandriva/erp5-PluggableAuthService/erp5-PluggableAuthService.spec
URL: http://svn.erp5.org/spec/mandriva/erp5-PluggableAuthService/erp5-PluggableAuthService.spec?rev=26105&r1=26104&r2=26105&view=diff
==============================================================================
--- spec/mandriva/erp5-PluggableAuthService/erp5-PluggableAuthService.spec [utf8] (original)
+++ spec/mandriva/erp5-PluggableAuthService/erp5-PluggableAuthService.spec [utf8] Fri Mar 20 09:16:13 2009
@@ -14,7 +14,7 @@
 Group:     System/Servers
 URL:       http://www.zope.org/Members/urbanape/PluggableAuthService
 Source0:   %{product}-%{version}.tar.bz2
-Patch0:    PluggableAuthService-zope_interface.patch.bz2
+Patch:     PluggableAuthService-zope_interface.patch.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
 Requires:  %{rpm_prefix}-zope, %{rpm_prefix}-PluginRegistry < 1.1

Added: spec/mandriva/python2.4-4Suite-XML/4Suite-XML-1.0.2-format-security.patch
URL: http://svn.erp5.org/spec/mandriva/python2.4-4Suite-XML/4Suite-XML-1.0.2-format-security.patch?rev=26105&view=auto
==============================================================================
--- spec/mandriva/python2.4-4Suite-XML/4Suite-XML-1.0.2-format-security.patch (added)
+++ spec/mandriva/python2.4-4Suite-XML/4Suite-XML-1.0.2-format-security.patch [utf8] Fri Mar 20 09:16:13 2009
@@ -1,0 +1,20 @@
+--- 4Suite-XML-1.0.2/Ft/Xml/src/StreamWriter.c.orig	2009-03-19 14:20:05.000000000 +0000
++++ 4Suite-XML-1.0.2/Ft/Xml/src/StreamWriter.c	2009-03-19 14:20:43.000000000 +0000
+@@ -602,7 +602,7 @@
+ static int writer_print(PyStreamWriterObject *self, FILE *fp, int flags)
+ {
+   PyObject *repr = writer_repr(self);
+-  fprintf(fp, PyString_AS_STRING(repr));
++  fprintf(fp, "%s", PyString_AS_STRING(repr));
+   Py_DECREF(repr);
+   return 0;
+ }
+@@ -812,7 +812,7 @@
+ static int entitymap_print(PyEntityMapObject *self, FILE *fp, int flags)
+ {
+   PyObject *repr = entitymap_repr(self);
+-  fprintf(fp, PyString_AS_STRING(repr));
++  fprintf(fp, "%s", PyString_AS_STRING(repr));
+   Py_DECREF(repr);
+   return 0;
+ }

Modified: spec/mandriva/python2.4-4Suite-XML/python2.4-4Suite-XML.spec
URL: http://svn.erp5.org/spec/mandriva/python2.4-4Suite-XML/python2.4-4Suite-XML.spec?rev=26105&r1=26104&r2=26105&view=diff
==============================================================================
--- spec/mandriva/python2.4-4Suite-XML/python2.4-4Suite-XML.spec [utf8] (original)
+++ spec/mandriva/python2.4-4Suite-XML/python2.4-4Suite-XML.spec [utf8] Fri Mar 20 09:16:13 2009
@@ -1,6 +1,6 @@
 %define dname 4Suite-XML
 %define version 1.0.2
-%define release 4
+%define release 5
 %define pyver 2.4
 %define python python2.4
 
@@ -9,6 +9,7 @@
 Version:        %{version}
 Release:        %mkrel %release
 Source0:        http://belnet.dl.sourceforge.net/sourceforge/foursuite/%{dname}-%{version}.tar.bz2
+Patch:          4Suite-XML-1.0.2-format-security.patch
 URL:            http://4suite.org/
 
 Group:          Development/Python
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q -n %{dname}-%{version}
+%patch -p1 -b .format-security
 perl -p -i -e "s,Script\('[^']+,$&2.4,g" packages/Xml.pkg
 
 %build
@@ -50,6 +52,9 @@
 %doc COPY* README docs/
 
 %changelog
+* Sun Sep  9 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 1.0.2-5nxd2009.0
+- add '4Suite-XML-1.0.2-format-security.patch'
+
 * Sun Sep  9 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 1.0.2-4mdv2007.1
 - add '2.4' suffix to /usr/bin/*
 

Added: spec/mandriva/python2.4-ctypes/ctypes-1.0.2-format-security.patch
URL: http://svn.erp5.org/spec/mandriva/python2.4-ctypes/ctypes-1.0.2-format-security.patch?rev=26105&view=auto
==============================================================================
--- spec/mandriva/python2.4-ctypes/ctypes-1.0.2-format-security.patch (added)
+++ spec/mandriva/python2.4-ctypes/ctypes-1.0.2-format-security.patch [utf8] Fri Mar 20 09:16:13 2009
@@ -1,0 +1,20 @@
+--- ctypes-1.0.2/source/_ctypes.c.orig	2007-05-15 19:53:25.000000000 +0200
++++ ctypes-1.0.2/source/_ctypes.c	2009-03-19 15:25:58.000000000 +0100
+@@ -300,6 +300,8 @@
+ /* dlerror() isn't very helpful on cygwin */
+ 			     "symbol '%s' not found (%s) ",
+ 			     name,
++#else
++			     "%s",
+ #endif
+ 			     ctypes_dlerror());
+ 		return NULL;
+@@ -2791,6 +2793,8 @@
+ /* dlerror() isn't very helpful on cygwin */
+ 			     "function '%s' not found (%s) ",
+ 			     name,
++#else
++			     "%s",
+ #endif
+ 			     ctypes_dlerror());
+ 		return NULL;

Modified: spec/mandriva/python2.4-ctypes/python2.4-ctypes.spec
URL: http://svn.erp5.org/spec/mandriva/python2.4-ctypes/python2.4-ctypes.spec?rev=26105&r1=26104&r2=26105&view=diff
==============================================================================
--- spec/mandriva/python2.4-ctypes/python2.4-ctypes.spec [utf8] (original)
+++ spec/mandriva/python2.4-ctypes/python2.4-ctypes.spec [utf8] Fri Mar 20 09:16:13 2009
@@ -1,7 +1,7 @@
 %define oname ctypes
 %define name python2.4-%oname
 %define version 1.0.2
-%define release %mkrel 1
+%define release %mkrel 2
 %define py_platsitedir %{_libdir}/python2.4/site-packages
 
 Summary: Create and manipulate C data types from Python
@@ -9,6 +9,7 @@
 Version: %{version}
 Release: %{release}
 Source0: http://prdownloads.sourceforge.net/ctypes/%{oname}-%{version}.tar.gz
+Patch:   ctypes-1.0.2-format-security.patch
 License: MIT
 Group: Development/Python
 Url: http://starship.python.net/crew/theller/ctypes/
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n %oname-%version
+%patch -p1 -b .format-security
 
 %build
 python2.4 setup.py build
@@ -41,6 +43,9 @@
 %py_platsitedir/ctypes
 
 %changelog
+* Thu Mar 19 2009 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 1.0.2-2nxd2009.0
+- add 'ctypes-1.0.2-format-security.patch'
+
 * Tue Nov 20 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 1.0.2-1mdv2007.1
 - import from Mandriva 2007.0
 - New release 1.0.2




More information about the Erp5-report mailing list