Modify the shlib Makefile to build a shared object correctly under

NetBSD (the ld step to create relocatable object files was missing),
and modify runsocks to use the correct shared object name.

1 files changed, 173 insertions, 0 deletions

diff --git a/net/socks5/patches/patch-aa b/net/socks5/patches/patch-aa
new file mode 100644
index 00000000000..f74335c73d1
--- /dev/null
+++ b/net/socks5/patches/patch-aa
@@ -0,0 +1,173 @@
+--- shlib/Makefile.in	1997/11/21 14:05:10	1.1
++++ shlib/Makefile.in	1997/11/21 14:20:18
+@@ -81,7 +81,7 @@
+ 	if [ -n "$(SHLIB_LIB)" -a -f "$(SHLIB_LIB)" ] ; then $(INSTALL) $(SHLIB_LIB) $(SHLIB_DIR) ; $(INSTALL) runsocks $(exec_prefix)/bin; fi
+ 
+ clean:
+-	-$(BINRM) *.o $(SHLIB_LIB) $(PLUGIN_LIBS) so_locations
++	-$(BINRM) *.o *.so $(SHLIB_LIB) $(PLUGIN_LIBS) so_locations
+ 
+ distclean: clean
+ 	-$(BINRM) Makefile runsocks *~ #*# *.bak
+@@ -92,70 +92,116 @@
+ 
+ 
+ msg.o: $(srcdir)/../lib/msg.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/msg.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/msg.c -o msg.so
++	${LD} -x -r msg.so -o msg.o
++	rm -f msg.so
+ 
+ protocol.o: $(srcdir)/../lib/protocol.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/protocol.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/protocol.c -o protocol.so
++	${LD} -x -r protocol.so -o protocol.o
++	rm -f protocol.so
+ 
+ log.o: $(srcdir)/../lib/log.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/log.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/log.c -o log.so
++	${LD} -x -r log.so -o log.o
++	rm -f log.so
+ 
+ hostname.o: $(srcdir)/../lib/hostname.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/hostname.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/hostname.c -o hostname.so
++	${LD} -x -r hostname.so -o hostname.o
++	rm -f hostname.so
+ 
+ confutil.o: $(srcdir)/../lib/confutil.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/confutil.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/confutil.c -o confutil.so
++	${LD} -x -r confutil.so -o confutil.o
++	rm -f confutil.so
+ 
+ buffer.o: $(srcdir)/../lib/buffer.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/buffer.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/buffer.c -o buffer.so
++	${LD} -x -r buffer.so -o buffer.o
++	rm -f buffer.so
+ 
+ cache.o: $(srcdir)/../lib/cache.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/cache.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/cache.c -o cache.so
++	${LD} -x -r cache.so -o cache.o
++	rm -f cache.so
+ 
+ wrap.o: $(srcdir)/../lib/wrap.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap.c -o wrap.so
++	${LD} -x -r wrap.so -o wrap.o
++	rm -f wrap.so
+ 
+ wrap_tcp.o: $(srcdir)/../lib/wrap_tcp.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_tcp.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_tcp.c -o wrap_tcp.so
++	${LD} -x -r wrap_tcp.so -o wrap_tcp.o
++	rm -f wrap_tcp.so
+ 
+ wrap_udp.o: $(srcdir)/../lib/wrap_udp.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_udp.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_udp.c -o wrap_udp.so
++	${LD} -x -r wrap_udp.so -o wrap_udp.o
++	rm -f wrap_udp.so
+ 
+ conf.o: $(srcdir)/../lib/conf.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/conf.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/conf.c -o conf.so
++	${LD} -x -r conf.so -o conf.o
++	rm -f conf.so
+ 
+ libproto.o: $(srcdir)/../lib/libproto.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/libproto.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/libproto.c -o libproto.so
++	${LD} -x -r libproto.so -o libproto.o
++	rm -f libproto.so
+ 
+ select.o: $(srcdir)/../lib/select.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/select.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/select.c -o select.so
++	${LD} -x -r select.so -o select.o
++	rm -f select.so
+ 
+ rld.o: $(srcdir)/../lib/rld.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/rld.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/rld.c -o rld.so
++	${LD} -x -r rld.so -o rld.o
++	rm -f rld.so
+ 
+ null.o: $(srcdir)/../lib/null.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/null.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/null.c -o null.so
++	${LD} -x -r null.so -o null.o
++	rm -f null.so
+ 
+ addr.o: $(srcdir)/../lib/addr.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/addr.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/addr.c -o addr.so
++	${LD} -x -r addr.so -o addr.o
++	rm -f addr.so
+ 
+ shim.o: $(srcdir)/../lib/shim.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/shim.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/shim.c -o shim.so
++	${LD} -x -r shim.so -o shim.o
++	rm -f shim.so
+ 
+ dpin.o: $(srcdir)/../lib/dpin.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpin.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpin.c -o dpin.so
++	${LD} -x -r dpin.so -o dpin.o
++	rm -f dpin.so
+ 
+ dpinutil.o: $(srcdir)/../lib/dpinutil.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpinutil.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpinutil.c -o dpinutil.so
++	${LD} -x -r dpinutil.so -o dpinutil.o
++	rm -f dpinutil.so
+ 
+ upwd.o: $(srcdir)/../lib/upwd.c
+-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/upwd.c
++	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/upwd.c -o upwd.so
++	${LD} -x -r upwd.so -o upwd.o
++	rm -f upwd.so
+ 
+ gss.o: $(srcdir)/../lib/gss.c
+-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/gss.c
++	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/gss.c -o gss.so
++	${LD} -x -r gss.so -o gss.o
++	rm -f gss.so
+ 
+ cram.o: $(srcdir)/../lib/cram.c
+-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/cram.c
++	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/cram.c -o cram.so
++	${LD} -x -r cram.so -o cram.o
++	rm -f cram.so
+ 
+ packet.o: $(srcdir)/../server/packet.c
+-	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../server/packet.c
++	$(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../server/packet.c -o packet.so
++	${LD} -x -r packet.so -o packet.o
++	rm -f packet.so
+--- shlib/runsocks.in	1997/11/21 14:21:03	1.1
++++ shlib/runsocks.in	1997/11/21 14:23:18
+@@ -21,8 +21,8 @@
+ # in front of it.  We make the path overridable with SOCKS5_SHLIB_RUNPATH...
+ #
+ case `uname -rs` in
+-SunOS*4.*)
+-	@PRELOADS@=${SOCKS5_SHLIB_RUNPATH}@SHLIB_LIB@@PRELOADA@
++SunOS*4.*|NetBSD*)
++	@PRELOADS@=${SOCKS5_SHLIB_RUNPATH}@SHLIB_LIB@@PRELOADA@.0.0
+ 	export @PRELOADS@
+ 	;;
+ *)
+@@ -33,7 +33,7 @@
+ 		export LD_LIBRARY_PATH
+ 	fi
+ 
+-	@PRELOADS@=@SHLIB_LIB@@PRELOADA@
++	@PRELOADS@=@SHLIB_LIB@@PRELOADA@.0.0
+ 	export LD_LIBRARY_PATH
+ 	;;
+ esac