From 15c3e0f19d6d6a44aad6da7b9348145547d389c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20K=C3=B6nig?= Date: Tue, 2 Feb 2021 16:58:03 +0100 Subject: [PATCH 1/8] initial import from upstream PR https://github.com/LeonardKoenig/hide.client.linux/tree/prq_archlinux --- .SRCINFO | 16 +++++++++++ PKGBUILD | 62 +++++++++++++++++++++++++++++++++++++++++++ config_sysdirs.patch | 22 +++++++++++++++ service_sysdirs.patch | 24 +++++++++++++++++ 4 files changed, 124 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD create mode 100644 config_sysdirs.patch create mode 100644 service_sysdirs.patch diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..5e86dd4 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,16 @@ +pkgbase = hide-client + pkgdesc = Hide.me CLI VPN client for Linux + pkgver = 0.9.1 + pkgrel = 1 + url = hide.me + arch = any + license = GPL2 + source = https://github.com/eventure/hide.client.linux/archive/0.9.1.zip + source = config_sysdirs.patch + source = service_sysdirs.patch + md5sums = 9346e79e8e1c98b5457a03e02febca9c + md5sums = 07d59ac194c4aa8ee0de284283796461 + md5sums = b2cee66ea77a0d76460131144d0a16b0 + +pkgname = hide-client + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..09f011b --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,62 @@ +# Maintainer: Leonard Janis Robert König +pkgname=hide-client +_pkgname=hide.client.linux +pkgver=0.9.1 +pkgrel=1 +epoch= +pkgdesc="Hide.me CLI VPN client for Linux" +arch=('any') +url="hide.me" +license=('GPL2') +groups=() +depends=() +makedepends=() +checkdepends=() +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=("https://github.com/eventure/$_pkgname/archive/$pkgver.zip" + "config_sysdirs.patch" + "service_sysdirs.patch") +noextract=() +md5sums=('9346e79e8e1c98b5457a03e02febca9c' + '07d59ac194c4aa8ee0de284283796461' + 'b2cee66ea77a0d76460131144d0a16b0') +validpgpkeys=() + +prepare() { + cd "$_pkgname-$pkgver" + patch -p1 -i "$srcdir/config_sysdirs.patch" + patch -p1 -i "$srcdir/service_sysdirs.patch" +} + +build() { + cd "$_pkgname-$pkgver" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + # readonly breaks build +# export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -modcacherw" + go build -o hide.me . +} + +#check() { +# cd "$_pkgname-$pkgver" +# go test . +#} + +package() { + cd "$_pkgname-$pkgver" + install -Dm755 -t "$pkgdir"/usr/bin/ hide.me + install -Dm644 -t "$pkgdir"/usr/share/hide.me/ CA.pem + # For (system-wide) accessToken.txt + install -dm750 "$pkgdir"/etc/hide.me/ + install -Dm644 -t "$pkgdir"/usr/lib/systemd/system/ hide.me@.service +} diff --git a/config_sysdirs.patch b/config_sysdirs.patch new file mode 100644 index 0000000..4abdecd --- /dev/null +++ b/config_sysdirs.patch @@ -0,0 +1,22 @@ +diff --git a/configuration/configuration.go b/configuration/configuration.go +index ac3947c..d65da20 100644 +--- a/configuration/configuration.go ++++ b/configuration/configuration.go +@@ -40,8 +40,8 @@ func NewHideGuardConfiguration() *HideGuardConfiguration { + Host: "", // command line option "-n" + Port: 432, // command line option "-p" + Domain: "hide.me", // Not configurable +- CA: "CA.pem", // command line option "-ca" +- AccessTokenFile: "accessToken.txt", // command line option "-t" ++ CA: "/usr/share/hide.me/CA.pem", // command line option "-ca" ++ AccessTokenFile: "/etc/hide.me/accessToken.txt", // command line option "-t" + Username: "", // command line option "-u" + Password: "", // Only configurable through the config file + ConnectTimeout: 10 * time.Second, // Only configurable through the config file +@@ -120,4 +120,4 @@ func ( c *HideGuardConfiguration ) InteractiveCredentials() ( err error ) { + func ( c *HideGuardConfiguration ) Print() { + if out, err := yaml.Marshal( c ); err != nil { fmt.Println( err ) } else { fmt.Print( string( out ) ) } + return +-} +\ No newline at end of file ++} diff --git a/service_sysdirs.patch b/service_sysdirs.patch new file mode 100644 index 0000000..4d82f7b --- /dev/null +++ b/service_sysdirs.patch @@ -0,0 +1,24 @@ +diff --git a/hide.me@.service b/hide.me@.service +index b32902f..641241d 100644 +--- a/hide.me@.service ++++ b/hide.me@.service +@@ -6,9 +6,9 @@ DefaultDependencies=yes + + [Service] + Type=notify +-ExecStart=/opt/hide.me/hide.me connect %i +-WorkingDirectory=/opt/hide.me +-ReadWritePaths=/opt/hide.me /etc ++ExecStart=/usr/bin/hide.me/hide.me connect %i ++WorkingDirectory=/usr/bin/hide.me ++ReadWritePaths=/usr/bin/hide.me /etc + TimeoutStopSec=30 + Restart=always + RestartSec=5s +@@ -30,4 +30,4 @@ Group=root + LimitNOFILE=64 + + [Install] +-WantedBy=multi-user.target +\ No newline at end of file ++WantedBy=multi-user.target From f245d35d7be7a0a09a8bece99af014d951f28534 Mon Sep 17 00:00:00 2001 From: ljrk Date: Sat, 10 Apr 2021 00:25:30 +0200 Subject: [PATCH 2/8] pre-run `go mod tidy` for build-compat with go-1.16 --- .SRCINFO | 2 ++ PKGBUILD | 4 ++++ go.sum | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 go.sum diff --git a/.SRCINFO b/.SRCINFO index 5e86dd4..ed02c94 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -6,9 +6,11 @@ pkgbase = hide-client arch = any license = GPL2 source = https://github.com/eventure/hide.client.linux/archive/0.9.1.zip + source = go.sum source = config_sysdirs.patch source = service_sysdirs.patch md5sums = 9346e79e8e1c98b5457a03e02febca9c + md5sums = 811aa82780b7f9c986048325dab17372 md5sums = 07d59ac194c4aa8ee0de284283796461 md5sums = b2cee66ea77a0d76460131144d0a16b0 diff --git a/PKGBUILD b/PKGBUILD index 09f011b..1950989 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,11 +20,15 @@ backup=() options=() install= changelog= +#XXX go.sum is created by `go mod tidy` as a workaround for repo not containing +# a go.sum file, which is required for go 1.16 compatibility. source=("https://github.com/eventure/$_pkgname/archive/$pkgver.zip" + "go.sum" "config_sysdirs.patch" "service_sysdirs.patch") noextract=() md5sums=('9346e79e8e1c98b5457a03e02febca9c' + '811aa82780b7f9c986048325dab17372' '07d59ac194c4aa8ee0de284283796461' 'b2cee66ea77a0d76460131144d0a16b0') validpgpkeys=() diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..fc918a7 --- /dev/null +++ b/go.sum @@ -0,0 +1,55 @@ +github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= +github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= +github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4 h1:nwOc1YaOrYJ37sEBrtWZrdqzK22hiJs3GpDmP3sR2Yw= +github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= +github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= +github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= +github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= +github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= +github.com/mdlayher/netlink v1.1.0 h1:mpdLgm+brq10nI9zM1BpX1kpDbh3NLl3RSnVq6ZSkfg= +github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= +github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws= +github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= +github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w= +golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.zx2c4.com/wireguard v0.0.20200121 h1:vcswa5Q6f+sylDfjqyrVNNrjsFUUbPsgAQTBCAg/Qf8= +golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4= +golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4 h1:KTi97NIQGgSMaN0v/oxniJV0MEzfzmrDUOAWxombQVc= +golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 3233270a402eeba46a80d4017514f62c8b220045 Mon Sep 17 00:00:00 2001 From: ljrk Date: Sat, 10 Apr 2021 01:11:51 +0200 Subject: [PATCH 3/8] fix ExecStart in systemd service file patch --- .SRCINFO | 2 +- PKGBUILD | 2 +- service_sysdirs.patch | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ed02c94..f30d8b1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = hide-client pkgdesc = Hide.me CLI VPN client for Linux pkgver = 0.9.1 - pkgrel = 1 + pkgrel = 2 url = hide.me arch = any license = GPL2 diff --git a/PKGBUILD b/PKGBUILD index 1950989..88c9134 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=hide-client _pkgname=hide.client.linux pkgver=0.9.1 -pkgrel=1 +pkgrel=2 epoch= pkgdesc="Hide.me CLI VPN client for Linux" arch=('any') diff --git a/service_sysdirs.patch b/service_sysdirs.patch index 4d82f7b..e4441c8 100644 --- a/service_sysdirs.patch +++ b/service_sysdirs.patch @@ -9,9 +9,9 @@ index b32902f..641241d 100644 -ExecStart=/opt/hide.me/hide.me connect %i -WorkingDirectory=/opt/hide.me -ReadWritePaths=/opt/hide.me /etc -+ExecStart=/usr/bin/hide.me/hide.me connect %i -+WorkingDirectory=/usr/bin/hide.me -+ReadWritePaths=/usr/bin/hide.me /etc ++ExecStart=/usr/bin/hide.me connect %i ++WorkingDirectory=/usr/bin ++ReadWritePaths=/etc TimeoutStopSec=30 Restart=always RestartSec=5s From 0d27796c7b6ff2747a400157266c270fce424c6a Mon Sep 17 00:00:00 2001 From: ljrk Date: Sat, 10 Apr 2021 01:12:45 +0200 Subject: [PATCH 4/8] ... also updpkgsums --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 88c9134..7ea8514 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -30,7 +30,7 @@ noextract=() md5sums=('9346e79e8e1c98b5457a03e02febca9c' '811aa82780b7f9c986048325dab17372' '07d59ac194c4aa8ee0de284283796461' - 'b2cee66ea77a0d76460131144d0a16b0') + '2b70f56ac58d8ba3e496bab23b8beb07') validpgpkeys=() prepare() { From 19609c1ff727a04c1da770e057c4b3c09f2073e6 Mon Sep 17 00:00:00 2001 From: ljrk Date: Sat, 10 Apr 2021 01:13:08 +0200 Subject: [PATCH 5/8] and .SRCINFO --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index f30d8b1..0865880 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -12,7 +12,7 @@ pkgbase = hide-client md5sums = 9346e79e8e1c98b5457a03e02febca9c md5sums = 811aa82780b7f9c986048325dab17372 md5sums = 07d59ac194c4aa8ee0de284283796461 - md5sums = b2cee66ea77a0d76460131144d0a16b0 + md5sums = 2b70f56ac58d8ba3e496bab23b8beb07 pkgname = hide-client From c18fe99f52ecf12187f0d35f829659a6c687b901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20K=C3=B6nig?= Date: Tue, 13 Apr 2021 18:52:13 +0200 Subject: [PATCH 6/8] include go.sum as patch --- .SRCINFO | 4 +-- PKGBUILD | 5 ++-- go-sum.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ go.sum | 55 ---------------------------------------- 4 files changed, 76 insertions(+), 59 deletions(-) create mode 100644 go-sum.patch delete mode 100644 go.sum diff --git a/.SRCINFO b/.SRCINFO index 0865880..ff484c8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -6,11 +6,11 @@ pkgbase = hide-client arch = any license = GPL2 source = https://github.com/eventure/hide.client.linux/archive/0.9.1.zip - source = go.sum + source = go-sum.patch source = config_sysdirs.patch source = service_sysdirs.patch md5sums = 9346e79e8e1c98b5457a03e02febca9c - md5sums = 811aa82780b7f9c986048325dab17372 + md5sums = 3cca85f964053529bc7d6581ceb3abd7 md5sums = 07d59ac194c4aa8ee0de284283796461 md5sums = 2b70f56ac58d8ba3e496bab23b8beb07 diff --git a/PKGBUILD b/PKGBUILD index 7ea8514..bb61f5a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,12 +23,12 @@ changelog= #XXX go.sum is created by `go mod tidy` as a workaround for repo not containing # a go.sum file, which is required for go 1.16 compatibility. source=("https://github.com/eventure/$_pkgname/archive/$pkgver.zip" - "go.sum" + "go-sum.patch" "config_sysdirs.patch" "service_sysdirs.patch") noextract=() md5sums=('9346e79e8e1c98b5457a03e02febca9c' - '811aa82780b7f9c986048325dab17372' + '3cca85f964053529bc7d6581ceb3abd7' '07d59ac194c4aa8ee0de284283796461' '2b70f56ac58d8ba3e496bab23b8beb07') validpgpkeys=() @@ -37,6 +37,7 @@ prepare() { cd "$_pkgname-$pkgver" patch -p1 -i "$srcdir/config_sysdirs.patch" patch -p1 -i "$srcdir/service_sysdirs.patch" + patch -p1 -i "$srcdir/go-sum.patch" } build() { diff --git a/go-sum.patch b/go-sum.patch new file mode 100644 index 0000000..0396504 --- /dev/null +++ b/go-sum.patch @@ -0,0 +1,71 @@ +commit 36763c751815da1d07b0437174ad59ad79d5e401 +Author: Leonard König +Date: Sat Apr 10 00:29:18 2021 +0200 + + Go 1.16 requires a go.sum file, generated by `go mod tidy` + + This commit adds a go.sum file generated by `go mod tidy` to the repo. + + Upstream issue: https://github.com/golang/go/issues/44129 + +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..fc918a7 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,55 @@ ++github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= ++github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= ++github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= ++github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= ++github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= ++github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= ++github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4 h1:nwOc1YaOrYJ37sEBrtWZrdqzK22hiJs3GpDmP3sR2Yw= ++github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= ++github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= ++github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= ++github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= ++github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= ++github.com/mdlayher/netlink v1.1.0 h1:mpdLgm+brq10nI9zM1BpX1kpDbh3NLl3RSnVq6ZSkfg= ++github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= ++github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws= ++github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= ++github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= ++github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= ++github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= ++github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= ++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w= ++golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= ++golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= ++golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= ++golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= ++golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++golang.zx2c4.com/wireguard v0.0.20200121 h1:vcswa5Q6f+sylDfjqyrVNNrjsFUUbPsgAQTBCAg/Qf8= ++golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4= ++golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4 h1:KTi97NIQGgSMaN0v/oxniJV0MEzfzmrDUOAWxombQVc= ++golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= ++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/go.sum b/go.sum deleted file mode 100644 index fc918a7..0000000 --- a/go.sum +++ /dev/null @@ -1,55 +0,0 @@ -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= -github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4 h1:nwOc1YaOrYJ37sEBrtWZrdqzK22hiJs3GpDmP3sR2Yw= -github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= -github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= -github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= -github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= -github.com/mdlayher/netlink v1.1.0 h1:mpdLgm+brq10nI9zM1BpX1kpDbh3NLl3RSnVq6ZSkfg= -github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= -github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws= -github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= -github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w= -golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.zx2c4.com/wireguard v0.0.20200121 h1:vcswa5Q6f+sylDfjqyrVNNrjsFUUbPsgAQTBCAg/Qf8= -golang.zx2c4.com/wireguard v0.0.20200121/go.mod h1:P2HsVp8SKwZEufsnezXZA4GRX/T49/HlU7DGuelXsU4= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4 h1:KTi97NIQGgSMaN0v/oxniJV0MEzfzmrDUOAWxombQVc= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod h1:UdS9frhv65KTfwxME1xE8+rHYoFpbm36gOud1GhBe9c= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 64d80f1e8c940adeca94c7c7360842d2110cf0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20K=C3=B6nig?= Date: Tue, 13 Apr 2021 19:27:10 +0200 Subject: [PATCH 7/8] add systemd configuration option open PR: https://github.com/eventure/hide.client.linux/pull/10 --- .SRCINFO | 6 ++++-- PKGBUILD | 8 ++++++-- service_sysdirs.patch | 6 ++++-- systemd-config.patch | 30 ++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 systemd-config.patch diff --git a/.SRCINFO b/.SRCINFO index ff484c8..c9a5dd8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,18 +1,20 @@ pkgbase = hide-client pkgdesc = Hide.me CLI VPN client for Linux pkgver = 0.9.1 - pkgrel = 2 + pkgrel = 3 url = hide.me arch = any license = GPL2 source = https://github.com/eventure/hide.client.linux/archive/0.9.1.zip source = go-sum.patch source = config_sysdirs.patch + source = systemd-config.patch source = service_sysdirs.patch md5sums = 9346e79e8e1c98b5457a03e02febca9c md5sums = 3cca85f964053529bc7d6581ceb3abd7 md5sums = 07d59ac194c4aa8ee0de284283796461 - md5sums = 2b70f56ac58d8ba3e496bab23b8beb07 + md5sums = 58efe83f8a4d181a788da86c24338b42 + md5sums = c19e92d773d241330b01fd83297cc94e pkgname = hide-client diff --git a/PKGBUILD b/PKGBUILD index bb61f5a..8d4435e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=hide-client _pkgname=hide.client.linux pkgver=0.9.1 -pkgrel=2 +pkgrel=3 epoch= pkgdesc="Hide.me CLI VPN client for Linux" arch=('any') @@ -25,16 +25,19 @@ changelog= source=("https://github.com/eventure/$_pkgname/archive/$pkgver.zip" "go-sum.patch" "config_sysdirs.patch" + "systemd-config.patch" "service_sysdirs.patch") noextract=() md5sums=('9346e79e8e1c98b5457a03e02febca9c' '3cca85f964053529bc7d6581ceb3abd7' '07d59ac194c4aa8ee0de284283796461' - '2b70f56ac58d8ba3e496bab23b8beb07') + '58efe83f8a4d181a788da86c24338b42' + 'c19e92d773d241330b01fd83297cc94e') validpgpkeys=() prepare() { cd "$_pkgname-$pkgver" + patch -p1 -i "$srcdir/systemd-config.patch" patch -p1 -i "$srcdir/config_sysdirs.patch" patch -p1 -i "$srcdir/service_sysdirs.patch" patch -p1 -i "$srcdir/go-sum.patch" @@ -63,5 +66,6 @@ package() { install -Dm644 -t "$pkgdir"/usr/share/hide.me/ CA.pem # For (system-wide) accessToken.txt install -dm750 "$pkgdir"/etc/hide.me/ + install -Dm644 -t "$pkgdir"/etc/hide.me config install -Dm644 -t "$pkgdir"/usr/lib/systemd/system/ hide.me@.service } diff --git a/service_sysdirs.patch b/service_sysdirs.patch index e4441c8..885e98f 100644 --- a/service_sysdirs.patch +++ b/service_sysdirs.patch @@ -6,12 +6,14 @@ index b32902f..641241d 100644 [Service] Type=notify --ExecStart=/opt/hide.me/hide.me connect %i +-ExecStart=/opt/hide.me/hide.me connect $OPTIONS %i -WorkingDirectory=/opt/hide.me -ReadWritePaths=/opt/hide.me /etc -+ExecStart=/usr/bin/hide.me connect %i +-EnvironmentFile=/opt/hide.me/config ++ExecStart=/usr/bin/hide.me connect $OPTIONS %i +WorkingDirectory=/usr/bin +ReadWritePaths=/etc ++EnvironmentFile=/etc/hide.me/config TimeoutStopSec=30 Restart=always RestartSec=5s diff --git a/systemd-config.patch b/systemd-config.patch new file mode 100644 index 0000000..dda4247 --- /dev/null +++ b/systemd-config.patch @@ -0,0 +1,30 @@ +diff --git a/config b/config +new file mode 100644 +index 0000000..f0d2bfb +--- /dev/null ++++ b/config +@@ -0,0 +1 @@ ++OPTIONS= +diff --git a/hide.me@.service b/hide.me@.service +index b32902f..46b44ef 100644 +--- a/hide.me@.service ++++ b/hide.me@.service +@@ -6,9 +6,10 @@ DefaultDependencies=yes + + [Service] + Type=notify +-ExecStart=/opt/hide.me/hide.me connect %i ++ExecStart=/opt/hide.me/hide.me connect $OPTIONS %i + WorkingDirectory=/opt/hide.me + ReadWritePaths=/opt/hide.me /etc ++EnvironmentFile=/opt/hide.me/config + TimeoutStopSec=30 + Restart=always + RestartSec=5s +@@ -30,4 +31,4 @@ Group=root + LimitNOFILE=64 + + [Install] +-WantedBy=multi-user.target +\ No newline at end of file ++WantedBy=multi-user.target From b6345137305e32442a14b16e2f9839732eff1dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20K=C3=B6nig?= Date: Tue, 13 Apr 2021 21:18:58 +0200 Subject: [PATCH 8/8] options come before commands --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- service_sysdirs.patch | 4 ++-- systemd-config.patch | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c9a5dd8..f9df8f0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = hide-client pkgdesc = Hide.me CLI VPN client for Linux pkgver = 0.9.1 - pkgrel = 3 + pkgrel = 4 url = hide.me arch = any license = GPL2 @@ -13,8 +13,8 @@ pkgbase = hide-client md5sums = 9346e79e8e1c98b5457a03e02febca9c md5sums = 3cca85f964053529bc7d6581ceb3abd7 md5sums = 07d59ac194c4aa8ee0de284283796461 - md5sums = 58efe83f8a4d181a788da86c24338b42 - md5sums = c19e92d773d241330b01fd83297cc94e + md5sums = cdd99adb78a8d0a5212e7f900fd53a6d + md5sums = ea50b6e6df86da7031cf72d8eaaf46a4 pkgname = hide-client diff --git a/PKGBUILD b/PKGBUILD index 8d4435e..1f1b172 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=hide-client _pkgname=hide.client.linux pkgver=0.9.1 -pkgrel=3 +pkgrel=4 epoch= pkgdesc="Hide.me CLI VPN client for Linux" arch=('any') @@ -31,8 +31,8 @@ noextract=() md5sums=('9346e79e8e1c98b5457a03e02febca9c' '3cca85f964053529bc7d6581ceb3abd7' '07d59ac194c4aa8ee0de284283796461' - '58efe83f8a4d181a788da86c24338b42' - 'c19e92d773d241330b01fd83297cc94e') + 'cdd99adb78a8d0a5212e7f900fd53a6d' + 'ea50b6e6df86da7031cf72d8eaaf46a4') validpgpkeys=() prepare() { diff --git a/service_sysdirs.patch b/service_sysdirs.patch index 885e98f..41d34b0 100644 --- a/service_sysdirs.patch +++ b/service_sysdirs.patch @@ -6,11 +6,11 @@ index b32902f..641241d 100644 [Service] Type=notify --ExecStart=/opt/hide.me/hide.me connect $OPTIONS %i +-ExecStart=/opt/hide.me/hide.me $OPTIONS connect %i -WorkingDirectory=/opt/hide.me -ReadWritePaths=/opt/hide.me /etc -EnvironmentFile=/opt/hide.me/config -+ExecStart=/usr/bin/hide.me connect $OPTIONS %i ++ExecStart=/usr/bin/hide.me $OPTIONS connect %i +WorkingDirectory=/usr/bin +ReadWritePaths=/etc +EnvironmentFile=/etc/hide.me/config diff --git a/systemd-config.patch b/systemd-config.patch index dda4247..c741a23 100644 --- a/systemd-config.patch +++ b/systemd-config.patch @@ -14,7 +14,7 @@ index b32902f..46b44ef 100644 [Service] Type=notify -ExecStart=/opt/hide.me/hide.me connect %i -+ExecStart=/opt/hide.me/hide.me connect $OPTIONS %i ++ExecStart=/opt/hide.me/hide.me $OPTIONS connect %i WorkingDirectory=/opt/hide.me ReadWritePaths=/opt/hide.me /etc +EnvironmentFile=/opt/hide.me/config