[Pkg-ocaml-maint-commits] r3829 - in /trunk/packages/edos-debcheck/trunk/debian: changelog patches/00list patches/03nonalphanumerics.dpatch

[treinen at users.alioth.debian.org]

Author: treinen
Date: Wed Jun 13 17:01:00 2007
New Revision: 3829

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3829
Log:
edos-debcheck 1.0-3 fix crash on non-alphanumerics

Added:
    trunk/packages/edos-debcheck/trunk/debian/patches/03nonalphanumerics.dpatch   (with props)
Modified:
    trunk/packages/edos-debcheck/trunk/debian/changelog
    trunk/packages/edos-debcheck/trunk/debian/patches/00list

Modified: trunk/packages/edos-debcheck/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/changelog?rev=3829&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/changelog (original)
+++ trunk/packages/edos-debcheck/trunk/debian/changelog Wed Jun 13 17:01:00 2007
@@ -1,3 +1,10 @@
+edos-debcheck (1.0-3) unstable; urgency=low
+
+  * Do not crash on version numbers that contain non-alphanumeric characters
+    (closes: Bug#428603). Patch by Julien Cristau - thanks!
+
+ -- Ralf Treinen <treinen at debian.org>  Wed, 13 Jun 2007 18:50:37 +0200
+
 edos-debcheck (1.0-2) unstable; urgency=low
 
   * Add a debian/watch file.

Modified: trunk/packages/edos-debcheck/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/00list?rev=3829&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/00list (original)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/00list Wed Jun 13 17:01:00 2007
@@ -1,2 +1,3 @@
 01Makefile
 02tilde_in_version
+03nonalphanumerics.dpatch

Added: trunk/packages/edos-debcheck/trunk/debian/patches/03nonalphanumerics.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/03nonalphanumerics.dpatch?rev=3829&op=file
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/03nonalphanumerics.dpatch (added)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/03nonalphanumerics.dpatch Wed Jun 13 17:01:00 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03nonalphanumerics.dpatch by Ralf Treinen <treinen at debian.org>
+##
+## DP: Do not crash on version numbes containing non-alphanumeics.
+## DP: Patch by Julien Cristau <jcristau at debian.org> (thanks!)
+
+ at DPATCH@
+diff -urNad trunk~/deb.ml trunk/deb.ml
+--- trunk~/deb.ml	2006-07-02 18:39:30.000000000 +0200
++++ trunk/deb.ml	2007-06-13 18:46:08.000000000 +0200
+@@ -144,7 +144,7 @@
+     ("[ \t]+\\|\\(" ^
+      String.concat "\\|"
+        [","; "|"; "("; ")"; "<<"; "<="; "="; ">="; ">>"; "<"; ">";
+-        "[A-Za-z0-9.:_+~-]+"] ^
++        "[A-Za-z0-9.:_+~\127-\255-]+"] ^
+      "\\)")
+ 
+ let rec next_token s p =
+@@ -183,7 +183,7 @@
+       | _          -> failwith (Format.sprintf "Bad relation '%s'" (cur s))
+     in
+     next s;
+-    let version = split_version (cur s) in
++    let version = try split_version (cur s) with _ -> (0, "0", None) in
+     next s;
+     expect s ")";
+     (name, Some (comp, version))

Propchange: trunk/packages/edos-debcheck/trunk/debian/patches/03nonalphanumerics.dpatch
------------------------------------------------------------------------------
    svn:executable = *