summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/ppp
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/ppp')
-rw-r--r--meta/recipes-connectivity/ppp/ppp/makefix.patch40
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.9.bb96
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.5.0.bb75
3 files changed, 75 insertions, 136 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/makefix.patch b/meta/recipes-connectivity/ppp/ppp/makefix.patch
deleted file mode 100644
index fce068cae0..0000000000
--- a/meta/recipes-connectivity/ppp/ppp/makefix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1We were seeing reproducibility issues where one host would use the internal
2logwtmp wrapper, another would use the one in libutil. The issue was that in
3some cases the "\#include" was making it to CC, in others, "#include". The
4issue seems to be related to shell escaping.
5
6The root cause looks to be:
7http://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4
8
9Instead of relying on shell quoting, use make to indirect the variable
10and avoid the problem.
11
12See https://github.com/paulusmack/ppp/issues/233
13
14Upstream-Status: Backport [https://github.com/paulusmack/ppp/commit/b4430f7092ececdff2504d5f3393a4c6528c3686]
15Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
16
17Index: ppp-2.4.9/pppd/Makefile.linux
18===================================================================
19--- ppp-2.4.9.orig/pppd/Makefile.linux
20+++ ppp-2.4.9/pppd/Makefile.linux
21@@ -80,7 +80,8 @@ PLUGIN=y
22 #USE_SRP=y
23
24 # Use libutil; test if logwtmp is declared in <utmp.h> to detect
25-ifeq ($(shell echo '\#include <utmp.h>' | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes)
26+UTMPHEADER = "\#include <utmp.h>"
27+ifeq ($(shell echo $(UTMPHEADER) | $(CC) -E - 2>/dev/null | grep -q logwtmp && echo yes),yes)
28 USE_LIBUTIL=y
29 endif
30
31@@ -143,7 +144,8 @@ CFLAGS += -DHAS_SHADOW
32 #LIBS += -lshadow $(LIBS)
33 endif
34
35-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
36+CRYPTHEADER = "\#include <crypt.h>"
37+ifeq ($(shell echo $(CRYPTHEADER) | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
38 CFLAGS += -DHAVE_CRYPT_H=1
39 LIBS += -lcrypt
40 endif
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
deleted file mode 100644
index a78992fa5e..0000000000
--- a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
+++ /dev/null
@@ -1,96 +0,0 @@
1SUMMARY = "Point-to-Point Protocol (PPP) support"
2DESCRIPTION = "ppp (Paul's PPP Package) is an open source package which implements \
3the Point-to-Point Protocol (PPP) on Linux and Solaris systems."
4SECTION = "console/network"
5HOMEPAGE = "http://samba.org/ppp/"
6BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs"
7DEPENDS = "libpcap openssl virtual/crypt"
8LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD"
9LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \
10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
13
14SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
15 file://makefix.patch \
16 file://pon \
17 file://poff \
18 file://init \
19 file://ip-up \
20 file://ip-down \
21 file://08setupdns \
22 file://92removedns \
23 file://pap \
24 file://ppp_on_boot \
25 file://provider \
26 file://ppp@.service \
27 "
28
29SRC_URI[sha256sum] = "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d"
30
31inherit autotools-brokensep systemd
32
33TARGET_CC_ARCH += " ${LDFLAGS}"
34EXTRA_OEMAKE = "CC='${CC}' STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}"
35EXTRA_OECONF = "--disable-strip"
36
37# Package Makefile computes CFLAGS, referencing COPTS.
38# Typically hard-coded to '-O2 -g' in the Makefile's.
39#
40EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"'
41
42do_configure () {
43 oe_runconf
44}
45
46do_install_append () {
47 make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
48 mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
49 mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/
50 mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/
51 install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon
52 install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff
53 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp
54 install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/
55 install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/
56 install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/
57 install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/
58 mkdir -p ${D}${sysconfdir}/chatscripts
59 mkdir -p ${D}${sysconfdir}/ppp/peers
60 install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts
61 install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot
62 install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider
63 install -d ${D}${systemd_unitdir}/system
64 install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_unitdir}/system
65 sed -i -e 's,@SBINDIR@,${sbindir},g' \
66 ${D}${systemd_unitdir}/system/ppp@.service
67 rm -rf ${D}/${mandir}/man8/man8
68 chmod u+s ${D}${sbindir}/pppd
69}
70
71do_install_append_libc-musl () {
72 install -Dm 0644 ${S}/include/net/ppp_defs.h ${D}${includedir}/net/ppp_defs.h
73}
74
75CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
76PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools"
77FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service"
78FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so"
79FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so"
80FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
81FILES_${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so"
82FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so"
83FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
84FILES_${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so"
85FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump"
86SUMMARY_${PN}-oa = "Plugin for PPP for PPP-over-ATM support"
87SUMMARY_${PN}-oe = "Plugin for PPP for PPP-over-Ethernet support"
88SUMMARY_${PN}-radius = "Plugin for PPP for RADIUS support"
89SUMMARY_${PN}-winbind = "Plugin for PPP to authenticate against Samba or Windows"
90SUMMARY_${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout applies"
91SUMMARY_${PN}-password = "Plugin for PPP to get passwords via a pipe"
92SUMMARY_${PN}-l2tp = "Plugin for PPP for l2tp support"
93SUMMARY_${PN}-tools = "Additional tools for the PPP package"
94
95# Ignore compatibility symlink rp-pppoe.so->pppoe.so
96INSANE_SKIP_${PN}-oe += "dev-so"
diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb
new file mode 100644
index 0000000000..36e2585de4
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb
@@ -0,0 +1,75 @@
1SUMMARY = "Point-to-Point Protocol (PPP) support"
2DESCRIPTION = "ppp (Paul's PPP Package) is an open source package which implements \
3the Point-to-Point Protocol (PPP) on Linux and Solaris systems."
4SECTION = "console/network"
5HOMEPAGE = "http://samba.org/ppp/"
6BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs"
7DEPENDS = "libpcap openssl virtual/crypt"
8LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD"
9LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \
10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
13
14SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
15 file://pon \
16 file://poff \
17 file://init \
18 file://ip-up \
19 file://ip-down \
20 file://08setupdns \
21 file://92removedns \
22 file://pap \
23 file://ppp_on_boot \
24 file://provider \
25 file://ppp@.service \
26 "
27
28SRC_URI[sha256sum] = "5cae0e8075f8a1755f16ca290eb44e6b3545d3f292af4da65ecffe897de636ff"
29
30inherit autotools systemd
31
32EXTRA_OECONF += "--with-openssl=${STAGING_EXECPREFIXDIR}"
33
34do_install:append () {
35 mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
36 mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/
37 mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/
38 install -m 0755 ${UNPACKDIR}/pon ${D}${bindir}/pon
39 install -m 0755 ${UNPACKDIR}/poff ${D}${bindir}/poff
40 install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/ppp
41 install -m 0755 ${UNPACKDIR}/ip-up ${D}${sysconfdir}/ppp/
42 install -m 0755 ${UNPACKDIR}/ip-down ${D}${sysconfdir}/ppp/
43 install -m 0755 ${UNPACKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/
44 install -m 0755 ${UNPACKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/
45 mkdir -p ${D}${sysconfdir}/chatscripts
46 mkdir -p ${D}${sysconfdir}/ppp/peers
47 install -m 0755 ${UNPACKDIR}/pap ${D}${sysconfdir}/chatscripts
48 install -m 0755 ${UNPACKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot
49 install -m 0755 ${UNPACKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider
50 install -d ${D}${systemd_system_unitdir}
51 install -m 0644 ${UNPACKDIR}/ppp@.service ${D}${systemd_system_unitdir}
52 sed -i -e 's,@SBINDIR@,${sbindir},g' \
53 ${D}${systemd_system_unitdir}/ppp@.service
54}
55
56CONFFILES:${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
57PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools"
58FILES:${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_system_unitdir}/ppp@.service"
59FILES:${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so"
60FILES:${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so"
61FILES:${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
62FILES:${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so"
63FILES:${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so"
64FILES:${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
65FILES:${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so"
66FILES:${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump"
67SUMMARY:${PN}-oa = "Plugin for PPP for PPP-over-ATM support"
68SUMMARY:${PN}-oe = "Plugin for PPP for PPP-over-Ethernet support"
69SUMMARY:${PN}-radius = "Plugin for PPP for RADIUS support"
70SUMMARY:${PN}-winbind = "Plugin for PPP to authenticate against Samba or Windows"
71SUMMARY:${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout applies"
72SUMMARY:${PN}-password = "Plugin for PPP to get passwords via a pipe"
73SUMMARY:${PN}-l2tp = "Plugin for PPP for l2tp support"
74SUMMARY:${PN}-tools = "Additional tools for the PPP package"
75
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-09 10:35:40 +0000