summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Hua2023-04-05 12:45:14 +0800
committerZhang Hua2023-04-05 12:45:14 +0800
commit956772e06b4f425438d02f1d3fc674bf947555b9 (patch)
tree56d971943cbcb11606717c6ee76b7e6ffa31fed9
parent1f4a293843cb6c60c411828fbce140cf4f055b6b (diff)
downloadaur-956772e06b4f425438d02f1d3fc674bf947555b9.tar.gz
Pin dist files to package's version
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD12
2 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 01f565aab6a0..e08e33e75df0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caddy-trojan
pkgdesc = Caddy web server with trojan support
pkgver = 2.6.4
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/imgk/caddy-trojan
arch = x86_64
arch = aarch64
@@ -13,10 +13,10 @@ pkgbase = caddy-trojan
source = caddy.hook
source = caddy.sysusers
source = caddy.tmpfiles
- source = https://raw.githubusercontent.com/caddyserver/dist/master/init/caddy.service
- source = https://raw.githubusercontent.com/caddyserver/dist/master/init/caddy-api.service
- source = https://raw.githubusercontent.com/caddyserver/dist/master/config/Caddyfile
- source = https://raw.githubusercontent.com/caddyserver/dist/master/welcome/index.html
+ source = https://raw.githubusercontent.com/caddyserver/dist/v2.6.4/init/caddy.service
+ source = https://raw.githubusercontent.com/caddyserver/dist/v2.6.4/init/caddy-api.service
+ source = https://raw.githubusercontent.com/caddyserver/dist/v2.6.4/config/Caddyfile
+ source = https://raw.githubusercontent.com/caddyserver/dist/v2.6.4/welcome/index.html
sha256sums = dfadb1f4a1f82024a11c110624680f98b3818305a16dd013363ca398020611ad
sha256sums = a9294eeba17a8fd57cf11cef21e2eb3719a016646eeac0764a0d9f9f380a40ef
sha256sums = 99282b1a57857d23b97883dfd7dd147005956cc04405630d6e4d73bb7069f5ba
diff --git a/PKGBUILD b/PKGBUILD
index 9430818a619b..206ef377219f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=caddy-trojan
pkgver=2.6.4
-pkgrel=4
+pkgrel=5
pkgdesc="Caddy web server with trojan support"
arch=('x86_64' 'aarch64')
url="https://github.com/imgk/caddy-trojan"
@@ -15,10 +15,10 @@ source=(
"caddy.hook"
"caddy.sysusers"
"caddy.tmpfiles"
- "https://raw.githubusercontent.com/caddyserver/dist/master/init/caddy.service"
- "https://raw.githubusercontent.com/caddyserver/dist/master/init/caddy-api.service"
- "https://raw.githubusercontent.com/caddyserver/dist/master/config/Caddyfile"
- "https://raw.githubusercontent.com/caddyserver/dist/master/welcome/index.html"
+ "https://raw.githubusercontent.com/caddyserver/dist/v${pkgver}/init/caddy.service"
+ "https://raw.githubusercontent.com/caddyserver/dist/v${pkgver}/init/caddy-api.service"
+ "https://raw.githubusercontent.com/caddyserver/dist/v${pkgver}/config/Caddyfile"
+ "https://raw.githubusercontent.com/caddyserver/dist/v${pkgver}/welcome/index.html"
)
sha256sums=('dfadb1f4a1f82024a11c110624680f98b3818305a16dd013363ca398020611ad'
'a9294eeba17a8fd57cf11cef21e2eb3719a016646eeac0764a0d9f9f380a40ef'
@@ -43,6 +43,8 @@ build() {
github.com/mholt/caddy-webdav
github.com/imgk/caddy-trojan
github.com/imgk/caddy-pprof
+ # Let caddy truse CDN's X-Forwarded-For header
+ # Only cloudflare is found now.
github.com/WeidiDeng/caddy-cloudflare-ip
)
xcaddy build v${pkgver} ${MODULES[@]/#/--with }