[xml/sgml-commit] r1299 - in /packages/html-xml-utils/trunk/debian: README.source changelog control patches/ patches/00list patches/508913_fix_segfault_in_hxclean.dpatch rules

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Thu Dec 18 01:08:54 UTC 2008 

Author: dleidert-guest
Date: Thu Dec 18 01:08:54 2008
New Revision: 1299

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1299
Log:
* dpatch environment added (including README.source).
* debian/patches/508913_fix_segfault_in_hxclean.dpatch: Added.
  - Fix a segmentation fault (closes: #508913).

Added:
    packages/html-xml-utils/trunk/debian/README.source
    packages/html-xml-utils/trunk/debian/patches/
    packages/html-xml-utils/trunk/debian/patches/00list
    packages/html-xml-utils/trunk/debian/patches/508913_fix_segfault_in_hxclean.dpatch   (with props)
Modified:
    packages/html-xml-utils/trunk/debian/changelog
    packages/html-xml-utils/trunk/debian/control
    packages/html-xml-utils/trunk/debian/rules

Added: packages/html-xml-utils/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/README.source?rev=1299&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/README.source (added)
+++ packages/html-xml-utils/trunk/debian/README.source Thu Dec 18 01:08:54 2008
@@ -1,0 +1,7 @@
+html-xml-utils source for Debian
+--------------------------------
+
+This package uses dpatch to manage all modifications to the upstream
+source. See /usr/share/doc/dpatch/README.source.gz.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>, 2008

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=1299&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/changelog (original)
+++ packages/html-xml-utils/trunk/debian/changelog Thu Dec 18 01:08:54 2008
@@ -1,6 +1,8 @@
 html-xml-utils (5.1-3) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * dpatch environment added (including README.source).
+  * debian/patches/508913_fix_segfault_in_hxclean.dpatch: Added.
+    - Fix a segmentation fault (closes: #508913).
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 15 Dec 2008 14:45:58 +0100
 

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=1299&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/control (original)
+++ packages/html-xml-utils/trunk/debian/control Thu Dec 18 01:08:54 2008
@@ -3,7 +3,7 @@
 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>
-Build-Depends: debhelper (>= 5), bison, flex, gperf, man2html
+Build-Depends: debhelper (>= 5), dpatch, bison, flex, gperf, man2html
 Standards-Version: 3.8.0
 Homepage: http://www.w3.org/Tools/HTML-XML-utils/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/

Added: packages/html-xml-utils/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/00list?rev=1299&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/00list (added)
+++ packages/html-xml-utils/trunk/debian/patches/00list Thu Dec 18 01:08:54 2008
@@ -1,0 +1,1 @@
+508913_fix_segfault_in_hxclean

Added: packages/html-xml-utils/trunk/debian/patches/508913_fix_segfault_in_hxclean.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/508913_fix_segfault_in_hxclean.dpatch?rev=1299&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/508913_fix_segfault_in_hxclean.dpatch (added)
+++ packages/html-xml-utils/trunk/debian/patches/508913_fix_segfault_in_hxclean.dpatch Thu Dec 18 01:08:54 2008
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 508913_fix_segfault_in_hxclean.dpatch by Bert Bos <bert at w3.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: A segmentation fault has been detected using hxclean/hxnormalize. Patch
+## DP:   has been provided by upstream.
+## DP:
+## DP: <URL:http://bugs.debian.org/508913>
+
+ at DPATCH@
+diff -urNad trunk~/tree.c trunk/tree.c
+--- trunk~/tree.c	2008-08-12 23:56:26.000000000 +0200
++++ trunk/tree.c	2008-12-16 22:27:00.000000000 +0100
+@@ -242,8 +242,10 @@
+ static const ElementType *lookup(const string e)
+ {
+   char h[MAXNAMELEN+2];
+-  down(strncpy(h, e, sizeof(h) - 1));
+-  return lookup_element(h, strlen(e));
++  strncpy(h, e, sizeof(h) - 1);
++  h[sizeof(h)-1] = '\0';
++  down(h);
++  return lookup_element(h, strlen(h));
+ }
+ 
+ /* is_known -- true if the element is an HTML 4 element */

Propchange: packages/html-xml-utils/trunk/debian/patches/508913_fix_segfault_in_hxclean.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/html-xml-utils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/rules?rev=1299&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/rules (original)
+++ packages/html-xml-utils/trunk/debian/rules Thu Dec 18 01:08:54 2008
@@ -4,6 +4,8 @@
 #export DH_VERBOSE=1
 
 PACKAGE = html-xml-utils
+
+include /usr/share/dpatch/dpatch.make
 
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -25,16 +27,16 @@
 	    --mandir=\$${prefix}/share/man
 
 build: build-stamp
-build-stamp: config.status
+build-stamp: patch-stamp config.status
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean build-stamp
+	dh_clean build-stamp patch-stamp
 
 install: build
 	dh_testdir

More information about the debian-xml-sgml-commit mailing list