From 9971dd3e6268224ee930a26fdb30f22395406233 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Mon, 19 Dec 2011 19:00:44 +0100 Subject: [PATCH] Imported Debian patch 2.2.8-3 --- debian/changelog | 12 +++++ .../patches/30_Werror-format-security.patch | 18 +++++++ debian/patches/40_linker.patch | 49 +++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 81 insertions(+) create mode 100644 debian/patches/30_Werror-format-security.patch create mode 100644 debian/patches/40_linker.patch diff --git a/debian/changelog b/debian/changelog index b9d3bf7b..364e5ccb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +glabels (2.2.8-3) unstable; urgency=low + + * QA upload. + * Fix "FTBFS: plessey.c:151:9: error: format not a string literal and + no format arguments [-Werror=format-security]": new patch + 30_Werror-format-security.patch: add format argument to sprintf call. + (Closes: #643390) + * New patch 40_linker.patch: add '-lm' to linker arguments, otherwise the + build fails with binutils-gold or --no-add-needed. + + -- gregor herrmann Mon, 19 Dec 2011 19:00:44 +0100 + glabels (2.2.8-2) unstable; urgency=low [ Olivier Berger ] diff --git a/debian/patches/30_Werror-format-security.patch b/debian/patches/30_Werror-format-security.patch new file mode 100644 index 00000000..2d99811a --- /dev/null +++ b/debian/patches/30_Werror-format-security.patch @@ -0,0 +1,18 @@ +Description: add format argument to sprintf call to prevent failure with -Werror=format-security +Origin: vendor +Bug-Debian: http://bugs.debian.org/bug=643390 +Forwarded: no +Author: gregor herrmann +Last-Update: 2011-12-19 + +--- a/barcode-0.98/plessey.c ++++ b/barcode-0.98/plessey.c +@@ -148,7 +148,7 @@ + checkptr[i+j] ^= check[j]; + } + for (i = 0; i < 8; i++) { +- sprintf(ptr, patterns[checkptr[strlen(text) * 4 + i]]); ++ sprintf(ptr, "%s", patterns[checkptr[strlen(text) * 4 + i]]); + ptr += 2; + } + fprintf(stderr, "CRC: "); diff --git a/debian/patches/40_linker.patch b/debian/patches/40_linker.patch new file mode 100644 index 00000000..22f53c02 --- /dev/null +++ b/debian/patches/40_linker.patch @@ -0,0 +1,49 @@ +Description: add '-lm' to linker arguments, otherwise the linking fails with binutils-golds or --no-add-needed +Origin: vendor +Forwarded: no +Author: gregor herrmann +Last-Update: 2011-12-19 + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -30,7 +30,8 @@ + ../libglabels/libglabels.la \ + mygal/libmygal.la \ + $(LIB_BARCODE_DIR)/libbarcode.la \ +- $(LIB_IEC16022_DIR)/libiec16022.la ++ $(LIB_IEC16022_DIR)/libiec16022.la \ ++ -lm + + glabels_batch_LDFLAGS = -export-dynamic + +@@ -38,7 +39,8 @@ + $(GLABELS_LIBS) \ + ../libglabels/libglabels.la \ + $(LIB_BARCODE_DIR)/libbarcode.la \ +- $(LIB_IEC16022_DIR)/libiec16022.la ++ $(LIB_IEC16022_DIR)/libiec16022.la \ ++ -lm + + BUILT_SOURCES = \ + marshal.c \ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -365,14 +365,16 @@ + ../libglabels/libglabels.la \ + mygal/libmygal.la \ + $(LIB_BARCODE_DIR)/libbarcode.la \ +- $(LIB_IEC16022_DIR)/libiec16022.la ++ $(LIB_IEC16022_DIR)/libiec16022.la \ ++ -lm + + glabels_batch_LDFLAGS = -export-dynamic + glabels_batch_LDADD = \ + $(GLABELS_LIBS) \ + ../libglabels/libglabels.la \ + $(LIB_BARCODE_DIR)/libbarcode.la \ +- $(LIB_IEC16022_DIR)/libiec16022.la ++ $(LIB_IEC16022_DIR)/libiec16022.la \ ++ -lm + + BUILT_SOURCES = \ + marshal.c \ diff --git a/debian/patches/series b/debian/patches/series index d2df0961..5b78de6a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ 20_menu.patch 10_manpage.patch +30_Werror-format-security.patch +40_linker.patch -- 2.39.5