Fix bug #353807 and bug #353549

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

5 files changed, 253 insertions, 2 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index df6c19704ac6..74dac53b77ec 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.95 2011/01/31 15:17:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.96 2011/02/06 15:06:17 qiaomuf Exp $
+
+*networkmanager-0.8.2-r5 (06 Feb 2011)
+
+  06 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> +networkmanager-0.8.2-r5.ebuild,
+  +files/networkmanager-0.8.2-fix-tests.patch,
+  +files/networkmanager-0.8.2-fix-timestamp.patch:
+  Fix bug #353807 and bug #353549
 
   31 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
   networkmanager-0.8-r1.ebuild, networkmanager-0.8.1-r6.ebuild,
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e5de02b7aa5d..f0fa096c3ba6 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -11,6 +11,8 @@ AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a61482
 AUX networkmanager-0.8.2-1.patch 6642 RMD160 466f7c2bd34043d13d1b265f4a52b172c594430e SHA1 7af80cb4ea3cf1d60566c8dacd3eadc3ef4cc186 SHA256 f29cfa186c9b77452266e9c303711c2368986fb7e5455e388a5dfe064e80b3e3
 AUX networkmanager-0.8.2-accept-gw.patch 3679 RMD160 b163afa5215f0eb52ba2562d22c65ec5e0bd3380 SHA1 a71f25413abf0c359439add74a73545790604ac9 SHA256 631ccad5bc4c2d880b5235bc8e6ace494467bad1734023ded9d8bcd52b9177af
 AUX networkmanager-0.8.2-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c7630d710a17a1812b5 SHA1 634ad19b189509e75362e5cd7f069ca795b4aeba SHA256 7c9ed8dc35b5b6d0414f96902fbe8117408ad556af655c0afc593ec5a1beac28
+AUX networkmanager-0.8.2-fix-tests.patch 2156 RMD160 b549d50e96efe7f26402f5d974560b3f9307dde5 SHA1 c38ae50f82a65c8e7e8c4a4fe65634e5ee9873c8 SHA256 d6cf4ceac6893a9893c916f1a5298cd1817ed0fb357f2e55539a3e6aae5e855e
+AUX networkmanager-0.8.2-fix-timestamp.patch 950 RMD160 4217e0332457eae47eb6c2f87a91f87adad37970 SHA1 d9fcaed9f2622937137bb977fba2d1c123b35893 SHA256 7d1d123b0da02ca8f02ce13b805eec912334bf1981032a38dcd2ef7e422bbf81
 AUX networkmanager-0.8.2-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
@@ -23,5 +25,6 @@ EBUILD networkmanager-0.8.1-r6.ebuild 4784 RMD160 cdf8ca556319629e311744d84f0822
 EBUILD networkmanager-0.8.2-r1.ebuild 4132 RMD160 1261ce2f0e499ece5e2ea4c010c8627ede1fa754 SHA1 96f9ac6b0ecaf0656386e82458453a97dfb8be61 SHA256 d247e094c0e22b885b78efa2cc8a6c8b32bbb5967f95a46439985d9a9da7362e
 EBUILD networkmanager-0.8.2-r2.ebuild 4407 RMD160 6ecc01211eb01e86a6856a1379dfdb991177b0d9 SHA1 ae3cc0a5869fc26b155b9704b286e61a01899c8c SHA256 0ead477d6ed601be6d1e3e5fa2a4546cc9cbbde77703406287125b3b639c5db2
 EBUILD networkmanager-0.8.2-r4.ebuild 4544 RMD160 2ea1b87f6dfbdacbc16880d66555f92ad8c8052d SHA1 ea3616a0e08410d710fcd02448b4c75850f56be0 SHA256 009027f150468dc72f5672e265b6e87b2adc3381451f2cee565a8577e369c678
-MISC ChangeLog 19765 RMD160 72b5ee914b79f657b49b3a7350cccfb613c4a9ce SHA1 3f6786333ea406e5e8b99c2780899c679fdffbca SHA256 1d53e04d59d963a34a06538e36dad8609b19dcc54f35a18316625b622c54ebf7
+EBUILD networkmanager-0.8.2-r5.ebuild 4747 RMD160 72b165be7833a7feb4a72e91efcc47825a74abf6 SHA1 bba611be46197f6d3df19941a9801fda0c568433 SHA256 cc0c15b6464d3e21c1164bd2a7a622c1e6242ed0dd6ea3671aca04c7113a84ee
+MISC ChangeLog 20013 RMD160 6a082b33c807157e5ff3ea18a66454fa6f6ba33b SHA1 d18ae3dbb7a234ee228cf80ad7174acf5757f312 SHA256 fa1c1db3048a0c224c01f6686e4bfd9591bb216f3c810c25b46abcfe97e63a57
 MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch
new file mode 100644
index 000000000000..dc3a99b11044
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch
@@ -0,0 +1,57 @@
+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
+
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch
new file mode 100644
index 000000000000..736a58c59dae
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch
@@ -0,0 +1,23 @@
+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
diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r5.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r5.ebuild
new file mode 100644
index 000000000000..97d6ee6e417f
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.8.2-r5.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r5.ebuild,v 1.1 2011/02/06 15:06:17 qiaomuf Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome.org linux-info
+
+# NetworkManager likes itself with capital letters
+MY_PN=${PN/networkmanager/NetworkManager}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing"
+
+RDEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.75
+	>=net-wireless/wireless-tools-28_pre9
+	>=sys-fs/udev-145[extras]
+	>=dev-libs/glib-2.18
+	>=sys-auth/polkit-0.92
+	>=dev-libs/libnl-1.1
+	>=net-misc/modemmanager-0.4
+	>=net-wireless/wpa_supplicant-0.5.10[dbus]
+	bluetooth? ( net-wireless/bluez )
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+	avahi? ( net-dns/avahi[autoipd] )
+	gnutls? (
+		nss? ( >=dev-libs/nss-3.11 )
+		!nss? ( dev-libs/libgcrypt
+			net-libs/gnutls ) )
+	!gnutls? ( >=dev-libs/nss-3.11 )
+	dhclient? (
+		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+		!dhcpcd? ( net-misc/dhcp ) )
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=net-dialup/ppp-2.4.5
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+S=${WORKDIR}/${MY_P}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See http://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_setup() {
+	# FIXME. Required by -confchanges.patch, but the patch is invalid as
+	# ConsoleKit and PolicyKit is enough to get authorization.
+	enewgroup plugdev
+
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See http://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+src_prepare() {
+	# dbus policy patch
+	epatch "${FILESDIR}/${P}-confchanges.patch"
+	# accept "gw" in /etc/conf.d/net (bug #339215)
+	epatch "${FILESDIR}/${P}-accept-gw.patch"
+	# fix shared connection wrt bug #350476
+	# fix parsing dhclient.conf wrt bug #352638
+	epatch "${FILESDIR}/${P}-shared-connection.patch"
+	# Backports #1
+	epatch "${FILESDIR}/${P}-1.patch"
+	# won't crash upon startup for 32bit machines wrt bug #353807
+	epatch "${FILESDIR}/${P}-fix-timestamp.patch"
+	# fix tests wrt bug #353549
+	epatch "${FILESDIR}/${P}-fix-tests.patch"
+	eautoreconf
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-udev-dir=/etc/udev
+		--with-iptables=/sbin/iptables
+		$(use_enable doc gtk-doc)
+		$(use_with doc docs)
+		$(use_with resolvconf)"
+
+	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
+	if use dhclient ; then
+		if use dhcpcd ; then
+			ECONF="${ECONF} --with-dhcpcd --without-dhclient"
+		else
+			ECONF="${ECONF} --with-dhclient --without-dhcpcd"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcpcd --without-dhclient"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
+		if use nss ; then
+			ECONF="${ECONF} --with-crypto=nss"
+		else
+			ECONF="${ECONF} --with-crypto=gnutls"
+		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
+		|| die "newins failed"
+}
+
+pkg_postinst() {
+	elog "You will need to reload DBus if this is your first time installing"
+	elog "NetworkManager, or if you're upgrading from 0.7 or older."
+	elog ""
+}