From 4e11e1c81b2e2f22b6d492af1fbddbc1650b2b76 Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Sat, 6 Aug 2005 17:44:20 +0000
Subject: Polishing maildir based install defaults.

---
 packages/postfix/files/main.cf_2.0 | 14 +++++++++++---
 packages/postfix/postfix_2.0.20.bb | 12 ++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'packages')

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
 }
 
-- 
cgit v1.2.3


From fb1672af9603e7f2e981e544d523bdfb07037346 Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Sat, 6 Aug 2005 18:07:31 +0000
Subject: Fixed paths for lmtp and notify.

---
 packages/cyrus-imapd/cyrus-imapd_2.2.12.bb | 2 +-
 packages/cyrus-imapd/files/cyrus.conf_2.2  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

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 {
-- 
cgit v1.2.3


From 68739e438610e0da4b786bc1ac02a5027fccb5ac Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 6 Aug 2005 21:43:42 +0000
Subject: Added watchdog package

---
 packages/iputils/iputils_20020927.bb | 2 +-
 packages/watchdog/.mtn2git_empty     | 0
 packages/watchdog/watchdog_5.2.bb    | 6 ++++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 packages/watchdog/.mtn2git_empty
 create mode 100644 packages/watchdog/watchdog_5.2.bb

(limited to 'packages')

diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 8ec7f54e2b..6bffc6e82a 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -1,6 +1,6 @@
 SECTION = "console/utils"
 BROKEN = "1"
-DEPENDS = "docbook-utils-native"
+#DEPENDS = "docbook-utils-native"
 DESCRIPTION = "Utilities for the IP protocol."
 LICENSE ="BSD"
 SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz"
diff --git a/packages/watchdog/.mtn2git_empty b/packages/watchdog/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
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
+
-- 
cgit v1.2.3


From 97ca1c86f4ab36f80a9b707344961d6b5a753d6b Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 6 Aug 2005 21:50:21 +0000
Subject: disapproval of revision b887317745e76c913d221d462248b9555eaf7c4d

---
 packages/iputils/iputils_20020927.bb | 2 +-
 packages/watchdog/.mtn2git_empty     | 0
 packages/watchdog/watchdog_5.2.bb    | 6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 packages/watchdog/.mtn2git_empty
 delete mode 100644 packages/watchdog/watchdog_5.2.bb

(limited to 'packages')

diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 6bffc6e82a..8ec7f54e2b 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -1,6 +1,6 @@
 SECTION = "console/utils"
 BROKEN = "1"
-#DEPENDS = "docbook-utils-native"
+DEPENDS = "docbook-utils-native"
 DESCRIPTION = "Utilities for the IP protocol."
 LICENSE ="BSD"
 SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz"
diff --git a/packages/watchdog/.mtn2git_empty b/packages/watchdog/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb
deleted file mode 100644
index 1858e52bf5..0000000000
--- a/packages/watchdog/watchdog_5.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-
-- 
cgit v1.2.3


From 79249fbdf324fba4c14a6bddd3f7c26d29d30a4d Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 6 Aug 2005 21:49:24 +0000
Subject: disapproval of revision aa7c47af4a1d20ac50212af0be57a0ab4b597184

---
 packages/iputils/iputils_20020927.bb | 2 +-
 packages/watchdog/.mtn2git_empty     | 0
 packages/watchdog/watchdog_5.2.bb    | 6 ++++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 packages/watchdog/.mtn2git_empty
 create mode 100644 packages/watchdog/watchdog_5.2.bb

(limited to 'packages')

diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 8ec7f54e2b..6bffc6e82a 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -1,6 +1,6 @@
 SECTION = "console/utils"
 BROKEN = "1"
-DEPENDS = "docbook-utils-native"
+#DEPENDS = "docbook-utils-native"
 DESCRIPTION = "Utilities for the IP protocol."
 LICENSE ="BSD"
 SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz"
diff --git a/packages/watchdog/.mtn2git_empty b/packages/watchdog/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
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
+
-- 
cgit v1.2.3


From bc43815da28cf6f23171e1c3c6ee3db5fbef89c0 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 6 Aug 2005 21:50:14 +0000
Subject: disapproval of revision ae3124f810e521f4a710f11319d143e188e3fee4

---
 packages/iputils/iputils_20020927.bb | 2 +-
 packages/watchdog/.mtn2git_empty     | 0
 packages/watchdog/watchdog_5.2.bb    | 6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 packages/watchdog/.mtn2git_empty
 delete mode 100644 packages/watchdog/watchdog_5.2.bb

(limited to 'packages')

diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 6bffc6e82a..8ec7f54e2b 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -1,6 +1,6 @@
 SECTION = "console/utils"
 BROKEN = "1"
-#DEPENDS = "docbook-utils-native"
+DEPENDS = "docbook-utils-native"
 DESCRIPTION = "Utilities for the IP protocol."
 LICENSE ="BSD"
 SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz"
diff --git a/packages/watchdog/.mtn2git_empty b/packages/watchdog/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb
deleted file mode 100644
index 1858e52bf5..0000000000
--- a/packages/watchdog/watchdog_5.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-
-- 
cgit v1.2.3


From 453c09b84d9196946ecf83bc7d02d1fc93916c20 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 6 Aug 2005 21:53:34 +0000
Subject: Added watchdog package. Without adding anything else this time

---
 packages/watchdog/.mtn2git_empty  | 0
 packages/watchdog/watchdog_5.2.bb | 6 ++++++
 2 files changed, 6 insertions(+)
 create mode 100644 packages/watchdog/.mtn2git_empty
 create mode 100644 packages/watchdog/watchdog_5.2.bb

(limited to 'packages')

diff --git a/packages/watchdog/.mtn2git_empty b/packages/watchdog/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
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
+
-- 
cgit v1.2.3


From 6c7d5d7b97b27e180246c461cf2c7a35419073df Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 6 Aug 2005 21:54:48 +0000
Subject: Add watchdog to openslug

---
 packages/meta/openslug-packages.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages')

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 \
-- 
cgit v1.2.3