On 03/03/2013 10:31 PM, Adam D. Barratt wrote: > On Sun, 2013-03-03 at 17:49 -0800, Nikolaus Rath wrote: >> Ok, I updated severity and tags of the bug and uploaded a new version >> to unstable that fixes the issue there. > > Thanks. > >> I have put the proposed update for testing on mentors.debian.net: >> >> http://mentors.debian.net/debian/pool/main/s/s3ql/s3ql_1.11.1-3.dsc > > fwiw "1.11.1-2+deb7u1" would be a more conventional version number here; > -3 works so long as there's never been a package using that version > before, though. > >> What else do I need to do? > > Please could you post a debdiff to this thread?
I already did, but here it is again :-). Thanks, -Niko
diff -Nru s3ql-1.11.1/debian/changelog s3ql-1.11.1/debian/changelog --- s3ql-1.11.1/debian/changelog 2012-06-05 13:35:58.000000000 -0700 +++ s3ql-1.11.1/debian/changelog 2013-02-24 18:52:36.000000000 -0800 @@ -1,3 +1,10 @@ +s3ql (1.11.1-3) testing-proposed-updates; urgency=low + + * Call fflush() on FILE stream before repositioning underlying + file descriptor. Closes: 701350. + + -- Nikolaus Rath <nikol...@rath.org> Sun, 24 Feb 2013 18:51:42 -0800 + s3ql (1.11.1-2) unstable; urgency=low * Add dependency on python-pkg-resources. Closes: 672916. diff -Nru s3ql-1.11.1/debian/patches/deltadump_fflush.diff s3ql-1.11.1/debian/patches/deltadump_fflush.diff --- s3ql-1.11.1/debian/patches/deltadump_fflush.diff 1969-12-31 16:00:00.000000000 -0800 +++ s3ql-1.11.1/debian/patches/deltadump_fflush.diff 2013-02-24 18:55:19.000000000 -0800 @@ -0,0 +1,29 @@ +Description: call fflush() to avoid data corruption +Origin: upstream +Applied-Upstream: http://code.google.com/p/s3ql/source/detail?r=e20279364896cfaa5d3c8cda29cb64c3b432a0ec +Last-Update: 2013-02-24 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/s3ql/_deltadump.pyx ++++ b/src/s3ql/_deltadump.pyx +@@ -28,6 +28,7 @@ + + cdef extern from 'stdio.h' nogil: + FILE * fdopen(int fd, const_char * mode) ++ int fflush(FILE * stream) + int fileno(FILE * stream) + + cdef extern from 'endian.h' nogil: +@@ -123,6 +124,12 @@ + + cdef ssize_t off + ++ # Explicitly flush data that needs to be written. This is ++ # important, so that we can safely reposition the fd position ++ # below (which is necessary in case there is cached input data) ++ if fflush(fp) != 0: ++ raise OSError(errno, strerror(errno)) ++ + # Reposition FD to position of FILE*, otherwise next read from FD will miss + # data currently in stream buffer. It seems that call to fflush() achieves + # the same thing, but this does not seem to be documented so we don't rely diff -Nru s3ql-1.11.1/debian/patches/series s3ql-1.11.1/debian/patches/series --- s3ql-1.11.1/debian/patches/series 2012-01-23 17:39:07.000000000 -0800 +++ s3ql-1.11.1/debian/patches/series 2013-02-24 18:51:23.000000000 -0800 @@ -1 +1,2 @@ proc_mount.diff +deltadump_fflush.diff
