[gentoo-commits] gentoo-x86 commit in net-misc/networkmanager/files: networkmanager-0.8.2-fix-tests.patch networkmanager-0.8.2-fix-timestamp.patch

[gentoo-commits] gentoo-x86 commit in net-misc/networkmanager/files: networkmanager-0.8.2-fix-tests.patch networkmanager-0.8.2-fix-timestamp.patch

[Mu Qiao (qiaomuf)]

qiaomuf     11/02/06 15:06:17

  Added:                networkmanager-0.8.2-fix-tests.patch
                        networkmanager-0.8.2-fix-timestamp.patch
  Log:
  Fix bug #353807 and bug #353549
  
  (Portage version: 2.1.9.25/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch?rev=1.1&content-type=text/plain

Index: networkmanager-0.8.2-fix-tests.patch
===================================================================
From 803277ff3b91f721846c90c092bb6306f2073810 Mon Sep 17 00:00:00 2001
From: Mu Qiao <qiaomuf@gentoo.org>
Date: Sun, 6 Feb 2011 22:23:58 +0000
Subject: [PATCH] remove tests
 Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>

---
 configure.ac                                    |    1 -
 system-settings/plugins/ifnet/Makefile.am       |    1 -
 system-settings/plugins/ifnet/tests/Makefile.am |   14 --------------
 3 files changed, 0 insertions(+), 16 deletions(-)
 delete mode 100644 system-settings/plugins/ifnet/tests/Makefile.am

diff --git a/configure.ac b/configure.ac
index 9cb0e9c..6c51a2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,7 +541,6 @@ system-settings/plugins/Makefile
 system-settings/plugins/ifupdown/Makefile
 system-settings/plugins/ifupdown/tests/Makefile
 system-settings/plugins/ifnet/Makefile
-system-settings/plugins/ifnet/tests/Makefile
 system-settings/plugins/ifcfg-rh/Makefile
 system-settings/plugins/ifcfg-rh/tests/Makefile
 system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
diff --git a/system-settings/plugins/ifnet/Makefile.am b/system-settings/plugins/ifnet/Makefile.am
index f63f8ca..b09cc8f 100644
--- a/system-settings/plugins/ifnet/Makefile.am
+++ b/system-settings/plugins/ifnet/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = . tests
 INCLUDES = \
 	-I$(top_srcdir)/src/system-settings \
 	-I$(top_srcdir)/include \
diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/system-settings/plugins/ifnet/tests/Makefile.am
deleted file mode 100644
index ead3f1f..0000000
--- a/system-settings/plugins/ifnet/tests/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\
-	 -I$(top_srcdir)/libnm-glib \
-	 -I$(top_srcdir)/libnm-util \
-	 -I$(top_srcdir)/include \
-	 -I$(top_srcdir)/src/system-settings
-TESTS = check_ifnet
-check_PROGRAMS = check_ifnet
-check_ifnet_SOURCES = test_all.c 
-check_ifnet_LDFLAGS = -g
-check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS) -g
-check_ifnet_LDADD = $(top_srcdir)/libnm-util/libnm-util.la\
-		    $(top_srcdir)/system-settings/plugins/ifnet/lib-ifnet-io.la\
-		    $(CHECK_LIBS)\
-		    $(GLIB_LIBS)
-- 
1.7.3.4




1.1                  net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch?rev=1.1&content-type=text/plain

Index: networkmanager-0.8.2-fix-timestamp.patch
===================================================================
From 4b022ed32bb3d729fd21d2e33483fda03c6a6333 Mon Sep 17 00:00:00 2001
From: Jiří Klimeš <jklimes@redhat.com>
Date: Tue, 23 Nov 2010 18:06:58 +0000
Subject: core: correct TIMESTAMP type; fixes potential crash when time() is 32bit

The Crash appeared on some platforms in glib while processing variable
arguments.
---
diff --git a/src/system-settings/nm-default-wired-connection.c b/src/system-settings/nm-default-wired-connection.c
index 1cda3d9..0d19dea 100644
--- a/src/system-settings/nm-default-wired-connection.c
+++ b/src/system-settings/nm-default-wired-connection.c
@@ -163,7 +163,7 @@ constructor (GType type,
 		      NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
 		      NM_SETTING_CONNECTION_UUID, uuid,
 		      NM_SETTING_CONNECTION_READ_ONLY, priv->read_only,
-		      NM_SETTING_CONNECTION_TIMESTAMP, time (NULL),
+		      NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL),
 		      NULL);
 
 	g_free (id);
--
cgit v0.8.3-6-g21f6