Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package jless.
Here is a fix for serious bugs (#684633, #680632 and #433086)
with minimal changes.
diff -u jless-382-iso262/debian/changelog jless-382-iso262/debian/changelog
--- jless-382-iso262/debian/changelog
+++ jless-382-iso262/debian/changelog
@@ -1,3 +1,10 @@
+jless (382-iso262-3) unstable; urgency=low
+
+ * Fix hang-up problem with gcc optimization. (#684633, #680632)
+ * Fix abort when JLESSCHARSET is not set. (#433086)
+
+ -- Tatsuki Sugiura <s...@nemui.org> Sat, 24 Nov 2012 12:06:47 +0900
+
jless (382-iso262-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u jless-382-iso262/debian/patches/00list
jless-382-iso262/debian/patches/00list
--- jless-382-iso262/debian/patches/00list
+++ jless-382-iso262/debian/patches/00list
@@ -6,0 +7 @@
+fix-hang-with-optimization
diff -u jless-382-iso262/debian/patches/less-382-iso259-260.dpatch
jless-382-iso262/debian/patches/less-382-iso259-260.dpatch
--- jless-382-iso262/debian/patches/less-382-iso259-260.dpatch
+++ jless-382-iso262/debian/patches/less-382-iso259-260.dpatch
@@ -1963,7 +1963,7 @@
+
+ cs = CS2CHARSET(cs);
+
-+ assert(0);
++ //assert(0);
+ if (cs == ASCII || cs == JISX0201ROMAN)
+ {
+ assert(cvindex == 1);
@@ -1985,7 +1985,7 @@
+ cvindex = 0;
+ return (cvbuffer);
+ }
-+ assert(0);
++ //assert(0);
+ cvindex = 0;
+ return (cvbuffer);
+}
only in patch2:
unchanged:
--- jless-382-iso262.orig/debian/patches/fix-hang-with-optimization.dpatch
+++ jless-382-iso262/debian/patches/fix-hang-with-optimization.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-hang-with-optimization.dpatch by <s...@nemui.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix hang-up problem with large file.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
jless~/ch.c jless/ch.c
+--- jless~/ch.c 2012-11-24 13:43:46.000000000 +0900
++++ jless/ch.c 2012-11-24 13:45:28.000000000 +0900
+@@ -91,7 +91,7 @@
+ thisfile->hashtbl[h].buf_hnext->hprev = (bp); \
+ thisfile->hashtbl[h].buf_hnext = (bp);
+
+-static struct filestate *thisfile;
++volatile static struct filestate *thisfile;
+ static int ch_ungotchar = -1;
+ static int maxbufs = -1;
+
unblock jless/382-iso262-2.1
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.6.6 (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.utf-8, LC_CTYPE=ja_JP.utf-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
