Drop MinGW32 support

knight084 · Jan 24, 2017 · 3f8cd98 · 3f8cd98
1 parent 61018b6
commit 3f8cd98
Show file tree

Hide file tree

Showing 28 changed files with 42 additions and 520 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,9 @@
+shadowsocks-libev (2.6.3-1) unstable; urgency=medium
+
+  * Refine the project structure.
+
+ -- Max Lv <max.c.lv@gmail.com>  Tue, 24 Jan 2017 19:10:45 +0800
+
 shadowsocks-libev (2.6.2-1) unstable; urgency=medium
 
   * Refine SIP003 plugin support.

diff --git a/Makefile.am b/Makefile.am
@@ -8,3 +8,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 pkgconfiglibdir = $(libdir)/pkgconfig
 pkgconfiglib_DATA = shadowsocks-libev.pc
+
+EXTRA_DIST = acl Changes completions debian docker rpm README.md
+EXTRA_DIST += libcork/include libipset/include
+EXTRA_DIST += libipset/src/libipset/map/inspection-template.c.in
+EXTRA_DIST += libipset/src/libipset/set/inspection-template.c.in
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ It is a port of [Shadowsocks](https://github.com/shadowsocks/shadowsocks)
 created by [@clowwindy](https://github.com/clowwindy), and maintained by
 [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang).
 
-Current version: 2.6.2 | [Changelog](debian/changelog)
+Current version: 2.6.3 | [Changelog](debian/changelog)
 
 Travis CI: [![Travis CI](https://travis-ci.org/shadowsocks/shadowsocks-libev.svg?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev)
 

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], [2.6.2], [max.c.lv@gmail.com])
+AC_INIT([shadowsocks-libev], [2.6.3], [max.c.lv@gmail.com])
 AC_CONFIG_SRCDIR([src/encrypt.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)
@@ -76,19 +76,6 @@ AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 AC_LANG_SOURCE
 
-dnl Add library for mingw
-case $host in
-  *-mingw*)
-    CFLAGS="$CFLAGS -mno-ms-bitfields"
-    LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -lcrypt32"
-    ;;
-  *-cygwin*)
-    CFLAGS="$CFLAGS -mno-ms-bitfields"
-    ;;
-  *)
-    ;;
-esac
-
 dnl Checks for TLS
 AX_TLS([:], [:])
 
@@ -135,15 +122,8 @@ case $host in
     os_support=linux
     AC_MSG_RESULT(Linux)
     ;;
-  *-mingw*)
-    dnl Add custom macros for libev
-    AC_DEFINE([FD_SETSIZE], [2048], [Reset max file descriptor size.])
-    AC_DEFINE([EV_FD_TO_WIN32_HANDLE(fd)], [(fd)], [Override libev default fd conversion macro.])
-    AC_DEFINE([EV_WIN32_HANDLE_TO_FD(handle)], [(handle)], [Override libev default handle conversion macro.])
-    AC_DEFINE([EV_WIN32_CLOSE_FD(fd)], [closesocket(fd)], [Override libev default fd close macro.])
-
-    os_support=mingw
-    AC_MSG_RESULT(MinGW)
+  *-cygwin*)
+    CFLAGS="$CFLAGS -mno-ms-bitfields"
     ;;
   *)
     AC_MSG_RESULT(transparent proxy does not support for $host)
@@ -188,7 +168,6 @@ if test x$has_stack_protector = xyes && test x$enable_ssp = xyes; then
 fi
 
 AM_CONDITIONAL(BUILD_REDIRECTOR, test "$os_support" = "linux")
-AM_CONDITIONAL(BUILD_WINCOMPAT, test "$os_support" = "mingw")
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([limits.h stdint.h inttypes.h arpa/inet.h fcntl.h langinfo.h locale.h netdb.h netinet/in.h stdlib.h string.h strings.h unistd.h sys/ioctl.h])
@@ -213,10 +192,6 @@ AC_CHECK_HEADERS([net/if.h], [], [],
 ])
 
 case $host in
-  *-mingw*)
-    AC_DEFINE([CONNECT_IN_PROGRESS], [WSAEWOULDBLOCK], [errno for incomplete non-blocking connect(2)])
-    AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h], [], [AC_MSG_ERROR([Missing MinGW headers])], [])
-    ;;
   *-linux*)
     AC_DEFINE([CONNECT_IN_PROGRESS], [EINPROGRESS], [errno for incomplete non-blocking connect(2)])
     dnl Checks for netfilter headers
@@ -270,31 +245,6 @@ AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([memset select setresuid setreuid strerror getpwnam_r setrlimit])
 
-dnl Check for select() into ws2_32 for Msys/Mingw
-if test "$ac_cv_func_select" != "yes"; then
-  AC_MSG_CHECKING([for select in ws2_32])
-  AC_TRY_LINK([
-#ifdef HAVE_WINSOCK2_H
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <winsock2.h>
-#endif
-    ],[
-      select(0,(fd_set *)NULL,(fd_set *)NULL,(fd_set *)NULL,(struct timeval *)NULL);
-    ],[
-      AC_MSG_RESULT([yes])
-      HAVE_SELECT="1"
-      AC_DEFINE_UNQUOTED(HAVE_SELECT, 1,
-        [Define to 1 if you have the 'select' function.])
-      HAVE_SYS_SELECT_H="1"
-      AC_DEFINE_UNQUOTED(HAVE_SYS_SELECT_H, 1,
-        [Define to 1 if you have the <sys/select.h> header file.])
-    ],[
-      AC_MSG_ERROR([no])
-  ])
-fi
-
 AC_CHECK_LIB(socket, connect)
 
 dnl Checks for library functions.

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+shadowsocks-libev (2.6.3-1) unstable; urgency=medium
+
+  * Refine the project structure.
+
+ -- Max Lv <max.c.lv@gmail.com>  Tue, 24 Jan 2017 19:10:45 +0800
+
 shadowsocks-libev (2.6.2-1) unstable; urgency=medium
 
   * Refine SIP003 plugin support.

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -60,3 +60,5 @@ html-local: $(MAN_HTML)
 
 doc_DATA = $(MAN_HTML)
 CLEANFILES = $(MAN_XML) $(man_MANS) $(MAN_HTML)
+
+EXTRA_DIST = *.asciidoc asciidoc.conf *.xsl
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
@@ -5,7 +5,7 @@
 FROM alpine
 MAINTAINER kev <noreply@datageek.info>
 
-ARG SS_VER=2.6.2
+ARG SS_VER=2.6.3
 ARG SS_URL=https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz
 
 ENV SERVER_ADDR 0.0.0.0

diff --git a/rpm/genrpm.sh b/rpm/genrpm.sh
@@ -7,7 +7,7 @@ show_help()
     echo
     echo -e "Options:"
     echo -e "  -h    show this help."
-    echo -e "  -v    with argument version (2.6.2 by default)."
+    echo -e "  -v    with argument version (2.6.3 by default)."
     echo -e "  -f    with argument format (tar.xz by default) used by git archive."
     echo
     echo -e "Examples:"
@@ -38,7 +38,7 @@ do
     esac
 done
 
-: ${version:=2.6.2}
+: ${version:=2.6.3}
 : ${format:=tar.gz}
 
 name="shadowsocks-libev"

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -11,10 +11,7 @@ SS_COMMON_LIBS = $(top_builddir)/libipset/libipset.la \
                  $(INET_NTOP_LIB) $(LIBPCRE_LIBS)
 SS_COMMON_LIBS += -lev -lsodium -lm
 
-bin_PROGRAMS = ss-local ss-tunnel
-if !BUILD_WINCOMPAT
-bin_PROGRAMS += ss-server ss-manager
-endif
+bin_PROGRAMS = ss-local ss-tunnel ss-server ss-manager
 
 sni_src = http.c \
           tls.c \
@@ -77,11 +74,6 @@ ss_tunnel_CFLAGS = $(AM_CFLAGS) -DMODULE_TUNNEL
 ss_server_CFLAGS = $(AM_CFLAGS) -DMODULE_REMOTE
 ss_manager_CFLAGS = $(AM_CFLAGS) -DMODULE_MANAGER
 
-if BUILD_WINCOMPAT
-ss_local_SOURCES += win32.c
-ss_tunnel_SOURCES += win32.c
-endif
-
 if BUILD_REDIRECTOR
 bin_SCRIPTS = ss-nat
 bin_PROGRAMS += ss-redir
@@ -107,3 +99,7 @@ libshadowsocks_libev_la_CFLAGS = $(ss_local_CFLAGS) -DLIB_ONLY
 libshadowsocks_libev_la_LDFLAGS = -version-info $(VERSION_INFO)
 libshadowsocks_libev_la_LIBADD = $(ss_local_LDADD)
 include_HEADERS = shadowsocks.h
+
+noinst_HEADERS = acl.h encrypt.h json.h netutils.h redir.h server.h tls.h uthash.h \
+				 cache.h http.h local.h plugin.h resolv.h tunnel.h utils.h \
+				 common.h jconf.h manager.h protocol.h rule.h socks5.h udprelay.h
diff --git a/src/cache.c b/src/cache.c
@@ -31,10 +31,6 @@
 #include "cache.h"
 #include "utils.h"
 
-#ifdef __MINGW32__
-#include "win32.h"
-#endif
-
 /** Creates a new cache object
  *
  *  @param dst

diff --git a/src/encrypt.c b/src/encrypt.c
@@ -69,9 +69,7 @@
 
 #include <sodium.h>
 
-#ifndef __MINGW32__
 #include <arpa/inet.h>
-#endif
 
 #include "cache.h"
 #include "encrypt.h"

diff --git a/src/encrypt.h b/src/encrypt.h
@@ -23,20 +23,7 @@
 #ifndef _ENCRYPT_H
 #define _ENCRYPT_H
 
-#ifndef __MINGW32__
 #include <sys/socket.h>
-#else
-
-#ifdef max
-#undef max
-#endif
-
-#ifdef min
-#undef min
-#endif
-
-#endif
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,3 +60,5 @@ html-local: $(MAN_HTML)

		doc_DATA = $(MAN_HTML)
		CLEANFILES = $(MAN_XML) $(man_MANS) $(MAN_HTML)

		EXTRA_DIST = .asciidoc asciidoc.conf .xsl