Package: release.debian.org User: release.debian....@packages.debian.org Usertags: tpu
Hi, I'd like to get your approval about the upload of beanstalkd 1.4.6-5 to testing-proposed-updates to add a two-line RC bug fix that's already applied upstream. Please find below the source diff and debdiff against the current release in testing. thanks, sez diff --git a/debian/changelog b/debian/changelog index 1e5ee8c..e6d62ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +beanstalkd (1.4.6-5) testing-proposed-updates; urgency=low + + * Add fix-empty-binlog-oom.diff (from upstream commit 70b63d5) to fix + OUT_OF_MEMORY error after crash (Closes: #698140, aka upstream issue 44) + + -- Serafeim Zanikolas <s...@debian.org> Mon, 14 Jan 2013 17:17:27 +0100 + beanstalkd (1.4.6-4) testing-proposed-updates; urgency=low * Add fiu-fix.diff (upstream commit 3176e28) to fix FTBFS due to diff --git a/debian/patches/fix-empty-binlog-oom.diff b/debian/patches/fix-empty-binlog-oom.diff new file mode 100644 index 0000000..43ef743 --- /dev/null +++ b/debian/patches/fix-empty-binlog-oom.diff @@ -0,0 +1,16 @@ +# Description: eliminate OOM error after server crash +# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698140 +# Origin: https://github.com/kr/beanstalkd/commit/70b63d5f52010d5b286f146058573849d8b95a81 +--- a/binlog.c ++++ b/binlog.c +@@ -111,6 +111,10 @@ + + oldest_binlog = b->next; + ++ if (newest_binlog == b) { ++ newest_binlog = b->next; /* == 0 */ ++ } ++ + unlink(b->path); + free(b); + } diff --git a/debian/patches/series b/debian/patches/series index f30298a..97715b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +fix-empty-binlog-oom.diff fiu-fix.diff rename-dprintf.diff randomise-port.diff $ debdiff /var/cache/pbuilder/result/beanstalkd_1.4.6-4_i386.deb /var/cache/pbuilder/result/beanstalkd_1.4.6-5_i386.deb File lists identical (after any substitutions) Control files: lines which differ (wdiff format) ------------------------------------------------ Version: [-1.4.6-4-] {+1.4.6-5+} -- Every great idea is worthless without someone to do the work. --Neil Williams -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
