Replace libasyncns with libudns

knight084 · Jan 10, 2015 · e5289e9 · e5289e9
1 parent 4908a25
commit e5289e9
Show file tree

Hide file tree

Showing 70 changed files with 9,641 additions and 2,081 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ build/
 /Makefile
 src/Makefile
 libev/Makefile
-libasyncns/Makefile
+libudns/Makefile
 libcork/Makefile
 libipset/Makefile
 autom4te.cache/

diff --git a/Makefile.am b/Makefile.am
@@ -1,7 +1,7 @@
 if BUILD_WINCOMPAT
 SUBDIRS = libsodium libcork libipset libev src
 else
-SUBDIRS = libsodium libcork libipset libasyncns libev src
+SUBDIRS = libsodium libcork libipset libudns libev src
 endif
 
 ACLOCAL_AMFLAGS = -I m4

diff --git a/Makefile.in b/Makefile.in
@@ -133,7 +133,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = libsodium libcork libipset libasyncns libev src
+DIST_SUBDIRS = libsodium libcork libipset libudns libev src
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -295,7 +295,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@BUILD_WINCOMPAT_FALSE@SUBDIRS = libsodium libcork libipset libasyncns libev src
+@BUILD_WINCOMPAT_FALSE@SUBDIRS = libsodium libcork libipset libudns libev src
 @BUILD_WINCOMPAT_TRUE@SUBDIRS = libsodium libcork libipset libev src
 ACLOCAL_AMFLAGS = -I m4
 man_MANS = shadowsocks-libev.8

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shadowsocks-libev 1.6.4.
+# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.0.1.
 #
 # Report bugs to <max.c.lv@gmail.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shadowsocks-libev'
 PACKAGE_TARNAME='shadowsocks-libev'
-PACKAGE_VERSION='1.6.4'
-PACKAGE_STRING='shadowsocks-libev 1.6.4'
+PACKAGE_VERSION='2.0.1'
+PACKAGE_STRING='shadowsocks-libev 2.0.1'
 PACKAGE_BUGREPORT='max.c.lv@gmail.com'
 PACKAGE_URL=''
 
@@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures shadowsocks-libev 1.6.4 to adapt to many kinds of systems.
+\`configure' configures shadowsocks-libev 2.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1407,7 +1407,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shadowsocks-libev 1.6.4:";;
+     short | recursive ) echo "Configuration of shadowsocks-libev 2.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1528,7 +1528,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shadowsocks-libev configure 1.6.4
+shadowsocks-libev configure 2.0.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2051,7 +2051,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shadowsocks-libev $as_me 1.6.4, which was
+It was created by shadowsocks-libev $as_me 2.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2872,7 +2872,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shadowsocks-libev'
- VERSION='1.6.4'
+ VERSION='2.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15091,7 +15091,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 subdirs="$subdirs libsodium"
 
 
-ac_config_files="$ac_config_files shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile libasyncns/Makefile libev/Makefile src/Makefile"
+ac_config_files="$ac_config_files shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile libudns/Makefile libev/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15636,7 +15636,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shadowsocks-libev $as_me 1.6.4, which was
+This file was extended by shadowsocks-libev $as_me 2.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15702,7 +15702,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shadowsocks-libev config.status 1.6.4
+shadowsocks-libev config.status 2.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16115,7 +16115,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "libcork/Makefile") CONFIG_FILES="$CONFIG_FILES libcork/Makefile" ;;
     "libipset/Makefile") CONFIG_FILES="$CONFIG_FILES libipset/Makefile" ;;
-    "libasyncns/Makefile") CONFIG_FILES="$CONFIG_FILES libasyncns/Makefile" ;;
+    "libudns/Makefile") CONFIG_FILES="$CONFIG_FILES libudns/Makefile" ;;
     "libev/Makefile") CONFIG_FILES="$CONFIG_FILES libev/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([shadowsocks-libev], [1.6.4], [max.c.lv@gmail.com])
+AC_INIT([shadowsocks-libev], [2.0.1], [max.c.lv@gmail.com])
 AC_CONFIG_SRCDIR([src/encrypt.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)
@@ -225,7 +225,7 @@ AC_CONFIG_FILES([ shadowsocks-libev.pc
                  Makefile
                  libcork/Makefile
                  libipset/Makefile
-                 libasyncns/Makefile
+                 libudns/Makefile
                  libev/Makefile
                  src/Makefile])
 AC_OUTPUT
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+shadowsocks-libev (2.0.1-1) unstable; urgency=low
+
+  * Implement a real asynchronous DNS resolver.
+
+ -- Max Lv <max.c.lv@gmail.com>  Sat, 10 Jan 2015 10:04:28 +0800
+
 shadowsocks-libev (1.6.4-1) unstable; urgency=low
 
   * Update documents.