[xml/sgml-commit] r2167 - in /packages/html-xml-utils/trunk/debian: changelog control patches/ patches/694460_fix_ftbfs_with_netcat_traditional.patch patches/series

[dleidert at users.alioth.debian.org]

Author: dleidert
Date: Mon May  6 23:13:40 2013
New Revision: 2167

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2167
Log:
* debian/control (Uploaders): Bumped to 3.9.4.
  (DM-Upload-Allowed): Dropped.
* debian/patches/694460_fix_ftbfs_with_netcat_traditional.patch: Added.
  - Fix test running using netcat-traditional (closes: #694460).
* debian/patches/series: Added.

Added:
    packages/html-xml-utils/trunk/debian/patches/
    packages/html-xml-utils/trunk/debian/patches/694460_fix_ftbfs_with_netcat_traditional.patch
    packages/html-xml-utils/trunk/debian/patches/series
Modified:
    packages/html-xml-utils/trunk/debian/changelog
    packages/html-xml-utils/trunk/debian/control

Modified: packages/html-xml-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/changelog?rev=2167&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/changelog (original)
+++ packages/html-xml-utils/trunk/debian/changelog Mon May  6 23:13:40 2013
@@ -2,6 +2,11 @@
 
   * NOT RELEASED YET
   * New upstream release.
+  * debian/control (Uploaders): Bumped to 3.9.4.
+    (DM-Upload-Allowed): Dropped.
+  * debian/patches/694460_fix_ftbfs_with_netcat_traditional.patch: Added.
+    - Fix test running using netcat-traditional (closes: #694460).
+  * debian/patches/series: Added.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 17 May 2012 17:13:14 +0200
 

Modified: packages/html-xml-utils/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/control?rev=2167&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/control (original)
+++ packages/html-xml-utils/trunk/debian/control Mon May  6 23:13:40 2013
@@ -2,18 +2,17 @@
 Section: text
 Priority: extra
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Uploaders: Daniel Leidert <dleidert at debian.org>
 Build-Depends: bison,
                debhelper (>> 9),
                flex,
                gperf,
                libcurl4-gnutls-dev (>> 7.9.7) | libcurl-dev (>> 7.9.7),
                man2html
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.w3.org/Tools/HTML-XML-utils/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/html-xml-utils/trunk/
-DM-Upload-Allowed: yes
 
 Package: html-xml-utils
 Architecture: any

Added: packages/html-xml-utils/trunk/debian/patches/694460_fix_ftbfs_with_netcat_traditional.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/694460_fix_ftbfs_with_netcat_traditional.patch?rev=2167&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/694460_fix_ftbfs_with_netcat_traditional.patch (added)
+++ packages/html-xml-utils/trunk/debian/patches/694460_fix_ftbfs_with_netcat_traditional.patch Mon May  6 23:13:40 2013
@@ -1,0 +1,24 @@
+Author: Roland Stigge <stigge at antcom.de>
+Reviewed-by: Daniel Leidert <dleidert at debian.org>
+Description: Fix extract1.sh test
+ When netcat-traditional is installed (and linked to from nc), it stalls at
+ this test since 1) -p isn't used appropriately and 2) nc.traditional waits
+ indefinitely for the network to EOF even if stdin is already EOF. The issue
+ only happens with netcat-traditional. netcat-openbsd works fine with and
+ without this patch, and when no netcat is installed, this test is skipped
+ without error. The patch makes sure to stay compatible with both
+ netcat-openbsd and netcat-traditional.
+Bug-Debian: http://bugs.debian.org/694460
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=html-xml-utils.patch;att=1;bug=694460
+
+--- a/tests/extract1.sh
++++ b/tests/extract1.sh
+@@ -12,7 +12,7 @@
+   ((p = PORT + i))
+   ((q = p + 1))
+   echo -e "HTTP/1.1 302\r\nLocation: http://localhost:$q/\r\n\r" |\
+-    nc -l $p >/dev/null &
++    nc -q 1 -l -p $p >/dev/null &
+ done
+ 
+ sleep 1				# Give the servers time to start

Added: packages/html-xml-utils/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/series?rev=2167&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/series (added)
+++ packages/html-xml-utils/trunk/debian/patches/series Mon May  6 23:13:40 2013
@@ -1,0 +1,1 @@
+694460_fix_ftbfs_with_netcat_traditional.patch