Fixing compilation: add 27_format_security.patch
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Thu, 2 Oct 2014 17:25:36 +0000 (20:25 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Thu, 2 Oct 2014 17:25:36 +0000 (20:25 +0300)
debian/lxdm.manpages
debian/patches/27_format_security.patch [new file with mode: 0644]
debian/patches/series
debian/rules

index 96c4bf7..142f99f 100644 (file)
@@ -1 +1 @@
-manpages/*
+debian/manpages/lxdm.1
diff --git a/debian/patches/27_format_security.patch b/debian/patches/27_format_security.patch
new file mode 100644 (file)
index 0000000..3e7fade
--- /dev/null
@@ -0,0 +1,14 @@
+Description: Fix non-literal format string in g_message.
+Author: Andriy Grytsenko <andrej@rep.kiev.ua>
+
+--- a/src/ui.c
++++ b/src/ui.c
+@@ -145,7 +145,7 @@
+       else if( !strncmp(str, "shutdown", 6) )
+               lxdm_do_shutdown();
+       else if( !strncmp(str, "log ", 4) )
+-              g_message(str + 4);
++              g_message("%s", str + 4);
+       else if( !strncmp(str, "login ", 6) )
+       {
+               char *user = greeter_param(str, "user");
index 249beaf..38d2bfb 100644 (file)
@@ -1,3 +1,4 @@
 15-path-replace.patch
 22_ubuntu_i18n_oneiric.patch
 23_debian-config.patch
+27_format_security.patch
index b5176f2..d84f63b 100755 (executable)
@@ -4,7 +4,7 @@ LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
 # Rename config file
 config_file = /etc/lxdm/default.conf
-CFLAGS+=-DCONFIG_FILE=\\\"$(config_file)\\\"
+CFLAGS+=-DCONFIG_FILE=\"$(config_file)\"
 
 %:
        dh ${@} --with systemd --parallel
@@ -22,8 +22,6 @@ override_dh_auto_test:
 override_dh_install:
        dh_install
 
-       mkdir -p debian/lxdm/etc/insserv.conf.d
-       cp debian/lxdm.insserv debian/lxdm/etc/insserv.conf.d/
        mv debian/lxdm/etc/insserv.conf.d/lxdm.insserv debian/lxdm/etc/insserv.conf.d/lxdm
 
 override_dh_installinit: