rpms
/
ypbind
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added signalstate patch, fixes compilation with NetworkManaged-devel 

headers installed. Resolves #537064 (F-12, devel)
This commit is contained in:
Karel Klíč 2009-11-13 14:39:28 +00:00
parent 5a60cdbb17
commit 32c36866f4
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ypbind-mt-1.20.4-signalstate.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.signalstate ypbind-mt-1.20.4/src/ypbind_dbus_nm.c
--- ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.signalstate 2009-11-13 12:32:30.639389786 +0100
+++ ypbind-mt-1.20.4/src/ypbind_dbus_nm.c 2009-11-13 12:34:30.429263750 +0100
@@ -34,11 +34,12 @@
#ifdef HAVE_NETWORKMANAGER_NETWORKMANAGER_H
#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager/NetworkManagerVPN.h>
#else
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
-#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
+#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
typedef enum NMState {
NM_STATE_UNKNOWN = 0,
@@ -138,7 +139,7 @@ dbus_filter (DBusConnection *connection,
handled = DBUS_HANDLER_RESULT_HANDLED;
}
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE,
- NM_DBUS_SIGNAL_STATE_CHANGE))
+ NM_DBUS_VPN_SIGNAL_STATE_CHANGE))
{
NMState state = NM_STATE_UNKNOWN;

9
ypbind.spec
View File

@ -1,7 +1,7 @@
Summary: The NIS daemon which binds NIS clients to an NIS domain
Name: ypbind
Version: 1.20.4
Release: 20%{?dist}
Release: 21%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@ -16,6 +16,8 @@ Patch5: ypbind-mt-1.20.4-smartwrite.patch
Patch6: ypbind-mt-1.20.4-man-port.patch
Patch7: ypbind-mt-1.20.4-nm.patch
Patch8: ypbind-mt-1.20.4-network.patch
# Sent to the upstream. Fixes bug #537064.
Patch9: ypbind-mt-1.20.4-signalstate.patch
Requires(post): chkconfig
Requires(preun): chkconfig
@ -55,6 +57,7 @@ also need to install the ypserv package to a machine on your network.
%patch6 -p1 -b .man-port
%patch7 -p1 -b .nm
%patch8 -p1 -b .network
%patch9 -p1 -b .signalstate
%build
%configure --sbindir=/sbin
@ -99,6 +102,10 @@ fi
%doc README NEWS
%changelog
* Fri Nov 13 2009 Karel Klic <kklic@redhat.com> - 3:1.20.4-21
- Added signalstate patch, which fixes compilation with
NetworkManaged-devel headers installed. Resolves #537064.
* Thu Oct 29 2009 Karel Klic <kklic@redhat.com> - 3:1.20.4-20
- Bind to domain even if not using NetworkManager
The fix uses only the code from upstream ypbind-mt-1.29.91