bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-06-13 11:00:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: bughz:41c120c5273fb45b44297665b94b032b28351ead
Branches Tags
bughz:master
bughz:test-ci
bughz:0.8
bughz:0.7
bughz:0.9.6
bughz:0.9.5
bughz:0.9.4
bughz:0.9.3
bughz:0.9.2
bughz:0.9.1
bughz:0.9.0
bughz:0.9.0-rc
bughz:0.8.13
bughz:0.8.12
bughz:0.8.11
bughz:0.8.10
bughz:0.8.9
bughz:3proxy-0.8.8
bughz:0.8.8
bughz:3proxy-0.8.7
bughz:3proxy-0.8.6
bughz:3proxy-0.8.5
bughz:3proxy-0.8.4
bughz:3proxy-0.8.3
bughz:3proxy-0.8.2
bughz:3proxy-0.7.1.4
bughz:3proxy-0.8.1
bughz:3proxy-0.8.0
bughz:3proxy-0.8-pre
bughz:3proxy-0.7.1.3
bughz:3proxy-0.7.1.2
bughz:v0.7.1.2
bughz:v0.7.1.1
bughz:v0.7.1
bughz:v0.7
...
compare: bughz:e9848b6622e1226286e3b0398fa8aebd30069bef
Branches Tags
bughz:master
bughz:test-ci
bughz:0.8
bughz:0.7
bughz:0.9.6
bughz:0.9.5
bughz:0.9.4
bughz:0.9.3
bughz:0.9.2
bughz:0.9.1
bughz:0.9.0
bughz:0.9.0-rc
bughz:0.8.13
bughz:0.8.12
bughz:0.8.11
bughz:0.8.10
bughz:0.8.9
bughz:3proxy-0.8.8
bughz:0.8.8
bughz:3proxy-0.8.7
bughz:3proxy-0.8.6
bughz:3proxy-0.8.5
bughz:3proxy-0.8.4
bughz:3proxy-0.8.3
bughz:3proxy-0.8.2
bughz:3proxy-0.7.1.4
bughz:3proxy-0.8.1
bughz:3proxy-0.8.0
bughz:3proxy-0.8-pre
bughz:3proxy-0.7.1.3
bughz:3proxy-0.7.1.2
bughz:v0.7.1.2
bughz:v0.7.1.1
bughz:v0.7.1
bughz:v0.7

2 Commits
41c120c527 ... e9848b6622

Author SHA1 Message Date
Vladimir Dubrovin
e9848b6622 Fix blake2 for Watcom
Some checks failed
RPM/DEB build aarch64 / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
Details
RPM/DEB build armhf / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
Details
RPM/DEB build x86-64 / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
Details
Build Win32 3proxy-lite with Watcom / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
Build Win32 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
Build Win64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
Build Win-arm64 3proxy with MSVC / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
2026-04-24 17:43:33 +03:00
Vladimir Dubrovin
e419a21cf9 build windows release 2026-04-24 17:24:39 +03:00
9 changed files with 18 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
.github/workflows/build-watcom.yml vendored
View File

@ -2,7 +2,7 @@ name: Build Win32 3proxy-lite with Watcom
on: on:
push: push:
branches: [ "master" ] branches: [ "master", "test-ci" ]
paths: [ 'RELEASE', '.github/workflows/build-watcom.yml' ] paths: [ 'RELEASE', '.github/workflows/build-watcom.yml' ]
jobs: jobs:

2
.github/workflows/build-win32.yml vendored
View File

@ -2,7 +2,7 @@ name: Build Win32 3proxy with MSVC
on: on:
push: push:
branches: [ "master" ] branches: [ "master", "test-ci" ]
paths: [ 'RELEASE', '.github/workflows/build-win32.yml' ] paths: [ 'RELEASE', '.github/workflows/build-win32.yml' ]
jobs: jobs:

2
.github/workflows/build-win64.yml vendored
View File

@ -2,7 +2,7 @@ name: Build Win64 3proxy with MSVC
on: on:
push: push:
branches: [ "master" ] branches: [ "master", "test-ci" ]
paths: [ 'RELEASE', '.github/workflows/build-win64.yml' ] paths: [ 'RELEASE', '.github/workflows/build-win64.yml' ]
jobs: jobs:

2
.github/workflows/build-winarm64.yml vendored
View File

@ -2,7 +2,7 @@ name: Build Win-arm64 3proxy with MSVC
on: on:
push: push:
branches: [ "master" ] branches: [ "master", "test-ci" ]
paths: [ 'RELEASE', '.github/workflows/build-winarm64.yml' ] paths: [ 'RELEASE', '.github/workflows/build-winarm64.yml' ]
jobs: jobs:

2
RELEASE
View File

@ -1 +1 @@
0.9.6 0.9.6.1

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
3proxy (0.9.6.1-1) buster; urgency=medium
*3proxy 0.9.6.1 initial build
-- z3APA3A <3apa3a@3proxy.org> Fri, 24 Apr 2026 17:23:05 +0300
3proxy (0.9.6-1) buster; urgency=medium 3proxy (0.9.6-1) buster; urgency=medium
*3proxy 0.9.6 initial build *3proxy 0.9.6 initial build

2
scripts/rh/3proxy.spec
View File

@ -1,5 +1,5 @@
Name: 3proxy Name: 3proxy
Version: 0.9.6 Version: 0.9.6.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: 3proxy tiny proxy server Summary: 3proxy tiny proxy server
License: GPL/LGPL/Apache/BSD License: GPL/LGPL/Apache/BSD

4
src/libs/blake2.h
View File

@ -18,7 +18,9 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#if defined(_MSC_VER) #if defined(WATCOM)
#define BLAKE2_PACKED(x) _Packed x
#elif defined(_MSC_VER)
#define BLAKE2_PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop)) #define BLAKE2_PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop))
#else #else
#define BLAKE2_PACKED(x) x __attribute__((packed)) #define BLAKE2_PACKED(x) x __attribute__((packed))

6
src/version.h
View File

@ -1,5 +1,5 @@
#ifndef VERSION #ifndef VERSION
#define VERSION "3proxy-0.9.6" #define VERSION "3proxy-0.9.6.1"
#endif #endif
#ifndef BUILDDATE #ifndef BUILDDATE
#define BUILDDATE "" #define BUILDDATE ""
@ -7,8 +7,8 @@
#define MAJOR3PROXY 0 #define MAJOR3PROXY 0
#define SUBMAJOR3PROXY 9 #define SUBMAJOR3PROXY 9
#define MINOR3PROXY 6 #define MINOR3PROXY 6
#define SUBMINOR3PROXY 0 #define SUBMINOR3PROXY 1
#define RELEASE3PROXY "3proxy-0.9.6(" BUILDDATE ")\0" #define RELEASE3PROXY "3proxy-0.9.6.1(" BUILDDATE ")\0"
#ifndef YEAR3PROXY #ifndef YEAR3PROXY
#define YEAR3PROXY "2026" #define YEAR3PROXY "2026"
#endif #endif