[packages/kmscon] - added format patch (fixes build error with -Werror=format-security) - added udev bcond

qboosh qboosh at pld-linux.org
Fri Nov 9 20:30:41 CET 2012


commit 64ea11c12de206d9bae783bb3c88cc644e827b93
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 9 20:30:34 2012 +0100

    - added format patch (fixes build error with -Werror=format-security)
    - added udev bcond

 kmscon-format.patch | 15 +++++++++++++++
 kmscon.spec         |  4 ++++
 2 files changed, 19 insertions(+)
---
diff --git a/kmscon.spec b/kmscon.spec
index ec5ce9d..270063a 100644
--- a/kmscon.spec
+++ b/kmscon.spec
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	systemd		# systemd-based multi-seat support
+%bcond_without	udev		# udev-based hotplug support
 %bcond_without	unifont		# Unifont backend (could make kmscon GPLed)
 %bcond_with	wayland		# wayland-based wlterm [needs update for wayland 1.0]
 #
@@ -17,6 +18,7 @@ Source0:	https://github.com/downloads/dvdhrm/kmscon/%{name}-%{version}.tar.bz2
 # Source0-md5:	d35014947a468d1a5e633d4221d2e4fa
 Patch0:		%{name}-xkbcommon.patch
 Patch1:		%{name}-link.patch
+Patch2:		%{name}-format.patch
 URL:		https://github.com/dvdhrm/kmscon/wiki/KMSCON
 BuildRequires:	Mesa-libEGL-devel
 BuildRequires:	Mesa-libGLES-devel
@@ -89,6 +91,7 @@ Statyczne biblioteki kmscon.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -99,6 +102,7 @@ Statyczne biblioteki kmscon.
 %configure \
 	--disable-silent-rules \
 	%{!?with_systemd:--disable-systemd} \
+	%{!?with_udev:--disable-udev} \
 	%{?with_unifont:--enable-unifont} \
 	%{?with_wayland:--enable-wlterm}
 %{__make}
diff --git a/kmscon-format.patch b/kmscon-format.patch
new file mode 100644
index 0000000..9e2d3f6
--- /dev/null
+++ b/kmscon-format.patch
@@ -0,0 +1,15 @@
+--- kmscon-5/src/genunifont.c.orig	2012-08-25 15:54:35.997327647 +0200
++++ kmscon-5/src/genunifont.c	2012-11-09 20:21:20.869890307 +0100
+@@ -82,10 +82,10 @@
+ 
+ 	idx = hex_val(c);
+ 	if (idx < 16) {
+-		fprintf(out, line_map[idx]);
++		fprintf(out, "%s", line_map[idx]);
+ 	} else {
+ 		fprintf(stderr, "genunifont: invalid value %c\n", c);
+-		fprintf(out, line_map[0]);
++		fprintf(out, "%s", line_map[0]);
+ 	}
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kmscon.git/commitdiff/64ea11c12de206d9bae783bb3c88cc644e827b93



More information about the pld-cvs-commit mailing list