Compare commits

..

251 Commits

Author SHA1 Message Date
Vladimir Dubrovin
d3b4f56869 change checkout to v5
Some checks failed
RPM build arm64 / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
RPM build arm / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
RPM build x86-64 / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win32 3proxy-lite with Watcom / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Build Win32 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Build Win64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Build Win-arm64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2026-04-08 15:57:49 +03:00
Vladimir Dubrovin
b3bf5e8a40 fix mcvs builds
Some checks are pending
Build Win32 3proxy-lite with Watcom / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win32 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win-arm64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-07 17:56:05 +03:00
Vladimir Dubrovin
d67f5e8024 Update build-watcom.yml 2026-04-07 17:50:00 +03:00
Vladimir Dubrovin
f6e4e774a2 update build 2026-04-07 17:43:06 +03:00
Vladimir Dubrovin
4414d081eb Update build-win64.yml 2026-04-07 17:02:55 +03:00
Vladimir Dubrovin
9412071f1a Update build-win64.yml
Some checks are pending
RPM build arm64 / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
Build Win32 3proxy-lite with Watcom / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win32 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win-arm64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-07 16:51:34 +03:00
Vladimir Dubrovin
40aa85428e Update build-win64.yml 2026-04-07 16:47:27 +03:00
Vladimir Dubrovin
0e5fbcc0c6 Update build-win64.yml 2026-04-07 16:29:51 +03:00
Vladimir Dubrovin
5b95e84872 Update build-win64.yml 2026-04-07 16:17:01 +03:00
Vladimir Dubrovin
67ee52e123 Fix makefiles 2026-04-07 15:29:57 +03:00
Vladimir Dubrovin
18bdb1dd30 Fix builds 2026-04-07 15:16:38 +03:00
Vladimir Dubrovin
cbb14cc09a Update windows builds 2026-04-07 15:13:17 +03:00
Vladimir Dubrovin
f7e98acee6 Update build-watcom.yml 2026-04-07 15:04:38 +03:00
Vladimir Dubrovin
968c3d70dc Update build-watcom.yml 2026-04-07 15:02:10 +03:00
Vladimir Dubrovin
a94f6a47b0 Use inttypes in Makefile.msvc 2026-04-07 14:36:37 +03:00
Vladimir Dubrovin
47ee1e5e77 Fix warnings 2026-04-07 14:34:34 +03:00
Vladimir Dubrovin
1233e05263 Fix warnings 2026-04-07 14:12:04 +03:00
Vladimir Dubrovin
8760949918 Fix SCN on Windows 2026-04-07 14:04:54 +03:00
Vladimir Dubrovin
cded784d03 Fix warnings 2026-04-07 13:54:07 +03:00
Vladimir Dubrovin
717ca8ae62 Fix warnings 2026-04-07 13:25:52 +03:00
Vladimir Dubrovin
49a61affb7 Use PRI/SCN modifiers where possible 2026-04-07 12:51:49 +03:00
Vladimir Dubrovin
9a99fc8082 Update build-rpm-arm64.yml 2026-04-07 11:48:43 +03:00
Vladimir Dubrovin
dfbb6b3213 Revert "Update structures.h"
This reverts commit b628aa859d.
2026-04-07 11:24:54 +03:00
Vladimir Dubrovin
b628aa859d Update structures.h 2026-04-07 11:22:08 +03:00
Vladimir Dubrovin
7992fbf31e Use uint32_t/uint16_t instead of unsigned long / unsigned short where required 2026-04-07 11:13:04 +03:00
Vladimir Dubrovin
7ea4e9b8c2 Update build-rpm-arm64.yml
Some checks failed
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
RPM build arm / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
RPM build x86-64 / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
2026-04-06 21:12:59 +03:00
Vladimir Dubrovin
a266ef3744 Update 3proxy.spec 2026-04-06 21:11:33 +03:00
Vladimir Dubrovin
a5f7a5a97f Update build-rpm-arm64.yml 2026-04-06 21:08:18 +03:00
Vladimir Dubrovin
e442696f3e Update 3proxy.spec 2026-04-06 21:07:55 +03:00
Vladimir Dubrovin
a4cf5cfcca build rpm for arm64 2026-04-06 21:03:45 +03:00
Vladimir Dubrovin
ccd6759f68 Update build-rpm-armhf.yml 2026-04-06 20:57:03 +03:00
Vladimir Dubrovin
af6df8bba7 update 3proxy.spec 2026-04-06 20:52:56 +03:00
Vladimir Dubrovin
ed0a3fe83f Update build-rpm-armhf.yml 2026-04-06 20:44:14 +03:00
Vladimir Dubrovin
7a23ec302e Update build-rpm-x86-64.yml 2026-04-06 20:42:13 +03:00
Vladimir Dubrovin
c417d50e64 Update build-rpm-armhf.yml 2026-04-06 20:41:18 +03:00
Vladimir Dubrovin
82a97e61e2 pass PAMLIB to make 2026-04-06 20:36:31 +03:00
Vladimir Dubrovin
15855ec5cd Allow specify pam library 2026-04-06 20:20:50 +03:00
Vladimir Dubrovin
93361b4128 Update build-rpm-armhf.yml 2026-04-06 19:56:47 +03:00
Vladimir Dubrovin
599d22f58c Update build-rpm-armhf.yml 2026-04-06 19:53:13 +03:00
Vladimir Dubrovin
7a17b07b70 Update build-rpm-armhf.yml 2026-04-06 19:42:07 +03:00
Vladimir Dubrovin
e0bc28cf7b Update build-rpm-armhf.yml 2026-04-06 19:39:57 +03:00
Vladimir Dubrovin
de91c98e54 Update build-rpm-armhf.yml 2026-04-06 19:29:04 +03:00
Vladimir Dubrovin
825bfbc755 Update build-rpm-armhf.yml 2026-04-06 19:21:30 +03:00
Vladimir Dubrovin
1b1cf764a2 Update build-rpm-armhf.yml 2026-04-06 19:10:20 +03:00
Vladimir Dubrovin
be2222adea update workflows 2026-04-06 19:09:10 +03:00
Vladimir Dubrovin
11ff2692d8 Add arm32 rpm build 2026-04-06 18:53:11 +03:00
Vladimir Dubrovin
c12d78dc72 update workflow 2026-04-06 18:34:10 +03:00
Vladimir Dubrovin
cc2e534705 Update Makefile.Linux 2026-04-06 18:29:40 +03:00
Vladimir Dubrovin
db81230305 Update build-rpm-x86-64.yml 2026-04-06 18:13:21 +03:00
Vladimir Dubrovin
9bfec689a2 Update 3proxy.spec 2026-04-06 18:12:52 +03:00
Vladimir Dubrovin
b21054ecb2 Update build-rpm-x86-64.yml 2026-04-06 17:58:19 +03:00
Vladimir Dubrovin
574e74c194 Update build-rpm-x86-64.yml 2026-04-06 17:52:06 +03:00
Vladimir Dubrovin
22b39f0d93 Update build-rpm-x86-64.yml 2026-04-06 17:50:48 +03:00
Vladimir Dubrovin
04bb5cd179 Update build-rpm-x86-64.yml 2026-04-06 17:49:00 +03:00
Vladimir Dubrovin
228fc96764 Update build-rpm-x86-64.yml 2026-04-06 17:40:19 +03:00
Vladimir Dubrovin
d74d9a195c Update 3proxy.spec 2026-04-06 17:39:23 +03:00
Vladimir Dubrovin
7924845d09 Update build-rpm-x86-64.yml 2026-04-06 17:37:18 +03:00
Vladimir Dubrovin
3c577df137 Update 3proxy.spec 2026-04-06 17:37:09 +03:00
Vladimir Dubrovin
75ab1cb92b Update build-rpm-x86-64.yml 2026-04-06 17:13:52 +03:00
Vladimir Dubrovin
962f2017ba Update build-rpm-x86-64.yml 2026-04-06 17:11:23 +03:00
Vladimir Dubrovin
35fba82518 Create build-rpm-x86-64.yml 2026-04-06 17:07:31 +03:00
Vladimir Dubrovin
b112b92737 Update build-rpm.yml 2026-04-06 17:00:35 +03:00
Vladimir Dubrovin
f604f8064d Update build-rpm.yml 2026-04-06 16:40:59 +03:00
Vladimir Dubrovin
bc5e7a78f6 Update build-rpm.yml 2026-04-06 16:35:36 +03:00
Vladimir Dubrovin
bc4fc5dd01 Update build-rpm.yml 2026-04-06 16:30:19 +03:00
Vladimir Dubrovin
b039faaca0 Update build-rpm.yml
Some checks failed
Build Win32 3proxy-lite with Watcom / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win32 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Build Win-arm64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
RPM build / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
2026-04-06 16:26:42 +03:00
Vladimir Dubrovin
ccc9f9757b Update build-rpm.yml 2026-04-06 16:19:17 +03:00
Vladimir Dubrovin
9410c5238f Update build-rpm.yml 2026-04-06 16:18:21 +03:00
Vladimir Dubrovin
df63ee4bd8 Update build-rpm.yml 2026-04-06 16:06:29 +03:00
Vladimir Dubrovin
804f92b099 Update build-rpm.yml 2026-04-06 16:04:42 +03:00
Vladimir Dubrovin
ce9a982cee Update build-rpm.yml 2026-04-06 15:56:44 +03:00
Vladimir Dubrovin
9544c7cd04 Merge branch 'master' of https://github.com/3proxy/3proxy 2026-04-06 15:53:58 +03:00
Vladimir Dubrovin
7df71515c8 Create build-rpm.yml 2026-04-06 15:53:56 +03:00
ilya
301baf98ac
docs: fix Docker link in README (#1193) 2026-04-06 13:31:05 +03:00
Vladimir Dubrovin
a73489cb75 scripts/debian moved to debian 2026-04-06 12:39:18 +03:00
Vladimir Dubrovin
540210a5a9 keep HTML mans 2026-04-06 12:27:45 +03:00
Vladimir Dubrovin
4c03c19cda fix debian files 2026-04-06 12:23:00 +03:00
Vladimir Dubrovin
98ae07176b fix workflows 2026-04-06 11:43:51 +03:00
Vladimir Dubrovin
9e7726d3ad fix workflows 2026-04-06 11:38:16 +03:00
Vladimir Dubrovin
1391a31c35 Update workflows 2026-04-06 11:29:56 +03:00
Vladimir Dubrovin
925516d3f3 Fix builds 2026-04-06 11:05:35 +03:00
Vladimir Dubrovin
c2161e8e7d Only Makefile.msvc is required, add workflow for building Windows binaries on version change 2026-04-06 10:59:59 +03:00
Vladimir Dubrovin
7092ecae71 Update year
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2026-04-05 13:29:33 +03:00
Vladimir Dubrovin
97ecabc80c change config example 2026-04-05 13:12:26 +03:00
Vladimir Dubrovin
4777ce51ae howto update 2026-04-05 13:05:34 +03:00
Vladimir Dubrovin
f72c6f5baa Update README 2026-04-05 12:49:03 +03:00
Vladimir Dubrovin
dc83562700 Use syslog for non-chroot configuration, support MacOS launchd 2026-04-05 12:46:57 +03:00
Vladimir Dubrovin
28969bbc5a add rc.d script
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-05 02:02:27 +03:00
Vladimir Dubrovin
d502ecb0fd Use non-chroot configuration in cmake; remove older script 2026-04-05 01:45:57 +03:00
Vladimir Dubrovin
b0db65dfde Howto update 2026-04-05 00:44:44 +03:00
Vladimir Dubrovin
d27afd05cd Howto update 2026-04-05 00:31:45 +03:00
Vladimir Dubrovin
6417f1acd1 Update 3proxy.cfg.3 2026-04-05 00:06:23 +03:00
Vladimir Dubrovin
858f361de1 SSLPlugin documentation updated 2026-04-04 20:54:20 +03:00
Vladimir Dubrovin
aca0bf4de4 Update documentation 2026-04-04 20:28:20 +03:00
Vladimir Dubrovin
d3116a4e7f remove unsued variables
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-04 14:18:25 +03:00
Vladimir Dubrovin
b56e97e06d Fix CONNECT_TO usage 2026-04-04 14:05:39 +03:00
Vladimir Dubrovin
4c190e108d Update c-cpp.yml 2026-04-04 13:30:52 +03:00
Vladimir Dubrovin
2e26ba8bab Update c-cpp.yml 2026-04-04 13:24:52 +03:00
Vladimir Dubrovin
f616645a09 Update c-cpp.yml 2026-04-04 13:16:34 +03:00
Vladimir Dubrovin
4e8ea2d7f0 Update c-cpp.yml 2026-04-04 13:13:46 +03:00
Vladimir Dubrovin
82533b1a50 Update c-cpp.yml 2026-04-04 12:59:38 +03:00
Vladimir Dubrovin
8c8ad7be6d Add cmake environment
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-03 18:13:31 +03:00
Vladimir Dubrovin
d2c343fbbc Fix external libraries
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-03 14:51:35 +03:00
Vladimir Dubrovin
ea8837e4b9 Update c-cpp.yml
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-02 19:16:35 +03:00
Vladimir Dubrovin
d26f27a87e fix makefiles 2026-04-02 19:13:53 +03:00
Vladimir Dubrovin
b1f27b545a Update c-cpp.yml 2026-04-02 19:08:54 +03:00
Vladimir Dubrovin
4747d69a62 fix makefiles 2026-04-02 19:06:26 +03:00
Vladimir Dubrovin
dc1dbf2ad5 move crypto and ssl libs to plugin makefile 2026-04-02 19:04:37 +03:00
Vladimir Dubrovin
ab75695944 Update c-cpp.yml 2026-04-02 18:42:40 +03:00
Vladimir Dubrovin
9e44dddfbe Update Makefile.win 2026-04-02 18:24:21 +03:00
Vladimir Dubrovin
17112334bc try to fix PCRE2 on win 2026-04-02 18:22:32 +03:00
Vladimir Dubrovin
5b6652ac99 Update Makefile.win 2026-04-02 18:13:43 +03:00
Vladimir Dubrovin
05eb317337 Update Makefile.win 2026-04-02 18:10:59 +03:00
Vladimir Dubrovin
1b64c7f8ab Update Makefile.win 2026-04-02 18:07:28 +03:00
Vladimir Dubrovin
5fd5eb55c6 switch PCREPlugin to PCRE2 2026-04-02 17:55:10 +03:00
Vladimir Dubrovin
5d3d56dae1 Merge branch 'master' of https://github.com/3proxy/3proxy 2026-04-02 16:55:43 +03:00
Vladimir Dubrovin
58ab65dfdf Use pcre/pam in Dockerfile.full 2026-04-02 16:55:40 +03:00
BDBSAlive6one6
c7318a825c
fix(PamAuth): добавлен вызов pam_acct_mgmt(), исправлен pam_start() (#1203)
Добавлен вызов pam_acct_mgmt() после pam_authenticate() для проверки
прав доступа на уровне PAM (HBAC, истечение пароля, блокировка учётки)
Исправлена передача реального username в pam_start() вместо '3proxy@'

---

Added pam_acct_mgmt() call after pam_authenticate() to enable PAM
account checks (HBAC, password expiration, account lockout).
Fixed pam_start() to pass actual username instead of hardcoded '3proxy@'
Tested with FreeIPA 4.12 + SSSD Rocky Linux 9
2026-04-02 15:06:21 +03:00
Vladimir Dubrovin
1f92847a63 Library checks compatible with different make versions (fix Ubuntu 18)
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-02 13:47:27 +03:00
Vladimir Dubrovin
5cb42abbb3 Move timeouts from conf
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-04-01 19:37:33 +03:00
Vladimir Dubrovin
46be1fb96c Update .gitignore 2026-04-01 18:58:10 +03:00
Vladimir Dubrovin
a5c81e4a29 Update c-cpp.yml
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2026-03-31 11:26:54 +03:00
Vladimir Dubrovin
d19a412b11 Update Makefile.msvc64 2026-03-31 11:19:59 +03:00
Vladimir Dubrovin
cf045b3bea Update c-cpp.yml 2026-03-31 11:14:54 +03:00
Vladimir Dubrovin
8efaee2651 Update Makefile.msvc64 2026-03-31 11:08:03 +03:00
Vladimir Dubrovin
3189a6a93e Update c-cpp.yml 2026-03-31 11:01:45 +03:00
Vladimir Dubrovin
da0aebe31c Do not use applink.c 2026-03-31 10:58:32 +03:00
Vladimir Dubrovin
ecc8d98f88 Update c-cpp.yml 2026-03-31 10:48:54 +03:00
Vladimir Dubrovin
7fb1dc4f65 Update c-cpp.yml 2026-03-31 10:43:13 +03:00
Vladimir Dubrovin
6bbf528a20 Update c-cpp.yml
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-03-30 21:01:25 +03:00
Vladimir Dubrovin
cc2a6ecc4a Update c-cpp.yml 2026-03-30 20:58:33 +03:00
Vladimir Dubrovin
772da8837a Update c-cpp.yml 2026-03-30 20:54:22 +03:00
Vladimir Dubrovin
d790e11ac6 Update c-cpp.yml 2026-03-30 20:40:31 +03:00
Vladimir Dubrovin
74cdf66786 Update c-cpp.yml 2026-03-30 20:37:13 +03:00
Vladimir Dubrovin
cbbe4d999e Update c-cpp.yml 2026-03-30 20:32:25 +03:00
Vladimir Dubrovin
ac1a667a50 Update c-cpp.yml 2026-03-30 20:24:00 +03:00
Vladimir Dubrovin
83229aa69e Update c-cpp.yml 2026-03-30 20:19:39 +03:00
Vladimir Dubrovin
71f35a78ec Update c-cpp.yml 2026-03-30 20:10:34 +03:00
Vladimir Dubrovin
2df68ddb33 Update c-cpp.yml 2026-03-30 19:54:48 +03:00
Vladimir Dubrovin
81f573ddec Update c-cpp.yml 2026-03-30 19:50:18 +03:00
Vladimir Dubrovin
584f75278b Update c-cpp.yml 2026-03-30 17:27:11 +03:00
Vladimir Dubrovin
4fa2c07dd1 Update Makefile.win 2026-03-30 17:24:33 +03:00
Vladimir Dubrovin
e058b56b27 Update Makefile.win 2026-03-30 17:10:39 +03:00
Vladimir Dubrovin
7f31a30f00 Fix TrafficPlugin 2026-03-30 15:18:18 +03:00
Vladimir Dubrovin
9ea553d44f Update c-cpp.yml 2026-03-30 15:09:46 +03:00
Vladimir Dubrovin
d823d8e712 Update c-cpp.yml
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-03-30 12:54:53 +03:00
Vladimir Dubrovin
6f2b1a00b6 Update c-cpp.yml 2026-03-30 12:49:56 +03:00
Vladimir Dubrovin
27b4c69dd9 Update c-cpp.yml 2026-03-30 12:39:30 +03:00
Vladimir Dubrovin
637d5e5539 Use build variables 2026-03-30 12:32:24 +03:00
Vladimir Dubrovin
ec164ffe81 Use conditional build in Makefile.win 2026-03-30 11:31:30 +03:00
Vladimir Dubrovin
1276f5f176 Update c-cpp.yml
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2026-03-27 20:23:40 +03:00
Vladimir Dubrovin
5fe681ad57 Update c-cpp.yml 2026-03-27 20:20:51 +03:00
Vladimir Dubrovin
5daefaf0b3 Update c-cpp.yml 2026-03-27 20:19:37 +03:00
Vladimir Dubrovin
449f7bfab8 Update c-cpp.yml 2026-03-27 20:15:32 +03:00
Vladimir Dubrovin
58d78f31a9 Update c-cpp.yml 2026-03-27 20:12:11 +03:00
Vladimir Dubrovin
0d4f8998ab Update c-cpp.yml 2026-03-27 20:03:48 +03:00
Vladimir Dubrovin
7df0f4c3f2 Update c-cpp.yml 2026-03-27 19:58:52 +03:00
Vladimir Dubrovin
ea937634cf Update c-cpp.yml 2026-03-27 19:50:13 +03:00
Vladimir Dubrovin
23b8fa37f8 Update Makefile.win 2026-03-27 19:05:49 +03:00
Vladimir Dubrovin
2e5dcb510b compile PCRE on Windows 2026-03-27 19:01:48 +03:00
Vladimir Dubrovin
c2f381d0cc Correct SSL functions for Windows 2026-03-27 18:36:16 +03:00
Vladimir Dubrovin
a35b08eae6 Update c-cpp.yml 2026-03-27 18:27:10 +03:00
Vladimir Dubrovin
408a734d43 Update c-cpp.yml 2026-03-27 18:25:52 +03:00
Vladimir Dubrovin
46c714a87b test PCRE on MacOS 2026-03-27 18:21:23 +03:00
Vladimir Dubrovin
94d36c3a38 correct package name 2026-03-27 18:05:59 +03:00
Vladimir Dubrovin
4a3bd4a068 Correct PCRE_CHECK 2026-03-27 18:04:40 +03:00
Vladimir Dubrovin
3a2223b798 Use external PCRE library 2026-03-27 17:56:56 +03:00
Vladimir Dubrovin
cbab9a2fe2 Use external PCRE library 2026-03-27 17:53:35 +03:00
Vladimir Dubrovin
5fde85f781 Use flags in checks 2026-03-27 17:17:32 +03:00
Vladimir Dubrovin
e21065d498 correct CPPFLAGS to CFLAGS 2026-03-27 17:12:30 +03:00
Vladimir Dubrovin
e23365e435 Try to use env variables in Mac flow 2026-03-27 17:07:55 +03:00
Vladimir Dubrovin
b678c9feff install libraries for macos 2026-03-27 16:55:14 +03:00
Vladimir Dubrovin
cd912f4287 Fix Makefile for Linux 2026-03-27 16:41:13 +03:00
Vladimir Dubrovin
3f7fb25bd0 Install linux libraries in github flow 2026-03-27 16:40:21 +03:00
Vladimir Dubrovin
4936ae0974 Fix warning 2026-03-27 16:12:30 +03:00
Vladimir Dubrovin
dfd6fe5a51 Correct PAM_CHECK in makefiles 2026-03-27 16:09:22 +03:00
Vladimir Dubrovin
b76a78228f Detect OpenSSL / pam libraries in Makefiles 2026-03-27 15:52:02 +03:00
Vladimir Dubrovin
b0755ea482 Use 64 bit arithmetics for rate limits 2026-03-27 13:23:06 +03:00
Vladimir Dubrovin
ed0a242f24 Allow redefine LIBS and PLUGINS 2026-03-27 12:56:56 +03:00
Vladimir Dubrovin
cd79f31034 remove SSL_shutdown 2026-03-27 12:21:00 +03:00
Vladimir Dubrovin
6143dfcb18 Use quit shutdown for SSL to prevent races
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-03-27 12:00:57 +03:00
Vladimir Dubrovin
a2edecfbad Fix potential use-after-free on filters, add SSL_shutdown in SSLPlugin
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-03-26 20:46:54 +03:00
Vladimir Dubrovin
be8fa4542c SNI break (DPI bypass) added
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
-s option to tlspr (or tls type redirect), requires TCP_NODELAY to be set

auth iponly
allow *
parent 1000 tls 0.0.0.0 0
allow *
proxy -s -i127.0.0.1 -ocTCP_NODELAY -osTCP_NODELAY -p1443
2026-03-10 13:38:09 +03:00
Vladimir Dubrovin
12c9039ea4 Fixed: crash on invalid configuration file
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2026-01-28 19:40:58 +03:00
Vladimir Dubrovin
1a970c5c98 Fixed: memory corruptions on config parsing 2026-01-28 19:13:41 +03:00
Vladimir Dubrovin
fdeee233de ssl_client_mode added, code cleanup
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
ssl_client_mode
0 (default) - handshake immediately after connect() (with first parent or with destination if there is no parent)
1 - handshake with destination server (handshake after connection via parents is established)
2 - handshake after data channel is established (e.g. after CONNECT)
2025-12-31 19:56:52 +03:00
Vladimir Dubrovin
aab8531072 ssl_client_alpn added 2025-12-31 13:47:31 +03:00
Vladimir Dubrovin
d014bb1149 Use SSL_connect / SSL_accept in non-blocking mode
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2025-12-30 17:57:23 +03:00
Vladimir Dubrovin
730fd96fb0 Fixed: allow ssl server and client on the same service 2025-12-30 15:40:03 +03:00
Vladimir Dubrovin
b5ab5b8906 client_sni command added; do not send hostname from request as SNI in SSL client configuration
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-12-12 19:08:26 +03:00
Vladimir Dubrovin
ec7004cd6f Close SSL on shutdown 2025-12-12 18:25:40 +03:00
Vladimir Dubrovin
fe53378596 maxseg / TCP_MAXSEG support added
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-11-29 15:05:29 +03:00
Vladimir Dubrovin
5450ca4cdf Fixed: invalid config value initializers 2025-11-29 14:46:01 +03:00
Vladimir Dubrovin
fbca6d8e93 Update c-cpp.yml
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-11-17 16:21:53 +03:00
Vladimir Dubrovin
7353b77206
Update c-cpp.yml 2025-11-17 15:40:26 +03:00
Vladimir Dubrovin
08d3f5fa76
Update c-cpp.yml 2025-11-17 15:38:40 +03:00
Alexey Suslov
7a1ca8d341
Fix HTTPS proxy for HTTPS addresses (#1175) 2025-11-17 15:31:54 +03:00
Vladimir Dubrovin
c5ba790d13 Fix: -P option for tlspr
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-10-03 17:06:11 +03:00
Vladimir Dubrovin
fe617048f1 Fix: WSAPoll fail in some Windows versions after e525ce913e
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-08-13 17:53:19 +03:00
Vladimir Dubrovin
8fcc358e43 Update c-cpp.yml
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-08-10 15:47:41 +03:00
Vladimir Dubrovin
352b570413 Update c-cpp.yml 2025-08-10 15:45:49 +03:00
Vladimir Dubrovin
6d93ffec5d Update c-cpp.yml 2025-08-10 15:44:55 +03:00
Vladimir Dubrovin
613f51599b Update c-cpp.yml 2025-08-10 15:43:45 +03:00
Vladimir Dubrovin
24967c9e2b Update c-cpp.yml 2025-08-10 15:42:11 +03:00
Vladimir Dubrovin
a281c05259 Update c-cpp.yml 2025-08-10 15:39:16 +03:00
Vladimir Dubrovin
cc06d305d5 Update c-cpp.yml 2025-08-10 15:34:57 +03:00
Vladimir Dubrovin
012987eb1c Update c-cpp.yml 2025-08-10 15:29:58 +03:00
Vladimir Dubrovin
4eefe0ccff Update c-cpp.yml 2025-08-10 15:14:12 +03:00
Vladimir Dubrovin
b1233e580c Merge branch 'master' of https://github.com/3proxy/3proxy 2025-08-10 15:12:46 +03:00
Vladimir Dubrovin
52cf4af0ac Update c-cpp.yml 2025-08-10 15:12:41 +03:00
Sertonix
d0ccaa07c3
Fix race condition in make install on linux (#1129)
Since INSTALL_CFG_DEST is a symlink we also need to make sure that the target always exists before installing anything to it.

Fixes f860ea9e54 Install chrooted configuration with make install on linux
2025-08-10 14:46:48 +03:00
bipface
83e4f181b3
Fix missing semicolons in debian postinst script (#1158)
These missing semicolons cause some errors to be printed during installation, such as: `Failed to stop bin-systemctl.mount: Unit bin-systemctl.mount not loaded.`
2025-08-10 14:39:49 +03:00
Vladimir Dubrovin
724946a834 Fixed: ssl_server_cert doesn't read full certificate chain 2025-08-10 14:36:00 +03:00
Vladimir Dubrovin
2966836dfa Fixed: CONNECT does not work in standalone 'proxy' binary
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-08-05 17:39:11 +03:00
Vladimir Dubrovin
e525ce913e Fixed: Failed connect may result in success response on some Windows versions 2025-08-05 17:38:38 +03:00
Vladimir Dubrovin
6916cea4eb Merge branch 'master' of https://github.com/3proxy/3proxy 2025-08-05 15:08:55 +03:00
Vladimir Dubrovin
db618f780b Fixed: invalid timeout in socksendto / sockrecvfrom 2025-08-05 15:07:50 +03:00
danyhm
6c2ba01394
Update Makefile.msvc64 (#1152)
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Fix build for windows x64 MSVC
2025-06-30 17:16:36 +03:00
Vladimir Dubrovin
a3e13d8211 Convert PAMAUTH.TXT to UTF-8 2025-06-23 19:24:27 +03:00
Vladimir Dubrovin
dc4e8d3427 Fixed service name detection for auto / tlspr
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-05-06 18:59:04 +03:00
Vladimir Dubrovin
57841074b9 Avoid sleep on service thread sync
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-04-16 21:29:48 +03:00
Vladimir Dubrovin
7320094c11 SOCKSTRACE fixed
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-04-15 19:51:01 +03:00
Vladimir Dubrovin
43d48adeb9 ssl_server_verify, ssl_server_ca_dir, ssl_server_ca_store added, ssl_server / ssl_client aliases added to ssl_serv / ssl_cli 2025-04-15 19:18:14 +03:00
Vladimir Dubrovin
6355f9659b ssl_noserv fixed, ssl_cli/ssl_nocli/ssl_client_cert/ssl_client_key added
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2025-04-14 21:40:59 +03:00
Vladimir Dubrovin
7aad0205e1 Remove legacy NTLMv1 code
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2025-03-17 19:44:48 +03:00
Vladimir Dubrovin
89b45b1b2a Support HAProxy proxy v1 protocol
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Added:
-H option - expect HAProxy proxy v1 header, e.g. `proxy -H`

parent ha type - send HAProxy proxy v1 header (must be last in redirection), e.g.

allow *
parent 1000 ha
parent 1000 proxy 1.2.3.4 3128
socks
2025-03-15 15:54:29 +03:00
Vladimir Dubrovin
27c9e62faa Merge branch 'master' of https://github.com/3proxy/3proxy
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2025-03-15 13:03:25 +03:00
Vladimir Dubrovin
7888502cd5 Support tlspr in auto 2025-03-15 13:02:46 +03:00
z3apa3a
9429421314 Fix Makefile.llvm 2025-03-15 11:52:33 +03:00
z3apa3a
00b3e02e05 Add 3proxy.rc to Makefile.llvm 2025-03-15 11:50:51 +03:00
z3apa3a
08177f2161 Fix Makefile.win 2025-03-15 11:21:08 +03:00
z3apa3a
188b0a2841 Add resources compilation to Makefile.win 2025-03-15 11:17:59 +03:00
Vladimir Dubrovin
a37e6e5a81 Fix Makefile.win
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2025-03-14 22:25:26 +03:00
Vladimir Dubrovin
8fc31a7336 return lost tabs into Makefiles 2025-03-14 22:23:15 +03:00
Vladimir Dubrovin
4eb0ca60b7
Update Makefile.win 2025-03-14 21:02:08 +03:00
Vladimir Dubrovin
584fdfd51f
Update Makefile.win 2025-03-14 21:00:22 +03:00
Vladimir Dubrovin
5a6e9c92e3
Update Makefile.win 2025-03-14 20:59:28 +03:00
Vladimir Dubrovin
eaf66dc8d1 Update git workflow
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2025-03-14 20:44:43 +03:00
Vladimir Dubrovin
e6f5f7b5e0 make compatible with openssl 1.x 2025-03-14 20:14:57 +03:00
Vladimir Dubrovin
d48f24ac84 rsa.h not required 2025-03-14 19:56:58 +03:00
Vladimir Dubrovin
4de45ff3a8
Use PCRE_STATIC pcre_plugin.c 2025-03-14 18:03:26 +03:00
Vladimir Dubrovin
74081c8146
use PCRE_STATIC 2025-03-14 17:55:09 +03:00
Vladimir Dubrovin
c71370ec03
Update c-cpp.yml
Do not try to install on mac
2025-03-14 17:04:42 +03:00
Vladimir Dubrovin
b1b64972c5
Update c-cpp.yml
add more targets
2025-03-14 17:02:05 +03:00
Vladimir Dubrovin
db7ef4ba2f
Update c-cpp.yml 2025-03-14 16:52:11 +03:00
Vladimir Dubrovin
51fc2f6dcb
Update c-cpp.yml 2025-03-14 16:38:47 +03:00
Vladimir Dubrovin
16bd55a074
Update c-cpp.yml 2025-03-14 16:28:40 +03:00
Vladimir Dubrovin
0ca9030520
Update c-cpp.yml 2025-03-14 16:27:16 +03:00
Vladimir Dubrovin
87255a8201
Create c-cpp.yml 2025-03-14 16:22:13 +03:00
Vladimir Dubrovin
d80889474b
Update README 2025-03-10 14:07:43 +03:00
Vladimir Dubrovin
8133480b11
Update README 2025-03-10 14:06:29 +03:00
2 changed files with 7 additions and 13 deletions

View File

@ -1,4 +1,4 @@
name: RPM build aarch64 name: RPM build arm64
on: on:
push: push:
@ -42,10 +42,10 @@ jobs:
cd ~/rpmbuild/SPECS cd ~/rpmbuild/SPECS
rpmbuild -ba 3proxy-$RELEASE.spec rpmbuild -ba 3proxy-$RELEASE.spec
cd $ret cd $ret
mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm 3proxy-$RELEASE.aarch64.rpm mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm 3proxy-$RELEASE.arm64.rpm
- name: Get artifact - name: Get artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: "3proxy-${{ env.RELEASE }}-aarch64.rpm" name: "3proxy-${{ env.RELEASE }}-arm64.rpm"
path: "*.rpm" path: "*.rpm"

View File

@ -1,4 +1,4 @@
name: RPM build armhf name: RPM build arm
on: on:
push: push:
@ -49,7 +49,7 @@ jobs:
echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/ubuntu.sources echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/ubuntu.sources
sudo cp ~/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources sudo cp ~/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources
sudo apt update sudo apt update
sudo apt install libssl3t64:armhf openssl:armhf libssl-dev:armhf libpam0g:armhf libpam0g-dev:armhf libpcre2-dev:armhf rpm crossbuild-essential-armhf sudo apt install libssl-dev:armhf libpam0g:armhf libpam0g-dev:armhf libpcre2-dev:armhf rpm crossbuild-essential-armhf
- name: make rpmbuild dir - name: make rpmbuild dir
run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
- name: configure rpm env - name: configure rpm env
@ -61,18 +61,12 @@ jobs:
run: | run: |
ret=`pwd` ret=`pwd`
cd ~/rpmbuild/SPECS cd ~/rpmbuild/SPECS
PATH=/usr/arm-linux-gnueabihf/bin:$PATH
export PATH=$PATH
CC=arm-linux-gnueabihf-gcc
export CC=$CC
export RPATH=/usr/arm-linux-gnueabihf/lib:$RPATH
export LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib:$LD_LIBRARY_PATH
rpmbuild -ba --define "PAMLIB pam0g" --define "_arch arm" --define "cross yes" --target=arm-linux-gnueabi 3proxy-$RELEASE.spec rpmbuild -ba --define "PAMLIB pam0g" --define "_arch arm" --define "cross yes" --target=arm-linux-gnueabi 3proxy-$RELEASE.spec
cd $ret cd $ret
mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm 3proxy-$RELEASE.armhf.rpm mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm 3proxy-$RELEASE.arm.rpm
- name: Get artifact - name: Get artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: "3proxy-${{ env.RELEASE }}-armhf.rpm" name: "3proxy-${{ env.RELEASE }}-arm.rpm"
path: "*.rpm" path: "*.rpm"