net-dialup/accel-pptp: fix build issue on 2.6.36.

svn path=/; revision=466

3 files changed, 90 insertions, 1 deletions

diff --git a/net-dialup/accel-pptp/Manifest b/net-dialup/accel-pptp/Manifest
index b8342f4..4f68174 100644
--- a/net-dialup/accel-pptp/Manifest
+++ b/net-dialup/accel-pptp/Manifest
@@ -1,8 +1,9 @@
 AUX README.gentoo 217 RMD160 9657859baa2f07dd426612321ffbf8312538b236 SHA1 351e9a8c3d7e6fbfb72a80926c9977fbf4e3ab7d SHA256 766c4d19732a44f1e1a5b093b2d65e6d1690fa29ddeada5116f1643ff1582f16
 AUX accel-pptp-0.8.3-redudant-log-line.patch 357 RMD160 a7f4cefa2372c836ef606f1614c3fca32d2ea5e0 SHA1 911c16f45671a45d0aa07b25a8fc2f464ab8d4a5 SHA256 4429d7e4aa098f886503bb4ef1708cf678d81beb8f56f481836fde5bfd8ded2b
+AUX accel-pptp-0.8.5-2.6.36-support.patch 2740 RMD160 252a8cc5070b28f95339fa5789b727e6d2a6c457 SHA1 79fd30fc5b2b2ccf460787027f41531aa7d0c60f SHA256 8dcf521785cb6843d224901b7b90ccdd5df99aacc3f72d09949e426b261513ef
 AUX options.pptp 341 RMD160 c55a423ee0bc8a9c349c1fe0c54847242809e915 SHA1 756529a80b02ed63a8625df8db195280447cc9a9 SHA256 fbf4859f10e5c7093b65c7edac506e240598ad53002bc5cea4569adf9ca85ce0
 AUX pptpd-confd 131 RMD160 cd7483c023adbb5d5e1aa6ed3b14114af5035790 SHA1 208d224be1e91f6e7d13b1c4cb451f92bbc55b94 SHA256 4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958
 AUX pptpd-init 531 RMD160 983c64cea78173ff190938e53f852e6ff4cb8ab9 SHA1 f6b83a219c44956e480f0668de7cfde44e741d2c SHA256 5e7f353a2b3812cd0e0292e5889bdbda6849e79be336d0acd5113f2fc00d38c6
 DIST accel-pptp-0.8.5.tar.bz2 589096 RMD160 7ac16756f32ccf617ac63e50fa57ab8c6d9f106f SHA1 1bb5ee672dab14025fc16906368244c17719e7a1 SHA256 ac27e9834e61bb4c97be232c8c2c342cc91ebf431309079d1014acede805106b
-EBUILD accel-pptp-0.8.5.ebuild 2775 RMD160 c62364bfef8f2bd777047eb54ac4d2d105c695a5 SHA1 db6e503673cbfed22a37e58d3fd6d481f95ad106 SHA256 ebc51a729120b8f99401929a9f4b4afdeb080542c303f1900fc42fa07e3725fa
+EBUILD accel-pptp-0.8.5.ebuild 2835 RMD160 7362a3e5d06e15a6ff25122048aa1a83c1dd1fe0 SHA1 b9ca3d38e10b8647379de03c2b08f4945a201ebd SHA256 ca1fa684e9f4eece08ec9fc9a6e1fba681a8e5b4368200e57bd9f46b3df1feed
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
diff --git a/net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild b/net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild
index 7a682b5..9f174cc 100644
--- a/net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild
+++ b/net-dialup/accel-pptp/accel-pptp-0.8.5.ebuild
@@ -31,6 +31,7 @@ MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
 
 src_prepare() {
 	epatch "${FILESDIR}/accel-pptp-0.8.3-redudant-log-line.patch"
+	epatch "${FILESDIR}/accel-pptp-0.8.5-2.6.36-support.patch"
 	convert_to_m "${S}/kernel/driver/Makefile"
 	use server && cd "${S}/pptpd-1.3.3" && eautoreconf
 	cd "${S}/pppd_plugin" && eautoreconf
diff --git a/net-dialup/accel-pptp/files/accel-pptp-0.8.5-2.6.36-support.patch b/net-dialup/accel-pptp/files/accel-pptp-0.8.5-2.6.36-support.patch
new file mode 100644
index 0000000..4e2d0a2
--- /dev/null
+++ b/net-dialup/accel-pptp/files/accel-pptp-0.8.5-2.6.36-support.patch
@@ -0,0 +1,87 @@
+X-Git-Url: http://accel-pptp.git.sourceforge.net/git/gitweb.cgi?p=accel-pptp%2Faccel-pptp;a=blobdiff_plain;f=kernel%2Fdriver%2Fpptp.c;h=78853fcb6908530fdecd50ed99ca67832d249a3c;hp=58eb307619392b908a515c68146e4bd8afc93fed;hb=5c6388a163646f5fe0726ee0ffbca281196b25a8;hpb=fc096cb1079a8ba334fdfd555bf56c8bb6f944bf
+
+diff --git a/kernel/driver/pptp.c b/kernel/driver/pptp.c
+index 58eb307..78853fc 100644
+--- a/kernel/driver/pptp.c
++++ b/kernel/driver/pptp.c
+@@ -400,7 +400,11 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
+ 		}
+ 	}
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+ 	tdev = rt->u.dst.dev;
++#else
++	tdev = rt->dst.dev;
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 	max_headroom = ((tdev->hard_header_len+15)&~15) + sizeof(*iph)+sizeof(*hdr)+2;
+@@ -507,7 +511,11 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
+ #endif
+ 	iph->version		=	4;
+ 	iph->ihl		=	sizeof(struct iphdr) >> 2;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+ 	if (ip_dont_fragment(sk, &rt->u.dst))
++#else
++	if (ip_dont_fragment(sk, &rt->dst))
++#endif
+ 		iph->frag_off	=	htons(IP_DF);
+ 	else
+ 		iph->frag_off	=	0;
+@@ -518,14 +526,22 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 	iph->ttl = sk->protinfo.af_inet.ttl;
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+ 	iph->ttl = dst_metric(&rt->u.dst, RTAX_HOPLIMIT);
++#else
++	iph->ttl = dst_metric(&rt->dst, RTAX_HOPLIMIT);
++#endif
+ #endif
+ 	iph->tot_len = htons(skb->len);
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ 	skb_dst_drop(skb);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+ 	skb_dst_set(skb,&rt->u.dst);
+ #else
++	skb_dst_set(skb,&rt->dst);
++#endif
++#else
+ 	dst_release(skb->dst);
+ 	skb->dst = &rt->u.dst;
+ #endif
+@@ -533,7 +549,11 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
+ 	nf_reset(skb);
+ 
+ 	skb->ip_summed = CHECKSUM_NONE;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+ 	ip_select_ident(iph, &rt->u.dst, NULL);
++#else
++	ip_select_ident(iph, &rt->dst, NULL);
++#endif
+ 	ip_send_check(iph);
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+@@ -855,13 +875,21 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
+ 			error = -EHOSTUNREACH;
+ 			goto end;
+ 		}
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+ 		sk_setup_caps(sk, &rt->u.dst);
++#else
++		sk_setup_caps(sk, &rt->dst);
++#endif
+ 	}
+ #endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 	po->chan.mtu=PPP_MTU;
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+ 	po->chan.mtu=dst_mtu(&rt->u.dst);
++#else
++	po->chan.mtu=dst_mtu(&rt->dst);
++#endif
+ 	if (!po->chan.mtu) po->chan.mtu=PPP_MTU;
+ #endif
+ 	ip_rt_put(rt);