[oe-commits] Roman I Khimov : poptop: change "require-mppe-128" option to plain "mppe"
git version control
git at git.openembedded.org
Wed Mar 31 09:01:50 UTC 2010
Module: openembedded.git
Branch: shr/unstable
Commit: 1ca92813d674b09bcabf670455055edbcd5cc845
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1ca92813d674b09bcabf670455055edbcd5cc845
Author: Roman I Khimov <khimov at altell.ru>
Date: Fri Nov 27 13:18:01 2009 +0300
poptop: change "require-mppe-128" option to plain "mppe"
OE has ppp-2.4.3-mppe-mppc-1.1.patch for pppd and it disables
'require-mppe-128' option, so poptop complains:
In file /etc/ppp/options.pptpd: unrecognized option 'require-mppe-128'
on start. Fix that by using 'mppe' option.
Signed-off-by: Roman I Khimov <khimov at altell.ru>
---
recipes/poptop/poptop_1.3.4.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/recipes/poptop/poptop_1.3.4.bb b/recipes/poptop/poptop_1.3.4.bb
index a4508c4..be1379a 100644
--- a/recipes/poptop/poptop_1.3.4.bb
+++ b/recipes/poptop/poptop_1.3.4.bb
@@ -8,7 +8,7 @@ SECTION = "network"
LICENSE = "GPL"
RDEPENDS_${PN} = "ppp"
RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
file://fix-plugins-install.patch;patch=1 \
@@ -30,6 +30,8 @@ do_install_append() {
# broken
sed -ri "s,^[:space:]*logwtmp[:space:]*,# logwtmp," ${D}/${sysconfdir}/pptpd.conf
rm -f ${D}${libdir}/pptpd/pptpd-logwtmp.so
+ # Use mppe option in OE style
+ sed -ri "s,^[[:space:]]*require-mppe-128[[:space:]]*$,mppe required,no40,no56," ${D}/${sysconfdir}/ppp/options.pptpd
}
PACKAGES = "${PN}-dbg ${PN}-bcrelay ${PN} ${PN}-doc"
More information about the Openembedded-commits
mailing list