From 7cd0752226de40392a3ea756b8e7b44b36e3c779 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 9 Nov 2011 23:17:20 +0000
Subject: [PATCH] packages/leafnode: move user/group creation from postinst to
 an initscript

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28900 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/leafnode/Makefile            | 12 ++++--------
 net/leafnode/files/leafnode.init | 13 +++++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 net/leafnode/files/leafnode.init

diff --git a/net/leafnode/Makefile b/net/leafnode/Makefile
index aaae163a4..8532dd149 100644
--- a/net/leafnode/Makefile
+++ b/net/leafnode/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-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:=leafnode
 PKG_VERSION:=1.11.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/leafnode
@@ -63,12 +63,6 @@ define Package/leafnode/conffiles
 /etc/crontabs/news
 endef
 
-define Package/leafnode/postinst
-#!/bin/sh
-grep -q '^news:' $${IPKG_INSTROOT}/etc/passwd 2>/dev/null
-[ $$? -ne 0 ] && echo "news:*:31:31:news:/var/spool/news:/bin/true" >>$${IPKG_INSTROOT}/etc/passwd && echo "news:x:31:" >>$${IPKG_INSTROOT}/etc/group || exit 0
-endef
-
 define Package/leafnode/install
   	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/leafnode $(1)/usr/sbin/
@@ -80,6 +74,8 @@ define Package/leafnode/install
 	$(INSTALL_DATA) ./files/nntp $(1)/etc/xinetd.d/
 	$(INSTALL_DIR) $(1)/etc/crontabs
 	$(INSTALL_DATA) ./files/news $(1)/etc/crontabs/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/leafnode.init $(1)/etc/init.d/leafnode
 endef
 
 define Package/leafnode-extra/install
diff --git a/net/leafnode/files/leafnode.init b/net/leafnode/files/leafnode.init
new file mode 100644
index 000000000..8a54cdfca
--- /dev/null
+++ b/net/leafnode/files/leafnode.init
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2011 OpenWrt.org
+
+START=49
+
+start() {
+	user_exists news 31 || user_add news 31 "" /var/spool/news
+	group_exists news 31 || group_add news 31
+	[ -d /var/spool/news ] || {
+		mkdir -m 0755 -p /var/spool/news
+		chown news:news /var/spool/news
+	}
+}
-- 
2.11.0