[packages/splashutils] - fix static linking - fix format string error - rel 8

[baggins]

commit 5ebc1d8d04f8795b119069f8e887bb5d323f3542
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 8 08:36:00 2013 +0100

    - fix static linking
    - fix format string error
    - rel 8

 format-security.patch  | 11 +++++++++++
 splashutils-link.patch | 13 +++++++++++++
 splashutils.spec       |  6 +++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/splashutils.spec b/splashutils.spec
index 967f979..b93b3a1 100644
--- a/splashutils.spec
+++ b/splashutils.spec
@@ -8,7 +8,7 @@ Summary:	Utilities for setting splash
 Summary(pl.UTF-8):	Narzędzia do ustawiania splash
 Name:		splashutils
 Version:	1.5.4.3
-Release:	7
+Release:	8
 License:	GPL
 Group:		Applications/System
 Source0:	http://dev.gentoo.org/~spock/projects/splashutils/archive/%{name}-%{version}.tar.bz2
@@ -23,6 +23,8 @@ Patch1:		%{name}-configpath.patch
 Patch2:		%{name}-relpath.patch
 Patch3:		%{name}-libpng15.patch
 Patch4:		%{name}-miscsplashutils-fbtruetype.patch
+Patch5:		format-security.patch
+Patch6:		%{name}-link.patch
 #Patch0: %{name}-makefile.patch # in -libs now
 #Patch1: %{name}-compile.patch
 #Patch2: %{name}-pld-paths.patch
@@ -91,6 +93,8 @@ mv miscsplashutils-* miscsplashutils
 %endif
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 #%patch0 -p0
 #%patch1 -p0
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..09ec93b
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- splashutils-1.5.4.3/src/libfbsplash.c~	2008-11-13 20:54:19.000000000 +0100
++++ splashutils-1.5.4.3/src/libfbsplash.c	2013-11-08 08:30:15.033789613 +0100
+@@ -692,7 +692,7 @@
+ 	vsnprintf(cmd, 256, fmt, ap);
+ 	va_end(ap);
+ 
+-	fprintf(fp_fifo, cmd);
++	fprintf(fp_fifo, "%s", cmd);
+ 	fbsplash_profile("comm %s", cmd);
+ 	return 0;
+ }
diff --git a/splashutils-link.patch b/splashutils-link.patch
new file mode 100644
index 0000000..24868ed
--- /dev/null
+++ b/splashutils-link.patch
@@ -0,0 +1,13 @@
+--- splashutils-1.5.4.3/miscsplashutils/fbtruetype/Makefile.orig	2013-11-08 08:31:05.000000000 +0100
++++ splashutils-1.5.4.3/miscsplashutils/fbtruetype/Makefile	2013-11-08 08:34:26.350454460 +0100
+@@ -23,8 +23,8 @@
+ OBJECTS  = fbtruetype.o messages.o console.o ttf.o luxisri.o
+ 
+ LDFLAGS  =  -L$(LIBDIR)
+-LIBSS    = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a $(LIBDIR)/libbz2.a -lm
+-LIBSD    = -lfreetype -lm -lbz2
++LIBSS    = $(LIBDIR)/libfreetype.a $(LIBDIR)/libpng.a $(LIBDIR)/libz.a $(LIBDIR)/libbz2.a -lm
++LIBSD    = -lfreetype -lm -lbz2 -lpng -lz
+ 
+ CFLAGS   = -O2 -Wall -I/usr/include/freetype2
+ COMPILE  = $(CC) $(CFLAGS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/splashutils.git/commitdiff/5ebc1d8d04f8795b119069f8e887bb5d323f3542