diff --git a/configure b/configure index 637c62f3..a634289f 100755 --- a/configure +++ b/configure @@ -10908,62 +10908,6 @@ fi - case $host_os in - *mingw*) - ;; - *) - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = x""yes; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : - LIBS="$LIBS -ldl" -else - as_fn_error $? "OpenSSL depends on libdl." "$LINENO" 5 ; break - -fi - - -fi - - ;; - esac # Check whether --with-openssl was given. diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 50cd37dc..00000000 --- a/debian/README.source +++ /dev/null @@ -1,9 +0,0 @@ -shadowsocks for Debian ----------------------- - - - - - - diff --git a/debian/changelog b/debian/changelog index 6618f441..90afef25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,42 +1,48 @@ +shadowsocks (1.3.3-1) unstable; urgency=high + + * Provide more info in verbose mode. + + -- Max Lv Fri, 21 Jun 2013 09:59:20 +0800 + shadowsocks (1.3.2-1) unstable; urgency=high * Fix some ciphers by @linusyang. - -- Max Lv Sun, 09 Jun 2013 09:52:31 +0000 + -- Max Lv Sun, 09 Jun 2013 09:52:31 +0000 shadowsocks (1.3.1-1) unstable; urgency=low * Support more cihpers: camellia, idea, rc2 and seed. - -- Max Lv Tue, 04 Jun 2013 00:56:17 +0000 + -- Max Lv Tue, 04 Jun 2013 00:56:17 +0000 shadowsocks (1.3-1) unstable; urgency=low * Able to bind connections to specific interface. * Support more ciphers: aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, cast5-cfb, des-cfb. - -- Max Lv Thu, 16 May 2013 10:51:15 +0800 + -- Max Lv Thu, 16 May 2013 10:51:15 +0800 shadowsocks (1.2-2) unstable; urgency=low * Close timeouted TCP connections. - -- Max Lv Tue, 07 May 2013 14:10:33 +0800 + -- Max Lv Tue, 07 May 2013 14:10:33 +0800 shadowsocks (1.2-1) unstable; urgency=low * Fix a high load issue. - -- Max Lv Thu, 18 Apr 2013 10:52:34 +0800 + -- Max Lv Thu, 18 Apr 2013 10:52:34 +0800 shadowsocks (1.1-1) unstable; urgency=low * Fix a IPV6 resolve issue. - -- Max Lv Wed, 10 Apr 2013 12:11:36 +0800 + -- Max Lv Wed, 10 Apr 2013 12:11:36 +0800 shadowsocks (1.0-2) unstable; urgency=low * Initial release. - -- Max Lv Sat, 06 Apr 2013 16:59:15 +0800 + -- Max Lv Sat, 06 Apr 2013 16:59:15 +0800 diff --git a/debian/control b/debian/control index ea6c0b9e..364491db 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: shadowsocks Section: net Priority: extra Maintainer: Max Lv -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, mime-support, gawk +Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>= 0.9.8), autotools-dev, mime-support, gawk Standards-Version: 3.8.4 Homepage: http://www.shadowsocks.org -#Vcs-Git: git://git.debian.org/collab-maint/shadowsocks.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/shadowsocks.git;a=summary +Vcs-Git: https://github.com/madeye/shadowsocks-libev.git +Vcs-Browser: https://github.com/madeye/shadowsocks-libev Package: shadowsocks Architecture: any diff --git a/m4/openssl.m4 b/m4/openssl.m4 index c47e94b0..2cfd34ad 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -2,19 +2,6 @@ dnl Check to find the OpenSSL headers/libraries AC_DEFUN([ss_OPENSSL], [ - case $host_os in - *mingw*) - ;; - *) - AC_CHECK_FUNC(dlopen, - [], - [AC_CHECK_LIB(dl, dlopen, - [LIBS="$LIBS -ldl"], - [AC_MSG_ERROR([OpenSSL depends on libdl.]); break] - )] - ) - ;; - esac AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]), diff --git a/src/Makefile.am b/src/Makefile.am index 4e4e4eea..8b278776 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -g -O2 -Wall +AM_CFLAGS = -g -O2 -Wall -fno-strict-aliasing AM_CFLAGS += -I$(top_builddir)/libev AM_CFLAGS += -I$(top_builddir)/libasyncns diff --git a/src/Makefile.in b/src/Makefile.in index d7c0e151..14d559dc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -207,7 +207,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = -g -O2 -Wall -I$(top_builddir)/libev \ +AM_CFLAGS = -g -O2 -Wall -fno-strict-aliasing -I$(top_builddir)/libev \ -I$(top_builddir)/libasyncns AM_LDFLAGS = -static SS_COMMON_LIBS = $(top_builddir)/libev/libev.la $(INET_NTOP_LIB)