update to snapshot from new development release 0.9.9.1
This commit is contained in:
Thomas Haller
parent
691505aed9
commit
b749848e40
1
.gitignore
vendored
1
.gitignore
vendored
@ -299,3 +299,4 @@ network-manager-applet-0.8.1.tar.bz2
|
||||
/NetworkManager-0.9.9.0.git20140114.4dd6ab8.tar.bz2
|
||||
/NetworkManager-0.9.9.0.git20140117.94c2993.tar.bz2
|
||||
/NetworkManager-0.9.9.0.git20140131.5d6a5f8.tar.bz2
|
||||
/NetworkManager-0.9.9.1.git20140228.16bbc90.tar.bz2
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From fa557a976fd8c6528e133b56be478cd50f4a915a Mon Sep 17 00:00:00 2001
|
||||
From: Dan Williams <dcbw@redhat.com>
|
||||
Date: Fri, 31 Jan 2014 15:22:16 -0600
|
||||
Subject: [PATCH 1/1] libnm-glib: zero 'secrets' to prevent crash getting
|
||||
secrets
|
||||
|
||||
If the GetSecrets call returned an error (eg, no secrets) then
|
||||
'secrets' isn't set by dbus_g_proxy_end_call() and is garbage,
|
||||
then gets freed.
|
||||
|
||||
(cherry picked from commit e922c120a3cf1bb3bd8def11bd0f23f1e18a0751)
|
||||
---
|
||||
libnm-glib/nm-remote-connection.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
|
||||
index 35c5be8..f4640c3 100644
|
||||
--- a/libnm-glib/nm-remote-connection.c
|
||||
+++ b/libnm-glib/nm-remote-connection.c
|
||||
@@ -313,7 +313,7 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *proxy_call, gpointer user_dat
|
||||
{
|
||||
RemoteCall *call = user_data;
|
||||
NMRemoteConnectionGetSecretsFunc func = (NMRemoteConnectionGetSecretsFunc) call->callback;
|
||||
- GHashTable *secrets;
|
||||
+ GHashTable *secrets = NULL;
|
||||
GError *error = NULL;
|
||||
|
||||
dbus_g_proxy_end_call (proxy, proxy_call, &error,
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,9 +6,9 @@
|
||||
%define libnl3_version 3.2.7
|
||||
%define ppp_version 2.4.5
|
||||
|
||||
%define snapshot .git20140131
|
||||
%define git_sha .5d6a5f8
|
||||
%define realversion 0.9.9.0
|
||||
%define snapshot .git20140228
|
||||
%define git_sha .16bbc90
|
||||
%define realversion 0.9.9.1
|
||||
|
||||
%global with_nmtui 1
|
||||
|
||||
@ -39,8 +39,8 @@
|
||||
Name: NetworkManager
|
||||
Summary: Network connection manager and user applications
|
||||
Epoch: 1
|
||||
Version: 0.9.9.0
|
||||
Release: 28%{snapshot}%{?dist}
|
||||
Version: 0.9.9.1
|
||||
Release: 0%{snapshot}%{?dist}
|
||||
Group: System Environment/Base
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org/projects/NetworkManager/
|
||||
@ -50,8 +50,6 @@ Source1: NetworkManager.conf
|
||||
Source2: 00-server.conf
|
||||
|
||||
Patch1: 0001-explain-dns1-dns2.patch
|
||||
Patch2: 0002-libnm-glib-zero-secrets-to-prevent-crash-getting-sec.patch
|
||||
Patch3: 0003-platform-caching-and-diverse.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -218,8 +216,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
||||
%setup -q -n NetworkManager-%{realversion}
|
||||
|
||||
%patch1 -p1 -b .0001.explain-dns1-dns2.orig
|
||||
%patch2 -p1 -b .0002.secrets.orig
|
||||
%patch3 -p1 -b .0003-platform-caching-and-diverse.orig
|
||||
|
||||
%build
|
||||
|
||||
@ -442,6 +438,9 @@ fi
|
||||
%{_bindir}/nmtui-hostname
|
||||
|
||||
%changelog
|
||||
* Fri Feb 28 2014 Thomas Haller <thaller@redhat.com> - 0.9.9.1-0.git20140228
|
||||
- new upstream snapshot with development version 0.9.9.1
|
||||
|
||||
* Sat Feb 22 2014 Thomas Haller <thaller@redhat.com> - 0.9.9.0-28.git20140131
|
||||
- add nmtui package
|
||||
- bugfix caching of libnl objects (caused error with new libnl3 version when activating bridges) (rh #1063290)
|
||||
|
||||
@ -100,6 +100,7 @@ docs/libnm-glib/html/index.sgml
|
||||
docs/libnm-glib/html/libnm-glib.devhelp2
|
||||
docs/libnm-glib/html/libnm-glib-nm-types.html
|
||||
docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
|
||||
docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
|
||||
docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
|
||||
docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
|
||||
docs/libnm-glib/html/NMAccessPoint.html
|
||||
@ -152,8 +153,74 @@ docs/libnm-glib/sgml.stamp
|
||||
docs/libnm-glib/tmpl-build.stamp
|
||||
docs/libnm-glib/tmpl/libnm-glib-unused.sgml
|
||||
docs/libnm-glib/tmpl/libnm-glib-unused.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-access-point.sgml
|
||||
docs/libnm-glib/tmpl/nm-access-point.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-active-connection.sgml
|
||||
docs/libnm-glib/tmpl/nm-active-connection.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-client.sgml
|
||||
docs/libnm-glib/tmpl/nm-client.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-adsl.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-adsl.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-bond.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-bond.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-bridge.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-bridge.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-bt.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-bt.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-ethernet.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-ethernet.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-generic.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-generic.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-infiniband.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-infiniband.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-modem.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-modem.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device.sgml
|
||||
docs/libnm-glib/tmpl/nm-device.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-team.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-team.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-vlan.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-vlan.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-wifi.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-wifi.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-device-wimax.sgml
|
||||
docs/libnm-glib/tmpl/nm-device-wimax.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
|
||||
docs/libnm-glib/tmpl/nm-dhcp4-config.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
|
||||
docs/libnm-glib/tmpl/nm-dhcp6-config.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
|
||||
docs/libnm-glib/tmpl/nm-glib-enum-types.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-ip4-config.sgml
|
||||
docs/libnm-glib/tmpl/nm-ip4-config.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-ip6-config.sgml
|
||||
docs/libnm-glib/tmpl/nm-ip6-config.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-object.sgml
|
||||
docs/libnm-glib/tmpl/nm-object.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-remote-connection.sgml
|
||||
docs/libnm-glib/tmpl/nm-remote-connection.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-remote-settings.sgml
|
||||
docs/libnm-glib/tmpl/nm-remote-settings.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-secret-agent.sgml
|
||||
docs/libnm-glib/tmpl/nm-secret-agent.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-types.sgml
|
||||
docs/libnm-glib/tmpl/nm-types.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-vpn-connection.sgml
|
||||
docs/libnm-glib/tmpl/nm-vpn-connection.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
|
||||
docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
|
||||
docs/libnm-glib/tmpl/nm-vpn-plugin.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
|
||||
docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
|
||||
docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml.bak
|
||||
docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
|
||||
docs/libnm-glib/tmpl/nm-wimax-nsp.sgml.bak
|
||||
docs/libnm-glib/tmpl.stamp
|
||||
docs/libnm-glib/xml/
|
||||
docs/libnm-glib/xml/annotation-glossary.xml
|
||||
@ -316,6 +383,8 @@ docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
|
||||
docs/libnm-util/tmpl/nm-setting-wireless-security.sgml.bak
|
||||
docs/libnm-util/tmpl/nm-setting-wireless.sgml
|
||||
docs/libnm-util/tmpl/nm-setting-wireless.sgml.bak
|
||||
docs/libnm-util/tmpl/nm-utils-enum-types.sgml
|
||||
docs/libnm-util/tmpl/nm-utils-enum-types.sgml.bak
|
||||
docs/libnm-util/tmpl/nm-utils.sgml
|
||||
docs/libnm-util/tmpl/nm-utils.sgml.bak
|
||||
docs/libnm-util/tmpl.stamp
|
||||
|
||||
@ -7,9 +7,6 @@ die() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
DIRNAME=NetworkManager-0.9.9.0
|
||||
|
||||
|
||||
if grep -q '^NAME="Red Hat Enterprise Linux' /etc/os-release ; then
|
||||
FEDPKG=rhpkg
|
||||
else
|
||||
@ -96,6 +93,8 @@ srcdir="$(dirname "$(readlink -f "$0")")"
|
||||
# generate the clean dir
|
||||
$FEDPKG prep || die "error while \`$FEDPKG prep\`"
|
||||
|
||||
DIRNAME="$(basename "$(ls -1d NetworkManager-[0-9].*/ || die "could not find directory")")"
|
||||
|
||||
pushd "$DIRNAME"
|
||||
git init .
|
||||
# if you have a local clone of NetworkManager, symlink
|
||||
|
||||
Loading…
Reference in New Issue
Block a user