Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

[vuplus_openembedded] / packages / ppp / ppp_2.4.3.bb

diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb
index 98a7251..181ea7e 100644 (file)
--- a/packages/ppp/ppp_2.4.3.bb
+++ b/packages/ppp/ppp_2.4.3.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 DEPENDS = "libpcap"
 LICENSE = "BSD GPLv2"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
+        file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 \
        file://makefile.patch;patch=1 \
        file://cifdefroute.patch;patch=1 \
        file://pppd-resolv-varrun.patch;patch=1 \
@@ -28,6 +29,10 @@ inherit autotools
 EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
 EXTRA_OECONF = "--disable-strip"
 
+do_stage () {
+         make INCDIR=${STAGING_INCDIR} install-devel
+}
+
 do_install_append () {
        make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
        mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
@@ -41,9 +46,15 @@ do_install_append () {
        install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/
        install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/
        rm -rf ${D}/${mandir}/man8/man8
+       if [ ${DISTRO} = "opendreambox" ]; then
+               for i in pap-secrets options; do
+                       rm ${D}/etc/ppp/$i
+               done
+       fi
 }
 
 CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
+CONFFILES_${PN}_opendreambox = "${sysconfdir}/ppp/chap-secrets"
 PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
 FILES_${PN}        = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
 FILES_${PN}_nylon  = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"