diff --git a/deb/xray-plugin/Makefile b/deb/xray-plugin/Makefile index 43a2d5b..2b56ce6 100644 --- a/deb/xray-plugin/Makefile +++ b/deb/xray-plugin/Makefile @@ -1,12 +1,12 @@ ARCH=$(shell uname -m) -VERSION?=1.8.11 -GO_VERSION:=1.22.2 +VERSION?=1.8.15 +GO_VERSION:=1.22.5 SHELL:=/bin/bash GO_BASE_IMAGE=golang GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-bookworm EPOCH?= REPO?=https://github.com/teddysun/xray-plugin.git -REF?=v1.8.11 +REF?=v1.8.15 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown ifdef BUILD_IMAGE diff --git a/deb/xray-plugin/debian-bookworm/Dockerfile b/deb/xray-plugin/debian-bookworm/Dockerfile index 779baad..25326b3 100644 --- a/deb/xray-plugin/debian-bookworm/Dockerfile +++ b/deb/xray-plugin/debian-bookworm/Dockerfile @@ -15,9 +15,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray-plugin/debian-bullseye/Dockerfile b/deb/xray-plugin/debian-bullseye/Dockerfile index 8c8fce7..61daeed 100644 --- a/deb/xray-plugin/debian-bullseye/Dockerfile +++ b/deb/xray-plugin/debian-bullseye/Dockerfile @@ -15,9 +15,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray-plugin/debian-buster/Dockerfile b/deb/xray-plugin/debian-buster/Dockerfile index 1ee621a..8c9dec2 100644 --- a/deb/xray-plugin/debian-buster/Dockerfile +++ b/deb/xray-plugin/debian-buster/Dockerfile @@ -15,9 +15,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray-plugin/ubuntu-focal/Dockerfile b/deb/xray-plugin/ubuntu-focal/Dockerfile index 0d55c5f..32628f0 100644 --- a/deb/xray-plugin/ubuntu-focal/Dockerfile +++ b/deb/xray-plugin/ubuntu-focal/Dockerfile @@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray-plugin/ubuntu-jammy/Dockerfile b/deb/xray-plugin/ubuntu-jammy/Dockerfile index 4e63f4f..348e131 100644 --- a/deb/xray-plugin/ubuntu-jammy/Dockerfile +++ b/deb/xray-plugin/ubuntu-jammy/Dockerfile @@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray-plugin/ubuntu-noble/Dockerfile b/deb/xray-plugin/ubuntu-noble/Dockerfile index 63f45bf..93cee15 100644 --- a/deb/xray-plugin/ubuntu-noble/Dockerfile +++ b/deb/xray-plugin/ubuntu-noble/Dockerfile @@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray/Makefile b/deb/xray/Makefile index 6b4f8f0..c1a42cb 100644 --- a/deb/xray/Makefile +++ b/deb/xray/Makefile @@ -1,12 +1,12 @@ ARCH=$(shell uname -m) -VERSION?=1.8.11 -GO_VERSION:=1.22.2 +VERSION?=1.8.16 +GO_VERSION:=1.22.5 SHELL:=/bin/bash GO_BASE_IMAGE=golang GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-bookworm EPOCH?= REPO?=https://github.com/xtls/xray-core.git -REF?=v1.8.11 +REF?=v1.8.16 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown ifdef BUILD_IMAGE diff --git a/deb/xray/debian-bookworm/Dockerfile b/deb/xray/debian-bookworm/Dockerfile index 779baad..25326b3 100644 --- a/deb/xray/debian-bookworm/Dockerfile +++ b/deb/xray/debian-bookworm/Dockerfile @@ -15,9 +15,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray/debian-bullseye/Dockerfile b/deb/xray/debian-bullseye/Dockerfile index 8c8fce7..61daeed 100644 --- a/deb/xray/debian-bullseye/Dockerfile +++ b/deb/xray/debian-bullseye/Dockerfile @@ -15,9 +15,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray/debian-buster/Dockerfile b/deb/xray/debian-buster/Dockerfile index 1ee621a..8c9dec2 100644 --- a/deb/xray/debian-buster/Dockerfile +++ b/deb/xray/debian-buster/Dockerfile @@ -15,9 +15,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray/ubuntu-focal/Dockerfile b/deb/xray/ubuntu-focal/Dockerfile index 0d55c5f..32628f0 100644 --- a/deb/xray/ubuntu-focal/Dockerfile +++ b/deb/xray/ubuntu-focal/Dockerfile @@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray/ubuntu-jammy/Dockerfile b/deb/xray/ubuntu-jammy/Dockerfile index 4e63f4f..348e131 100644 --- a/deb/xray/ubuntu-jammy/Dockerfile +++ b/deb/xray/ubuntu-jammy/Dockerfile @@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/deb/xray/ubuntu-noble/Dockerfile b/deb/xray/ubuntu-noble/Dockerfile index 63f45bf..93cee15 100644 --- a/deb/xray/ubuntu-noble/Dockerfile +++ b/deb/xray/ubuntu-noble/Dockerfile @@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=off -ENV GOPATH /go +ENV GOPATH=/go ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin ARG COMMON_FILES COPY --link ${COMMON_FILES} /root/build-deb/debian diff --git a/rpm/xray-plugin/xray-plugin.spec b/rpm/xray-plugin/xray-plugin.spec index 3a385cf..8138289 100644 --- a/rpm/xray-plugin/xray-plugin.spec +++ b/rpm/xray-plugin/xray-plugin.spec @@ -2,7 +2,7 @@ # spec file for package xray-plugin # Name: xray-plugin -Version: 1.8.11 +Version: 1.8.15 Release: 1%{?dist} Summary: A SIP003 plugin for shadowsocks License: MIT @@ -34,82 +34,3 @@ install -D -p -m 0755 xray-plugin %{buildroot}%{_bindir}/xray-plugin %doc README.md %{_bindir}/xray-plugin %license LICENSE - -%changelog -* Fri Apr 26 2024 Teddysun - 1.8.11-1 -- Update to version 1.8.11 - -* Sat Mar 30 2024 Teddysun - 1.8.10-1 -- Update to version 1.8.10 - -* Mon Mar 11 2024 Teddysun - 1.8.9-1 -- Update to version 1.8.9 - -* Mon Feb 26 2024 Teddysun - 1.8.8-1 -- Update to version 1.8.8 - -* Mon Jan 08 2024 Teddysun - 1.8.7-1 -- Update to version 1.8.7 - -* Sat Nov 18 2023 Teddysun - 1.8.6-1 -- Update to version 1.8.6 - -* Tue Nov 14 2023 Teddysun - 1.8.5-1 -- Update to version 1.8.5 - -* Tue Aug 29 2023 Teddysun - 1.8.4-1 -- Update version to 1.8.4 - -* Mon Jun 19 2023 Teddysun - 1.8.3-1 -- Update version to 1.8.3 - -* Tue Apr 18 2023 Teddysun - 1.8.1-1 -- Update version to 1.8.1 - -* Sat Mar 11 2023 Teddysun - 1.8.0-1 -- Update version to 1.8.0 - -* Thu Feb 09 2023 Teddysun - 1.7.5-1 -- Update version to 1.7.5 - -* Thu Feb 02 2023 Teddysun - 1.7.3-1 -- Update version to 1.7.3 - -* Sun Jan 08 2023 Teddysun - 1.7.2-1 -- Update version to 1.7.2 - -* Mon Dec 26 2022 Teddysun - 1.7.0-1 -- Update version to 1.7.0 - -* Mon Dec 12 2022 Teddysun - 1.6.6-1 -- Update version to 1.6.6 - -* Mon Nov 28 2022 Teddysun - 1.6.5-1 -- Update version to 1.6.5 - -* Mon Nov 14 2022 Teddysun - 1.6.4-1 -- Update version to 1.6.4 - -* Mon Nov 07 2022 Teddysun - 1.6.3-1 -- Update version to 1.6.3 - -* Sat Oct 29 2022 Teddysun - 1.6.2-1 -- Update version to 1.6.2 - -* Sat Oct 22 2022 Teddysun - 1.6.1-1 -- Update version to 1.6.1 - -* Tue Sep 20 2022 Teddysun - 1.6.0-1 -- Update version to 1.6.0 - -* Mon Aug 29 2022 Teddysun - 1.5.10-1 -- Update version to 1.5.10 - -* Sat Jul 16 2022 Teddysun - 1.5.9-1 -- Update version to 1.5.9 - -* Mon Jun 20 2022 Teddysun - 1.5.8-1 -- Update version to 1.5.8 - -* Thu Jun 16 2022 Teddysun - 1.5.7-1 -- Update version to 1.5.7 diff --git a/rpm/xray/xray.spec b/rpm/xray/xray.spec index 5d3de97..cefea2d 100644 --- a/rpm/xray/xray.spec +++ b/rpm/xray/xray.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: xray -Version: 1.8.11 +Version: 1.8.16 Release: 1%{?dist} Summary: Xray, Penetrates Everything. License: MPL-2.0 @@ -105,28 +105,3 @@ EOF %{_datadir}/%{name}/*.dat %license LICENSE %doc README.md - -%changelog -* Fri Apr 26 2024 Teddysun - 1.8.11-1 -- Update to version 1.8.11 - -* Sat Mar 30 2024 Teddysun - 1.8.10-1 -- Update to version 1.8.10 - -* Mon Mar 11 2024 Teddysun - 1.8.9-1 -- Update to version 1.8.9 - -* Mon Feb 26 2024 Teddysun - 1.8.8-1 -- Update to version 1.8.8 - -* Mon Jan 08 2024 Teddysun - 1.8.7-1 -- Update to version 1.8.7 - -* Sat Nov 18 2023 Teddysun - 1.8.6-1 -- Update to version 1.8.6 - -* Tue Nov 14 2023 Teddysun - 1.8.5-1 -- Update to version 1.8.5 - -* Wed Oct 18 2023 Teddysun - 1.8.4-1 -- Update to version 1.8.4