Merge recent submits

.copr/Makefile

@@ -0,0 +1,19 @@
+.PHONY: deps srpm
+.DEFAULT_GOAL := srpm
+
+DOT_COPR := $(dir $(firstword $(MAKEFILE_LIST)))
+TOP_DIR := $(realpath $(DOT_COPR)/../)
+
+RPM_DIR := $(TOP_DIR)/rpm
+outdir ?= $(RPM_DIR)/SRPMS
+
+HAS_GIT := $(shell command -v git 2> /dev/null)
+ifndef HAS_GIT
+deps:
+	dnf -y install git
+else
+deps:
+endif
+
+srpm: deps
+	$(TOP_DIR)/rpm/genrpm.sh -o $(outdir)

.dockerignore

@@ -0,0 +1,27 @@
+# General
+.dockerignore
+.git
+.gitmodules
+.gitignore
+.github
+AUTHORS
+Changes
+COPYING
+INSTALL
+LICENSE
+README.md
+
+# Code formatting
+.uncrustify.cfg
+code-format.bat
+code-format.sh
+
+# CI & CD
+.travis.yml
+tests
+
+# OS-specific packaging, etc.
+debian
+scripts/build_deb.sh
+rpm
+completions

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [madeye]

.github/issue_template.md

@@ -0,0 +1,22 @@
+Please answer these questions before submitting your issue. Thanks!
+
+(Please mention that if the issue you filed is solved, you may wish to close it by yourself. Thanks again.)
+
+(PS, you can remove 3 lines above, including this one, before post your issue.)
+
+### What version of shadowsocks-libev are you using?
+
+
+### What operating system are you using?
+
+
+### What did you do?
+
+
+### What did you expect to see?
+
+
+### What did you see instead?
+
+
+### What is your config in detail (with all sensitive info masked)?

.gitignore

@@ -1,34 +1,72 @@
+# Ignore files generated by autoconf
+/Makefile.in
+/aclocal.m4
+/auto/
+/config.h.in
+/configure
+/doc/Makefile.in
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/src/Makefile.in
+/src/config.h
+
+# Ignore files generated by configure
 build/
 .deps/
 /Makefile
 src/Makefile
 libev/Makefile
-libasyncns/Makefile
+libudns/Makefile
 libcork/Makefile
 libipset/Makefile
+doc/Makefile
 autom4te.cache/
 /config.h
 config.log
 config.status
 libtool
 pid
-ss*
+src/ss-*
+!src/ss-nat
 stamp-h1
 .libs
 .pc
-debian/shadowsocks/
+debian/shadowsocks-libev/
 debian/patches/
 debian/files
-debian/shadowsocks.substvars
+debian/shadowsocks-libev.substvars
 debian/*.debhelper*
 .dirstamp
+shadowsocks-libev.pc
+debian/libshadowsocks-libev*.symbols
+libsodium/src/libsodium/include/sodium/version.h
+rpm/SPECS/shadowsocks-libev.spec
+rpm/SRPMS/
+rpm/RPMS/
+rpm/BUILD/
+rpm/BUILDROOT/
+*.rpm
+*.deb
+
+# Ignore per-project vim config
+.vimrc
 
 # Ignore garbage of OS X
 *.DS_Store
 
 # Ignore vim cache
 *.swp
 
+# Documentation files
+doc/*.1
+doc/*.8
+doc/*.gz
+doc/*.xml
+doc/*.html
+
 #	Do not edit the following section
 # 	Edit Compile Debug Document Distribute
 *~
@@ -50,6 +88,12 @@ debian/*.debhelper*
 *.so
 *.pcf.gz
 *.pdb
+*.tar
 *.tar.bz2
 *.tar.gz
+*.tgz
+*.snap
 #
+
+# Visual Studio Code
+.vscode/*

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "libcork"]
+	path = libcork
+	url = https://github.com/shadowsocks/libcork.git
+    ignore = dirty
+[submodule "libipset"]
+	path = libipset
+	url = https://github.com/shadowsocks/ipset.git
+    ignore = dirty
+[submodule "libbloom"]
+	path = libbloom
+	url = https://github.com/shadowsocks/libbloom.git
+    ignore = dirty

.travis.yml

@@ -1,8 +1,57 @@
+sudo: required
 language: c
+dist : trusty
 compiler:
-    - gcc
     - clang
-script: "sudo apt-get install libev-dev && ./configure && make"
+    - gcc
+os:
+    - linux
+    - osx
+env:
+    global:
+        - LIBSODIUM_VER=1.0.12
+        - MBEDTLS_VER=2.4.0
+before_install:
+    - |
+      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+          # All dependencies for macOS build. Some packages has been installed by travis so use reinstall.
+          brew reinstall autoconf automake xmlto c-ares libev mbedtls libsodium asciidoc >> /dev/null 2>&1;
+      else
+          wget  https://github.com/jedisct1/libsodium/releases/download/$LIBSODIUM_VER/libsodium-$LIBSODIUM_VER.tar.gz;
+          tar xvf libsodium-$LIBSODIUM_VER.tar.gz;
+          pushd libsodium-$LIBSODIUM_VER;
+          ./configure --prefix=/usr && make;
+          sudo make install;
+          popd;
+          wget https://tls.mbed.org/download/mbedtls-$MBEDTLS_VER-gpl.tgz;
+          tar xvf mbedtls-$MBEDTLS_VER-gpl.tgz;
+          pushd mbedtls-$MBEDTLS_VER;
+          make SHARED=1;
+          sudo make install;
+          popd;
+          # Load cached docker images
+          if [[ -d $HOME/docker ]]; then
+              ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load";
+          fi
+      fi
+addons:
+    apt:
+        sources:
+            - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3
+        packages:
+            - libc-ares-dev
+            - libev-dev
+            - asciidoc
+            - xmlto
+script:
+    - ./autogen.sh
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+          ./configure --disable-documentation --with-mbedtls=/usr/local/opt/mbedtls --with-sodium=/usr/local/opt/libsodium;
+      else
+          ./configure;
+      fi
+    - make
+    - cd build && cmake ../ && make
 branches:
     only:
         - master