update to Dante v1.1.11

This commit is contained in:
jakob 2001-12-11 03:07:21 +00:00
parent e796a3956e
commit 26e6111d95
8 changed files with 33 additions and 144 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.19 2001/05/29 14:51:33 jakob Exp $
# $OpenBSD: Makefile,v 1.20 2001/12/11 03:07:21 jakob Exp $
COMMENT= socks client and server
ONLY_FOR_ARCHS= i386 sparc m68k powerpc
DISTNAME= dante-1.1.10
DISTNAME= dante-1.1.11
CATEGORIES= security
NEED_VERSION= 1.363
NEED_VERSION= 1.500
MASTER_SITES= ftp://ftp.inet.no/pub/socks/
HOMEPAGE= http://www.inet.no/dante/
@ -22,7 +22,14 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
MODGNU_CONFIG_GUESS_DIRS+= ${WRKSRC}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dante
${INSTALL_DATA} ${WRKSRC}/doc/README.* ${PREFIX}/share/doc/dante
${INSTALL_DATA} ${WRKSRC}/doc/SOCKS4.* ${PREFIX}/share/doc/dante
${INSTALL_DATA} ${WRKSRC}/doc/rfc* ${PREFIX}/share/doc/dante
${INSTALL_DATA} ${WRKSRC}/doc/faq.ps ${PREFIX}/share/doc/dante
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dante
${INSTALL_DATA} ${WRKSRC}/example/*.conf ${PREFIX}/share/examples/dante

3
security/dante/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (dante-1.1.11.tar.gz) = fe172d2116427214df82f0133a91a32b
RMD160 (dante-1.1.11.tar.gz) = 10e54fd5706d2e4f7b97c84fa2bc72e2c2a62f4c
SHA1 (dante-1.1.11.tar.gz) = 6bc7b10d7c42fba8379c076c2165fb71e5113b9e

View File

@ -1,3 +0,0 @@
MD5 (dante-1.1.10.tar.gz) = ebb25c57efbe03eb07706cf295d59875
RMD160 (dante-1.1.10.tar.gz) = 8e3f0410566cf3a61e925b2db2d1ce2fd1d3992d
SHA1 (dante-1.1.10.tar.gz) = 70f17de4f9d45f55daa9514d268f8e927010b1b9

View File

@ -1,24 +0,0 @@
--- configure.orig Mon Jan 22 11:17:47 2001
+++ configure Mon Jan 22 11:20:44 2001
@@ -1135,21 +1135,6 @@
fi
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
# Check whether --with-gnu-ld or --without-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then

View File

@ -1,51 +0,0 @@
--- ltconfig.orig Thu Jul 8 14:17:30 1999
+++ ltconfig Mon Jan 22 11:29:29 2001
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1391,10 +1394,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1955,13 +1969,10 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix ${libname}.so'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

View File

@ -1,53 +0,0 @@
--- ltmain.sh.orig Thu Jul 8 14:17:30 1999
+++ ltmain.sh Mon Jan 22 11:21:59 2001
@@ -1798,6 +1798,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3531,40 +3534,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/01/22 17:15:29 brad Exp $
lib/libsocks.so
lib/libsocks.so.1.0
lib/libdsocks.so
@comment $OpenBSD: PFRAG.shared,v 1.5 2001/12/11 03:07:21 jakob Exp $
lib/libdsocks.so.1.0
DYNLIBDIR(%B)
lib/libsocks.so.1.0
DYNLIBDIR(%D/lib)

View File

@ -1,15 +1,27 @@
@comment $OpenBSD: PLIST,v 1.6 2001/05/29 14:51:33 jakob Exp $
@comment $OpenBSD: PLIST,v 1.7 2001/12/11 03:07:21 jakob Exp $
bin/socksify
include/socks.h
lib/libdsocks.la
lib/libdsocks.so
lib/libsocks.a
lib/libsocks.la
%%SHARED%%
man/man8/sockd.8
lib/libsocks.so
man/man5/sockd.conf.5
man/man5/socks.conf.5
man/man8/sockd.8
sbin/sockd
share/doc/dante/README.msproxy
share/doc/dante/README.socksify
share/doc/dante/README.survey
share/doc/dante/README.usage
share/doc/dante/SOCKS4.protocol
share/doc/dante/faq.ps
share/doc/dante/rfc1928.txt
share/doc/dante/rfc1929.txt
share/examples/dante/sockd.conf
share/examples/dante/socks.conf
share/examples/dante/socks-simple.conf
share/examples/dante/socks-simple-withoutnameserver.conf
share/examples/dante/socks-simple.conf
share/examples/dante/socks.conf
%%SHARED%%
@dirrm share/examples/dante
@dirrm share/doc/dante