From 568202d28272982217841e698779709bcda3d84c Mon Sep 17 00:00:00 2001 From: boypt <1033514+boypt@users.noreply.github.com> Date: Sat, 22 Aug 2026 00:12:13 +0800 Subject: [PATCH] refactor: remove GH_PROXY mechanism --- AGENTS.md | 3 +-- README.md | 2 +- pullsrc.sh | 2 -- version.env | 4 ---- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index afc4b4b..94a3322 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -24,7 +24,7 @@ docker run --rm -v .:/data elssh:el8 ## Configuration - `version.env` — source versions (OpenSSH, OpenSSL, Perl). Committed. -- `version-local.env` — user overrides like `PKGREL`, `WITH_OPENSSL`, `GH_PROXY`. Gitignored (`*-local*`). +- `version-local.env` — user overrides like `PKGREL`, `WITH_OPENSSL`. Gitignored (`*-local*`). - `compile.sh` sources `version.env` then `version-local.env` (if present), so `version-local.env` wins. ## Key variables @@ -33,7 +33,6 @@ docker run --rm -v .:/data elssh:el8 - `PKGREL`: package release number (defaults to `1`) - `M32=1`: build 32-bit RPMs (EL5 only) - `DOCKERBUILD=1`: when set, `pullsrc.sh` skips downloading (assumes Docker image has the sources) -- `GH_PROXY`: GitHub proxy URL for Chinese users (e.g. `https://gh-proxy.com/`) - `UOS20=1`: build the UOS 20 variant — enables the kernel-panic patch (`openssh-uos20-kernel-panic-fix.patch`) and prefixes `PKGREL` with `uos20.` so resulting RPMs are distinguishable. ## Architecture notes diff --git a/README.md b/README.md index 6bf7886..3422da9 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Similar Project: [Backport OpenSSH for Debian / Ubuntu distros](https://github.c - `pullsrc.sh`: Script to download source packages. - `compile.sh`: Script to build RPMs. -- `version.env`: config file for variables (versions, release number, OPENSSL MODE, proxy ...) +- `version.env`: config file for variables (versions, release number, OPENSSL MODE ...) The directory (`el5`, `el6`, `el7`) serve as functional templates for different environment types. The `openssh.spec` are modified based on the shipped spec file from OpenSSH project. diff --git a/pullsrc.sh b/pullsrc.sh index 3d55a95..a66cdee 100755 --- a/pullsrc.sh +++ b/pullsrc.sh @@ -27,8 +27,6 @@ source version.env OPENSSHMIR=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSLMIR=https://www.openssl.org/source/ -# shellcheck disable=SC2153 -OPENSSLMIR=${GH_PROXY:-}https://github.com/openssl/openssl/releases/download/openssl-${OPENSSLVER}/ ASKPASSMIR=https://src.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3 PERLMIR=https://www.cpan.org/src/5.0 diff --git a/version.env b/version.env index fc3206f..290d263 100644 --- a/version.env +++ b/version.env @@ -23,7 +23,3 @@ OPENSSLVER=${OPENSSLSRC%%.tar.gz} OPENSSLVER=${OPENSSLVER##openssl-} PERLVER=${PERLSRC%%.tar.gz} PERLVER=${PERLVER##perl-} - -# Github Proxy, this arg is very useful for Chinese users. -# You can try this: https://github.akams.cn/ -# GH_PROXY=""