diff options
-rw-r--r-- | packages/bogofilter/bogofilter_0.96.0.bb | 16 | ||||
-rw-r--r-- | packages/bogofilter/files/.mtn2git_empty (renamed from packages/gnuz/gnuz/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/bogofilter/files/postfix-filter.sh | 25 | ||||
-rw-r--r-- | packages/bogofilter/files/volatiles | 1 | ||||
-rw-r--r-- | packages/cyrus-sasl/cyrus-sasl_2.1.19.bb | 4 | ||||
-rw-r--r-- | packages/gnuz/gnuz/intro_level.patch | 14 | ||||
-rw-r--r-- | packages/gnuz/gnuz_0.3.bb | 51 | ||||
-rw-r--r-- | packages/gpe-mini-browser/gpe-mini-browser_cvs.bb | 2 | ||||
-rw-r--r-- | packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb | 25 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-mm3.bb | 18 | ||||
-rw-r--r-- | packages/meta/meta-opie-all.bb | 3 | ||||
-rw-r--r-- | packages/opie-mediaplayer2/opie-mediaplayer2.inc | 5 | ||||
-rw-r--r-- | packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb | 1 | ||||
-rw-r--r-- | packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb | 3 | ||||
-rw-r--r-- | packages/postfix/postfix_2.0.20.bb | 6 |
15 files changed, 102 insertions, 72 deletions
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb index e552f1b8bd..dcef43d2a6 100644 --- a/packages/bogofilter/bogofilter_0.96.0.bb +++ b/packages/bogofilter/bogofilter_0.96.0.bb @@ -4,14 +4,28 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham ( by a statistical analysis of the message's header and content (body). \ The program is able to learn from the user's classifications and corrections." LICENSE = "GPL" -PR = "r1" +PR = "r2" PRIORITY = "optional" SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ file://${FILESDIR}/configure.ac.patch;patch=1 \ + file://volatiles \ + file://postfix-filter.sh \ " inherit autotools EXTRA_OECONF = "--with-libdb-prefix=${libdir}" +do_install_append () { + mkdir -p ${D}${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_bogofilter + install -m 755 ${WORKDIR}/postfix-filter.sh ${D}${bindir}/postfix-filter.sh +} + +pkg_postinst () { + grep filter /etc/group || addgroup filter + grep spam /etc/passwd || adduser --disabled-password --home=/var/spool/filter --ingroup filter -g "Bogofilter" spam + grep bogo /etc/passwd || adduser --disabled-password --home=/home/bogo --ingroup filter -g "Bogofilter" bogo + /etc/init.d/populate-volatile.sh +} diff --git a/packages/gnuz/gnuz/.mtn2git_empty b/packages/bogofilter/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnuz/gnuz/.mtn2git_empty +++ b/packages/bogofilter/files/.mtn2git_empty diff --git a/packages/bogofilter/files/postfix-filter.sh b/packages/bogofilter/files/postfix-filter.sh new file mode 100644 index 0000000000..156330b43d --- /dev/null +++ b/packages/bogofilter/files/postfix-filter.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +FILTER=/usr/bin/bogofilter +FILTER_DIR=/var/spool/filter +POSTFIX=/usr/sbin/sendmail +export BOGOFILTER_DIR=/home/bogo + +# Exit codes from <sysexits.h> +EX_TEMPFAIL=75 +EX_UNAVAILABLE=69 + +cd $FILTER_DIR || { echo $FILTER_DIR does not exist; exit $EX_TEMPFAIL; } + +# Clean up when done or when aborting. +trap "rm -f msg.$$ ; exit $EX_TEMPFAIL" 0 1 2 3 15 + +# bogofilter -e returns: 0 for OK, nonzero for error +rm -f msg.$$ || exit $EX_TEMPFAIL +$FILTER -p -u -e > msg.$$ || exit $EX_TEMPFAIL + +exec <msg.$$ || exit $EX_TEMPFAIL +rm -f msg.$$ # safe, we hold the file descriptor +exec $POSTFIX "$@" +exit $EX_TEMPFAIL + diff --git a/packages/bogofilter/files/volatiles b/packages/bogofilter/files/volatiles new file mode 100644 index 0000000000..4c18681cac --- /dev/null +++ b/packages/bogofilter/files/volatiles @@ -0,0 +1 @@ +d spam filter 0750 /var/spool/filter diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb index ebf892ab3e..c76fe3e8f3 100644 --- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb +++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DEPENDS = "db3 openssl" DESCRIPTION = "Generic client/server library for SASL authentication." LICENSE = "BSD" -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \ file://berkdb.m4.patch;patch=1" @@ -45,7 +45,7 @@ do_stage () { } pkg_postinst () { - grep cyrus /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup mail cyrus + grep cyrus /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup mail -g "Cyrus sasl" cyrus echo "cyrus" | saslpasswd2 -p -c cyrus chgrp mail /etc/sasldb2 } diff --git a/packages/gnuz/gnuz/intro_level.patch b/packages/gnuz/gnuz/intro_level.patch deleted file mode 100644 index ad1a69dff0..0000000000 --- a/packages/gnuz/gnuz/intro_level.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../intro.conf.orig 2003-09-13 18:55:01 +0200 -+++ ../intro.conf 2004-10-12 23:35:18 +0200 -@@ -1,8 +1,9 @@ - LevelName=Welcome Screen - LevelAuthor=WarCow --LevelPicFilename=intro_new.png --LevelMaskFilename=intro_new_mask.png -+LevelPicFilename=intro.png -+LevelMaskFilename=intro_mask.png - LevelDifficulty=0 -+LevelParTime=0 - - GnuCount=23 - GnuMinSave=0 diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb index 23a1832596..3e986cf398 100644 --- a/packages/gnuz/gnuz_0.3.bb +++ b/packages/gnuz/gnuz_0.3.bb @@ -5,49 +5,26 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" AUTHOR = "Lukas Fraser" HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/" -DEPENDS = "gnuz-levelmaker-native gnuz-package-native" +PR = "r1" + +APPTYPE = "binary" +APPNAME = "gnuz" +APPDESKTOP = "${S}/data/" SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \ - http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3_levels.tar.gz \ - file://intro_level.patch;patch=1;pnum=0" + http://www.hrw.one.pl/_pliki/oe/files/gnuz-levels-0.3.tar.bz2" S = "${WORKDIR}/gnuz" -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST += "LIBS+=-lqpe" - -inherit palmtop - -do_compile_append() { - - cd ${WORKDIR} - - for level in *.conf - do - if [ $level != 'intro.conf' ] ;then - ${STAGING_BINDIR}/gnuz_levelmaker `basename $level .conf`.lvl $level - fi - done - ${STAGING_BINDIR}/gnuz_levelmaker intro intro.conf - cd ${S}/data/ - ${STAGING_BINDIR}/gnuz_package guiimages.dat gui - ${STAGING_BINDIR}/gnuz_package gnuimages.dat gnu - - -} - -do_install() { +inherit opie - install -d ${D}${palmtopdir}/apps/Games \ - ${D}${palmtopdir}/pics \ - ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/share/gnuz/levels +do_install_append() { - install -m 0755 gnuz ${D}${palmtopdir}/bin/ - install -m 0644 data/gnuz.desktop ${D}${palmtopdir}/apps/Games/ - install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/*.lvl ${D}${palmtopdir}/share/gnuz/levels/ - install -m 0644 ${WORKDIR}/intro ${D}${palmtopdir}/share/gnuz/levels/ - install -m 0644 ${S}/data/*images.dat ${D}${palmtopdir}/share/gnuz/ + install -d ${D}${palmtopdir}/apps/Games \ + ${D}${palmtopdir}/pics \ + ${D}${palmtopdir}/share/gnuz/levels + install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/levels/* ${D}${palmtopdir}/share/gnuz/levels/ + install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/*images.dat ${D}${palmtopdir}/share/gnuz/ } diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb index 31781cc37d..82a674c752 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb @@ -4,7 +4,7 @@ PV = "0.17+cvs-${CVSDATE}" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser" DESCRIPTION = "A lightweight webbrowser for the GPE platform" LICENSE = "GPL" -DEPENDS = "sqlite osb-nrcit libgpewidget" +DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/gpe-mini-browser" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb new file mode 100644 index 0000000000..1ecc553cf9 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb @@ -0,0 +1,25 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." +MAINTAINER = "Greg Gilbert <greg@treke.net>" +LICENSE = "GPL" +# +COMPATIBLE_HOST = "arm.*-linux" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')}" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +do_configure() { + install -m 0644 arch/arm/configs/ipaqpxa_defconfig .config + yes '' | oe_runmake oldconfig +} diff --git a/packages/linux/linux-openzaurus_2.6.13-mm3.bb b/packages/linux/linux-openzaurus_2.6.13-mm3.bb index 1213b8416a..cc9ec6df0d 100644 --- a/packages/linux/linux-openzaurus_2.6.13-mm3.bb +++ b/packages/linux/linux-openzaurus_2.6.13-mm3.bb @@ -28,6 +28,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ + ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \ + ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \ + ${RPSRC}/poodle_mmc-r0.patch;patch=1 \ + ${RPSRC}/poodle_irda-r0.patch;patch=1 \ ${RPSRC}/pxa_i2c_fixes-r0.patch;patch=1 \ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \ @@ -35,16 +39,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/corgi_pm-r3.patch;patch=1 \ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \ ${RPSRC}/spitz_pm-r3.patch;patch=1 \ - ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \ - ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \ - ${RPSRC}/poodle_mmc-r0.patch;patch=1 \ - ${RPSRC}/poodle_irda-r0.patch;patch=1 \ ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \ ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \ ${RPSRC}/spitzcf-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ - ${RPSRC}/pxa_irda-r3.patch;patch=1 \ + ${RPSRC}/pxa_irda-r4.patch;patch=1 \ ${RPSRC}/corgi_irda-r3.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/scoop_susres-r1.patch;patch=1 \ @@ -53,15 +53,15 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \ ${RPSRC}/corgi_snd-r10.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \ ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \ - ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \ + ${RPSRC}/ipaq/tsc2101-r8.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ ${DOSRC}/tc6393-device-r5.patch;patch=1 \ ${DOSRC}/tc6393_nand-r6.patch;patch=1 \ - ${DOSRC}/tosa-machine-base-r11.patch;patch=1 \ + ${DOSRC}/tosa-machine-base-r12.patch;patch=1 \ ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \ ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \ ${DOSRC}/tosa-power-r6.patch;patch=1 \ @@ -69,7 +69,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${DOSRC}/tosa-udc-r4.patch;patch=1 \ ${DOSRC}/tosa-irda-r3.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ - ${DOSRC}/tosa-bl-r5.patch;patch=1 \ + ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb index 9abd270212..8b6a3df829 100644 --- a/packages/meta/meta-opie-all.bb +++ b/packages/meta/meta-opie-all.bb @@ -4,7 +4,7 @@ ALLOW_EMPTY = 1 PACKAGE_ARCH = "all" LICENSE = "MIT" DEPENDS = "meta-opie" -PR = "r1" +PR = "r2" PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \ task-qpe-multimedia task-qpe-emulators task-qpe-applications \ @@ -79,6 +79,7 @@ fish \ froot \ gemdropx \ glider \ +gnuz \ hexatrolic \ iaimaster \ icebloxx \ diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc index 00247fe6ad..fed919a9c0 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc +++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc @@ -5,9 +5,8 @@ PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default" -RDEPENDS = "opie-mediaplayer2-skin" -RRECOMMENDS = "opie-mediaplayer2-skin-default \ -libxine-plugin-ao-out-oss libxine-plugin-inp-file \ +RDEPENDS = "opie-mediaplayer2-skin-default" +RRECOMMENDS = "libxine-plugin-ao-out-oss libxine-plugin-inp-file \ libxine-plugin-decode-ff libxine-plugin-decode-mad \ libxine-plugin-dmx-audio libxine-plugin-dmx-avi libxine-plugin-dmx-mpeg" APPNAME = "opieplayer2" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb index 1dcf37adae..41de8fc487 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb @@ -1,5 +1,6 @@ include ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index d3219e85b0..8f9450842a 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index cbc2e03f1f..66839764b7 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "db3 pcre postfix-native" LICENSE = "IPL" -PR = "r5" +PR = "r6" SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ file://${FILESDIR}/makedefs.patch;patch=1 \ @@ -47,8 +47,8 @@ pkg_postinst () { grep postfix /etc/group || addgroup postfix grep postdrop /etc/group || addgroup postdrop grep vmail /etc/group || addgroup vmail - grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/postfix --ingroup postfix postfix - grep vmail /etc/passwd || adduser --disabled-password --home=/var/spool/vmail --ingroup vmail vmail + grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/postfix --ingroup postfix -g "Postfix" postfix + grep vmail /etc/passwd || adduser --disabled-password --home=/var/spool/vmail --ingroup vmail -g "Postfix" vmail chgrp postdrop /usr/sbin/postqueue chgrp postdrop /usr/sbin/postdrop chmod g+s /usr/sbin/postqueue |