| 1 |
qiaomuf 11/02/06 15:06:17 |
| 2 |
|
| 3 |
Added: networkmanager-0.8.2-fix-tests.patch |
| 4 |
networkmanager-0.8.2-fix-timestamp.patch |
| 5 |
Log: |
| 6 |
Fix bug #353807 and bug #353549 |
| 7 |
|
| 8 |
(Portage version: 2.1.9.25/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch |
| 12 |
|
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: networkmanager-0.8.2-fix-tests.patch |
| 17 |
=================================================================== |
| 18 |
From 803277ff3b91f721846c90c092bb6306f2073810 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Mu Qiao <qiaomuf@g.o> |
| 20 |
Date: Sun, 6 Feb 2011 22:23:58 +0000 |
| 21 |
Subject: [PATCH] remove tests |
| 22 |
Signed-off-by: Mu Qiao <qiaomuf@g.o> |
| 23 |
|
| 24 |
--- |
| 25 |
configure.ac | 1 - |
| 26 |
system-settings/plugins/ifnet/Makefile.am | 1 - |
| 27 |
system-settings/plugins/ifnet/tests/Makefile.am | 14 -------------- |
| 28 |
3 files changed, 0 insertions(+), 16 deletions(-) |
| 29 |
delete mode 100644 system-settings/plugins/ifnet/tests/Makefile.am |
| 30 |
|
| 31 |
diff --git a/configure.ac b/configure.ac |
| 32 |
index 9cb0e9c..6c51a2a 100644 |
| 33 |
--- a/configure.ac |
| 34 |
+++ b/configure.ac |
| 35 |
@@ -541,7 +541,6 @@ system-settings/plugins/Makefile |
| 36 |
system-settings/plugins/ifupdown/Makefile |
| 37 |
system-settings/plugins/ifupdown/tests/Makefile |
| 38 |
system-settings/plugins/ifnet/Makefile |
| 39 |
-system-settings/plugins/ifnet/tests/Makefile |
| 40 |
system-settings/plugins/ifcfg-rh/Makefile |
| 41 |
system-settings/plugins/ifcfg-rh/tests/Makefile |
| 42 |
system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile |
| 43 |
diff --git a/system-settings/plugins/ifnet/Makefile.am b/system-settings/plugins/ifnet/Makefile.am |
| 44 |
index f63f8ca..b09cc8f 100644 |
| 45 |
--- a/system-settings/plugins/ifnet/Makefile.am |
| 46 |
+++ b/system-settings/plugins/ifnet/Makefile.am |
| 47 |
@@ -1,4 +1,3 @@ |
| 48 |
-SUBDIRS = . tests |
| 49 |
INCLUDES = \ |
| 50 |
-I$(top_srcdir)/src/system-settings \ |
| 51 |
-I$(top_srcdir)/include \ |
| 52 |
diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/system-settings/plugins/ifnet/tests/Makefile.am |
| 53 |
deleted file mode 100644 |
| 54 |
index ead3f1f..0000000 |
| 55 |
--- a/system-settings/plugins/ifnet/tests/Makefile.am |
| 56 |
+++ /dev/null |
| 57 |
@@ -1,14 +0,0 @@ |
| 58 |
-INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\ |
| 59 |
- -I$(top_srcdir)/libnm-glib \ |
| 60 |
- -I$(top_srcdir)/libnm-util \ |
| 61 |
- -I$(top_srcdir)/include \ |
| 62 |
- -I$(top_srcdir)/src/system-settings |
| 63 |
-TESTS = check_ifnet |
| 64 |
-check_PROGRAMS = check_ifnet |
| 65 |
-check_ifnet_SOURCES = test_all.c |
| 66 |
-check_ifnet_LDFLAGS = -g |
| 67 |
-check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS) -g |
| 68 |
-check_ifnet_LDADD = $(top_srcdir)/libnm-util/libnm-util.la\ |
| 69 |
- $(top_srcdir)/system-settings/plugins/ifnet/lib-ifnet-io.la\ |
| 70 |
- $(CHECK_LIBS)\ |
| 71 |
- $(GLIB_LIBS) |
| 72 |
-- |
| 73 |
1.7.3.4 |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.1 net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch |
| 79 |
|
| 80 |
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 |
| 81 |
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 |
| 82 |
|
| 83 |
Index: networkmanager-0.8.2-fix-timestamp.patch |
| 84 |
=================================================================== |
| 85 |
From 4b022ed32bb3d729fd21d2e33483fda03c6a6333 Mon Sep 17 00:00:00 2001 |
| 86 |
From: Jiří Klimeš <jklimes@××××××.com> |
| 87 |
Date: Tue, 23 Nov 2010 18:06:58 +0000 |
| 88 |
Subject: core: correct TIMESTAMP type; fixes potential crash when time() is 32bit |
| 89 |
|
| 90 |
The Crash appeared on some platforms in glib while processing variable |
| 91 |
arguments. |
| 92 |
--- |
| 93 |
diff --git a/src/system-settings/nm-default-wired-connection.c b/src/system-settings/nm-default-wired-connection.c |
| 94 |
index 1cda3d9..0d19dea 100644 |
| 95 |
--- a/src/system-settings/nm-default-wired-connection.c |
| 96 |
+++ b/src/system-settings/nm-default-wired-connection.c |
| 97 |
@@ -163,7 +163,7 @@ constructor (GType type, |
| 98 |
NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, |
| 99 |
NM_SETTING_CONNECTION_UUID, uuid, |
| 100 |
NM_SETTING_CONNECTION_READ_ONLY, priv->read_only, |
| 101 |
- NM_SETTING_CONNECTION_TIMESTAMP, time (NULL), |
| 102 |
+ NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL), |
| 103 |
NULL); |
| 104 |
|
| 105 |
g_free (id); |
| 106 |
-- |
| 107 |
cgit v0.8.3-6-g21f6 |
Archives