Move inclusion of <linux/ppp_ioctl.h> to allow geriatric systems to build ppp. #552
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@fest3er: There is the sign-off problem (DCO) :/ @jkroonza, @paulusmack: What do you think? |
…uild ppp. Given a system with the following: - linux 4.4.302 - kernel headers 3.4.104 - gcc 4.7.3 - binutils 2.22 - glibc 2.18 Compiling ppp fails with the following errors: ==== x86_64-linux-gnu-gcc -std=gnu11 -DHAVE_CONFIG_H -I. -I../pppd/plugins/pppoe -DSYSCONFDIR=\"/usr/etc\" -DPPPD_RUNTIME_DIR='"/usr/var/run/pppd"' -DPPPD_LOGFILE_DIR='"/usr/var/log/ppp"' -DSYSTEM_CA_PATH='"/usr/etc/ssl/certs"' -DPPPD_PLUGIN_DIR='"/usr/lib/pppd/2.5.2"' -O2 -m64 -fPIC -MT pppd-sys-linux.o -MD -MP -MF .deps/pppd-sys-linux.Tpo -c -o pppd-sys-linux.o `test -f 'sys-linux.c' || echo './'`sys-linux.c In file included from sys-linux.c:125:0: /usr/include/linux/ppp-ioctl.h:55:14: error: field 'mode' has incomplete type make[3]: *** [Makefile:1334: pppd-sys-linux.o] Error 1 make[3]: Leaving directory '/build/sources/ppp/ppp-2.5.2/pppd' make[2]: *** [Makefile:819: all] Error 2 make[2]: Leaving directory '/build/sources/ppp/ppp-2.5.2/pppd' make[1]: *** [Makefile:505: all-recursive] Error 1 make[1]: Leaving directory '/build/sources/ppp/ppp-2.5.2' make: *** [Makefile:31: compile] Error 2 make: Leaving directory '/build/sources/ppp' ==== and ==== libtool: compile: x86_64-linux-gnu-gcc -std=gnu11 -DHAVE_CONFIG_H -I. -I../../../pppd -I../../../pppd/plugins/pppoe -I../../.. -O2 -m64 -fPIC -MT pppol2tp_la-pppol2tp.lo -MD -MP -MF .deps/pppol2tp_la-pppol2tp.Tpo -c pppol2tp.c -fPIC -DPIC -o .libs/pppol2tp_la-pppol2tp.o In file included from pppol2tp.c:41:0: /usr/include/linux/ppp-ioctl.h:55:14: error: field 'mode' has incomplete type make[3]: *** [Makefile:498: pppol2tp_la-pppol2tp.lo] Error 1 make[3]: Leaving directory '/build/sources/ppp/ppp-2.5.2/pppd/plugins/pppol2tp' make[2]: *** [Makefile:579: all-recursive] Error 1 make[2]: Leaving directory '/build/sources/ppp/ppp-2.5.2/pppd/plugins' make[1]: *** [Makefile:505: all-recursive] Error 1 make[1]: Leaving directory '/build/sources/ppp/ppp-2.5.2' make: *** [Makefile:31: compile] Error 2 make: Leaving directory '/build/sources/ppp' ==== They are likely due to the ordering of include files which changed in newer systems. The following two patches correct the error on my geriatric system. ==== --- ppp-2.5.2/pppd/sys-linux.c 2024-12-19 02:18:51.000000000 -0500 +++ ppp-2.5.2-new/pppd/sys-linux.c 2025-03-04 12:27:24.975267745 -0500 @@ -122,8 +122,6 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <linux/ppp-ioctl.h> - #include <linux/netlink.h> #include <linux/rtnetlink.h> #include <linux/if_link.h> @@ -156,6 +154,8 @@ #include "multilink.h" +#include <linux/ppp-ioctl.h> + #ifdef PPP_WITH_FILTER #include <pcap-bpf.h> #include <linux/filter.h> ==== and ==== --- ppp-2.5.2/pppd/plugins/pppol2tp/pppol2tp.c 2023-11-09 01:17:25.000000000 -0500 +++ ppp-2.5.2-new/pppd/plugins/pppol2tp/pppol2tp.c 2025-03-04 12:28:43.001934416 -0500 @@ -38,7 +38,6 @@ #include <linux/version.h> #include <linux/sockios.h> -#include <linux/ppp-ioctl.h> #ifndef aligned_u64 /* should be defined in sys/types.h */ @@ -51,6 +50,8 @@ #include <linux/if_pppox.h> #include <linux/if_pppol2tp.h> +#include <linux/ppp-ioctl.h> + #include <pppd/pppd.h> #include <pppd/options.h> #include <pppd/fsm.h> ==== Unknowns: - Do these patches affect compiling on new(er) systems? - Are the changes are reasonably optimal? - Do the changes introduce operational faults? Signed-off-by: Neal Murphy <imnozi@gmail.com> Signed-off-by: NPMurphy <neal.p.murphy@alum.wpi.edu>
Never had to use --signoff before; didn't know it existed. Took a while to fix it on github. The proper signed-off-by is now in place in the commit. |
|
Looks basically fine to me. If/when I merge it I will probably edit the commit message - there is no need to include the patch in the commit message when the commit makes exactly that change. It could conceivably be useful to include a diff in a commit message to explain an apparently promising approach which was discarded, I suppose, but a diff that simply duplicates what's already in the commit isn't useful. |
|
@fest3er: Can you reduce your commit message? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Given a system with the following:
Compiling ppp fails with the following errors:
and
They are likely due to the ordering of include files which changed in newer systems. The following two patches correct the error on my geriatric system.
and
Unknowns: