[sslogger] Fix FTBFS for formatsecurity Werror.

Tomáš Mráz tmraz at fedoraproject.org
Thu Apr 24 21:47:42 UTC 2014


commit df4357ecdf3daf3d39dc7f87a32736b12d9dd488
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Apr 24 23:47:12 2014 +0200

    Fix FTBFS for formatsecurity Werror.

 sslogger-0.96-formatsecurity.patch |   34 ++++++++++++++++++++++++++++++++++
 sslogger.spec                      |    2 ++
 2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/sslogger-0.96-formatsecurity.patch b/sslogger-0.96-formatsecurity.patch
new file mode 100644
index 0000000..869285a
--- /dev/null
+++ b/sslogger-0.96-formatsecurity.patch
@@ -0,0 +1,34 @@
+diff -up sslogger-0.96/slogd-server-fork.c.formatsecurity sslogger-0.96/slogd-server-fork.c
+--- sslogger-0.96/slogd-server-fork.c.formatsecurity	2014-04-24 22:46:05.000000000 +0200
++++ sslogger-0.96/slogd-server-fork.c	2014-04-24 23:46:06.110834671 +0200
+@@ -109,7 +109,7 @@ void log_info (int bufSize, char * forma
+         mysyslog(buffer,LOG_INFO);
+     }
+     else
+-        printf(buffer);
++        printf("%s", buffer);
+ }
+ 
+ /*
+diff -up sslogger-0.96/sslogger.c.formatsecurity sslogger-0.96/sslogger.c
+--- sslogger-0.96/sslogger.c.formatsecurity	2014-04-24 23:32:23.000000000 +0200
++++ sslogger-0.96/sslogger.c	2014-04-24 23:44:38.389447293 +0200
+@@ -218,7 +218,6 @@ my_strftime(char *buf, size_t len, const
+ }
+ 
+ int logCmd2(char *user, char *asUser, char *cmd, char *keyLogfname, char *reason) {
+-    char *message;
+     char *logfname;
+     const char *log_dir=STRINGIFY(LOG_DIR);
+     const char *log_file=STRINGIFY(LOGFILE);
+@@ -350,9 +349,8 @@ int logCmd2(char *user, char *asUser, ch
+         reason[commentSize]='\0';
+     }
+ 
+-    asprintf(&message,"user:%s; as:%s; %s; logfile:%s; reason:%s\n",user,asUser,cmd,keyLogfname,reason);
+     //openlog (progname, LOG_PID,LOG_AUTHPRIV);
+-    syslog(LOG_INFO,message);
++    syslog(LOG_INFO, "user:%s; as:%s; %s; logfile:%s; reason:%s\n",user,asUser,cmd,keyLogfname,reason);
+     //closelog();
+     undo_setuid();
+     undo_setgid();
diff --git a/sslogger.spec b/sslogger.spec
index 25174d1..8addf64 100644
--- a/sslogger.spec
+++ b/sslogger.spec
@@ -16,6 +16,7 @@ URL:  http://sourceforge.net/downloads/%{name}/%{name}-%{version}
 Source0: http://sourceforge.net/downloads/%{name}/%{name}-%{version}/tgz/%{name}-%{version}.tar.gz
 Source1: sslogger-slogd-tmpfiles.conf
 Patch1: sslogger-0.96-nogcrypt.patch
+Patch2: sslogger-0.96-formatsecurity.patch
 Requires: bash logrotate initscripts sudo
 Requires(pre): shadow-utils util-linux gnutls
 BuildRequires: gnutls-devel
@@ -49,6 +50,7 @@ chkconfig sslogger-slogd off
 %prep
 %setup -q
 %patch1 -p1 -b .nogcrypt
+%patch2 -p1 -b .formatsecurity
 make clean
 sed -i -e 's|/usr/share/doc/sslogger-\$(VERSION)|%{_pkgdocdir}|g' Makefile
 


More information about the scm-commits mailing list