From 4da870fd428a4bcb18d4c04ffdd4f1f27a7dccdd Mon Sep 17 00:00:00 2001 From: piernov Date: Mon, 2 Jul 2012 21:39:36 +0200 Subject: networkmanager 0.9.5.95-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- networkmanager/.footprint.i686 | 2 + networkmanager/.footprint.x86_64 | 2 + networkmanager/.md5sum.i686 | 4 +- networkmanager/.md5sum.x86_64 | 4 +- networkmanager/Pkgfile | 17 +++------ networkmanager/dont-use-struct-ifpppstatsreq.patch | 44 ---------------------- 6 files changed, 11 insertions(+), 62 deletions(-) delete mode 100644 networkmanager/dont-use-struct-ifpppstatsreq.patch (limited to 'networkmanager') diff --git a/networkmanager/.footprint.i686 b/networkmanager/.footprint.i686 index ef037bc05..f30f0d66b 100644 --- a/networkmanager/.footprint.i686 +++ b/networkmanager/.footprint.i686 @@ -25,6 +25,7 @@ drwxr-xr-x root/root usr/include/NetworkManager/ -rw-r--r-- root/root usr/include/NetworkManager/NetworkManagerVPN.h -rw-r--r-- root/root usr/include/NetworkManager/nm-connection.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-8021x.h +-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-adsl.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bluetooth.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bond.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-cdma.h @@ -52,6 +53,7 @@ drwxr-xr-x root/root usr/include/libnm-glib/ -rw-r--r-- root/root usr/include/libnm-glib/nm-access-point.h -rw-r--r-- root/root usr/include/libnm-glib/nm-active-connection.h -rw-r--r-- root/root usr/include/libnm-glib/nm-client.h +-rw-r--r-- root/root usr/include/libnm-glib/nm-device-adsl.h -rw-r--r-- root/root usr/include/libnm-glib/nm-device-bond.h -rw-r--r-- root/root usr/include/libnm-glib/nm-device-bt.h -rw-r--r-- root/root usr/include/libnm-glib/nm-device-ethernet.h diff --git a/networkmanager/.footprint.x86_64 b/networkmanager/.footprint.x86_64 index ef037bc05..f30f0d66b 100644 --- a/networkmanager/.footprint.x86_64 +++ b/networkmanager/.footprint.x86_64 @@ -25,6 +25,7 @@ drwxr-xr-x root/root usr/include/NetworkManager/ -rw-r--r-- root/root usr/include/NetworkManager/NetworkManagerVPN.h -rw-r--r-- root/root usr/include/NetworkManager/nm-connection.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-8021x.h +-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-adsl.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bluetooth.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bond.h -rw-r--r-- root/root usr/include/NetworkManager/nm-setting-cdma.h @@ -52,6 +53,7 @@ drwxr-xr-x root/root usr/include/libnm-glib/ -rw-r--r-- root/root usr/include/libnm-glib/nm-access-point.h -rw-r--r-- root/root usr/include/libnm-glib/nm-active-connection.h -rw-r--r-- root/root usr/include/libnm-glib/nm-client.h +-rw-r--r-- root/root usr/include/libnm-glib/nm-device-adsl.h -rw-r--r-- root/root usr/include/libnm-glib/nm-device-bond.h -rw-r--r-- root/root usr/include/libnm-glib/nm-device-bt.h -rw-r--r-- root/root usr/include/libnm-glib/nm-device-ethernet.h diff --git a/networkmanager/.md5sum.i686 b/networkmanager/.md5sum.i686 index 542d5e2ff..05186719a 100644 --- a/networkmanager/.md5sum.i686 +++ b/networkmanager/.md5sum.i686 @@ -1,4 +1,2 @@ -d0e38a744ddbad77e4a8e5059e7b3730 NetworkManager-0.9.4.0-upstream-fixes-1.patch -66a54b51a4998c484613911b72a7e6ff NetworkManager-0.9.4.0.tar.xz +69507b5b2af1ad9b383a524d7cdb6c53 NetworkManager-0.9.5.95.tar.xz 3e3ade1a28def9838b19605b85acf9bf NuTyX.patch -bf7685c2bd1e92d6b72ccc722017d883 dont-use-struct-ifpppstatsreq.patch diff --git a/networkmanager/.md5sum.x86_64 b/networkmanager/.md5sum.x86_64 index 542d5e2ff..05186719a 100644 --- a/networkmanager/.md5sum.x86_64 +++ b/networkmanager/.md5sum.x86_64 @@ -1,4 +1,2 @@ -d0e38a744ddbad77e4a8e5059e7b3730 NetworkManager-0.9.4.0-upstream-fixes-1.patch -66a54b51a4998c484613911b72a7e6ff NetworkManager-0.9.4.0.tar.xz +69507b5b2af1ad9b383a524d7cdb6c53 NetworkManager-0.9.5.95.tar.xz 3e3ade1a28def9838b19605b85acf9bf NuTyX.patch -bf7685c2bd1e92d6b72ccc722017d883 dont-use-struct-ifpppstatsreq.patch diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile index d8ce12976..c3965646a 100644 --- a/networkmanager/Pkgfile +++ b/networkmanager/Pkgfile @@ -7,23 +7,15 @@ name=networkmanager -version=0.9.4.0 -release=2 +version=0.9.5.95 +release=1 _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 - dont-use-struct-ifpppstatsreq.patch) + NuTyX.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 -# autoconf -# automake -# autoreconf -if gtkdocize autopoint --force AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose @@ -41,7 +33,8 @@ build() { --enable-polkit \ --enable-introspection=yes \ --disable-wimax \ - --disable-more-warnings + --disable-more-warnings \ + --enable-vala=no make make DESTDIR=$PKG install diff --git a/networkmanager/dont-use-struct-ifpppstatsreq.patch b/networkmanager/dont-use-struct-ifpppstatsreq.patch deleted file mode 100644 index f6ece6f7f..000000000 --- a/networkmanager/dont-use-struct-ifpppstatsreq.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6b64e4db2f3c9cfc0e0e240cf0bc58f3b3e90c1f Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš -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 -- cgit v1.2.3-54-g00ecf