[packages/libconic] - updated to 0.24.1 - updated version,noWerror patches (also kill -static for tests) - removed obsol

qboosh qboosh at pld-linux.org
Thu Oct 3 17:31:48 CEST 2019 

commit 82cab93e902f402e56fb8b82751a90cd8a91cbb3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Oct 3 17:35:01 2019 +0200

    - updated to 0.24.1
    - updated version,noWerror patches (also kill -static for tests)
    - removed obsolete dbus patch
    - added format patch (fixes build with -Werror=format-security)
    - build with icd2-osso-ic-devel compat headers

 libconic-dbus.patch     | 97 -------------------------------------------------
 libconic-format.patch   | 20 ++++++++++
 libconic-noWerror.patch | 33 ++++++++---------
 libconic-version.patch  |  2 +-
 libconic.spec           | 31 +++++++++++-----
 5 files changed, 58 insertions(+), 125 deletions(-)
---
diff --git a/libconic.spec b/libconic.spec
index d4e7027..b7bbcad 100644
--- a/libconic.spec
+++ b/libconic.spec
@@ -1,25 +1,31 @@
+#
+# Conditional build:
+%bcond_without	apidocs	# Doxygen documentation
+
 Summary:	Maemo Internet Connectivity library
 Summary(pl.UTF-8):	Biblioteka łączności z Internetem dla Maemo
 Name:		libconic
-Version:	0.13
+Version:	0.24.1
 Release:	1
-License:	LGPL
+License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://repository.maemo.org/pool/bora/free/source/%{name}_%{version}.tar.gz
-# Source0-md5:	f852e61c2700b5bc571a730c6516e4ce
+#Source0Download: https://github.com/maemo-leste/libconic/releases
+Source0:	https://github.com/maemo-leste/libconic/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	fc387d4fb49631c5298bd734cc6b7231
 Patch0:		%{name}-version.patch
-Patch1:		%{name}-dbus.patch
+Patch1:		%{name}-format.patch
 Patch2:		%{name}-noWerror.patch
 URL:		http://maemo.org/
 BuildRequires:	GConf2-devel >= 2.0
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.60
+%{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	glib2-devel >= 1:2.0
-BuildRequires:	intltool
 BuildRequires:	libtool
-BuildRequires:	osso-ic-oss-devel >= 1.0.1
+BuildRequires:	icd2-osso-ic-devel >= 1.0.1
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,12 +67,15 @@ Statyczna biblioteka libconic.
 %patch1 -p1
 %patch2 -p1
 
+%{__sed} -i -e 's/@VERSION@/%{version}/' configure.ac
+
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--enable-docs%{!?with_apidocs:=no}
 %{__make}
 
 %install
@@ -75,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/test-*
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libconic.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,11 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libconic.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libconic.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libconic.so
-%{_libdir}/libconic.la
 %dir %{_includedir}/conic
 %{_includedir}/conic/conic.h
 %{_includedir}/conic/conicconnection.h
diff --git a/libconic-dbus.patch b/libconic-dbus.patch
deleted file mode 100644
index 3fa3001..0000000
--- a/libconic-dbus.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ur libconic-0.10-o/conic/conicconnection.c libconic-0.10/conic/conicconnection.c
---- libconic-0.10-o/conic/conicconnection.c	2006-10-30 00:52:48.000000000 -0700
-+++ libconic-0.10/conic/conicconnection.c	2007-06-02 08:49:12.000000000 -0600
-@@ -473,7 +473,7 @@
- 							  ICD_DBUS_PATH,
- 							  &icd_vtable,
- 							  NULL)) {
--			dbus_connection_disconnect(dbus_connection);
-+			dbus_connection_close(dbus_connection);
- 			dbus_connection_unref(dbus_connection);
- 			dbus_connection = NULL;
- 		}
-diff -ur libconic-0.10-o/tests/test-automatic-events.c libconic-0.10/tests/test-automatic-events.c
---- libconic-0.10-o/tests/test-automatic-events.c	2006-10-03 07:33:33.000000000 -0600
-+++ libconic-0.10/tests/test-automatic-events.c	2007-06-02 08:49:30.000000000 -0600
-@@ -138,7 +138,7 @@
- 
- static void finalize_dbus(void)
- {
--	dbus_connection_disconnect(dbus_connection);
-+	dbus_connection_close(dbus_connection);
- 	dbus_connection_unref(dbus_connection);
- }
- 
-diff -ur libconic-0.10-o/tests/test-connect.c libconic-0.10/tests/test-connect.c
---- libconic-0.10-o/tests/test-connect.c	2006-10-03 07:33:33.000000000 -0600
-+++ libconic-0.10/tests/test-connect.c	2007-06-02 08:48:52.000000000 -0600
-@@ -91,7 +91,7 @@
- 
- static void finalize_dbus(void)
- {
--	dbus_connection_disconnect(dbus_connection);
-+	dbus_connection_close(dbus_connection);
- 	dbus_connection_unref(dbus_connection);
- }
- 
-Only in libconic-0.10/tests: test-connect.c~
-diff -ur libconic-0.10-o/tests/test-disconnect.c libconic-0.10/tests/test-disconnect.c
---- libconic-0.10-o/tests/test-disconnect.c	2006-10-03 07:33:33.000000000 -0600
-+++ libconic-0.10/tests/test-disconnect.c	2007-06-02 08:49:30.000000000 -0600
-@@ -127,7 +127,7 @@
- 
- static void finalize_dbus(void)
- {
--	dbus_connection_disconnect(dbus_connection);
-+	dbus_connection_close(dbus_connection);
- 	dbus_connection_unref(dbus_connection);
- }
- 
-diff -ur libconic-0.10-o/tests/test-iap.c libconic-0.10/tests/test-iap.c
---- libconic-0.10-o/tests/test-iap.c	2006-10-03 07:33:33.000000000 -0600
-+++ libconic-0.10/tests/test-iap.c	2007-06-02 08:49:30.000000000 -0600
-@@ -99,7 +99,7 @@
- 
- static void finalize_dbus(void)
- {
--	dbus_connection_disconnect(dbus_connection);
-+	dbus_connection_close(dbus_connection);
- 	dbus_connection_unref(dbus_connection);
- }
- 
-diff -ur libconic-0.10-o/tests/test-proxies.c libconic-0.10/tests/test-proxies.c
---- libconic-0.10-o/tests/test-proxies.c	2006-10-03 07:33:33.000000000 -0600
-+++ libconic-0.10/tests/test-proxies.c	2007-06-02 08:49:30.000000000 -0600
-@@ -159,7 +159,7 @@
- 
- static void finalize_dbus(void)
- {
--	dbus_connection_disconnect(dbus_connection);
-+	dbus_connection_close(dbus_connection);
- 	dbus_connection_unref(dbus_connection);
- }
- 
-diff -ur libconic-0.10-o/tests/test-statistics.c libconic-0.10/tests/test-statistics.c
---- libconic-0.10-o/tests/test-statistics.c	2006-10-03 07:33:33.000000000 -0600
-+++ libconic-0.10/tests/test-statistics.c	2007-06-02 08:49:30.000000000 -0600
-@@ -157,7 +157,7 @@
- 
- static void finalize_dbus(void)
- {
--	dbus_connection_disconnect(dbus_connection);
-+	dbus_connection_close(dbus_connection);
- 	dbus_connection_unref(dbus_connection);
- }
- 
-diff -ur libconic-0.10-o/tests/test-two-objects.c libconic-0.10/tests/test-two-objects.c
---- libconic-0.10-o/tests/test-two-objects.c	2006-10-03 07:33:33.000000000 -0600
-+++ libconic-0.10/tests/test-two-objects.c	2007-06-02 08:49:30.000000000 -0600
-@@ -132,7 +132,7 @@
- 
- static void finalize_dbus(void)
- {
--	dbus_connection_disconnect(dbus_connection);
-+	dbus_connection_close(dbus_connection);
- 	dbus_connection_unref(dbus_connection);
- }
- 
diff --git a/libconic-format.patch b/libconic-format.patch
new file mode 100644
index 0000000..c4e79e6
--- /dev/null
+++ b/libconic-format.patch
@@ -0,0 +1,20 @@
+--- libconic-0.24.1/tests/test-proxies.c.orig	2019-07-27 12:17:04.000000000 +0200
++++ libconic-0.24.1/tests/test-proxies.c	2019-10-03 17:28:52.278832306 +0200
+@@ -75,7 +75,7 @@
+ 	g_debug("ignore_hosts:");
+ 	list = con_ic_connection_get_proxy_ignore_hosts(connection);
+ 	for (entry = list; entry; entry = entry->next) {
+-		g_debug(entry->data);
++		g_debug("%s", entry->data);
+ 		g_free(entry->data);
+ 	}
+ 	g_slist_free(list);
+@@ -116,7 +116,7 @@
+ 	g_debug("ignore_hosts:");
+ 	list = con_ic_connection_get_proxy_ignore_hosts(connection);
+ 	for (entry = list; entry; entry = entry->next) {
+-		g_debug(entry->data);
++		g_debug("%s", entry->data);
+ 		g_free(entry->data);
+ 	}
+ 	g_slist_free(list);
diff --git a/libconic-noWerror.patch b/libconic-noWerror.patch
index 3fc3dff..908955e 100644
--- a/libconic-noWerror.patch
+++ b/libconic-noWerror.patch
@@ -1,26 +1,23 @@
-diff -ur libconic-0.10-o/configure.ac libconic-0.10/configure.ac
---- libconic-0.10-o/configure.ac	2007-06-02 08:43:40.000000000 -0600
-+++ libconic-0.10/configure.ac	2007-06-02 08:45:07.000000000 -0600
-@@ -50,7 +50,7 @@
- AC_SUBST(GCONF_CFLAGS)
- AC_SUBST(GCONF_LIBS)
+--- libconic-0.24.1/configure.ac.orig	2019-10-03 16:58:24.488734295 +0200
++++ libconic-0.24.1/configure.ac	2019-10-03 17:14:56.920024500 +0200
+@@ -54,7 +54,7 @@
+ AC_SUBST(OSSO_IC_CFLAGS)
+ AC_SUBST(OSSO_IC_LIBS)
  
--CONCFLAGS="-Wall -Werror -Wmissing-prototypes -std=c99"
-+CONCFLAGS="-Wall -Wmissing-prototypes -std=c99"
+-CONCFLAGS="-Wall -Werror -Wmissing-prototypes"
++CONCFLAGS="-Wall -Wmissing-prototypes"
  AC_SUBST(CONCFLAGS)
  
  AC_CONFIG_FILES([Makefile \
-Only in libconic-0.10: configure.ac~
-diff -ur libconic-0.10-o/tests/Makefile.am libconic-0.10/tests/Makefile.am
---- libconic-0.10-o/tests/Makefile.am	2006-08-31 01:39:49.000000000 -0600
-+++ libconic-0.10/tests/Makefile.am	2007-06-02 08:45:12.000000000 -0600
-@@ -13,7 +13,7 @@
+--- libconic-0.24.1/tests/Makefile.am.orig	2019-10-03 16:58:24.492067610 +0200
++++ libconic-0.24.1/tests/Makefile.am	2019-10-03 17:15:33.416493448 +0200
+@@ -12,8 +12,7 @@
+ 	@DBUS_LIBS@ \
  	$(top_builddir)/conic/libconic.la
  
- AM_LDFLAGS = -static
--AM_CFLAGS = -Wall -Werror -std=gnu99 -Wmissing-prototypes
-+AM_CFLAGS = -Wall -std=gnu99 -Wmissing-prototypes
+-AM_LDFLAGS = -static
+-AM_CFLAGS = -Wall -Werror -Wmissing-prototypes
++AM_CFLAGS = -Wall -Wmissing-prototypes
  
  bin_PROGRAMS = test-connect test-disconnect test-automatic-events \
- 		test-statistics test-proxies test-iap test-two-objects
-Only in libconic-0.10/tests: Makefile.am~
+ 		test-statistics test-proxies test-iap test-two-objects \
diff --git a/libconic-version.patch b/libconic-version.patch
index c6643be..53e9bb6 100644
--- a/libconic-version.patch
+++ b/libconic-version.patch
@@ -4,7 +4,7 @@ diff -ur libconic-0.10-o/configure.ac libconic-0.10/configure.ac
 @@ -1,5 +1,4 @@
 -AC_INIT([libconic], patsubst(esyscmd([dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}']), [
 -]), [Kalle.Valo at nokia.com])
-+AC_INIT([libconic], [0.10], [Kalle.Valo at nokia.com])
++AC_INIT([libconic], [@VERSION@], [Kalle.Valo at nokia.com])
  AM_INIT_AUTOMAKE([foreign])
  
  AC_PROG_CC
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libconic.git/commitdiff/82cab93e902f402e56fb8b82751a90cd8a91cbb3

More information about the pld-cvs-commit mailing list