Merge pull request #4853 from StevenHessing/noddos

[feed/packages.git] / net / radicale / Makefile

diff --git a/net/radicale/Makefile b/net/radicale/Makefile
index 26cacd7770c3665ad2969b6fa396238f4e6f7989..b3f60d183b7e05d5f2519c755c2edbd58c394f5d 100644 (file)
--- a/net/radicale/Makefile
+++ b/net/radicale/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2016 OpenWrt.org
+# Copyright (C) 2008-2017 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 #
@@ -7,19 +7,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radicale
-PKG_VERSION:=1.1.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.1.6
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
 
-PKG_SOURCE:=Radicale-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://pypi.python.org/packages/source/R/Radicale/
-PKG_MD5SUM:=a29dd538377ea24cec83237a636122ae
-
-# needed for "r"adicale <-> "R"adicale
-PKG_BUILD_DIR:=$(BUILD_DIR)/Radicale-$(PKG_VERSION)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=https://github.com/Kozea/Radicale
+PKG_SOURCE_VERSION:=7568ec39f09a753217fb2d525c5f8db64f4d98f4
+PKG_MIRROR_HASH:=73de51e296479f860d4d8cd383a6aa34e8c702d9fca63b0499c7fcc2e794e6df
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
@@ -28,7 +28,7 @@ $(call include_mk, python3-package.mk)
 # no default dependencies
 PKG_DEFAULT_DEPENDS:=
 
-define Package/$(PKG_NAME)/Default
+define Package/radicale/Default
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
@@ -37,29 +37,29 @@ define Package/$(PKG_NAME)/Default
   PKGARCH:=all
   USERID:=radicale=5232:radicale=5232
 endef
-define Package/$(PKG_NAME)-py2
-  $(call Package/$(PKG_NAME)/Default)
+define Package/radicale-py2
+  $(call Package/radicale/Default)
   TITLE+= (Python 2)
   VARIANT:=2
   DEPENDS:=+python-logging +python-openssl +python-xml +python-codecs
 endef
-define Package/$(PKG_NAME)-py3
-  $(call Package/$(PKG_NAME)/Default)
+define Package/radicale-py3
+  $(call Package/radicale/Default)
   TITLE+= (Python 3)
   VARIANT:=3
   DEPENDS:=+python3-logging +python3-openssl +python3-xml +python3-codecs +python3-email
 endef
 
 # shown in LuCI package description
-define Package/$(PKG_NAME)-py2/description
+define Package/radicale-py2/description
 Radicale CalDAV/CardDAV server (Python 2) - Homepage: http://radicale.org/
 endef
-define Package/$(PKG_NAME)-py3/description
+define Package/radicale-py3/description
 Radicale CalDAV/CardDAV server (Python 3) - Homepage: http://radicale.org/
 endef
 
 # shown in make menuconfig <Help>
-define Package/$(PKG_NAME)-py2/config
+define Package/radicale-py2/config
     help
        The Radicale Project is a CalDAV (calendar) and CardDAV (contact) server.
        It aims to be a light solution, easy to use, easy to install, easy to configure.
@@ -69,14 +69,14 @@ define Package/$(PKG_NAME)-py2/config
        Version : $(PKG_VERSION)
        Homepage: http://radicale.org/
 endef
-Package/$(PKG_NAME)-py3/config = $(Package/$(PKG_NAME)-py2/config)
+Package/radicale-py3/config = $(Package/radicale-py2/config)
 
-define Package/$(PKG_NAME)-py2/conffiles
+define Package/radicale-py2/conffiles
 /etc/config/radicale
 /etc/radicale/users
 /etc/radicale/rights
 endef
-Package/$(PKG_NAME)-py3/conffiles = $(Package/$(PKG_NAME)-py2/conffiles)
+Package/radicale-py3/conffiles = $(Package/radicale-py2/conffiles)
 
 define Build/Configure
        # nothing to configure
@@ -85,7 +85,7 @@ define Build/Compile
        # nothing to compile
 endef
 
-define Package/$(PKG_NAME)-py2/preinst
+define Package/radicale-py2/preinst
        #!/bin/sh
        [ -n "$${IPKG_INSTROOT}" ] && exit 0    # if run within buildroot exit
 
@@ -94,11 +94,11 @@ define Package/$(PKG_NAME)-py2/preinst
 
        exit 0  # suppress errors from stop command
 endef
-define Package/$(PKG_NAME)-py3/preinst
-$(call Package/$(PKG_NAME)-py2/preinst)
+define Package/radicale-py3/preinst
+$(call Package/radicale-py2/preinst)
 endef
 
-define Package/$(PKG_NAME)/inst_all
+define Package/radicale/inst_all
        $(INSTALL_DIR)  $(1)/etc/init.d
        $(INSTALL_BIN)  ./files/radicale.init    $(1)/etc/init.d/radicale
 
@@ -120,27 +120,27 @@ define Package/$(PKG_NAME)/inst_all
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/radicale $(1)/usr/bin/
 endef
-define Package/$(PKG_NAME)-py2/install
-       $(call Package/$(PKG_NAME)/inst_all, $(1))
+define Package/radicale-py2/install
+       $(call Package/radicale/inst_all, $(1))
        $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/radicale
        $(CP) $(PKG_BUILD_DIR)/radicale/* $(1)$(PYTHON_PKG_DIR)/radicale
 endef
-define Package/$(PKG_NAME)-py3/install
-       $(call Package/$(PKG_NAME)/inst_all, $(1))
+define Package/radicale-py3/install
+       $(call Package/radicale/inst_all, $(1))
        $(INSTALL_DIR) $(1)$(PYTHON3_PKG_DIR)/radicale
        $(CP) $(PKG_BUILD_DIR)/radicale/* $(1)$(PYTHON3_PKG_DIR)/radicale
 endef
 
-define Package/$(PKG_NAME)-py2/postinst
+define Package/radicale-py2/postinst
        #!/bin/sh
        # patch /usr/bin/radicale force run using python2
        /bin/sed -i 's/python/python2/' $${IPKG_INSTROOT}/usr/bin/radicale
 endef
-define Package/$(PKG_NAME)-py3/postinst
+define Package/radicale-py3/postinst
        #!/bin/sh
        # patch /usr/bin/radicale force run using python3
        /bin/sed -i 's/python/python3/' $${IPKG_INSTROOT}/usr/bin/radicale
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)-py2))
-$(eval $(call BuildPackage,$(PKG_NAME)-py3))
+$(eval $(call BuildPackage,radicale-py2))
+$(eval $(call BuildPackage,radicale-py3))