diff options
| -rw-r--r-- | community/rest-server/0001-Move-TestIsUserPath-to-correct-package.patch | 71 | ||||
| -rw-r--r-- | community/rest-server/APKBUILD | 7 |
2 files changed, 2 insertions, 76 deletions
diff --git a/community/rest-server/0001-Move-TestIsUserPath-to-correct-package.patch b/community/rest-server/0001-Move-TestIsUserPath-to-correct-package.patch deleted file mode 100644 index 5c3932f849a..00000000000 --- a/community/rest-server/0001-Move-TestIsUserPath-to-correct-package.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 69ed06aa661590ae74e4e839f71f6861d5fb4243 Mon Sep 17 00:00:00 2001 -From: Alexander Neumann <alexander@bumpern.de> -Date: Tue, 20 Mar 2018 20:45:59 +0100 -Subject: [PATCH] Move TestIsUserPath to correct package - ---- - cmd/rest-server/main_test.go | 21 --------------------- - handlers_test.go | 21 +++++++++++++++++++++ - 2 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/cmd/rest-server/main_test.go b/cmd/rest-server/main_test.go -index 44b06a2..b2a71e1 100644 ---- a/cmd/rest-server/main_test.go -+++ b/cmd/rest-server/main_test.go -@@ -71,24 +71,3 @@ func TestTLSSettings(t *testing.T) { - }) - } - } -- --func TestIsUserPath(t *testing.T) { -- var tests = []struct { -- username string -- path string -- result bool -- }{ -- {"foo", "/", false}, -- {"foo", "/foo", true}, -- {"foo", "/foo/", true}, -- {"foo", "/foo/bar", true}, -- {"foo", "/foobar", false}, -- } -- -- for _, test := range tests { -- result := isUserPath(test.username, test.path) -- if result != test.result { -- t.Errorf("isUserPath(%q, %q) was incorrect, got: %v, want: %v.", test.username, test.path, result, test.result) -- } -- } --} -diff --git a/handlers_test.go b/handlers_test.go -index 6536a26..f6cdbaa 100644 ---- a/handlers_test.go -+++ b/handlers_test.go -@@ -37,3 +37,24 @@ func TestJoin(t *testing.T) { - }) - } - } -+ -+func TestIsUserPath(t *testing.T) { -+ var tests = []struct { -+ username string -+ path string -+ result bool -+ }{ -+ {"foo", "/", false}, -+ {"foo", "/foo", true}, -+ {"foo", "/foo/", true}, -+ {"foo", "/foo/bar", true}, -+ {"foo", "/foobar", false}, -+ } -+ -+ for _, test := range tests { -+ result := isUserPath(test.username, test.path) -+ if result != test.result { -+ t.Errorf("isUserPath(%q, %q) was incorrect, got: %v, want: %v.", test.username, test.path, result, test.result) -+ } -+ } -+} --- -2.18.0 - diff --git a/community/rest-server/APKBUILD b/community/rest-server/APKBUILD index fce452c0015..e870e54fe5a 100644 --- a/community/rest-server/APKBUILD +++ b/community/rest-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=rest-server -pkgver=0.9.7 +pkgver=0.9.8 pkgrel=0 pkgdesc="A high performance HTTP server that implements restic's REST backend API" url="https://github.com/restic/rest-server" @@ -12,8 +12,6 @@ makedepends="go" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/restic/$pkgname/archive/v$pkgver.tar.gz - 0001-Move-TestIsUserPath-to-correct-package.patch - $pkgname.confd $pkgname.initd" builddir="$srcdir/src/github.com/restic/$pkgname" @@ -49,7 +47,6 @@ package() { "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="2288f93703d03859ec1a5d9085eda7ca5b82e801bc74cd66fcc58601e73a2bf5150f85e948749ca7d95e4598087acf5115499404ccbbfba62a4cc9043437ed29 rest-server-0.9.7.tar.gz -98a9fbb7c0b60dbb3682bab40f7b4f488da93d7c7afdab174185bc62ad250bf8e1238b6513a239dd5da276935b51bd05495f13c7e03befa3a0f651cf3d109979 0001-Move-TestIsUserPath-to-correct-package.patch +sha512sums="6f7ee557b7bf278ee97e9f8887909b6ab253a231123e755e12b6e5a6c028953acf8ba5c5bdedae60b2875a8268bb5cb80aadcad29b809fcbe5ee0afa402c1e96 rest-server-0.9.8.tar.gz cd9e4d3df04c26aa602a57196bdfb14d7ad6e957f1d9596a09e596b9d01543eee08474817ba47192659fe6f5ab15b8fa64400fb6a8d24111f5c792b1412f5e5b rest-server.confd 185c0022d07c66fcee2d84af1bb0a11ac0753bd79deb8f5ae7dc2bd84909886aa3e58f42cd6ace4f191da6128d0385036948d4a8accd14cf9cdb9603001b9aca rest-server.initd" |