diff options
author | AkinoKaede | 2020-12-03 13:44:35 +0800 |
---|---|---|
committer | AkinoKaede | 2020-12-03 13:44:35 +0800 |
commit | 31656f3a7410e573e8a57e0568de47e5f0aa7a59 (patch) | |
tree | 54c49f2cd70f875422c431800bbb1b6b6a184a50 | |
parent | 6e7c81927f4c4cab95e6359b948bf8ed12125b5c (diff) | |
download | aur-31656f3a7410e573e8a57e0568de47e5f0aa7a59.tar.gz |
patch location asset
-rw-r--r-- | PKGBUILD | 46 | ||||
-rw-r--r-- | location_asset.patch | 9 | ||||
-rw-r--r-- | xray.service | 1 | ||||
-rw-r--r-- | xray@.service | 1 |
4 files changed, 35 insertions, 22 deletions
@@ -4,52 +4,58 @@ pkgname=xray pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="The best v2ray-core, with XTLS support." arch=('x86_64') url="https://github.com/XTLS/Xray-core" license=('MPLv2') depends=('glibc' 'v2ray-domain-list-community' 'v2ray-geoip') -makedepends=('go') +makedepends=('go' 'patch') backup=(etc/xray/config.json) source=( - "${pkgname}-${pkgver}.tar.gz::${url}/archive/v$pkgver.tar.gz" + "${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" "config.json" "vpoint_socks_vmess.json" "vpoint_vmess_freedom.json" "xray.service" "xray@.service" + "location_asset.patch" ) sha512sums=( '03c6337ca13e135f7cdaef978bb526c846cd83ff30036764aacaecbf22a9ad79dc661de6f5fd699fbf22fac6833a4aeb5870941c82aee0d74fc60641f858460e' '2000211cbf987adaee7f278cc8cb23268965caab3bc46401f9324f2beaad95bec11012f5f4500f1016f4b75f097f3ac96cc5be2da7a6df0261582b3f23b3d78d' '9914fd3da02511b716951e521ca22006a6e8ad66e64d32cc7dd7dc3544a754174b37e35df6108ca217130f02763265d74f8bc56c4e52b262bdd48dcdb5310eb5' '532f66fe19196de0cc43df1812d6f32cbca7bbcacaa0cd4141bd80b3121b17eb8b23e0464765cf05a97b11e0213fb688eade83e393e36b3e7ebded6f0925de97' - 'f5ea93fab3a108ee30bbf9ac6f611df0397809f0c63c6bdb79dde60a49c3be175b4c915bd4d26313fbd2703b73f3a28f3e158352c521d1173baac219df73300d' - '7c96cbea8d8e34d2458c3aeb31b03e9f322e3774193e0458f003f2336c7ff39b65a94840942f09b7c5e96287c74cdd8b7b96717e38ff230161ad887d34a86d8f' + '1d31e11c3a11090ee2616adfcf77a4a1013793c8f63a41e5293d07e889e34f85223b9f5a0791b649f22ecc5e18e12182b5b074e61aa36f5cd6de523f3c64f95d' + '6582aa9bf988acb2660a7172282768c217ad8335a55ccee916d7786c227bc62cc973d7d6d3b5632260c69eec98c15804c2b52cdd91c5f395d3a0fe36519586b4' + '3fc64f9980fb9d5ceedf6c77fa88abcbf9c3ca15189de7f4e5e319d525591d7049676b8a89e9ef1341ed3ba198041539db4fe37338bab4df9f9b7594f77b36b6' ) +prepare() { + patch "${srcdir}"/"Xray-core-${pkgver}"/common/platform/others.go "${srcdir}"/location_asset.patch +} + build() { - cd "${srcdir}"/"Xray-core-${pkgver}" - export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external" - export CGO_LDFLAGS="${LDFLAGS}" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CPPFLAGS="${CPPFLAGS}" - go build -o xray ./main + cd "${srcdir}"/"Xray-core-${pkgver}" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external" + export CGO_LDFLAGS="${LDFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + go build -o xray ./main } check() { - cd "${srcdir}"/"Xray-core-${pkgver}" - go test -p 1 -tags json -v -timeout 30m github.com/xtls/xray-core/v1/core/... + cd "${srcdir}"/"Xray-core-${pkgver}" + go test -p 1 -tags json -v -timeout 30m github.com/xtls/xray-core/v1/core/... } package() { - cd "${srcdir}" - install -Dm644 xray.service "${pkgdir}"/usr/lib/systemd/system/xray.service - install -Dm644 xray@.service "${pkgdir}"/usr/lib/systemd/system/xray@.service - install -Dm644 *.json -t "${pkgdir}"/etc/xray/ + cd "${srcdir}" + install -Dm644 xray.service "${pkgdir}"/usr/lib/systemd/system/xray.service + install -Dm644 xray@.service "${pkgdir}"/usr/lib/systemd/system/xray@.service + install -Dm644 *.json -t "${pkgdir}"/etc/xray/ - cd "${srcdir}"/"Xray-core-${pkgver}" - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/xray/LICENSE - install -Dm755 xray -t "${pkgdir}"/usr/bin/ + cd "${srcdir}"/"Xray-core-${pkgver}" + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/xray/LICENSE + install -Dm755 xray -t "${pkgdir}"/usr/bin/ } diff --git a/location_asset.patch b/location_asset.patch new file mode 100644 index 000000000000..7bf4aaff8679 --- /dev/null +++ b/location_asset.patch @@ -0,0 +1,9 @@ +@@ -30,6 +30,8 @@ + defPath, + filepath.Join("/usr/local/share/xray/", file), + filepath.Join("/usr/share/xray/", file), ++ filepath.Join("/usr/local/share/v2ray/", file), ++ filepath.Join("/usr/share/v2ray/", file), + } { + if _, err := os.Stat(p); os.IsNotExist(err) { + continue diff --git a/xray.service b/xray.service index f4215d9be8ba..77889293c647 100644 --- a/xray.service +++ b/xray.service @@ -8,7 +8,6 @@ User=nobody CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE NoNewPrivileges=true -Environment=XRAY_LOCATION_ASSET=/usr/share/v2ray ExecStart=/usr/bin/xray run -config /etc/xray/config.json Restart=on-failure RestartPreventExitStatus=23 diff --git a/xray@.service b/xray@.service index bbb0461171ae..c7563486d112 100644 --- a/xray@.service +++ b/xray@.service @@ -8,7 +8,6 @@ User=nobody CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE NoNewPrivileges=true -Environment=XRAY_LOCATION_ASSET=/usr/share/v2ray ExecStart=/usr/bin/xray run -config /etc/xray/%i.json Restart=on-failure RestartPreventExitStatus=23 |