From f5b9882ba0c8519f8ebed8140e1e1fbd0e073e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=BC?= Date: Fri, 26 May 2017 01:46:53 +0700 Subject: [PATCH 1/4] Add unbound --- unbound.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 unbound.json diff --git a/unbound.json b/unbound.json new file mode 100644 index 0000000000..c6b4b45b87 --- /dev/null +++ b/unbound.json @@ -0,0 +1,40 @@ +{ + "homepage": "http://unbound.net/", + "version": "1.6.2", + "license": "BSD", + "architecture": { + "64bit": { + "url": "http://unbound.net/downloads/unbound-1.6.2.zip", + "hash": "f109ee38b2f7f34043555dda54f3af017c5164c47a12d977594ee56557b059f8" + }, + "32bit": { + "url": "http://unbound.net/downloads/unbound-1.6.2-w32.zip", + "hash": "46cef0c2d47b4d622f4a83456f677ddb124498a69011d14c97e2c8251e00be7d" + } + }, + "bin": "unbound.ps1", + "persist": "service.conf", + "suggest": [ + "openssl", + "openssl10x" + ], + "checkver": { + "url": "http://unbound.net/download.html", + "re": "\\(currently ([\\d.]+)\\)" + }, + "autoupdate": { + "architecture": { + "64bit": { + "url": "http://unbound.net/downloads/unbound-$version.zip" + }, + "32bit": { + "url": "http://unbound.net/downloads/unbound-$version-w32.zip" + } + }, + "hash": { + "url": "$url.sha256" + } + }, + "pre_install": "echo \"if (`$args.count -eq 0) {`n `t`Start-Process -WorkingDirectory `\"`$psscriptroot`\" -f unbound.exe -a '-c service.conf'-WindowStyle Hidden`n`tWrite-Host -F Green `\"Unbound started in background.``nRun 'ps -n unbound' to show the processes``nRun 'kill -n unbound' to stop the processes`\"`n} else {`n`t& `$psscriptroot @args `n}\" | out-file $dir\\unbound.ps1 -append", + "post_install": "(gc \"$dir\\create_unbound_ad_servers.cmd\").Replace('C:\\Program Files (x86)', $pwd) | sc \"$dir\\create_unbound_ad_servers.cmd\"" +} From c4d95e7c3b9ba607151e9e642f713b5c1cc24567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=BC?= Date: Fri, 26 May 2017 02:02:01 +0700 Subject: [PATCH 2/4] CI Fix and tweak --- unbound.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/unbound.json b/unbound.json index c6b4b45b87..274999fa09 100644 --- a/unbound.json +++ b/unbound.json @@ -12,12 +12,13 @@ "hash": "46cef0c2d47b4d622f4a83456f677ddb124498a69011d14c97e2c8251e00be7d" } }, - "bin": "unbound.ps1", - "persist": "service.conf", - "suggest": [ - "openssl", - "openssl10x" + "bin": [ + "unbound.ps1" ], + "persist": "service.conf", + "suggest": { + "openssl": ["openssl", "openssl10x"] + }, "checkver": { "url": "http://unbound.net/download.html", "re": "\\(currently ([\\d.]+)\\)" @@ -35,6 +36,6 @@ "url": "$url.sha256" } }, - "pre_install": "echo \"if (`$args.count -eq 0) {`n `t`Start-Process -WorkingDirectory `\"`$psscriptroot`\" -f unbound.exe -a '-c service.conf'-WindowStyle Hidden`n`tWrite-Host -F Green `\"Unbound started in background.``nRun 'ps -n unbound' to show the processes``nRun 'kill -n unbound' to stop the processes`\"`n} else {`n`t& `$psscriptroot @args `n}\" | out-file $dir\\unbound.ps1 -append", + "pre_install": "echo \"if (`$args.count -eq 0) {`n `t`Start-Process -WorkingDirectory `\"`$psscriptroot`\" -f unbound.exe -a '-c service.conf'-WindowStyle Hidden`n`tWrite-Host -F Green `\"Unbound started in background.``nRun 'ps -n unbound' to show the processes``nRun 'kill -n unbound' to stop the processes`\"`n} else {`n`t& `$psscriptroot @args `n}\" | out-file $dir\\unbound.ps1", "post_install": "(gc \"$dir\\create_unbound_ad_servers.cmd\").Replace('C:\\Program Files (x86)', $pwd) | sc \"$dir\\create_unbound_ad_servers.cmd\"" } From 6363533633e8ffabe01c1057945df59d48c58784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=BC?= Date: Fri, 26 May 2017 10:39:29 +0700 Subject: [PATCH 3/4] use https instead --- unbound.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/unbound.json b/unbound.json index 274999fa09..dc8dce8106 100644 --- a/unbound.json +++ b/unbound.json @@ -1,14 +1,14 @@ { - "homepage": "http://unbound.net/", + "homepage": "https://unbound.net/", "version": "1.6.2", "license": "BSD", "architecture": { "64bit": { - "url": "http://unbound.net/downloads/unbound-1.6.2.zip", + "url": "https://unbound.net/downloads/unbound-1.6.2.zip", "hash": "f109ee38b2f7f34043555dda54f3af017c5164c47a12d977594ee56557b059f8" }, "32bit": { - "url": "http://unbound.net/downloads/unbound-1.6.2-w32.zip", + "url": "https://unbound.net/downloads/unbound-1.6.2-w32.zip", "hash": "46cef0c2d47b4d622f4a83456f677ddb124498a69011d14c97e2c8251e00be7d" } }, @@ -20,16 +20,16 @@ "openssl": ["openssl", "openssl10x"] }, "checkver": { - "url": "http://unbound.net/download.html", + "url": "https://unbound.net/download.html", "re": "\\(currently ([\\d.]+)\\)" }, "autoupdate": { "architecture": { "64bit": { - "url": "http://unbound.net/downloads/unbound-$version.zip" + "url": "https://unbound.net/downloads/unbound-$version.zip" }, "32bit": { - "url": "http://unbound.net/downloads/unbound-$version-w32.zip" + "url": "https://unbound.net/downloads/unbound-$version-w32.zip" } }, "hash": { From e7e9054096a9fa6cc32ff161e5ecb4df365beae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=BC?= Date: Fri, 26 May 2017 11:31:45 +0700 Subject: [PATCH 4/4] more bins --- unbound.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/unbound.json b/unbound.json index dc8dce8106..1ef7a90ef0 100644 --- a/unbound.json +++ b/unbound.json @@ -13,11 +13,15 @@ } }, "bin": [ - "unbound.ps1" + "unbound.ps1", + "create_unbound_ad_servers.cmd", + "unbound_cache.cmd", + "unbound-control-setup.cmd" ], "persist": "service.conf", "suggest": { - "openssl": ["openssl", "openssl10x"] + "openssl": ["openssl", "openssl10x"], + "wget": ["wget"] }, "checkver": { "url": "https://unbound.net/download.html", @@ -37,5 +41,9 @@ } }, "pre_install": "echo \"if (`$args.count -eq 0) {`n `t`Start-Process -WorkingDirectory `\"`$psscriptroot`\" -f unbound.exe -a '-c service.conf'-WindowStyle Hidden`n`tWrite-Host -F Green `\"Unbound started in background.``nRun 'ps -n unbound' to show the processes``nRun 'kill -n unbound' to stop the processes`\"`n} else {`n`t& `$psscriptroot @args `n}\" | out-file $dir\\unbound.ps1", - "post_install": "(gc \"$dir\\create_unbound_ad_servers.cmd\").Replace('C:\\Program Files (x86)', $pwd) | sc \"$dir\\create_unbound_ad_servers.cmd\"" + "post_install": " + (gc \"$dir\\create_unbound_ad_servers.cmd\").Replace('C:\\Program Files (x86)', (convert-path \"$dir\\..\")).replace('%prefix%\\Unbound', '%prefix%\\current') | sc \"$dir\\create_unbound_ad_servers.cmd\" + (gc \"$dir\\unbound_cache.cmd\").Replace('C:\\Program Files (x86)', (convert-path \"$dir\\..\")).replace('%prefix%\\Unbound', '%prefix%\\current') | sc \"$dir\\unbound_cache.cmd\" + (gc \"$dir\\unbound-control-setup.cmd\").Replace('C:\\Program Files', (convert-path \"$dir\\..\")).replace('%prefix%\\Unbound', '%prefix%\\current') | sc \"$dir\\unbound-control-setup.cmd\" + " }