From 9d9e383b0e2df6607393bc09ec842cb14aaf88c2 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 6 Nov 2011 13:55:56 +0000 Subject: [PATCH] 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. SVN-Revision: 28774 --- net/znc/Makefile | 5 +++-- net/znc/files/znc.init | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/znc/Makefile b/net/znc/Makefile index e6488db2a8..d9b6958329 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 be2f3f5a75..01af217a9e 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" ] -- 2.30.2