Merge ccdecfd832 into 3bfabb29f8

pass -fPIC for plugins (so) only
Update README with alternative Docker image information
2026-08-13 12:19:17 +08:00 · 2026-07-30 04:15:26 -07:00 · 2026-07-28 18:59:02 +03:00 · 2026-06-02 18:32:47 +04:00
10 changed files with 14 additions and 11 deletions
--- a/Makefile.Linux
+++ b/Makefile.Linux
@ -9,12 +9,12 @@ PREFIX ?= 3proxy_
 CRYPT_PREFIX ?= $(PREFIX)
 CC ?= gcc

-CFLAGS ?= -O3 -flto -fPIC
+CFLAGS ?= -O3 -flto
 CFLAGS += -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER -D WITH_UN
 COUT = -o 
 LN ?= ${CC}
-DCFLAGS ?= 
-LDFLAGS ?= -O3 -flto -fPIC
+DCFLAGS ?= -fPIC
+LDFLAGS ?= -O3 -flto
 LDFLAGS += -fno-strict-aliasing -pthread
 DLFLAGS ?= -shared
 DLSUFFICS = .ld.so
--- a/README.md
+++ b/README.md
@ -18,6 +18,9 @@ https://github.com/3proxy/3proxy/releases
 https://hub.docker.com/r/3proxy/3proxy
 https://github.com/3proxy/3proxy/pkgs/container/3proxy

+> [!TIP]
+> An alternative Docker image (community-maintained) with support for configuration through environment variables and a ready-to-use Helm chart for Kubernetes can be found here: [tarampampam/3proxy-docker](https://github.com/tarampampam/3proxy-docker).
+
 ### Archive of old versions

 https://github.com/z3APA3A/3proxy-archive
--- a/src/plugins/FilePlugin/Makefile.inc
+++ b/src/plugins/FilePlugin/Makefile.inc
@ -1,7 +1,7 @@
 all: $(BUILDDIR)FilePlugin$(DLSUFFICS)

 FilePlugin$(OBJSUFFICS): FilePlugin.c
-	$(CC) $(DCFLAGS) $(CFLAGS) FilePlugin.c
+	$(CC) $(CFLAGS) $(DCFLAGS) FilePlugin.c

 $(BUILDDIR)FilePlugin$(DLSUFFICS): FilePlugin$(OBJSUFFICS)
 	$(LN) $(LNOUT)../../$(BUILDDIR)FilePlugin$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) FilePlugin$(OBJSUFFICS)
--- a/src/plugins/LdapPlugin/Makefile.inc
+++ b/src/plugins/LdapPlugin/Makefile.inc
@ -1,7 +1,7 @@
 all: $(BUILDDIR)ldapauth$(DLSUFFICS)

 ldapauth$(OBJSUFFICS): ldapauth.c
-	$(CC) $(DCFLAGS) $(CFLAGS) ldapauth.c
+	$(CC) $(CFLAGS) $(DCFLAGS) ldapauth.c

 $(BUILDDIR)ldapauth$(DLSUFFICS): ldapauth$(OBJSUFFICS)
 	$(LN) $(LNOUT)../../$(BUILDDIR)ldapauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)ldap$(LIBSSUFFIX) ldapauth$(OBJSUFFICS)
--- a/src/plugins/PamAuth/Makefile.inc
+++ b/src/plugins/PamAuth/Makefile.inc
@ -3,7 +3,7 @@ PAMLIB ?= pam
 all: $(BUILDDIR)pamauth$(DLSUFFICS)

 pamauth$(OBJSUFFICS): pamauth.c
-	$(CC) $(DCFLAGS) $(CFLAGS) pamauth.c
+	$(CC) $(CFLAGS) $(DCFLAGS) pamauth.c

 $(BUILDDIR)pamauth$(DLSUFFICS): pamauth$(OBJSUFFICS)
 	$(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)$(PAMLIB)$(LIBSSUFFIX) pamauth$(OBJSUFFICS)
--- a/src/plugins/StringsPlugin/Makefile.inc
+++ b/src/plugins/StringsPlugin/Makefile.inc
@ -1,7 +1,7 @@
 all: $(BUILDDIR)StringsPlugin$(DLSUFFICS)

 StringsPlugin$(OBJSUFFICS): StringsPlugin.c
-	$(CC) $(DCFLAGS) $(CFLAGS) StringsPlugin.c
+	$(CC) $(CFLAGS) $(DCFLAGS) StringsPlugin.c

 $(BUILDDIR)StringsPlugin$(DLSUFFICS): StringsPlugin$(OBJSUFFICS)
 	$(LN) $(LNOUT)../../$(BUILDDIR)StringsPlugin$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) StringsPlugin$(OBJSUFFICS)
--- a/src/plugins/TrafficPlugin/Makefile.inc
+++ b/src/plugins/TrafficPlugin/Makefile.inc
@ -1,7 +1,7 @@
 all: $(BUILDDIR)TrafficPlugin$(DLSUFFICS)

 TrafficPlugin$(OBJSUFFICS): TrafficPlugin.c
-	$(CC) $(DCFLAGS) $(CFLAGS) TrafficPlugin.c
+	$(CC) $(CFLAGS) $(DCFLAGS) TrafficPlugin.c

 $(BUILDDIR)TrafficPlugin$(DLSUFFICS): TrafficPlugin$(OBJSUFFICS)
 	$(LN) $(LNOUT)../../$(BUILDDIR)TrafficPlugin$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) TrafficPlugin$(OBJSUFFICS)
--- a/src/plugins/TransparentPlugin/Makefile.inc
+++ b/src/plugins/TransparentPlugin/Makefile.inc
@ -3,7 +3,7 @@ all: $(BUILDDIR)TransparentPlugin$(DLSUFFICS)


 transparent_plugin$(OBJSUFFICS): transparent_plugin.c
-	$(CC) $(DCFLAGS) $(CFLAGS) transparent_plugin.c
+	$(CC) $(CFLAGS) $(DCFLAGS) transparent_plugin.c


 $(BUILDDIR)TransparentPlugin$(DLSUFFICS): transparent_plugin$(OBJSUFFICS)
--- a/src/plugins/WindowsAuthentication/Makefile.inc
+++ b/src/plugins/WindowsAuthentication/Makefile.inc
@ -1,7 +1,7 @@
 all: $(BUILDDIR)WindowsAuthentication$(DLSUFFICS)

 WindowsAuthentication$(OBJSUFFICS): WindowsAuthentication.c
-	$(CC) $(DCFLAGS) $(CFLAGS) WindowsAuthentication.c
+	$(CC) $(CFLAGS) $(DCFLAGS) WindowsAuthentication.c

 $(BUILDDIR)WindowsAuthentication$(DLSUFFICS): WindowsAuthentication$(OBJSUFFICS)
 	$(LN) $(LNOUT)../../$(BUILDDIR)WindowsAuthentication$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) WindowsAuthentication$(OBJSUFFICS) $(LIBS)
--- a/src/plugins/utf8tocp1251/Makefile.inc
+++ b/src/plugins/utf8tocp1251/Makefile.inc
@ -1,7 +1,7 @@
 all: $(BUILDDIR)utf8tocp1251$(DLSUFFICS)

 utf8tocp1251$(OBJSUFFICS): utf8tocp1251.c
-	$(CC) $(DCFLAGS) $(CFLAGS) utf8tocp1251.c
+	$(CC) $(CFLAGS) $(DCFLAGS) utf8tocp1251.c

 $(BUILDDIR)utf8tocp1251$(DLSUFFICS): utf8tocp1251$(OBJSUFFICS)
 	$(LN) $(LNOUT)../../$(BUILDDIR)utf8tocp1251$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) utf8tocp1251$(OBJSUFFICS) $(LIBS)
Author	SHA1	Message	Date
Pаramtamtām	15c884748f	Merge `ccdecfd832` into `3bfabb29f8`	2026-07-30 04:15:26 -07:00
Vladimir Dubrovin	3bfabb29f8	pass -fPIC for plugins (so) only Some checks failed C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled Details C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled Details	2026-07-28 18:59:02 +03:00
Pаramtamtām	ccdecfd832	Update README with alternative Docker image information Added a tip about an alternative Docker image with Helm chart support.	2026-06-02 18:32:47 +04:00