[packages/libbtctl] - fix format string error - fix compatibility with new glib2 - rel 10

baggins baggins at pld-linux.org
Thu May 5 19:07:28 CEST 2016


commit db79dde1353749310a55373c9ad56262169146eb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 5 19:07:04 2016 +0200

    - fix format string error
    - fix compatibility with new glib2
    - rel 10

 format-security.patch | 11 +++++++++++
 glib.patch            | 11 +++++++++++
 libbtctl.spec         |  6 +++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/libbtctl.spec b/libbtctl.spec
index 55689ca..c315c40 100644
--- a/libbtctl.spec
+++ b/libbtctl.spec
@@ -10,13 +10,15 @@ Summary:	Bluetooth GObject based library
 Summary(pl.UTF-8):	Biblioteka do programowania urządzeń Bluetooth
 Name:		libbtctl
 Version:	0.10.0
-Release:	9
+Release:	10
 License:	GPL
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libbtctl/0.10/%{name}-%{version}.tar.bz2
 # Source0-md5:	83d5f90efb2b26d1bd12a668940d02ba
 Patch0:		%{name}-make-jN.patch
 Patch1:		%{name}-newapi.patch
+Patch2:		glib.patch
+Patch3:		format-security.patch
 URL:		http://usefulinc.com/software/gnome-bluetooth/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -100,6 +102,8 @@ Dokumentacja API libbtctl.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..e476000
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- libbtctl-0.10.0/src/btctlimpl.c~	2016-05-05 18:59:50.000000000 +0200
++++ libbtctl-0.10.0/src/btctlimpl.c	2016-05-05 19:02:34.549483462 +0200
+@@ -436,7 +436,7 @@
+ 		if (*err) {
+ 			g_set_error (err, BTCTL_ERROR,
+ 			     BTCTL_ERROR_SERVICE_SEARCH_FAILED,
+-			     g_strdup_printf(_("Service search failed on device %s"), str));
++			     _("Service search failed on device %s"), str);
+ 		}
+ 		sdp_close(sess);
+ 		return -1;
diff --git a/glib.patch b/glib.patch
new file mode 100644
index 0000000..50d8386
--- /dev/null
+++ b/glib.patch
@@ -0,0 +1,11 @@
+--- libbtctl-0.10.0/src/btctl-types.h~	2007-03-06 00:07:20.000000000 +0100
++++ libbtctl-0.10.0/src/btctl-types.h	2016-05-05 19:03:09.746566449 +0200
+@@ -1,7 +1,7 @@
+ #ifndef __BTCTL_TYPES_H__
+ #define __BTCTL_TYPES_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ G_BEGIN_DECLS
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libbtctl.git/commitdiff/db79dde1353749310a55373c9ad56262169146eb



More information about the pld-cvs-commit mailing list