From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 03:39:43 +0000 (+0000)
Subject: [packages_10.03.2] dovecot: merge r28903
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b6421cbae1ed2b02b2498c83a91f343b7fa4d931;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] dovecot: merge r28903

SVN-Revision: 30186
---

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 614cc18e41..850a72e087 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dovecot
 PKG_VERSION:=1.2.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.dovecot.org/releases/1.2
@@ -74,41 +74,4 @@ define Package/dovecot/conffiles
 /etc/dovecot.conf
 endef
 
-define Package/dovecot/postinst
-#!/bin/sh
-
-id=59
-name=dovecot
-home=/var/run/dovecot
-shell=/bin/false
-
-# do not change below
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-        # create copies of passwd and group, if we use squashfs
-        rootfs=`mount |awk '/root/ { print $$5 }'`
-        if [ "$$rootfs" = "squashfs" ]; then
-                if [ -h /etc/group ]; then
-                        rm /etc/group
-                        cp -p /rom/etc/group /etc/group
-                fi
-                if [ -h /etc/passwd ]; then
-                        rm /etc/passwd
-                        cp -p /rom/etc/passwd /etc/passwd
-                fi
-        fi
-fi
-
-echo ""
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then
-        echo "adding group $$name to /etc/group"
-        echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group
-fi
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then
-        echo "adding user $$name to /etc/passwd"
-        echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd
-fi
-endef
-
-
 $(eval $(call BuildPackage,dovecot))
diff --git a/mail/dovecot/files/dovecot.init b/mail/dovecot/files/dovecot.init
index 00f0edbc3a..7539fb614d 100644
--- a/mail/dovecot/files/dovecot.init
+++ b/mail/dovecot/files/dovecot.init
@@ -1,20 +1,23 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=99
 
-RUN_D=/var/run/dovecot
-PID_F=$RUN_D/master.pid
+SERVICE_PID_FILE=/var/run/dovecot/master.pid
 
 start() {
-	mkdir -p $RUN_D
-	dovecot
+	user_exists dovecot 59 || user_add dovecot 59
+	group_exists dovecot 59 || group_add dovecot 59
+	mkdir -p -m 0755 /var/lib/dovecot
+	mkdir -p -m 0755 /var/run/dovecot
+	chmod 0750 /var/lib/dovecot
+	service_start /usr/sbin/dovecot
 }
 
 stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
+	service_stop /usr/sbin/dovecot
 }
 
 reload() {
-	[ -f $PID_F ] && kill -HUP $(cat $PID_F)
+	service_reload /usr/sbin/dovecot
 }