packages: NetworkManager/NetworkManager.spec, NetworkManager/llh340.patch (...

[sls]

Author: sls                          Date: Thu Jun 14 08:51:30 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added llh340.patch

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.110 -> 1.111) , llh340.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.110 packages/NetworkManager/NetworkManager.spec:1.111
--- packages/NetworkManager/NetworkManager.spec:1.110	Tue Apr 17 19:41:33 2012
+++ packages/NetworkManager/NetworkManager.spec	Thu Jun 14 10:51:25 2012
@@ -20,6 +20,7 @@
 Patch0:		%{name}-pld.patch
 Patch1:		ifcfg-path.patch
 Patch2:		systemd-fallback.patch
+Patch3:		llh340.patch
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10
@@ -138,6 +139,7 @@
 %patch0 -p1
 %patch1 -p1
 %{?with_systemd:%patch2 -p1}
+%patch3 -p1
 
 %build
 %{__gtkdocize}
@@ -312,6 +314,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2012/06/14 08:51:25  sls
+- added llh340.patch
+
 Revision 1.110  2012/04/17 17:41:33  baggins
 - rel 4
 - better systemd deps

================================================================
Index: packages/NetworkManager/llh340.patch
diff -u /dev/null packages/NetworkManager/llh340.patch:1.1
--- /dev/null	Thu Jun 14 10:51:30 2012
+++ packages/NetworkManager/llh340.patch	Thu Jun 14 10:51:25 2012
@@ -0,0 +1,21 @@
+# there's no <linux/if_ppp.h> in linux-libc-headers-3.4.0
+--- NetworkManager-0.9.4.0/src/ppp-manager/nm-ppp-manager.c.orig	2012-06-14 09:42:51.793598842 +0200
++++ NetworkManager-0.9.4.0/src/ppp-manager/nm-ppp-manager.c	2012-06-14 09:46:36.876054350 +0200
+@@ -32,14 +32,14 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <asm/types.h>
+-#include <linux/if.h>
++#include <net/if.h>
+ #include <sys/stat.h>
+ 
+-#include <linux/ppp_defs.h>
++#include <net/ppp_defs.h>
+ #ifndef aligned_u64
+ #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+ #endif
+-#include <linux/if_ppp.h>
++#include <net/if_ppp.h>
+ 
+ #include "NetworkManager.h"
+ #include "nm-glib-compat.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/NetworkManager/NetworkManager.spec?r1=1.110&r2=1.111