Hello community, here is the log from the commit of package NetworkManager checked in at Mon May 29 00:59:42 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-05-25 17:02:52.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-05-26 21:22:10.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 21:15:32 CEST 2006 - rml@suse.de + +- Make sure we require and correctly build with gcrypt support + (Novell bug #179315) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.ZPNN8x/_old 2006-05-29 00:58:58.000000000 +0200 +++ /var/tmp/diff_new_pack.ZPNN8x/_new 2006-05-29 00:58:58.000000000 +0200 @@ -17,7 +17,7 @@ %define dbus_version 0.60-22 %define hal_version 0.5.0 %define wireless_version 28pre13-6 -%define wpa_supplicant_version 0.4.8-14.1 +%define wpa_supplicant_version 0.4.8-14 %define resmgr_version 0.9.8 %define dhcp_version 3.0.3-22 %define gtk_version 2.6.0 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 39 +Release: 40 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -167,6 +167,7 @@ --localstatedir=%{_localstatedir} \ --mandir=%{_mandir} \ --enable-notify=yes \ + --with-gcrypt=yes \ --with-distro=suse make @@ -261,6 +262,9 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Fri May 26 2006 - rml@suse.de +- Make sure we require and correctly build with gcrypt support + (Novell bug #179315) * Thu May 25 2006 - rml@suse.de - For ndiswrapper, only use "AP_SCAN 2" if the network is not broadcasting (Novell bug #178210) ++++++ nm-0.6-branch.patch ++++++ --- /var/tmp/diff_new_pack.ZPNN8x/_old 2006-05-29 00:58:59.000000000 +0200 +++ /var/tmp/diff_new_pack.ZPNN8x/_new 2006-05-29 00:58:59.000000000 +0200 @@ -1,20 +1,24 @@ NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE - ChangeLog | 314 +++++++++++++++++++ + ChangeLog | 335 +++++++++++++++++++ + Makefile.am | 8 NEWS | 5 - configure.in | 11 + configure.in | 87 ++-- + gnome/Makefile.am | 4 gnome/applet/Makefile.am | 2 gnome/applet/applet-compat.c | 2 gnome/applet/applet-dbus-devices.c | 9 gnome/applet/applet-dbus-info.c | 14 - gnome/applet/applet.c | 153 +++------ + gnome/applet/applet.c | 153 +++----- gnome/applet/applet.glade | 60 +-- gnome/applet/applet.h | 4 gnome/applet/eggtrayicon.c | 2 gnome/applet/main.c | 24 - gnome/applet/menu-items.c | 59 ++- gnome/applet/menu-items.h | 2 - gnome/applet/nm-gconf-wso-wpa-eap.c | 105 ++---- + gnome/applet/nm-device.c | 4 + gnome/applet/nm-device.h | 2 + gnome/applet/nm-gconf-wso-wpa-eap.c | 105 ++--- gnome/applet/passphrase-dialog.c | 5 gnome/applet/vpn-password-dialog.c | 3 gnome/applet/wireless-network.c | 21 + @@ -32,19 +36,20 @@ initscript/Slackware/rc.networkmanager | 66 --- initscript/Slackware/rc.networkmanager-dispatcher.in | 99 +++++ initscript/Slackware/rc.networkmanager.in | 99 +++++ - libnm-util/Makefile.am | 2 + libnm-util/Makefile.am | 4 + libnm-util/cipher-wep-passphrase.c | 4 libnm-util/dbus-helpers.c | 4 po/ChangeLog | 4 - po/hu.po | 184 +++-------- + po/hu.po | 184 +++------- src/Makefile.am | 2 src/NetworkManager.c | 16 src/NetworkManagerAPList.c | 15 src/NetworkManagerAPList.h | 4 - src/NetworkManagerDbus.c | 74 ++-- + src/NetworkManagerDbus.c | 74 +--- src/NetworkManagerDbus.h | 2 src/NetworkManagerMain.h | 1 src/NetworkManagerPolicy.c | 4 - src/NetworkManagerSystem.c | 291 ++++++++--------- + src/NetworkManagerSystem.c | 291 ++++++++-------- src/NetworkManagerSystem.h | 2 src/NetworkManagerUtils.c | 15 src/NetworkManagerUtils.h | 1 @@ -56,7 +61,7 @@ src/nm-dbus-net.c | 1 src/nm-dbus-nm.c | 21 - src/nm-dbus-nmi.c | 1 - src/nm-device-802-11-wireless.c | 227 ++++++++----- + src/nm-device-802-11-wireless.c | 227 ++++++++---- src/nm-device-802-11-wireless.h | 2 src/nm-device-802-3-ethernet.c | 3 src/nm-device.c | 33 - @@ -65,14 +70,35 @@ src/nm-netlink-monitor.c | 4 src/vpn-manager/nm-vpn-service.c | 13 test/Makefile.am | 5 - test/nm-online.c | 141 ++++++++ + test/nm-online.c | 141 +++++++ test/nm-tool.c | 4 - 67 files changed, 1766 insertions(+), 813 deletions(-) + 72 files changed, 1848 insertions(+), 852 deletions(-) diff -urN NetworkManager-0.6.2/ChangeLog NetworkManager/ChangeLog --- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500 -+++ NetworkManager/ChangeLog 2006-05-24 11:52:16.000000000 -0400 -@@ -1,3 +1,317 @@ ++++ NetworkManager/ChangeLog 2006-05-25 16:32:01.000000000 -0400 +@@ -1,3 +1,338 @@ ++2006-05-25 Robert Love <rml@novell.com> ++ ++ Patch Valentine Sinitsyn <e_val@inbox.ru> to fix GNOME bug #342400: ++ * libnm-util/Makefile.am: Only build gnome-keyring-md5.{c,h} if we are ++ not using gcrypt. Otherwise, we get a linker error. ++ ++2006-05-25 Robert Love <rml@novell.com> ++ ++ Patch Valentine Sinitsyn <e_val@inbox.ru> to fix GNOME bug #342398: ++ * configure.in, gnome/Makefile.am, Makefile.am: Add "--without-gnome" ++ configure flag to disable building of the GNOME-based applet. ++ ++2006-05-25 Robert Love <rml@novell.com> ++ ++ * gnome/applet/nm-device.c, gnome/applet/nm-device.h: Rename function ++ parameter from link, because it shadows a global variable with some ++ older versions of glibc. Yes, glibc is now fixed and, yes, glibc ++ should never have exported to the entire system a common four letter ++ word. But we here at NetworkManager are team players. Fixes ++ GNOME bug #336532. ++ +2006-05-24 Robert Love <rml@novell.com> + + * examples/python/systray/eggtrayicon.c, gnome/applet/eggtrayicon.c, @@ -392,8 +418,21 @@ * configure.in: Bump version to 0.6.2. diff -urN NetworkManager-0.6.2/configure.in NetworkManager/configure.in --- NetworkManager-0.6.2/configure.in 2006-03-27 11:05:17.000000000 -0500 -+++ NetworkManager/configure.in 2006-04-17 10:58:12.000000000 -0400 -@@ -44,13 +44,14 @@ ++++ NetworkManager/configure.in 2006-05-25 16:29:14.000000000 -0400 +@@ -35,6 +35,12 @@ + AC_CHECK_FUNCS(select socket uname) + + dnl ++dnl GNOME support ++dnl ++AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager without GNOME support, e.g. daemon only])) ++AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno) ++ ++dnl + dnl translation support + dnl + GETTEXT_PACKAGE=NetworkManager +@@ -44,13 +50,14 @@ AC_PROG_INTLTOOL([0.27.2]) AM_GLIB_GNU_GETTEXT @@ -409,7 +448,7 @@ AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` -@@ -60,7 +61,7 @@ +@@ -60,7 +67,7 @@ exit 1 else case $with_distro in @@ -418,7 +457,7 @@ *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 -@@ -72,6 +73,7 @@ +@@ -72,6 +79,7 @@ AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) @@ -426,7 +465,92 @@ AC_MSG_CHECKING([for wireless-tools >= 28pre9]) AC_TRY_COMPILE([#include <iwlib.h>], -@@ -332,9 +334,14 @@ +@@ -139,33 +147,35 @@ + AC_SUBST(HAL_CFLAGS) + AC_SUBST(HAL_LIBS) + +-PKG_CHECK_MODULES(GTK, gtk+-2.0) +-AC_SUBST(GTK_CFLAGS) +-AC_SUBST(GTK_LIBS) +- +-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) +-AC_SUBST(GDK_PIXBUF_CFLAGS) +-AC_SUBST(GDK_PIXBUF_LIBS) +- +-PKG_CHECK_MODULES(GLADE, libglade-2.0) +-AC_SUBST(GLADE_CFLAGS) +-AC_SUBST(GLADE_LIBS) +- +-PKG_CHECK_MODULES(GCONF, gconf-2.0) +-AC_SUBST(GCONF_CFLAGS) +-AC_SUBST(GCONF_LIBS) +- +-PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1) +-AC_SUBST(GNOME_KEYRING_CFLAGS) +-AC_SUBST(GNOME_KEYRING_LIBS) +- +-PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes], +- [enable_notify=no]) +-if test "x$enable_notify" != "xno"; then +- AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1], +- [Enable notifications with libnotify]) ++if test x"$with_gnome" != xno; then ++ PKG_CHECK_MODULES(GTK, gtk+-2.0) ++ AC_SUBST(GTK_CFLAGS) ++ AC_SUBST(GTK_LIBS) ++ ++ PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) ++ AC_SUBST(GDK_PIXBUF_CFLAGS) ++ AC_SUBST(GDK_PIXBUF_LIBS) ++ ++ PKG_CHECK_MODULES(GLADE, libglade-2.0) ++ AC_SUBST(GLADE_CFLAGS) ++ AC_SUBST(GLADE_LIBS) ++ ++ PKG_CHECK_MODULES(GCONF, gconf-2.0) ++ AC_SUBST(GCONF_CFLAGS) ++ AC_SUBST(GCONF_LIBS) ++ ++ PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1) ++ AC_SUBST(GNOME_KEYRING_CFLAGS) ++ AC_SUBST(GNOME_KEYRING_LIBS) ++ ++ PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes], ++ [enable_notify=no]) ++ if test "x$enable_notify" != "xno"; then ++ AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1], ++ [Enable notifications with libnotify]) ++ fi + fi +-AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) ++AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if' + + PKG_CHECK_MODULES(LIBNL, libnl-1) + AC_SUBST(LIBNL_CFLAGS) +@@ -193,13 +203,15 @@ + fi + AM_CONDITIONAL(WITH_GCRYPT, test x"$ac_gcrypt" != xno) + +-PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0) +-AC_SUBST(PANEL_APPLET_CFLAGS) +-AC_SUBST(PANEL_APPLET_LIBS) +- +-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) +-AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before +-AC_SUBST(LIBGNOMEUI_LIBS) ++if test x"$with_gnome" != xno; then ++ PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0) ++ AC_SUBST(PANEL_APPLET_CFLAGS) ++ AC_SUBST(PANEL_APPLET_LIBS) ++ ++ PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) ++ AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before ++ AC_SUBST(LIBGNOMEUI_LIBS) ++fi + + AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [where D-BUS system.d directory is])) + +@@ -332,9 +344,14 @@ initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Slackware/Makefile @@ -1275,6 +1399,35 @@ /* Helper function; escapes an essid for human readable display. */ char *nm_menu_network_escape_essid_for_display (const char *essid); +diff -urN NetworkManager-0.6.2/gnome/applet/nm-device.c NetworkManager/gnome/applet/nm-device.c +--- NetworkManager-0.6.2/gnome/applet/nm-device.c 2006-03-02 18:01:32.000000000 -0500 ++++ NetworkManager/gnome/applet/nm-device.c 2006-05-25 16:10:31.000000000 -0400 +@@ -672,11 +672,11 @@ + return (dev->link); + } + +-void network_device_set_link (NetworkDevice *dev, gboolean link) ++void network_device_set_link (NetworkDevice *dev, gboolean new_link) + { + g_return_if_fail (dev != NULL); + +- dev->link = link; ++ dev->link = new_link; + } + + /* +diff -urN NetworkManager-0.6.2/gnome/applet/nm-device.h NetworkManager/gnome/applet/nm-device.h +--- NetworkManager-0.6.2/gnome/applet/nm-device.h 2006-03-02 18:01:32.000000000 -0500 ++++ NetworkManager/gnome/applet/nm-device.h 2006-05-25 16:10:36.000000000 -0400 +@@ -95,7 +95,7 @@ + void network_device_set_hal_udi (NetworkDevice *dev, const char *hal_udi); + + gboolean network_device_get_link (NetworkDevice *dev); +-void network_device_set_link (NetworkDevice *dev, gboolean link); ++void network_device_set_link (NetworkDevice *dev, gboolean new_link); + + int network_device_get_speed (NetworkDevice *dev); + void network_device_set_speed (NetworkDevice *dev, int speed); diff -urN NetworkManager-0.6.2/gnome/applet/nm-gconf-wso-wpa-eap.c NetworkManager/gnome/applet/nm-gconf-wso-wpa-eap.c --- NetworkManager-0.6.2/gnome/applet/nm-gconf-wso-wpa-eap.c 2006-03-27 10:14:05.000000000 -0500 +++ NetworkManager/gnome/applet/nm-gconf-wso-wpa-eap.c 2006-05-09 10:50:06.000000000 -0400 @@ -1637,6 +1790,16 @@ return ctx; +diff -urN NetworkManager-0.6.2/gnome/Makefile.am NetworkManager/gnome/Makefile.am +--- NetworkManager-0.6.2/gnome/Makefile.am 2005-06-12 10:35:58.000000000 -0400 ++++ NetworkManager/gnome/Makefile.am 2006-05-25 16:29:14.000000000 -0400 +@@ -1,2 +1,6 @@ ++if WITH_GNOME + SUBDIRS = applet libnm_glib vpn-properties ++else ++SUBDIRS = libnm_glib ++endif + diff -urN NetworkManager-0.6.2/gnome/vpn-properties/clipboard.c NetworkManager/gnome/vpn-properties/clipboard.c --- NetworkManager-0.6.2/gnome/vpn-properties/clipboard.c 1969-12-31 19:00:00.000000000 -0500 +++ NetworkManager/gnome/vpn-properties/clipboard.c 2006-04-20 11:13:08.000000000 -0400 @@ -2305,6 +2468,20 @@ +*) + echo "usage $0 start|stop|status|restart" +esac +diff -urN NetworkManager-0.6.2/libnm-util/cipher-wep-passphrase.c NetworkManager/libnm-util/cipher-wep-passphrase.c +--- NetworkManager-0.6.2/libnm-util/cipher-wep-passphrase.c 2005-12-23 03:20:11.000000000 -0500 ++++ NetworkManager/libnm-util/cipher-wep-passphrase.c 2006-05-25 18:26:30.000000000 -0400 +@@ -19,6 +19,10 @@ + * (C) Copyright 2005 Red Hat, Inc. + */ + ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ + #include <glib.h> + #include <iwlib.h> + diff -urN NetworkManager-0.6.2/libnm-util/dbus-helpers.c NetworkManager/libnm-util/dbus-helpers.c --- NetworkManager-0.6.2/libnm-util/dbus-helpers.c 2006-03-22 16:26:58.000000000 -0500 +++ NetworkManager/libnm-util/dbus-helpers.c 2006-05-09 10:24:04.000000000 -0400 @@ -2328,7 +2505,7 @@ dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &private_key_file); diff -urN NetworkManager-0.6.2/libnm-util/Makefile.am NetworkManager/libnm-util/Makefile.am --- NetworkManager-0.6.2/libnm-util/Makefile.am 2005-12-17 16:10:37.000000000 -0500 -+++ NetworkManager/libnm-util/Makefile.am 2006-05-24 11:00:31.000000000 -0400 ++++ NetworkManager/libnm-util/Makefile.am 2006-05-25 16:31:06.000000000 -0400 @@ -9,7 +9,7 @@ -DG_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ @@ -2338,6 +2515,39 @@ if WITH_GCRYPT libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS) +@@ -29,8 +29,6 @@ + cipher-wpa-psk-hex.h \ + cipher-wpa-psk-passphrase.c \ + cipher-wpa-psk-passphrase.h \ +- gnome-keyring-md5.c \ +- gnome-keyring-md5.h \ + dbus-helpers.c \ + dbus-helpers.h \ + sha1.c \ +diff -urN NetworkManager-0.6.2/Makefile.am NetworkManager/Makefile.am +--- NetworkManager-0.6.2/Makefile.am 2006-03-01 11:51:38.000000000 -0500 ++++ NetworkManager/Makefile.am 2006-05-25 16:29:14.000000000 -0400 +@@ -15,13 +15,19 @@ + NetworkManager.pc.in \ + intltool-extract.in \ + intltool-merge.in \ +- intltool-update.in \ ++ intltool-update.in ++ ++if WITH_GNOME ++EXTRA_DIST += \ + nm-applet.desktop ++endif + + DISTCLEANFILES = intltool-extract intltool-merge intltool-update + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = NetworkManager.pc + ++if WITH_GNOME + autostartdir = $(datadir)/gnome/autostart + autostart_DATA = nm-applet.desktop ++endif diff -urN NetworkManager-0.6.2/NEWS NetworkManager/NEWS --- NetworkManager-0.6.2/NEWS 2006-03-27 11:05:17.000000000 -0500 +++ NetworkManager/NEWS 2006-03-28 09:47:17.000000000 -0500 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de