Fix issue with libproxychains library naming on mac os.

haad · Dec 29, 2023 · 5cd04b7 · 5cd04b7
1 parent 87733ca
commit 5cd04b7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/buildci.yml b/.github/workflows/buildci.yml
@@ -22,11 +22,10 @@ jobs:
         run: ./proxychains4 -v
 
       - name: Run tests
-        run: ./proxychains4 -f dist/proxychains.conf curl -o /dev/null -v https://sme.sk
+        run: ./src/proxychains -f dist/proxychains.conf curl -o /dev/null -v https://sme.sk
 
       - name: Run tests
-        run: ./proxychains4 -f dist/proxychains.conf curl -o /dev/null -v https://sme.sk
-
+        run: ./src/proxychains -f dist/proxychains.conf ping -t 1 sme.sk
   build-macos:
     runs-on: macos-latest
     steps:
@@ -42,6 +41,9 @@ jobs:
         run: ./proxychains4 -v
 
       - name: Run tests
-        run: ./proxychains4 -f dist/proxychains.conf curl -o /dev/null -v https://sme.sk
+        run: ./src/proxychains -f dist/proxychains.conf curl -o /dev/null -v https://sme.sk
+
+      - name: Run tests
+        run: ./src/proxychains -f dist/proxychains.conf ping -t 1 sme.sk
 
 
diff --git a/Makefile b/Makefile
@@ -27,14 +27,11 @@ PIC     = -fPIC
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
 
-LDSO_SUFFIX = so
 LD_SET_SONAME = -Wl
 INSTALL_FLAGS = -D -m
 
 -include config.mak
 
-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
-
 SHARED_LIBS = $(LDSO_PATHNAME)
 ALL_LIBS = $(SHARED_LIBS)
 PXCHAINS = proxychains4
@@ -45,6 +42,16 @@ LDFLAGS+=$(USER_LDFLAGS) $(OS_LDFLAGS)
 CXXFLAGS+=$(CCFLAGS) $(USER_CFLAGS) $(OS_CFLAGS)
 CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DINSTALL_PREFIX=\"$(prefix)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\" -DSYSCONFDIR=\"$(confdir)\"
 
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+    LDSO_SUFFIX = so
+endif
+ifeq ($(UNAME_S),Darwin)
+    LDSO_SUFFIX = dylib
+endif
+LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
+
+
 all: $(ALL_LIBS) $(ALL_TOOLS)
 
 #install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(DESTDIR)$(LDSO_PATHNAME)

diff --git a/dist/proxychains.conf b/dist/proxychains.conf
@@ -6,7 +6,8 @@ tcp_connect_time_out 8000
 
 localnet 127.0.0.0/255.0.0.0
 
+
 [ProxyList]
+http 162.243.184.252 8585
 #socks4 184.170.245.148 4145
 #raw 162.243.184.252 8585
-http 162.243.184.252 8585
diff --git a/src/proxychains b/src/proxychains
@@ -4,7 +4,7 @@ echo "ProxyChains-4.0 (https://github.com/haad/proxychains)"
 usage() {
 
 	echo "	usage:"
-	echo "	$0 [hq] [-f config-file] <prog> [args]"
+	echo "	$0 [hqv] [-f config-file] <prog> [args]"
 	echo "		-q make proxychains quiet"
 	exit
 }