Fix blake2 for Watcom

.github/workflows/build-watcom.yml

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

.github/workflows/build-win32.yml

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

.github/workflows/build-win64.yml

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

.github/workflows/build-winarm64.yml

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

RELEASE

@@ -1 +1 @@
-0.9.6
+0.9.6.1

debian/changelog

@@ -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 initial build

scripts/rh/3proxy.spec

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

src/auth.c

@@ -823,7 +823,7 @@ int doauth(struct clientparam * param){
 				(res = (*authfuncs->authorize)(param)))
 					return res;
 			if(conf.authcachetype && authfuncs->authenticate && authfuncs->authenticate != cacheauth && param->username && (!(conf.authcachetype&4) || (!param->pwtype && param->password))){
-			    struct authcache ac={};
+			    struct authcache ac={.username=""};
 			    
 			    if(param->username) strncpy((char *)ac.username, (char *)param->username, 64);
 			    if(*SAFAMILY(&param->sincr) == AF_INET

src/conf.c

@@ -153,6 +153,7 @@ int start_proxy_thread(struct child * chp){
   pthread_t thread;
 #ifdef _WIN32
   HANDLE h;
+  DWORD num;
 #endif
   char r[1];
 
@@ -171,7 +172,7 @@ int start_proxy_thread(struct child * chp){
 	pthread_attr_destroy(&pa);
 #endif
 #ifdef _WIN32
-	ReadFile(conf.threadinit[0], r, 1, NULL, NULL);
+	ReadFile(conf.threadinit[0], r, 1, &num, NULL);
 #else
 	while(read(conf.threadinit[0], r, 1) !=1) if(errno != EINTR) {
 	    fprintf(stderr, "pipe failed\n");

src/libs/blake2.h

@@ -18,7 +18,9 @@
 #include <stddef.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))
 #else
 #define BLAKE2_PACKED(x) x __attribute__((packed))

src/plugins/SSLPlugin/ssl_plugin.c

@@ -279,7 +279,7 @@ SSL_CONN ssl_handshake_to_server(SOCKET s, char * hostname, SSL_CONFIG *config,
 #endif
 
     do {
-	struct pollfd fds[1] = {{}};
+	struct pollfd fds[1] = {{INVALID_SOCKET}};
 	int sslerr;
 
 	err = SSL_connect(conn->ssl);
@@ -350,7 +350,7 @@ SSL_CONN ssl_handshake_to_client(SOCKET s, SSL_CONFIG *config, X509 *server_cert
     SSL_set_fd(conn->ssl, s);
 
     do {
-	struct pollfd fds[1] = {{}};
+	struct pollfd fds[1] = {{INVALID_SOCKET}};
 	int sslerr;
 
 	err = SSL_accept(conn->ssl);

src/proxymain.c

@@ -116,11 +116,11 @@ void * threadfunc (void *p) {
 #undef param
 
 int pushthreadinit(){
-    return 
 #ifdef _WIN32
-    WriteFile(conf.threadinit[1], "1", 1, NULL, NULL);
+    DWORD n;
+    return WriteFile(conf.threadinit[1], "1", 1, &n, NULL);
 #else
-    write(conf.threadinit[1], "1", 1);
+    return write(conf.threadinit[1], "1", 1);
 #endif
 }
 

src/version.h

@@ -1,5 +1,5 @@
 #ifndef VERSION
-#define VERSION "3proxy-0.9.6"
+#define VERSION "3proxy-0.9.6.1"
 #endif
 #ifndef BUILDDATE
 #define BUILDDATE ""
@@ -7,8 +7,8 @@
 #define MAJOR3PROXY 0
 #define SUBMAJOR3PROXY 9
 #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
 #define YEAR3PROXY "2026"
 #endif