[for-15.05] radicale: update to 0.10-2 (not updated from trunk)

* fixed hotplug script (not restarting on "ifup")
* fixed init script (not stopping in 1 second)
* fixed PKG_MAINTAINER string
* removing not needed comments in config file

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
This commit is contained in:
Christian Schoenebeck 2015-06-14 12:51:15 +02:00
parent 30908edc95
commit 0341970545
4 changed files with 4 additions and 6 deletions

View File

@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=radicale
PKG_VERSION:=0.10
PKG_RELEASE:=1
PKG_MAINTAINER:=Christian Schoenebeck <chris5560@web.de>
PKG_RELEASE:=2
PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING

View File

@ -71,7 +71,6 @@ config setting 'auth'
# Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | remote_user | custom
# Default: None
# if setting 'htpasswd' the file /etc/radicale/users is used (hardcoded)
# option type 'htpasswd'
# Htpasswd encryption method
# Value: plain | sha1 | ssha | crypt
@ -98,7 +97,6 @@ config setting 'rights'
# Value: None | authenticated | owner_only | owner_write | from_file | custom
# Default: None
# if setting 'from_file' the file /etc/radicale/rights is used (hardcoded)
# option type 'from_file'
# Custom rights handler
# option custom_handler ''

View File

@ -3,7 +3,7 @@
# only (re-)start on ifup
[ "$ACTION" = "ifup" ] || exit 0
_PID=$(ps | grep '[p]ython.*[r]adicale' 2>/dev/null | awk '{print \$1}')
_PID=$(ps | grep '[p]ython.*[r]adicale' 2>/dev/null | awk '{print $1}')
kill -1 $_PID 2>/dev/null
if [ $? -eq 0 ]; then
# only restart if already running

View File

@ -208,7 +208,7 @@ stop() {
local _PID=$(eval "$PGREP")
[ -z "$_PID" ] && return 0 # not running
kill -15 $_PID 2>/dev/null
sleep 1 # give time to shutdown
sleep 3 # give time to shutdown
local _tmp=$(eval "$PGREP")
if [ -z "$_tmp" ]; then
logger -p user.notice -t "radicale[$_PID]" "Service shutdown successfully"