[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#725172: marked as done (pu: package subversion/1.6.17dfsg-4+deb7u4)

Your message dated Wed, 2 Oct 2013 14:27:47 +0200
with message-id <20131002122747.GD15582@mraw.org>
and subject line Re: Bug#725172: pu: package subversion/1.6.17dfsg-4+deb7u4
has caused the Debian Bug report #725172,
regarding pu: package subversion/1.6.17dfsg-4+deb7u4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
725172: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725172
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I know we love to get patches land into unstable first, but given the
current series of NMUs in unstable, and the pending ones (based on some
question on #debian-ftp earlier today), I thought it would be worthwhile
to suggest a subversion wheezy upload to fix python-subversion.

Only impacted file is subversion/bindings/swig/core.i, fix is different
from upstream's (which isn't in the version in unstable anyway), but was
tested live on alioth.

Mraw,
KiBi.

diff -Nru subversion-1.6.17dfsg/debian/changelog subversion-1.6.17dfsg/debian/changelog
--- subversion-1.6.17dfsg/debian/changelog	2013-10-02 10:14:51.000000000 +0000
+++ subversion-1.6.17dfsg/debian/changelog	2013-10-02 10:14:51.000000000 +0000
@@ -1,3 +1,22 @@
+subversion (1.6.17dfsg-4+deb7u4) wheezy; urgency=low
+
+  * Non-maintainer upload.
+  * Fix python-subversion by compensating for swig behavorial changes:
+    - SVN_STREAM_CHUNK_SIZE is declared as a long constant, and is
+      frequently used as a second parameter to svn_stream_read().
+    - swig 2.0.4- was generating an integer constant anyway since that was
+      sufficient to hold the declared value.
+    - swig 2.0.5+ uses a long unconditionally in such cases.
+    - svn_stream_read() calls both of PyInt_Check() and PyInt_AsLong().
+    Since error handling in PyInt_AsLong() is sufficient, and since
+    PyInt_Check() fails with a long parameter, drop the PyInt_Check()
+    check. A slightly different version was committed upstream as r1351117
+    but this version was tested live on alioth, thanks to Stephen Gran.
+  * This should fix at least svnmailer, viewvc, trac. (Closes: #680298)
+    + patches/python-fix-svn_stream_read.diff
+
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 17 Sep 2013 10:52:32 +0000
+
 subversion (1.6.17dfsg-4+deb7u3) wheezy-security; urgency=high
 
   * Non-maintainer upload by the Security Team.
diff -Nru subversion-1.6.17dfsg/debian/patches/python-fix-svn_stream_read.diff subversion-1.6.17dfsg/debian/patches/python-fix-svn_stream_read.diff
--- subversion-1.6.17dfsg/debian/patches/python-fix-svn_stream_read.diff	1970-01-01 00:00:00.000000000 +0000
+++ subversion-1.6.17dfsg/debian/patches/python-fix-svn_stream_read.diff	2013-10-02 10:14:51.000000000 +0000
@@ -0,0 +1,18 @@
+Get rid of extraneous PyInt_Check(), which would reject a long
+parameter, which is now usually the case since the len parameter
+tends to be SVN_STREAM_CHUNK_SIZE, declared as a long, and now
+enforced as a long in swig 2.0.5+
+--- a/subversion/bindings/swig/core.i
++++ b/subversion/bindings/swig/core.i
+@@ -337,11 +337,6 @@
+ */
+ #ifdef SWIGPYTHON
+ %typemap(in) (char *buffer, apr_size_t *len) ($*2_type temp) {
+-    if (!PyInt_Check($input)) {
+-        PyErr_SetString(PyExc_TypeError,
+-                        "expecting an integer for the buffer size");
+-        SWIG_fail;
+-    }
+     temp = PyInt_AsLong($input);
+     if (temp < 0) {
+         PyErr_SetString(PyExc_ValueError,
diff -Nru subversion-1.6.17dfsg/debian/patches/series subversion-1.6.17dfsg/debian/patches/series
--- subversion-1.6.17dfsg/debian/patches/series	2013-10-02 10:14:51.000000000 +0000
+++ subversion-1.6.17dfsg/debian/patches/series	2013-10-02 10:14:51.000000000 +0000
@@ -40,3 +40,4 @@
 cve-2013-1849
 CVE-2013-1968.patch
 CVE-2013-2112.patch
+python-fix-svn_stream_read.diff

--- End Message ---
--- Begin Message --- 
Cyril Brulebois <kibi@debian.org> (2013-10-02):
> I know we love to get patches land into unstable first, but given the
> current series of NMUs in unstable, and the pending ones (based on some
> question on #debian-ftp earlier today), I thought it would be worthwhile
> to suggest a subversion wheezy upload to fix python-subversion.
> 
> Only impacted file is subversion/bindings/swig/core.i, fix is different
> from upstream's (which isn't in the version in unstable anyway), but was
> tested live on alioth.

Apparently, my doing the work triggered James' looking into it…

KiBi.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: