Hello community, here is the log from the commit of package NetworkManager checked in at Mon Sep 29 18:04:26 CEST 2008. -------- --- NetworkManager/NetworkManager.changes 2008-09-25 15:37:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2008-09-26 15:26:07.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Sep 26 15:55:31 EEST 2008 - tambet@suse.de + +- Update to the latest from upstream: + + Add support for static and dynamic hostnames. + + Correctly clean wpa_supplicant state on shutdown (bnc #404883). + + Fix a crash when a device is removed (bgo #549401). + + Fix (bgo #551361). + + Updated translations: it br sv lt fi hu fr. + +------------------------------------------------------------------- Old: ---- NetworkManager-0.7.0.r4076.tar.bz2 New: ---- NetworkManager-0.7.0.r4115.tar.bz2 nm-opensuse-merge.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.Gj1820/_old 2008-09-29 18:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Gj1820/_new 2008-09-29 18:02:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package NetworkManager (Version 0.7.0.r4076) +# spec file for package NetworkManager (Version 0.7.0.r4115) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ -Version: 0.7.0.r4076 -Release: 2 +Version: 0.7.0.r4115 +Release: 1 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PolicyKit-devel dhcp-client gtk-doc hal-devel intltool iproute2 libgcrypt-devel libnl-devel libtool mozilla-nss-devel ppp-devel wireless-tools @@ -34,6 +34,7 @@ %if 0%{?suse_version} == 1100 Patch1: nm-dbus-glib-opensuse110.patch %endif +Patch2: nm-opensuse-merge.patch Requires: wpa_supplicant >= 0.5.8-54 Requires: dhcp-client Requires: mozilla-nss @@ -125,6 +126,7 @@ %if 0%{?suse_version} == 1100 %patch1 -p1 %endif +%patch2 -p1 pppddir=`ls -1d /usr/%_lib/pppd/2*` test -n "$pppddir" || exit 1 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -149,6 +151,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN ./libtool --mode=install install -m 755 test/nm-online $RPM_BUILD_ROOT%{_bindir}/ +./libtool --mode=install install -m 755 test/nm-opensuse-sysconfig-merge $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager mkdir -p $RPM_BUILD_ROOT/var/log/ touch $RPM_BUILD_ROOT/var/log/NetworkManager mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections @@ -159,7 +162,9 @@ %clean rm -rf "$RPM_BUILD_ROOT" -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge %postun -p /sbin/ldconfig @@ -229,6 +234,13 @@ %{_datadir}/gtk-doc/html/libnm-glib/* %changelog +* Fri Sep 26 2008 tambet@suse.de +- Update to the latest from upstream: + + Add support for static and dynamic hostnames. + + Correctly clean wpa_supplicant state on shutdown (bnc #404883). + + Fix a crash when a device is removed (bgo #549401). + + Fix (bgo #551361). + + Updated translations: it br sv lt fi hu fr. * Thu Sep 25 2008 ro@suse.de - use autoreconf -f -i for new libtool * Fri Sep 19 2008 tambet@suse.de @@ -241,7 +253,7 @@ + Updated translations: cs, fi, fr, nl. * Mon Sep 15 2008 ro@suse.de - added directory to filelist -* Sun Sep 14 2008 aj@suse.de +* Mon Sep 15 2008 aj@suse.de - Fix directory ownership. - Remove unneeded build require on ppp. * Fri Sep 12 2008 tambet@suse.de @@ -448,7 +460,7 @@ * Mon Jun 19 2006 rml@suse.de - Fix automatic connection to WPA Enterprise networks (Novell bug [#175172]) -* Fri Jun 16 2006 rml@suse.de +* Sat Jun 17 2006 rml@suse.de - Update translations (Novell bug #169096) * Mon Jun 12 2006 rml@suse.de - nm-applet: Add nm-dialup-bugfix-183974.patch to fix bug where the @@ -482,7 +494,7 @@ - Merged upstream translations from GNOME CVS (#169096#c37). * Mon May 29 2006 sbrabec@suse.cz - Use translation compendium gnome-patch-translation (#169096). -* Fri May 26 2006 rml@suse.de +* Sat May 27 2006 rml@suse.de - Make sure we require and correctly build with gcrypt support (Novell bug #179315) * Thu May 25 2006 rml@suse.de @@ -536,7 +548,7 @@ GNOME keyring and not in gconf (Novell bug #173823) - Merge nm-online-header.patch into nm-0.6-branch.patch (fix is now upstream) -* Sun May 07 2006 jpr@suse.de +* Mon May 08 2006 jpr@suse.de - Fix header include to fix build * Tue May 02 2006 rml@suse.de - Install nm-online utility (start of fix for Novell bug #169632) @@ -576,10 +588,10 @@ - Reflect active modem/ISDN connections in state. Fixes bug where NM would report system as offline even if dial up connection were active (Novell bug #161611) -* Tue Apr 04 2006 rml@suse.de +* Wed Apr 05 2006 rml@suse.de - nm-applet: Remove 'Remove' option from right-click menu (undo Novell bug #155690) -* Wed Mar 29 2006 rml@suse.de +* Thu Mar 30 2006 rml@suse.de - Allow VPN modules to specify a per-route MSS value (bug #157988) - Fix possible crash in strcmp (Novell bug #162104) - Have NetworkManager require NetworkManager-client and have @@ -613,7 +625,7 @@ - Do not override the gtk default invisible character - Bump dbus-1 requirement to 0.60-22 or later - Bump dhcdbd requirement to 1.12-9 or later -* Wed Mar 22 2006 rml@suse.de +* Thu Mar 23 2006 rml@suse.de - Properly handle "Dynamic WEP" (Novell bug #158589) * Tue Mar 21 2006 rml@suse.de - Respect and set per-device MTU value in sysconfig, if any (Novell @@ -652,17 +664,17 @@ - Update to 0.6.0cvs20060310 - Fix WPA Enterprise SEGV on successfull connect (Bug #156973) - Do not log WPA Enterprise password in clear text (Bug #156977) -* Thu Mar 09 2006 rml@suse.de +* Fri Mar 10 2006 rml@suse.de - Update to 0.6.0cvs20060309 - Parse sysconfig encryption settings, too * Wed Mar 08 2006 rml@suse.de - Update to 0.6.0cvs20060308 - nm-applet: Hide password keystrokes (Novell beta customer) - Trust wireless networks in sysconfig -* Tue Mar 07 2006 rml@suse.de +* Wed Mar 08 2006 rml@suse.de - Update to 0.6.0cvs20060307 - nm-applet: Add 'Remove' option to the applet (Novell bug #155690) -* Mon Mar 06 2006 rml@suse.de +* Tue Mar 07 2006 rml@suse.de - Have NetworkManager.pc provide the NetworkManager include directory in CFLAGS. - Undo prism54 workarounds @@ -674,7 +686,7 @@ and #144938) - Workaround for airo wireless driver - Improved handling of activation cancellation (Novell bug #150787) -* Fri Mar 03 2006 rml@suse.de +* Sat Mar 04 2006 rml@suse.de - Update to 0.6.0 (just a version bump) * Fri Mar 03 2006 rml@suse.de - Update to 0.5.1cvs20060303 @@ -737,7 +749,7 @@ - Fix VPN GUI dialog when successively editing entries of two or more different VPN types (Novell bug #150854) - Improve debugging output -* Tue Feb 14 2006 rml@suse.de +* Wed Feb 15 2006 rml@suse.de - Update to 0.5.1cvs20060214 - Fix connecting non-broadcast encrypted networks (blocker #150784) * Mon Feb 13 2006 rml@suse.de @@ -757,7 +769,7 @@ - Better handling of non-broadcast networks - Merge half of nm-madwifi-wpa-driver-rml.patch upstream - Remove nm-supplicant-timeout-rml.patch, merged upstream -* Fri Feb 03 2006 rml@suse.de +* Sat Feb 04 2006 rml@suse.de - Update to 0.5.1cvs20060203 - Do not log encryption information (per bug #147748) - Fix memory leak in SUSE backend @@ -787,14 +799,14 @@ * Thu Jan 26 2006 rml@suse.de - Update to 0.5.1cvs20060126 - Move all non-GNOME bits out of /opt/gnome -* Wed Jan 25 2006 rml@suse.de +* Thu Jan 26 2006 rml@suse.de - Update to 0.5.1cvs20060125 - Remove temporary patch nm-dhcp-hostname-byte-array-thoenig-01, merged upstream - Add nm-fix-madwifi-strength-rml.patch, fixing strength output of Atheros devices - Update BuildRequires -* Wed Jan 25 2006 mls@suse.de +* Thu Jan 26 2006 mls@suse.de - converted neededforbuild to BuildRequires * Wed Jan 25 2006 thoenig@suse.de - temporary patch nm-dhcp-hostname-byte-array-thoenig-01.patch to @@ -824,7 +836,7 @@ - Update to 0.5.1cvs20060116 - Fixes #135595 - C++-sanitizes headers for thoenig -* Fri Jan 13 2006 rml@suse.de +* Sat Jan 14 2006 rml@suse.de - Update to 0.5.1cvs20060113 * Fri Jan 13 2006 rml@suse.de - Fix Novell #142773. @@ -910,7 +922,7 @@ - New version 0.4cvs20050725 * Thu Jul 21 2005 jpr@suse.de - Build against dbus 0.35 -* Thu Jun 30 2005 gekker@suse.de +* Fri Jul 01 2005 gekker@suse.de - Upate to version 0.4cvs20050630 - Update patch for connection dialog - Remove patched NetworkManager.conf source ++++++ NetworkManager-0.7.0.r4076.tar.bz2 -> NetworkManager-0.7.0.r4115.tar.bz2 ++++++ ++++ 11685 lines of diff (skipped) ++++++ nm-opensuse-merge.patch ++++++
From 18de9cfebc2b892e67e95244c1e9af74fed24337 Mon Sep 17 00:00:00 2001 From: Tambet Ingo
Date: Fri, 26 Sep 2008 11:32:56 +0300 Subject: [PATCH] Implement a utility script to merge opensuse's sysconfig configuration.
diff --git a/test/Makefile.am b/test/Makefile.am
index b0cb1aa..e757ca7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,3 +31,8 @@ libnm_glib_test_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \
$(top_builddir)/libnm-glib/libnm_glib.la \
$(top_builddir)/libnm-util/libnm-util.la
+if TARGET_SUSE
+noinst_PROGRAMS += nm-opensuse-sysconfig-merge
+nm_opensuse_sysconfig_merge_SOURCES = nm-opensuse-sysconfig-merge.c
+nm_opensuse_sysconfig_merge_LDADD = $(GLIB_LIBS)
+endif
diff --git a/test/nm-opensuse-sysconfig-merge.c b/test/nm-opensuse-sysconfig-merge.c
new file mode 100644
index 0000000..43609f2
--- /dev/null
+++ b/test/nm-opensuse-sysconfig-merge.c
@@ -0,0 +1,110 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+#include