[packages/librtas] - up to 1.3.13 - added format patch (fixes build with -Werror=format-security) - added verbose patch

qboosh qboosh at pld-linux.org
Wed Jul 1 21:51:00 CEST 2015


commit 696af613473764d723e3674e496f4b09ff6a28a4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 1 21:52:50 2015 +0200

    - up to 1.3.13
    - added format patch (fixes build with -Werror=format-security)
    - added verbose patch (verbose make)

 librtas-format.patch  | 33 +++++++++++++++++++++++++++++++++
 librtas-verbose.patch | 22 ++++++++++++++++++++++
 librtas.spec          | 12 +++++++-----
 3 files changed, 62 insertions(+), 5 deletions(-)
---
diff --git a/librtas.spec b/librtas.spec
index 89ac3f5..de53ee6 100644
--- a/librtas.spec
+++ b/librtas.spec
@@ -1,13 +1,15 @@
 Summary:	Libraries for user-space access to the Run-Time Abstraction Services
 Summary(pl.UTF-8):	Biblioteki do dostępu do RTAS z przestrzeni użytkownika
 Name:		librtas
-Version:	1.3.8
-Release:	2
+Version:	1.3.13
+Release:	1
 License:	CPL v1.0
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/librtas/%{name}-%{version}.tar.gz
-# Source0-md5:	1d737ff4bc9a86b3e2cfd3a805f7632d
+# Source0-md5:	4b3e2ef81f80d8f05dad878f3d2bb640
 Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-format.patch
+Patch2:		%{name}-verbose.patch
 URL:		http://librtas.sourceforge.net/
 # uses PowerPC-specific RTAS proc files/syscalls
 ExclusiveArch:	ppc ppc64
@@ -49,8 +51,8 @@ Statyczna biblioteka librtas.
 %prep
 %setup -q
 %patch0 -p1
-
-find . -name 'lib*.so*' | xargs %{__rm}
+%patch1 -p1
+%patch2 -p1
 
 %build
 CFLAGS="%{rpmcflags}" \
diff --git a/librtas-format.patch b/librtas-format.patch
new file mode 100644
index 0000000..710dafd
--- /dev/null
+++ b/librtas-format.patch
@@ -0,0 +1,33 @@
+--- librtas-1.3.13/librtasevent_src/print_rtas_event.c.orig	2014-10-23 04:23:41.000000000 +0200
++++ librtas-1.3.13/librtasevent_src/print_rtas_event.c	2015-07-01 21:23:45.884757758 +0200
+@@ -330,7 +330,7 @@
+ 
+             if (newline != NULL) {
+                 prnt_len = newline - &tmpbuf[offset] + 1;
+-                snprintf(buf + buf_offset, prnt_len, &tmpbuf[offset]);
++                snprintf(buf + buf_offset, prnt_len, "%s", &tmpbuf[offset]);
+                 buf_offset = strlen(buf);
+                 buf_offset += snprintf(buf + buf_offset,
+ 				       sizeof(buf) - buf_offset, "\n");
+@@ -350,7 +350,7 @@
+             }
+ 
+             /* print up to the last brkpt */
+-            snprintf(buf + buf_offset, prnt_len, &tmpbuf[offset]);
++            snprintf(buf + buf_offset, prnt_len, "%s", &tmpbuf[offset]);
+             buf_offset = strlen(buf);
+             buf_offset += snprintf(buf + buf_offset, sizeof(buf) - buf_offset,
+ 				   "\n");
+@@ -361,10 +361,10 @@
+     } 
+ 
+     prnt_len = snprintf(buf + buf_offset, sizeof(buf) - buf_offset,
+-			&tmpbuf[offset]);
++			"%s", &tmpbuf[offset]);
+     line_offset += prnt_len;
+ 
+-    return fprintf(ostream, buf);
++    return fprintf(ostream, "%s", buf);
+ }
+ 
+ /** 
diff --git a/librtas-verbose.patch b/librtas-verbose.patch
new file mode 100644
index 0000000..5ff7950
--- /dev/null
+++ b/librtas-verbose.patch
@@ -0,0 +1,22 @@
+--- librtas-1.3.13/rules.mk.orig	2015-07-01 21:13:58.128115757 +0200
++++ librtas-1.3.13/rules.mk	2015-07-01 21:24:28.838089289 +0200
+@@ -210,7 +210,6 @@
+ 
+ # Default target for building object files
+ %.o: %.c
+-	@echo "CC $(WORK_DIR)/$@"
+-	@$(CC) -c $(CFLAGS) $<
++	$(CC) -c $(CFLAGS) $<
+ 
+ 
+--- librtas-1.3.13/Makefile.orig	2014-10-23 04:23:41.000000000 +0200
++++ librtas-1.3.13/Makefile	2015-07-01 21:35:00.668062773 +0200
+@@ -4,8 +4,6 @@
+ 
+ include rules.mk
+ 
+-.SILENT:
+-
+ FILES = README COPYRIGHT
+ SUBDIRS = librtas_src librtasevent_src libofdt_src
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/librtas.git/commitdiff/696af613473764d723e3674e496f4b09ff6a28a4



More information about the pld-cvs-commit mailing list