[NetworkManager/f15] Updated to 0.9.1.90 + git snapshot to fix ifcfg-rh security issue
Jirka Klimes
jklimes at fedoraproject.org
Tue Sep 27 13:25:10 UTC 2011
commit d715ac022495c3a1d8b5e7a176e69bbd65a52370
Author: Jiří Klimeš <jklimes at redhat.com>
Date: Tue Sep 27 15:22:34 2011 +0200
Updated to 0.9.1.90 + git snapshot to fix ifcfg-rh security issue
(CVE-2011-3364) (rh #737338)
see https://bugzilla.redhat.com/show_bug.cgi?id=737338 (parent bug)
https://bugzilla.redhat.com/show_bug.cgi?id=741418 (tracker bug)
.gitignore | 2 +
NetworkManager.spec | 95 ++++++++++++++++++++++-------
nm-applet-internal-buildfixes.patch | 109 +++++++++++++++++++++------------
nm-applet-no-notifications.patch | 6 +-
nm-applet-wifi-dialog-ui-fixes.patch | 6 +-
sources | 4 +-
6 files changed, 151 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56e0ca5..237570e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -259,3 +259,5 @@ network-manager-applet-0.8.1.tar.bz2
/network-manager-applet-0.8.9997.git20110721.tar.bz2
/NetworkManager-0.9.0.tar.bz2
/network-manager-applet-0.9.0.tar.bz2
+/NetworkManager-0.9.1.90.git20110927.tar.bz2
+/network-manager-applet-0.9.1.90.git20110927.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index c7e31cb..e2ff514 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,14 +7,14 @@
%define libnl_version 1.1
%define ppp_version 2.4.5
-%define snapshot %{nil}
-%define applet_snapshot %{nil}
-%define realversion 0.9.0
+%define snapshot .git20110927
+%define applet_snapshot .git20110927
+%define realversion 0.9.1.90
Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
-Version: 0.9.0
+Version: 0.9.1.90
Release: 1%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
@@ -32,6 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig
Requires(preun): chkconfig
+Requires(post): systemd-sysv
Requires(post): /bin/systemctl
Requires(preun): /bin/systemctl
Requires(postun): /bin/systemctl
@@ -67,6 +68,7 @@ BuildRequires: GConf2-devel
BuildRequires: gnome-keyring-devel
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
+BuildRequires: /usr/bin/autopoint
BuildRequires: pkgconfig
BuildRequires: wpa_supplicant
BuildRequires: libnl-devel >= %{libnl_version}
@@ -88,6 +90,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
%endif
BuildRequires: systemd
+BuildRequires: iso-codes-devel
%description
NetworkManager is a system network service that manages your network devices
@@ -114,6 +117,7 @@ Summary: GNOME applications for use with NetworkManager
Group: Applications/Internet
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-glib = %{epoch}:%{version}-%{release}
+Requires: %{name}-gtk = %{epoch}:%{version}-%{release}
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
Requires: libnotify >= 0.4.3
@@ -152,6 +156,29 @@ This package contains the header and pkg-config files for development applicatio
NetworkManager functionality from applications that use glib.
+%package gtk
+Summary: Private libraries for NetworkManager GUI support
+Group: Development/Libraries
+Requires: gtk3 >= %{gtk3_version}
+
+%description gtk
+This package contains private libraries to be used only by nm-applet and
+the GNOME Control Center.
+
+
+%package gtk-devel
+Summary: Private header files for NetworkManager GUI support
+Group: Development/Libraries
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Requires: %{name}-glib = %{epoch}:%{version}-%{release}
+Requires: gtk3-devel
+Requires: pkgconfig
+
+%description gtk-devel
+This package contains private header and pkg-config files to be used only by
+nm-applet and the GNOME control center.
+
+
%prep
%setup -q -n NetworkManager-%{realversion}
@@ -240,9 +267,7 @@ install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
# don't autostart in KDE on F13+ (#541353)
-%if 0%{?fedora} > 12
echo 'NotShowIn=KDE;' >>$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
-%endif
# validate the autostart .desktop file
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
@@ -253,35 +278,35 @@ desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desk
%post
-if [ $1 == 1 ]; then
- /sbin/chkconfig --add NetworkManager
- /sbin/chkconfig NetworkManager resetpriorities
-
- # Enable (but don't start) the units by default
- /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || :
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || :
fi
%preun
if [ $1 -eq 0 ]; then
- /sbin/service NetworkManager stop >/dev/null 2>&1
- killall -TERM nm-system-settings >/dev/null 2>&1
- /sbin/chkconfig --del NetworkManager
-
- # Disable and stop the units
- /bin/systemctl disable NetworkManager.service >/dev/null 2>&1 || :
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable NetworkManager.service >/dev/null 2>&1 || :
/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
fi
%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # On upgrade, reload init system configuration if we changed unit files
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || :
fi
%triggerun -- NetworkManager < 1:0.8.990
-if /sbin/chkconfig --level 5 NetworkManager ; then
- /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || :
-fi
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply NetworkManager
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save NetworkManager >/dev/null 2>&1 ||:
+/bin/systemctl --no-reload enable NetworkManager.service >/dev/null 2>&1 ||:
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del NetworkManager >/dev/null 2>&1 || :
+/bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || :
+
%triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614
/sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1
@@ -419,7 +444,31 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%dir %{_datadir}/gtk-doc/html/libnm-util
%{_datadir}/gtk-doc/html/libnm-util/*
+%files gtk
+%defattr(-,root,root,0755)
+%{_libdir}/libnm-gtk.so.*
+
+%files gtk-devel
+%defattr(-,root,root,0755)
+%dir %{_includedir}/libnm-gtk
+%{_includedir}/libnm-gtk/*.h
+%{_libdir}/pkgconfig/libnm-gtk.pc
+%{_libdir}/libnm-gtk.so
+%dir %{_datadir}/libnm-gtk
+%{_datadir}/libnm-gtk/*.ui
+
%changelog
+* Tue Sep 27 2011 Jiří Klimeš <jklimes at redhat.com> - 0.9.1.90-2.git20110927
+- Update to 0.9.1.90 (0.9.2-beta1) + git snapshot
+- core: ifcfg-rh: remove newlines when writing to ifcfg files (CVE-2011-3364) (rh #737338)
+- core: change iscsiadm path to /sbin/iscsiadm in ifcfg-rh plugin (rh #740753)
+- core: fix refcounting when deleting a default wired connection (lp:797868)
+- core: fix IPv6 link-local DNS servers in the dnsmasq DNS plugin
+- cli: add ability to delete connections
+- keyfile: fix an issue with duplicated keyfile connections
+- core: ensure the 'novj' option is passed through to pppd
+- core: store timestamps for VPN connections too (rh #725353)
+
* Tue Aug 23 2011 Dan Williams <dcbw at redhat.com> - 0.9.0-1
- Update to 0.9 release
- core: fix issue where scan results could be ignored
diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch
index 4a7ff40..e588671 100644
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac 2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac 2009-07-28 13:11:39.261718877 -0400
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
glib-2.0 >= 2.16
-- NetworkManager >= 0.9
-- libnm-glib >= 0.9
-- libnm-util >= 0.9
-- libnm-glib-vpn >= 0.9
+- NetworkManager >= 0.9.1
+- libnm-glib >= 0.9.1
+- libnm-util >= 0.9.1
+- libnm-glib-vpn >= 0.9.1
gmodule-export-2.0])
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@@ -17,16 +17,16 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/configure.ac.buildfix
AC_MSG_CHECKING(for gnome-bluetooth)
PKG_CHECK_MODULES(GNOME_BLUETOOTH,
- gnome-bluetooth-1.0 >= 2.27.6
-- libnm-util >= 0.9
-- libnm-glib >= 0.9,
+- libnm-util >= 0.9.1
+- libnm-glib >= 0.9.1,
+ gnome-bluetooth-1.0 >= 2.27.6,
have_gbt=yes, have_gbt=no)
;;
esac
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor
@@ -38,7 +38,7 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor
$(GTK_CFLAGS) \
$(NMA_CFLAGS) \
@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
- ${top_builddir}/src/marshallers/libmarshallers.la \
+ ${top_builddir}/src/libnm-gtk/libnm-gtk.la \
$(GTK_LIBS) \
$(NMA_LIBS) \
- -lm
@@ -49,9 +49,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/connection-editor
uidir = $(datadir)/nm-applet
ui_DATA = \
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/Mak
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -94,13 +94,13 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gconf-helpers/tes
noinst_PROGRAMS = test-upgrade
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \
- -I$(top_builddir) \
-I${top_builddir}/src/marshallers \
-I${top_srcdir}/src/utils \
+ -I${top_srcdir}/src/libnm-gtk \
+ -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \
+ -I${top_srcdir}/../libnm-glib \
@@ -108,9 +108,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/M
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS)
@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
- libnma_la_LIBADD = \
$(top_builddir)/src/marshallers/libmarshallers.la \
$(top_builddir)/src/utils/libutils.la \
+ $(top_builddir)/src/libnm-gtk/libnm-gtk.la \
- $(GNOME_BLUETOOTH_LIBS)
+ $(GNOME_BLUETOOTH_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
@@ -118,9 +118,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/gnome-bluetooth/M
endif
EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet
@@ -133,19 +133,19 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/Makefile.am.build
$(GTK_CFLAGS) \
$(NMA_CFLAGS) \
@@ -54,7 +58,9 @@ nm_applet_LDADD = \
- ${top_builddir}/src/marshallers/libmarshallers.la \
${top_builddir}/src/utils/libutils.la \
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
-- ${top_builddir}/src/wireless-security/libwireless-security.la
-+ ${top_builddir}/src/wireless-security/libwireless-security.la \
+ ${top_builddir}/src/wireless-security/libwireless-security.la \
+- ${top_builddir}/src/libnm-gtk/libnm-gtk.la
++ ${top_builddir}/src/libnm-gtk/libnm-gtk.la \
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
uidir = $(datadir)/nm-applet
- ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+ ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
SUBDIRS=. tests
@@ -165,9 +165,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/Makefile.am
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
+
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
@@ -177,9 +177,9 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/utils/tests/Makef
noinst_PROGRAMS = test-utils
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la
@@ -202,3 +202,32 @@ diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-security
uidir = $(datadir)/nm-applet
ui_DATA = \
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500
+@@ -1,3 +1,7 @@
++INCLUDES = -I${top_srcdir}/../include \
++ -I${top_srcdir}/../libnm-util \
++ -I${top_srcdir}/../libnm-glib
++
+ uidir = $(datadir)/libnm-gtk
+ ui_DATA = wifi.ui
+
+@@ -36,11 +40,14 @@ libnm_gtk_la_LIBADD = \
+ $(NMA_LIBS) \
+ $(GNOME_KEYRING_LIBS) \
+ $(top_builddir)/src/marshallers/libmarshallers.la \
+- $(top_builddir)/src/wireless-security/libwireless-security.la
++ $(top_builddir)/src/wireless-security/libwireless-security.la \
++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
+
+ libnm_gtk_la_LDFLAGS = -Wl,-no-undefined
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libnm-gtk.pc
+
+-EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
+\ No newline at end of file
++EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA)
diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch
index 327d9ad..542a03b 100644
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in.foo NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
@@ -6,7 +6,7 @@
<applyto>/apps/nm-applet/disable-connected-notifications</applyto>
<owner>nm-applet</owner>
diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch
index 5d24ef9..296c4ec 100644
--- a/nm-applet-wifi-dialog-ui-fixes.patch
+++ b/nm-applet-wifi-dialog-ui-fixes.patch
@@ -1,7 +1,7 @@
-diff --git NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c
+diff --git NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c
index 2cd75e0..5ae4764 100644
---- NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c
-+++ NetworkManager-0.9.0/network-manager-applet-0.9.0/src/wireless-dialog.c
+--- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c
++++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c
@@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self,
tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."),
diff --git a/sources b/sources
index 7d1df1b..face1a7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0acb51a218ed16454d0ee04fe186e445 NetworkManager-0.9.0.tar.bz2
-8d1e26870039e27ae6b4606f593631d5 network-manager-applet-0.9.0.tar.bz2
+485df497921ae4a9eba8f25fb2b5fc81 NetworkManager-0.9.1.90.git20110927.tar.bz2
+c8f0627d303ed3893c38e151086ad5a5 network-manager-applet-0.9.1.90.git20110927.tar.bz2
More information about the scm-commits
mailing list