Bug 617625

Created attachment 433979 [details]
Fix FTBFS by adding definition of struct pppol2tpv3_addr

ppp currently fails to build from source in rawhide.

Scratch build of ppp-2.4.5-10.fc14:
http://koji.fedoraproject.org/koji/taskinfo?taskID=2346702

The build failure happens due to a missing pppoe-discovery plugin but that in turn is due to compilation problems that don't themselves cause the build to fail because of poor Makefile construction.

The actual failure is this:
for d in rp-pppoe pppoatm pppol2tp radius; do make -w -C $d all; done
make[2]: Entering directory `/builddir/build/BUILD/ppp-2.4.5/pppd/plugins/rp-pppoe'
cc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fPIC -Wall -I../../../include '-DRP_VERSION="3.8p"' -I../../.. -c -o plugin.o -fPIC plugin.c
In file included from plugin.c:53:0:
/usr/include/linux/if_pppox.h:75:25: error: field 'pppol2tp' has incomplete type
make[2]: *** [plugin.o] Error 1

It took me a while to track this one down but it's due to ppp bundling a copy of linux/if_pppol2tp.h and this being used in preference to the system one. A recent change in kernel-headers has added a definition of struct pppol2tpv3_addr to this header file, and that definition is needed by linux/if_pppox.h but isn't found when compiling ppp due to the presence of the bundled copy of linux/if_pppol2tp.h. Simplest fix is to add the definition of struct pppol2tpv3_addr to the bundled copy as per the attached patch.

One other query: the ppp-2.4.5-instroot.patch from the F-12 branch that addresses Bug #572174 (missing pppol2tp plugins) isn't present in the F-13 and devel branches - is there a reason for that?