merge of 69894987a74901f755f23dcc5ff02467692a1d81

     and fc974e9671578c44c3b488a5ab0f5eb31d1ea9bf

8 files changed, 33 insertions, 8 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index e576d83329..46f5b8babc 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -153,6 +153,7 @@ ${PKGDIR}/packages/tar/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
 ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
+${PKGDIR}/packages/udev/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
 ${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
@@ -161,6 +162,7 @@ ${PKGDIR}/packages/upslug/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
+${PKGDIR}/packages/watchdog/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
 ${PKGDIR}/packages/xinetd/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index ce7be61d21..e1290ef1f9 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "cyrus-sasl db3"
 LICENSE = "BSD"
-PR = "r5"
+PR = "r6"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
diff --git a/packages/cyrus-imapd/files/cyrus.conf_2.2 b/packages/cyrus-imapd/files/cyrus.conf_2.2
index 13e635a1ba..17541063fe 100644
--- a/packages/cyrus-imapd/files/cyrus.conf_2.2
+++ b/packages/cyrus-imapd/files/cyrus.conf_2.2
@@ -23,10 +23,10 @@ SERVICES {
 
   # at least one LMTP is required for delivery
   #lmtp         cmd="lmtpd" listen="lmtp" prefork=0
-  lmtpunix      cmd="lmtpd" listen="/cyrus/tmp/socket/lmtp" prefork=0
+  lmtpunix      cmd="lmtpd" listen="/var/lib/cyrus/socket/lmtp" prefork=0
 
   # this is only necessary if using notifications
-  #notify       cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
+  #notify       cmd="notifyd" listen="/var/lib/cyrus/socket/notify" proto="udp" prefork=1
 }
 
 EVENTS {
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 6d16f9039d..75fe4699a8 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -115,6 +115,7 @@ OPENSLUG_PACKAGES = "\
 	unionfs-modules unionfs-utils \
 	vlan \
 	wakelan \
+	watchdog \
 	wget \
 	xinetd \
 	yp-tools ypbind ypserv \
diff --git a/packages/postfix/files/main.cf_2.0 b/packages/postfix/files/main.cf_2.0
index 0bfe4afc1d..1c50b4ae00 100644
--- a/packages/postfix/files/main.cf_2.0
+++ b/packages/postfix/files/main.cf_2.0
@@ -1,11 +1,18 @@
+#!/bin/sh
+cat <<EOF
 mydomain=sample.com
 
 virtual_mailbox_domains = sample.com, other.net
-virtual_mailbox_base = /var/spool/vmail
 virtual_mailbox_maps = hash:/etc/postfix/virtual
 virtual_alias_maps = hash:/etc/postfix/virtual_alias
-virtual_uid_maps = static:vmail
-virtual_gid_maps = static:vmail
+
+# You'll start with the following lines for maildir storage
+virtual_mailbox_base = /var/spool/vmail
+virtual_uid_maps = static:`grep vmail /etc/passwd | cut -d ":" -f 3`
+virtual_gid_maps = static:`grep vmail /etc/passwd | cut -d ":" -f 4`
+
+# You'll start with the following lines for IMAP storage
+
 
 config_directory = /etc/postfix
 sample_directory = /etc/postfix
@@ -23,3 +30,4 @@ debug_peer_level = 2
 sendmail_path = /usr/sbin/sendmail
 newaliases_path = /usr/bin/newaliases
 mailq_path = /usr/bin/mailq
+EOF
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 3344e05115..f5c22c1139 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 = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
 	   file://${FILESDIR}/makedefs.patch;patch=1 \
@@ -34,7 +34,7 @@ do_install () {
 	sh ./postfix-install 'install_root=${D}' -non-interactive
 	rm -rf ${D}/var/spool/postfix
         mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf
-	install -m 644 ${WORKDIR}/main.cf_2.0 ${D}${sysconfdir}/postfix/main.cf
+	install -m 755 ${WORKDIR}/main.cf_2.0 ${D}/var/tmp/main_cf.sh
         install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_postfix
         install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
 }
@@ -45,6 +45,14 @@ pkg_postinst () {
         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
+	chgrp postdrop /usr/sbin/postqueue
+	chgrp postdrop /usr/sbin/postdrop
+	chmod g+s /usr/sbin/postqueue
+	chmod g+s /usr/sbin/postdrop
+	/var/tmp/main_cf.sh >/etc/postfix/main.cf
+	chmod 644 /etc/postfix/main.cf
 	/etc/init.d/populate-volatile.sh
+	touch /etc/aliases
+	newaliases
 }
 
diff --git a/packages/watchdog/.mtn2git_empty b/packages/watchdog/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/watchdog/.mtn2git_empty
diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb
new file mode 100644
index 0000000000..1858e52bf5
--- /dev/null
+++ b/packages/watchdog/watchdog_5.2.bb
@@ -0,0 +1,6 @@
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" 
+PR = "r0"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+
+inherit autotools
+