tags 687402 + patch tags 687402 + pending thanks Dear RMs,
Please consider the attached patch for beanstalkd to fix RC bug #687402 (FTBFS, test failure). It must go through TPU. Hi Serafeim: this also serves as notice to NMU through DELAYED/2, please feel free to tell me if I should delay it longer. Thanks, -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51 <directhex> i have six years of solaris sysadmin experience, from 8->10. i am well qualified to say it is made from bonghits layered on top of bonghits
diff -Nru beanstalkd-1.4.6/debian/changelog beanstalkd-1.4.6/debian/changelog --- beanstalkd-1.4.6/debian/changelog 2011-08-14 14:50:22.000000000 +0100 +++ beanstalkd-1.4.6/debian/changelog 2012-10-13 17:59:02.000000000 +0100 @@ -1,3 +1,11 @@ +beanstalkd (1.4.6-3.1) testing-proposed-updates; urgency=low + + * Non-maintainer upload. + * Cherry-pick upstream patch for newer FIU version output parsing + (Closes: #687402) + + -- Jonathan Wiltshire <j...@debian.org> Sat, 13 Oct 2012 17:53:25 +0100 + beanstalkd (1.4.6-3) unstable; urgency=high * Patch sh-tests/common.functions to randomise the listener port during diff -Nru beanstalkd-1.4.6/debian/patches/newer-fiu.diff beanstalkd-1.4.6/debian/patches/newer-fiu.diff --- beanstalkd-1.4.6/debian/patches/newer-fiu.diff 1970-01-01 01:00:00.000000000 +0100 +++ beanstalkd-1.4.6/debian/patches/newer-fiu.diff 2012-10-13 17:43:03.000000000 +0100 @@ -0,0 +1,52 @@ +Description: Fix for new FIU version in tests + (output parsing changes) +Origin: https://github.com/kr/beanstalkd/commit/3176e28 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687402 +Forwarded: not-needed +Reviewed-by: Jonathan Wiltshire <j...@debian.org> +Last-Update: 2012-10-13 + +Index: beanstalkd-1.4.6/sh-tests/binlog-diskfull-delete.sh +=================================================================== +--- beanstalkd-1.4.6.orig/sh-tests/binlog-diskfull-delete.sh 2010-05-22 22:23:16.000000000 +0100 ++++ beanstalkd-1.4.6/sh-tests/binlog-diskfull-delete.sh 2012-10-13 17:40:55.159542634 +0100 +@@ -81,7 +81,7 @@ + } + + # Make beanstalkd think the disk is full now. +-fiu-ctrl -e posix/io/oc/open -i $ENOSPC $bpid ++fiu-ctrl -c 'enable name=posix/io/oc/open' -i $ENOSPC $bpid + + # Insert enough jobs to create another binlog file + $nc $server $port <<EOF > "$out1" +@@ -138,7 +138,7 @@ + test ! -e "$logdir"/binlog.1 || fail First binlog file is still there + + # Now make beanstalkd think the disk once again has space. +-fiu-ctrl -d posix/io/oc/open $bpid ++fiu-ctrl -c 'disable name=posix/io/oc/open' $bpid + + # Insert enough jobs to create another binlog file + $nc $server $port <<EOF > "$out1" +Index: beanstalkd-1.4.6/sh-tests/binlog-diskfull.sh +=================================================================== +--- beanstalkd-1.4.6.orig/sh-tests/binlog-diskfull.sh 2010-05-22 22:23:16.000000000 +0100 ++++ beanstalkd-1.4.6/sh-tests/binlog-diskfull.sh 2012-10-13 17:40:55.159542634 +0100 +@@ -39,7 +39,7 @@ + start_beanstalkd $logdir "-s $size" "fiu-run -x" + + # Make beanstalkd think the disk is full now. +-fiu-ctrl -e posix/io/oc/open -i $ENOSPC $bpid ++fiu-ctrl -c 'enable name=posix/io/oc/open' -i $ENOSPC $bpid + + # Insert enough jobs to create another binlog file + $nc $server $port <<EOF > "$out1" +@@ -70,7 +70,7 @@ + test "$res" -eq 0 || exit $res + + # Now make beanstalkd think the disk once again has space. +-fiu-ctrl -d posix/io/oc/open $bpid ++fiu-ctrl -c 'disable name=posix/io/oc/open' $bpid + + # Insert enough jobs to create another binlog file + $nc $server $port <<EOF > "$out1" diff -Nru beanstalkd-1.4.6/debian/patches/series beanstalkd-1.4.6/debian/patches/series --- beanstalkd-1.4.6/debian/patches/series 2011-08-14 14:36:47.000000000 +0100 +++ beanstalkd-1.4.6/debian/patches/series 2012-10-13 17:38:21.000000000 +0100 @@ -1,2 +1,3 @@ rename-dprintf.diff randomise-port.diff +newer-fiu.diff
signature.asc
Description: Digital signature
