diff options
| author | piernov <piernov@piernov.org> | 2012-06-15 11:29:20 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-06-15 11:29:20 +0200 |
| commit | dc5aaf95f8c436525cadafe7e15bf73d6a6e61bf (patch) | |
| tree | 8feb1bdfa94f4aaa79c806dc6042e5597295a4e6 | |
| parent | 5f3c0aa9c3042353370be73b8513cc6f79f4713d (diff) | |
| download | nutyx-extra-dc5aaf95f8c436525cadafe7e15bf73d6a6e61bf.tar.gz nutyx-extra-dc5aaf95f8c436525cadafe7e15bf73d6a6e61bf.tar.bz2 nutyx-extra-dc5aaf95f8c436525cadafe7e15bf73d6a6e61bf.tar.xz nutyx-extra-dc5aaf95f8c436525cadafe7e15bf73d6a6e61bf.zip | |
networkmanager ajout patch
| -rw-r--r-- | networkmanager/.md5sum.i686 | 1 | ||||
| -rw-r--r-- | networkmanager/.md5sum.x86_64 | 1 | ||||
| -rw-r--r-- | networkmanager/Pkgfile | 4 | ||||
| -rw-r--r-- | networkmanager/dont-use-struct-ifpppstatsreq.patch | 44 |
4 files changed, 49 insertions, 1 deletions
diff --git a/networkmanager/.md5sum.i686 b/networkmanager/.md5sum.i686 index 2ea27b589..542d5e2ff 100644 --- a/networkmanager/.md5sum.i686 +++ b/networkmanager/.md5sum.i686 @@ -1,3 +1,4 @@ d0e38a744ddbad77e4a8e5059e7b3730 NetworkManager-0.9.4.0-upstream-fixes-1.patch 66a54b51a4998c484613911b72a7e6ff NetworkManager-0.9.4.0.tar.xz 3e3ade1a28def9838b19605b85acf9bf NuTyX.patch +bf7685c2bd1e92d6b72ccc722017d883 dont-use-struct-ifpppstatsreq.patch diff --git a/networkmanager/.md5sum.x86_64 b/networkmanager/.md5sum.x86_64 index 2ea27b589..542d5e2ff 100644 --- a/networkmanager/.md5sum.x86_64 +++ b/networkmanager/.md5sum.x86_64 @@ -1,3 +1,4 @@ d0e38a744ddbad77e4a8e5059e7b3730 NetworkManager-0.9.4.0-upstream-fixes-1.patch 66a54b51a4998c484613911b72a7e6ff NetworkManager-0.9.4.0.tar.xz 3e3ade1a28def9838b19605b85acf9bf NuTyX.patch +bf7685c2bd1e92d6b72ccc722017d883 dont-use-struct-ifpppstatsreq.patch diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile index f9b281fec..d8ce12976 100644 --- a/networkmanager/Pkgfile +++ b/networkmanager/Pkgfile @@ -12,10 +12,12 @@ release=2 _name=NetworkManager source=(http://ftp.gnome.org/pub/GNOME/sources/$_name/${version%.*.*}/$_name-$version.tar.xz NuTyX.patch - http://www.linuxfromscratch.org/blfs/downloads/svn/NetworkManager-0.9.4.0-upstream-fixes-1.patch) + http://www.linuxfromscratch.org/blfs/downloads/svn/NetworkManager-0.9.4.0-upstream-fixes-1.patch + dont-use-struct-ifpppstatsreq.patch) build() { cd ${_name}-$version + patch -p1 < ../dont-use-struct-ifpppstatsreq.patch patch -p1 < ../NuTyX.patch patch -p1 < ../NetworkManager-0.9.4.0-upstream-fixes-1.patch # aclocal diff --git a/networkmanager/dont-use-struct-ifpppstatsreq.patch b/networkmanager/dont-use-struct-ifpppstatsreq.patch new file mode 100644 index 000000000..f6ece6f7f --- /dev/null +++ b/networkmanager/dont-use-struct-ifpppstatsreq.patch @@ -0,0 +1,44 @@ +From 6b64e4db2f3c9cfc0e0e240cf0bc58f3b3e90c1f Mon Sep 17 00:00:00 2001 +From: Jiří Klimeš <jklimes@redhat.com> +Date: Wed, 28 Mar 2012 14:42:24 +0000 +Subject: ppp: don't use struct ifpppstatsreq that was removed from linux/ip_ppp.h + +in recent kernels. + +We can use ifreq and ppp_stats structures separately. They needn't have to +to be packed in a structure. +--- +(limited to 'src/ppp-manager/nm-ppp-manager.c') + +diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c +index 59698c3..243d2e1 100644 +--- a/src/ppp-manager/nm-ppp-manager.c ++++ b/src/ppp-manager/nm-ppp-manager.c +@@ -304,18 +304,20 @@ monitor_cb (gpointer user_data) + { + NMPPPManager *manager = NM_PPP_MANAGER (user_data); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (manager); +- struct ifpppstatsreq req; ++ struct ifreq req; ++ struct ppp_stats stats; + + memset (&req, 0, sizeof (req)); +- req.stats_ptr = (caddr_t) &req.stats; ++ memset (&stats, 0, sizeof (stats)); ++ req.ifr_data = (caddr_t) &stats; + +- strncpy (req.ifr__name, priv->ip_iface, sizeof (req.ifr__name)); ++ strncpy (req.ifr_name, priv->ip_iface, sizeof (req.ifr_name)); + if (ioctl (priv->monitor_fd, SIOCGPPPSTATS, &req) < 0) { + nm_log_warn (LOGD_PPP, "could not read ppp stats: %s", strerror (errno)); + } else { + g_signal_emit (manager, signals[STATS], 0, +- req.stats.p.ppp_ibytes, +- req.stats.p.ppp_obytes); ++ stats.p.ppp_ibytes, ++ stats.p.ppp_obytes); + } + + return TRUE; +-- +cgit v0.9.0.2-2-gbebe |