[package] iptables: add support for ipt_recent --reap option

[openwrt.git] / include / download.mk

diff --git a/include/download.mk b/include/download.mk
index e19cd41..d1b3fc8 100644 (file)
--- a/include/download.mk
+++ b/include/download.mk
@@ -11,12 +11,14 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
 define dl_method
 $(strip \
   $(if $(2),$(2), \
-    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \
+    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% https://% file://%,$(1)),default, \
       $(if $(filter git://%,$(1)),git, \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
             $(if $(filter hg://%,$(1)),hg, \
-              unknown \
+              $(if $(filter sftp://%,$(1)),bzr, \
+                unknown \
+              ) \
             ) \
           ) \
         ) \
@@ -26,7 +28,7 @@ $(strip \
 )
 endef
 
-# code for creating tarballs from cvs/svn/git/bzr/hg checkouts - useful for mirror support
+# code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support
 dl_pack/bz2=$(TAR) cfj $(1) $(2)
 dl_pack/gz=$(TAR) cfz $(1) $(2)
 dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
@@ -53,11 +55,11 @@ define DownloadMethod/cvs
                cd $(TMP_DIR)/dl && \
                rm -rf $(SUBDIR) && \
                [ \! -d $(SUBDIR) ] && \
-               cvs -d $(URL) co $(VERSION) $(SUBDIR) && \
-               find $(SUBDIR) -name CVS | xargs rm -rf && \
+               cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
        )
 endef
 
@@ -68,11 +70,13 @@ define DownloadMethod/svn
                cd $(TMP_DIR)/dl && \
                rm -rf $(SUBDIR) && \
                [ \! -d $(SUBDIR) ] && \
-               svn co --non-interactive -r$(VERSION) $(URL) $(SUBDIR) && \
-               find $(SUBDIR) -name .svn | xargs rm -rf && \
+               ( svn help export | grep -q trust-server-cert && \
+               svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
+               svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
        )
 endef
 
@@ -88,7 +92,8 @@ define DownloadMethod/git
                echo "Packing checkout..." && \
                rm -rf $(SUBDIR)/.git && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
        )
 endef
 
@@ -99,11 +104,11 @@ define DownloadMethod/bzr
                cd $(TMP_DIR)/dl && \
                rm -rf $(SUBDIR) && \
                [ \! -d $(SUBDIR) ] && \
-               bzr co --lightweight -r$(VERSION) $(URL) $(SUBDIR) && \
-               find $(SUBDIR) -name .bzr | xargs rm -rf && \
+               bzr export -r$(VERSION) $(SUBDIR) $(URL) && \
                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
        )
 endef
 
@@ -118,7 +123,24 @@ define DownloadMethod/hg
                find $(SUBDIR) -name .hg | xargs rm -rf && \
                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
+       )
+endef
+
+define DownloadMethod/darcs
+       $(call wrap_mirror, \
+               echo "Checking out files from the darcs repository..."; \
+               mkdir -p $(TMP_DIR)/dl && \
+               cd $(TMP_DIR)/dl && \
+               rm -rf $(SUBDIR) && \
+               [ \! -d $(SUBDIR) ] && \
+               darcs get -t $(VERSION) $(URL) $(SUBDIR) && \
+               find $(SUBDIR) -name _darcs | xargs rm -rf && \
+               echo "Packing checkout..." && \
+               $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
        )
 endef
 
@@ -127,6 +149,7 @@ Validate/svn=VERSION SUBDIR
 Validate/git=VERSION SUBDIR
 Validate/bzr=VERSION SUBDIR
 Validate/hg=VERSION SUBDIR
+Validate/darcs=VERSION SUBDIR
 
 define Download/Defaults
   URL:=