From: jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 6 Nov 2011 13:55:56 +0000 (+0000)
Subject: packages: znc: fix cert linking and add mirror
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=4fa2299e14a1e2387489fedce69d76bf174b4f32;p=packages.git

packages: znc: fix cert linking and add mirror

Properly (re-)create the link only if there's a file given and don't try to
change the owner of the link target.

Also add the znc release archive as a file mirror to prevent updates from
breaking the build.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28774 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/znc/Makefile b/net/znc/Makefile
index e6488db2a..d9b695832 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -9,10 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=znc
 PKG_VERSION:=0.098
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://znc.in/releases
+PKG_SOURCE_URL:=http://znc.in/releases \
+		http://znc.in/releases/archive
 PKG_MD5SUM:=5667b4acb1f01309d6eded77abac700c
 
 PKG_BUILD_PARALLEL:=1
diff --git a/net/znc/files/znc.init b/net/znc/files/znc.init
index be2f3f5a7..01af217a9 100644
--- a/net/znc/files/znc.init
+++ b/net/znc/files/znc.init
@@ -52,7 +52,7 @@ znc_global() {
 		config_get serverthrottle "$znc" serverthrottle
 		config_get znc_pem_file "$znc" znc_ssl_cert
 
-		[ -z $znc_pem_file -o -f $ZNC_CONFIG_PATH/znc.pem ] || ln -s "$znc_pem_file" $ZNC_CONFIG_PATH/znc.pem
+		[ -z "$znc_pem_file" ] || ln -sf "$znc_pem_file" $ZNC_CONFIG_PATH/znc.pem
 
 		[ -z $anoniplimit ] || echo "AnonIPLimit = $anoniplimit" >> $ZNC_CONFIG
 		[ -z $maxbuffersize ] || echo "MaxBufferSize = $maxbuffersize" >> $ZNC_CONFIG
@@ -127,7 +127,7 @@ start() {
 		config_foreach add_listener listener
 		config_foreach add_user user
 
-		chown -R ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} /tmp/etc/znc
+		chown -hR ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} /tmp/etc/znc
 	fi
 
 	if [ "$EXTERNAL_CONFIG" -eq 1 -a "$RUNAS_USER"  ]