diff options
author | Justin Patrin <papercrane@gmail.com> | 2006-03-22 16:54:55 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-22 16:54:55 +0000 |
commit | 9a554304f9a614a941826cbed921d8f54da76c36 (patch) | |
tree | 4eb76d1c2e25daef6c4029e5092ea423f161595f | |
parent | ab495ddef3b3410d5b012c70f67673b7d821bec9 (diff) | |
parent | 4304b2e4dff5947b008585750f06c5ddc1d23f78 (diff) | |
download | openembedded-9a554304f9a614a941826cbed921d8f54da76c36.tar.gz |
merge of 671950969b0eb8f7d9ebf09fb75ca27b3077c225
and ac18cbdde564c5e7f20043f64d21032f7a94b619
-rw-r--r-- | conf/distro/familiar-0.8.3.conf | 1 | ||||
-rw-r--r-- | conf/distro/preferred-gpe-versions-2.7.inc | 5 | ||||
-rw-r--r-- | packages/dropbear/dropbear_0.45.bb | 69 | ||||
-rw-r--r-- | packages/dropbear/dropbear_0.46.bb | 74 | ||||
-rw-r--r-- | packages/dropbear/dropbear_0.47.bb | 72 | ||||
-rw-r--r-- | packages/gpe-filemanager/gpe-filemanager_0.14.bb | 8 | ||||
-rw-r--r-- | packages/gpe-filemanager/gpe-filemanager_0.15.bb | 8 | ||||
-rw-r--r-- | packages/gpe-filemanager/gpe-filemanager_0.17.bb | 8 | ||||
-rw-r--r-- | packages/gpe-filemanager/gpe-filemanager_0.20.bb | 10 | ||||
-rw-r--r-- | packages/gpe-filemanager/gpe-filemanager_0.25.bb (renamed from packages/gpe-filemanager/gpe-filemanager_0.23.bb) | 0 |
10 files changed, 211 insertions, 44 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 2a48111e2e..0de7d7c2c8 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -46,6 +46,7 @@ CVSDATE_LAB-kernel = "20051221" PREFERRED_VERSION_gcc ?= "3.4.4" PREFERRED_VERSION_gcc-cross ?= "3.4.4" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk ?= "3.4.4" # diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 2852746889..f86942c874 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -24,9 +24,10 @@ PREFERRED_VERSION_gtk+ ?= "2.6.10" PREFERRED_VERSION_pango ?= "1.8.1" PREFERRED_VERSION_librsvg ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.109" -PREFERRED_VERSION_libgpepimc ?= "0.5" +PREFERRED_VERSION_libgpepimc ?= "0.6" PREFERRED_VERSION_libgpevtype ?= "0.15" PREFERRED_VERSION_libschedule ?= "0.15" +PREFERRED_VERSION_libeventdb ?= "0.21" PREFERRED_VERSION_libcontactsdb ?= "0.3" PREFERRED_VERSION_libtododb ?= "0.09" PREFERRED_VERSION_gpe-icons ?= "0.25" @@ -73,7 +74,7 @@ PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" PREFERRED_VERSION_gpe-terminal ?= "1.1" PREFERRED_VERSION_gpe-watch ?= "0.10" PREFERRED_VERSION_gpe-what ?= "0.42" -PREFERRED_VERSION_gpe-filemanager ?= "0.23" +PREFERRED_VERSION_gpe-filemanager ?= "0.25" PREFERRED_VERSION_gpe-go ?= "0.05" PREFERRED_VERSION_gpe-irc ?= "0.07" PREFERRED_VERSION_gpe-lights ?= "0.13" diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb index 8daf54aac3..f6681b707c 100644 --- a/packages/dropbear/dropbear_0.45.bb +++ b/packages/dropbear/dropbear_0.45.bb @@ -1,5 +1,68 @@ -include dropbear.inc +DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation" +HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" +SECTION = "console/network" +LICENSE = "MIT" +DEPENDS = "zlib" +PROVIDES = "ssh sshd" +PR = "r2" -PR = "r4" +SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ + file://urandom-xauth-changes-to-options.h.patch;patch=1 \ + file://configure.patch;patch=1 \ + file://allow-nopw.patch \ + file://fix-2kb-keys.patch;patch=1 \ + file://chansession-security-fix.patch;patch=1 \ + file://init" -SRC_URI += "file://chansession-security-fix.patch;patch=1 " +inherit autotools update-rc.d + +INITSCRIPT_NAME = "dropbear" +INITSCRIPT_PARAMS = "defaults 10" + +CFLAGS_prepend = "-I. " +LD = "${CC}" + +SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" +BINCOMMANDS = "dbclient ssh scp" +EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' + +do_configure_prepend() { + if [ "${DISTRO_TYPE}" == "debug" ]; then + patch -p1 < ${WORKDIR}/allow-nopw.patch + fi +} + +do_install() { + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/dropbear \ + ${D}${bindir} \ + ${D}${sbindir} \ + ${D}${localstatedir} + + install -m 0755 dropbearmulti ${D}${sbindir}/ + for i in ${BINCOMMANDS} + do + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i + done + for i in ${SBINCOMMANDS} + do + ln -s ./dropbearmulti ${D}${sbindir}/$i + done + cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \ + -e 's,/usr/sbin,${sbindir},g' \ + -e 's,/var,${localstatedir},g' \ + -e 's,/usr/bin,${bindir},g' \ + -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear + chmod 755 ${D}${sysconfdir}/init.d/dropbear +} + +pkg_postrm_append () { + if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_rsa_host_key + fi + if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_dss_host_key + fi +} diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index 9aed2dc976..5bce95a71d 100644 --- a/packages/dropbear/dropbear_0.46.bb +++ b/packages/dropbear/dropbear_0.46.bb @@ -1,5 +1,73 @@ -include dropbear.inc +DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation" +HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" +SECTION = "console/network" +LICENSE = "MIT" +DEPENDS = "zlib" +PROVIDES = "ssh sshd" +PR = "r4" -PR = "r6" +SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ + file://urandom-xauth-changes-to-options.h.patch;patch=1 \ + file://configure.patch;patch=1 \ + file://allow-nopw.patch \ + file://fix-2kb-keys.patch;patch=1 \ + file://chansession-security-fix.patch;patch=1 \ + file://init" -SRC_URI += "file://chansession-security-fix.patch;patch=1 " +inherit autotools update-rc.d + +INITSCRIPT_NAME = "dropbear" +INITSCRIPT_PARAMS = "defaults 10" + +CFLAGS_prepend = "-I. " +LD = "${CC}" + +SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" +BINCOMMANDS = "dbclient ssh scp" +EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' + +do_configure_prepend() { + if [ "${DISTRO_TYPE}" == "debug" ]; then + patch -p1 < ${WORKDIR}/allow-nopw.patch + fi +} + +do_install() { + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/dropbear \ + ${D}${bindir} \ + ${D}${sbindir} \ + ${D}${localstatedir} + + install -m 0755 dropbearmulti ${D}${sbindir}/ + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + + for i in ${SBINCOMMANDS} + do + ln -s ./dropbearmulti ${D}${sbindir}/$i + done + cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \ + -e 's,/usr/sbin,${sbindir},g' \ + -e 's,/var,${localstatedir},g' \ + -e 's,/usr/bin,${bindir},g' \ + -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear + chmod 755 ${D}${sysconfdir}/init.d/dropbear +} + +pkg_postinst () { + update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 + update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 +} + +pkg_postrm_append () { + if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_rsa_host_key + fi + if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_dss_host_key + fi + update-alternatives --remove ssh ${bindir}/dropbearmulti + update-alternatives --remove scp ${bindir}/dropbearmulti +} diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb index 5990260b87..8035fb7969 100644 --- a/packages/dropbear/dropbear_0.47.bb +++ b/packages/dropbear/dropbear_0.47.bb @@ -1,3 +1,71 @@ -include dropbear.inc +DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation" +HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" +SECTION = "console/network" +LICENSE = "MIT" +DEPENDS = "zlib" +PROVIDES = "ssh sshd" -PR = "r2" +SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ + file://urandom-xauth-changes-to-options.h.patch;patch=1 \ + file://configure.patch;patch=1 \ + file://allow-nopw.patch \ + file://fix-2kb-keys.patch;patch=1 \ + file://init" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "dropbear" +INITSCRIPT_PARAMS = "defaults 10" + +CFLAGS_prepend = "-I. " +LD = "${CC}" + +SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" +BINCOMMANDS = "dbclient ssh scp" +EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' + +do_configure_prepend() { + if [ "${DISTRO_TYPE}" == "debug" ]; then + patch -p1 < ${WORKDIR}/allow-nopw.patch + fi +} + +do_install() { + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/dropbear \ + ${D}${bindir} \ + ${D}${sbindir} \ + ${D}${localstatedir} + + install -m 0755 dropbearmulti ${D}${sbindir}/ + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + + for i in ${SBINCOMMANDS} + do + ln -s ./dropbearmulti ${D}${sbindir}/$i + done + cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \ + -e 's,/usr/sbin,${sbindir},g' \ + -e 's,/var,${localstatedir},g' \ + -e 's,/usr/bin,${bindir},g' \ + -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear + chmod 755 ${D}${sysconfdir}/init.d/dropbear +} + +pkg_postinst () { + update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20 + update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20 +} + +pkg_postrm_append () { + if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_rsa_host_key + fi + if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_dss_host_key + fi + update-alternatives --remove ssh ${bindir}/dropbearmulti + update-alternatives --remove scp ${bindir}/dropbearmulti +} diff --git a/packages/gpe-filemanager/gpe-filemanager_0.14.bb b/packages/gpe-filemanager/gpe-filemanager_0.14.bb deleted file mode 100644 index 57e3cd6e3f..0000000000 --- a/packages/gpe-filemanager/gpe-filemanager_0.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget sqlite gnome-vfs gnome-vfs-extras dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE file manager" - -FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/gpe-filemanager/gpe-filemanager_0.15.bb b/packages/gpe-filemanager/gpe-filemanager_0.15.bb deleted file mode 100644 index 57e3cd6e3f..0000000000 --- a/packages/gpe-filemanager/gpe-filemanager_0.15.bb +++ /dev/null @@ -1,8 +0,0 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget sqlite gnome-vfs gnome-vfs-extras dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE file manager" - -FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/gpe-filemanager/gpe-filemanager_0.17.bb b/packages/gpe-filemanager/gpe-filemanager_0.17.bb deleted file mode 100644 index 57e3cd6e3f..0000000000 --- a/packages/gpe-filemanager/gpe-filemanager_0.17.bb +++ /dev/null @@ -1,8 +0,0 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget sqlite gnome-vfs gnome-vfs-extras dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE file manager" - -FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/gpe-filemanager/gpe-filemanager_0.20.bb b/packages/gpe-filemanager/gpe-filemanager_0.20.bb deleted file mode 100644 index d9c36f0575..0000000000 --- a/packages/gpe-filemanager/gpe-filemanager_0.20.bb +++ /dev/null @@ -1,10 +0,0 @@ -inherit gpe -LICENSE = "GPL" -DESCRIPTION = "GPE file manager" -DEPENDS = "libgpewidget gnome-vfs dbus sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r2" - -FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/gpe-filemanager/gpe-filemanager_0.23.bb b/packages/gpe-filemanager/gpe-filemanager_0.25.bb index 2beee83596..2beee83596 100644 --- a/packages/gpe-filemanager/gpe-filemanager_0.23.bb +++ b/packages/gpe-filemanager/gpe-filemanager_0.25.bb |