Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/28 16:38:28-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2004/12/28 16:18:33-06:00 ti.com!kergoth
Change CCLD to be identical to CC for the moment, so libtool's lack of CCLD awareness doesn't break things.

2004/12/28 22:09:49+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2004/12/28 22:09:29+01:00 dyndns.org!reenoo
ppp(-dialin): fix ppp-dialin (and other uses of pppd) by making pppd suid root.

2004/12/28 21:59:53+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/28 21:59:44+01:00 uni-frankfurt.de!mickeyl
fix zbedic to 20041227 and add a qtopia17.patch

BKrev: 41d1dbbb__VEbpAroY8Qu9r_OOB55g

4 files changed, 43 insertions, 10 deletions

diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index 0d2ee82589..968ed1d73e 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Enables PPP dial-in through a serial connection"
 MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 DEPENDS = "ppp"
 RDEPENDS = "ppp"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://host-peer \
            file://ppp-dialin"
@@ -13,21 +13,15 @@ do_install() {
 	install -m 0644 ${WORKDIR}/host-peer ${D}/${sysconfdir}/ppp/peers/host
 
 	install -d ${D}/${sbindir}
-	install -m 0750 ${WORKDIR}/ppp-dialin ${D}/${sbindir}
+	install -m 0755 ${WORKDIR}/ppp-dialin ${D}/${sbindir}
 }
 
 
-# NOTE: adduser appears to be malfunctioning.
-#       add ppp user when creating the group already.
-
 pkg_postinst() {
 if test "x$D" != "x"; then
 	exit 1
 else
-	addgroup ppp ppp
-	adduser --system --home /dev/null --no-create-home --empty-password --ingroup ppp -s /usr/sbin/ppp-dialin ppp
-	chgrp ppp /usr/sbin/ppp-dialin
-	chmod u+s /usr/sbin/ppp-dialin
+	adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s /usr/sbin/ppp-dialin ppp
 fi
 }
 
@@ -36,6 +30,5 @@ if test "x$D" != "x"; then
 	exit 1
 else
 	deluser ppp
-	delgroup ppp
 fi
 }
diff --git a/packages/ppp/ppp_2.4.1.bb b/packages/ppp/ppp_2.4.1.bb
index e69de29bb2..7f4e58e107 100644
--- a/packages/ppp/ppp_2.4.1.bb
+++ b/packages/ppp/ppp_2.4.1.bb
@@ -0,0 +1,40 @@
+SECTION = "console/network"
+DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
+HOMEPAGE = "http://samba.org/ppp/"
+LICENSE = "BSD GPLv2"
+PR = "r4"
+
+SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-2.4.1.tar.gz \
+	file://pppd.patch;patch=1 \
+	file://man.patch;patch=1 \
+	file://pon \
+	file://poff \
+	file://init \
+	file://ip-up \
+	file://ip-down"
+	
+inherit autotools libtool
+
+EXTRA_OEMAKE = "STRIPPROG=${STRIP}"
+EXTRA_OECONF = --disable-strip
+
+do_install_append () {
+	install -d ${D}${bindir}/ ${D}${sysconfdir}/init.d
+ 	install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon
+	install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp
+	install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/
+	install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/
+	install -d ${D}${sysconfdir}/ppp/ip-up.d/
+	install -d ${D}${sysconfdir}/ppp/ip-down.d/
+}
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets"
+
+pkg_postinst() {
+if test "x$D" != "x"; then
+	exit 1
+else
+	chmod u+s /usr/sbin/pppd
+fi
+}
diff --git a/packages/zbedic/zbedic_cvs.bb b/packages/zbedic/files/qtopia17.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/zbedic/zbedic_cvs.bb
+++ b/packages/zbedic/files/qtopia17.patch
diff --git a/packages/zbedic/zbedic_20041227.bb b/packages/zbedic/zbedic_20041227.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zbedic/zbedic_20041227.bb