Bug#684414: unblock (pre-approval): libspectre/0.2.7-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Hi,
yesterday a new bugfix version of libspectre, 0.2.7, has been released.
This version quite small in the actual changes it brings, while fixing
a couple of issues.
The full source diff between 0.2.6 and 0.2.7 is:
ChangeLog | 333 +--
Makefile.in | 104 -
NEWS | 10
aclocal.m4 | 2501 ++++++++++++++++----------
config.guess | 263 +-
config.sub | 204 +-
configure | 3339 ++++++++++++++++++++++-------------
configure.ac | 4
depcomp | 238 ++
install-sh | 544 +++--
libspectre/Makefile.am | 12
libspectre/Makefile.in | 201 +-
libspectre/ps.c | 12
libspectre/spectre-version.h | 6
ltmain.sh | 4051 ++++++++++++++++++++++++++++---------------
missing | 145 -
test/Makefile.am | 19
test/Makefile.in | 123 -
18 files changed, 7840 insertions(+), 4269 deletions(-)
.... but most of the changes are autoconf/automake/libtool-related stuff;
stripping those and stripping the ChangeLog (output of `git log`) and
NEWS files, what is left is:
configure.ac | 4 ++--
libspectre/Makefile.am | 12 ++++++------
libspectre/ps.c | 12 +++++++-----
libspectre/spectre-version.h | 6 +++---
test/Makefile.am | 19 +++++++++++++------
5 files changed, 31 insertions(+), 22 deletions(-)
which is also attached.
The changes are the following:
- configure.ac, libspectre/spectre-version.h:
bump the version to 0.2.7
- libspectre/Makefile.am, test/Makefile.am:
fix the automake build system to handle own CFLAGS properly and not
ignore user-specified ones (like the Debian ones)
- libspectre/ps.c
as written in NEWS,
"fixes two crashes than can happen when %%Pages: or
%%Page: comments are missing in the document or when %%Pages: comment
is present but it's invalid."
On the Debian side, other than the usual "new upstream release",
I would need to just add "export V=1" in debian/rules to have the build
system output the compilation commands used.
I think it should be mostly harmless overall for wheezy, hence
I'm asking for a pre-approval (and then unblock) before uploading it
to unstable.
Thanks,
--
Pino
--- libspectre-0.2.6/configure.ac
+++ libspectre-0.2.7/configure.ac
@@ -2,7 +2,7 @@
m4_define([spectre_major_version], [0])
m4_define([spectre_minor_version], [2])
-m4_define([spectre_micro_version], [6])
+m4_define([spectre_micro_version], [7])
m4_define([spectre_version],
[spectre_major_version.spectre_minor_version.spectre_micro_version])
@@ -25,7 +25,7 @@
## increment any time the source changes; set to
## 0 if you increment CURRENT
-LT_REVISION=6
+LT_REVISION=7
## increment if any interfaces have been added; set to 0
## if any interfaces have been changed or removed. removal has
--- libspectre-0.2.6/libspectre/Makefile.am
+++ libspectre-0.2.7/libspectre/Makefile.am
@@ -1,9 +1,3 @@
-INCLUDES = \
- -I$(top_builddir) \
- -I$(srcdir) \
- -I$(top_srcdir) \
- $(SPECTRE_CFLAGS)
-
EXTRA_DIST=spectre-version.h.in
lib_LTLIBRARIES = libspectre.la
@@ -47,5 +41,11 @@
spectre-utils.c \
$(gv_sources)
+libspectre_la_CFLAGS = \
+ -I$(top_builddir) \
+ -I$(srcdir) \
+ -I$(top_srcdir) \
+ $(SPECTRE_CFLAGS)
+
libspectre_la_LIBADD = $(LIB_GS)
libspectre_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
--- libspectre-0.2.6/libspectre/ps.c
+++ libspectre-0.2.7/libspectre/ps.c
@@ -597,6 +597,8 @@
if (maxpages > 0) {
doc->pages = (struct page *) PS_calloc(maxpages,
sizeof(struct page));
+ if (!doc->pages)
+ maxpages = 0;
CHECK_MALLOCED(doc->pages);
}
}
@@ -1002,14 +1004,14 @@
section_len += line_len;
}
+ if (maxpages == 0) {
+ maxpages = 1;
+ doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page));
+ CHECK_MALLOCED(doc->pages);
+ }
newpage:
while (DSCcomment(line) && iscomment(line+2, "Page:")) {
- if (maxpages == 0) {
- maxpages = 1;
- doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page));
- CHECK_MALLOCED(doc->pages);
- }
label = ps_gettext(line+length("%%Page:"), &next_char);
if (sscanf(next_char, "%u", &thispage) != 1) thispage = 0;
if (nextpage == 1) {
--- libspectre-0.2.6/libspectre/spectre-version.h
+++ libspectre-0.2.7/libspectre/spectre-version.h
@@ -27,11 +27,11 @@
#define SPECTRE_MAJOR_VERSION 0
#define SPECTRE_MINOR_VERSION 2
-#define SPECTRE_MICRO_VERSION 6
+#define SPECTRE_MICRO_VERSION 7
-#define SPECTRE_VERSION_STRING "0.2.6"
+#define SPECTRE_VERSION_STRING "0.2.7"
-#define SPECTRE_VERSION ((0 << 16) | (2 << 8) | (6))
+#define SPECTRE_VERSION ((0 << 16) | (2 << 8) | (7))
SPECTRE_END_DECLS
--- libspectre-0.2.6/test/Makefile.am
+++ libspectre-0.2.7/test/Makefile.am
@@ -1,15 +1,22 @@
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/libspectre \
- $(SPECTRE_CFLAGS) \
- $(CAIRO_CFLAGS)
-
noinst_PROGRAMS = spectre-test parser-test
spectre_test_SOURCES = spectre-test.c
+
+spectre_test_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/libspectre \
+ $(SPECTRE_CFLAGS) \
+ $(CAIRO_CFLAGS)
+
spectre_test_LDADD = \
$(top_builddir)/libspectre/libspectre.la \
$(CAIRO_LIBS)
parser_test_SOURCES = parser-test.c
+
+parser_test_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/libspectre \
+ $(SPECTRE_CFLAGS)
+
parser_test_LDADD = $(top_builddir)/libspectre/libspectre.la
Reply to: