Bug#687237: unblock: le/1.14.3-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package le. It fixes a FTBFS (which requires sort-of
autoreconf'iguring) and a strcpy of overlapping memory regions, which
may lead to issues.
unblock le/1.14.3-2
diff -u le-1.14.3/debian/control le-1.14.3/debian/control
--- le-1.14.3/debian/control
+++ le-1.14.3/debian/control
@@ -2,7 +2,8 @@
Section: editors
Priority: optional
Maintainer: Raphael Geissert <geissert@debian.org>
-Build-Depends: debhelper (>= 6.0.0), autotools-dev, libncursesw5-dev, quilt, cdbs
+Build-Depends: debhelper (>= 6.0.0), autotools-dev, libncursesw5-dev,
+ quilt, cdbs, autoconf, automake
Standards-Version: 3.8.3
Homepage: http://freshmeat.net/projects/leeditor/
diff -u le-1.14.3/debian/rules le-1.14.3/debian/rules
--- le-1.14.3/debian/rules
+++ le-1.14.3/debian/rules
@@ -11,3 +11,12 @@
+DEB_AUTO_UPDATE_ACLOCAL=1.11
+DEB_AUTO_UPDATE_AUTOMAKE=1.11
+DEB_AUTO_UPDATE_AUTOCONF=true
+DEB_AUTO_UPDATE_AUTOHEADER=true
+
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+clean::
+ find . -name 'Makefile.in' -delete
+ $(RM) lib/Makefile configure lib/stamp-h1 lib/config.h src/config.h.in
diff -u le-1.14.3/debian/changelog le-1.14.3/debian/changelog
--- le-1.14.3/debian/changelog
+++ le-1.14.3/debian/changelog
@@ -1,3 +1,15 @@
+le (1.14.3-2) unstable; urgency=low
+
+ * debian/patches/multiarch-path.patch:
+ + Search for ncurses/w in the multiarch library path.
+ Thanks to peter green for the patch. (Closes: #651705)
+ * debian/rules: "autoreconf" the cdbs way due to the above change
+ * debian/control: B-d on automake and autoconf
+ * debian/patches/strcpy-overlap.patch:
+ + Don't use strcpy when src and dst overlap.
+
+ -- Raphael Geissert <geissert@debian.org> Mon, 10 Sep 2012 21:34:51 -0500
+
le (1.14.3-1) unstable; urgency=low
* New upstream release
diff -u le-1.14.3/debian/patches/series le-1.14.3/debian/patches/series
--- le-1.14.3/debian/patches/series
+++ le-1.14.3/debian/patches/series
@@ -3,0 +4,2 @@
+multiarch-path.patch
+strcpy-overlap.patch
only in patch2:
unchanged:
--- le-1.14.3.orig/debian/patches/strcpy-overlap.patch
+++ le-1.14.3/debian/patches/strcpy-overlap.patch
@@ -0,0 +1,13 @@
+Index: le-1.14.6/src/file.cc
+===================================================================
+--- le-1.14.6.orig/src/file.cc
++++ le-1.14.6/src/file.cc
+@@ -74,7 +74,7 @@ void NormalizeFileName(char *s)
+ *s=0;
+ break;
+ }
+- strcpy(s+1,p);
++ memmove(s+1,p, strlen(p)+1);
+ }
+ }
+ }
only in patch2:
unchanged:
--- le-1.14.3.orig/debian/patches/multiarch-path.patch
+++ le-1.14.3/debian/patches/multiarch-path.patch
@@ -0,0 +1,21 @@
+Description: Search for ncurses/w in the multiarch path too, allowing
+ the package to build now that the ncurses libs have been moved to
+ triplet-based paths.
+Origin: other
+Author: peter green <peter.green@postgrad.manchester.ac.uk>
+Forwarded: no
+Last-Update: 2011-12-11
+
+
+Index: le-1.14.6/acinclude.m4
+===================================================================
+--- le-1.14.6.orig/acinclude.m4
++++ le-1.14.6/acinclude.m4
+@@ -48,6 +48,7 @@ AC_DEFUN([LE_PATH_CURSES_DIRECT],
+ for ac_dir0 in `echo "$ac_curses_includes" | sed -e 's:include:lib:' -e 's:/ncurses$::'` \
+ /usr/lib \
+ /usr/local/lib \
++ /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` \
+ ; \
+ do
+ for ac_dir in ${ac_dir0}64 ${ac_dir0}; do
Reply to: