From d1b0c8f314e436a7b586993c395c0857024d62c9 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Sat, 30 May 2026 16:18:40 +0300
Subject: [PATCH] Fix deb/rpm builds

---
 CMakeLists.txt         | 24 ++++++++++++------------
 debian/3proxy.manpages | 11 -----------
 debian/conffiles       |  4 ++++
 debian/rules           | 21 +++++++++++++++++----
 scripts/rh/3proxy.spec |  2 +-
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39cd177..db41fe4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,20 +64,20 @@ endif()
 # For crypt: if prefix is empty, "my" is used instead (→ mycrypt)
 set(3PROXY_BINARY_PREFIX "3proxy_" CACHE STRING "Prefix for standalone module and crypt binary names")
 
-# Standalone module build options (OFF by default)
-option(3PROXY_BUILD_ALL   "Build all standalone binaries"   OFF)
-option(3PROXY_BUILD_PROXY  "Build standalone proxy binary"  OFF)
-option(3PROXY_BUILD_SOCKS  "Build standalone socks binary"  OFF)
-option(3PROXY_BUILD_POP3P  "Build standalone pop3p binary"  OFF)
-option(3PROXY_BUILD_SMTPP  "Build standalone smtpp binary"  OFF)
-option(3PROXY_BUILD_FTPPR  "Build standalone ftppr binary"  OFF)
-option(3PROXY_BUILD_TCPPM  "Build standalone tcppm binary"  OFF)
-option(3PROXY_BUILD_UDPPM  "Build standalone udppm binary"  OFF)
-option(3PROXY_BUILD_TLSPR  "Build standalone tlspr binary"  OFF)
+# Standalone module build options (ON by default)
+option(3PROXY_BUILD_NONE   "Do not build standalone binaries"   OFF)
+option(3PROXY_BUILD_PROXY  "Build standalone proxy binary"  ON)
+option(3PROXY_BUILD_SOCKS  "Build standalone socks binary"  ON)
+option(3PROXY_BUILD_POP3P  "Build standalone pop3p binary"  ON)
+option(3PROXY_BUILD_SMTPP  "Build standalone smtpp binary"  ON)
+option(3PROXY_BUILD_FTPPR  "Build standalone ftppr binary"  ON)
+option(3PROXY_BUILD_TCPPM  "Build standalone tcppm binary"  ON)
+option(3PROXY_BUILD_UDPPM  "Build standalone udppm binary"  ON)
+option(3PROXY_BUILD_TLSPR  "Build standalone tlspr binary"  ON)
 
-if(3PROXY_BUILD_ALL)
+if(3PROXY_BUILD_NONE)
     foreach(_M PROXY SOCKS POP3P SMTPP FTPPR TCPPM UDPPM TLSPR)
-        set(3PROXY_BUILD_${_M} ON)
+        set(3PROXY_BUILD_${_M} OFF)
     endforeach()
 endif()
 
diff --git a/debian/3proxy.manpages b/debian/3proxy.manpages
index e7e4124..e69de29 100644
--- a/debian/3proxy.manpages
+++ b/debian/3proxy.manpages
@@ -1,11 +0,0 @@
-man/3proxy.8
-man/3proxy.cfg.5
-man/3proxy_ftppr.8
-man/3proxy_pop3p.8
-man/3proxy_tlspr.8
-man/3proxy_proxy.8
-man/3proxy_smtpp.8
-man/3proxy_socks.8
-man/3proxy_tcppm.8
-man/3proxy_udppm.8
-man/3proxy_crypt.8
diff --git a/debian/conffiles b/debian/conffiles
index e69de29..41544e6 100644
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -0,0 +1,4 @@
+/etc/3proxy/3proxy.cfg
+/usr/local/3proxy/conf/3proxy.cfg
+/usr/local/3proxy/conf/bandlimiters
+/usr/local/3proxy/conf/counters
diff --git a/debian/rules b/debian/rules
index aacf054..ffae8d6 100644
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,21 @@
 %:
 	dh $@
 
-override_dh_auto_clean:
-	find src/ -type f -name "*.o" -delete
-	find src/ -type f -name "Makefile.var" -delete
-	find bin/ -type f -executable -delete
+override_dh_auto_configure:
+	ln -sf Makefile.Linux Makefile
 
+override_dh_auto_build:
+	$(MAKE)
+
+override_dh_auto_install:
+	$(MAKE) DESTDIR=debian/3proxy install
+
+override_dh_installman:
+
+override_dh_usrlocal:
+
+override_dh_auto_clean:
+	find src/ -type f -name "*.o" -delete                               
+	find src/ -type f -name "Makefile.var" -delete                    
+	find bin/ -type f -executable -delete 
+	rm -f Makefile
diff --git a/scripts/rh/3proxy.spec b/scripts/rh/3proxy.spec
index efbabde..bd537ef 100644
--- a/scripts/rh/3proxy.spec
+++ b/scripts/rh/3proxy.spec
@@ -50,7 +50,7 @@ make clean
 %config(noreplace) /usr/local/3proxy/conf/bandlimiters
 %config(noreplace) /usr/local/3proxy/conf/counters
 /usr/local/3proxy/libexec/*.ld.so
-/usr/share/man/man5/3proxy.cfg.5
+/usr/share/man/man5/3proxy.cfg.5*
 /usr/share/man/man8/*
 /var/log/3proxy