Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A Pull Request #26

Open
wants to merge 1,895 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1895 commits
Select commit Hold shift + click to select a range
c96e284
Fix an issue of IPv6 NAT
madeye Apr 26, 2019
49526d8
Fix ss-nat's log
madeye Apr 26, 2019
a7291ea
Enlarge the socket buffer size to 16KB.
madeye Apr 30, 2019
38e83d6
Make sure socket buffer size no larger than max chunk size
madeye Apr 30, 2019
c8fcec1
remove -u arguments by default
aieu May 2, 2019
d14664c
shadowsocks-libev.pc.in: Remove crypto library dependency
May 4, 2019
34450e8
Merge pull request #2365 from zgist/patch-1
madeye May 4, 2019
9c935f7
Fix #2366
madeye May 6, 2019
850473a
Add snapcraft.yml
madeye May 7, 2019
c2337fe
Update README.md
madeye May 8, 2019
4a42da6
Allow bind to local IPv4/v6 addresses. Fix #2372
madeye May 9, 2019
3c44139
Clean up
madeye May 16, 2019
1b37c77
Create FUNDING.yml
madeye May 24, 2019
fd22043
Update FUNDING.yml
madeye May 24, 2019
ec36ae6
Update FUNDING.yml
madeye May 24, 2019
b8e75b5
Update FUNDING.yml
madeye May 24, 2019
5e65dc0
change from bzero(3) to memset(3) for better compatibility. (#2383)
papadave66 May 31, 2019
a99c39c
Simplify the server auto blocking mechanism
madeye Jun 1, 2019
8d8b1cd
Refine TCP related headers. #2387
madeye Jun 1, 2019
dc4742b
Update mingw build scripts
madeye Jun 2, 2019
63a991c
ss-local: improve verbose logging; print hit of missing option
Low-power Jun 4, 2019
e3e0f2a
Merge pull request #2390 from rivoreo/ss-local-verbose
madeye Jun 4, 2019
ffad914
Bump version
madeye Jun 8, 2019
94dc47d
Add echo for stat API
Lensual Jun 10, 2019
1b30010
Clean up
madeye Jun 14, 2019
37ca683
Refine #2402
madeye Jun 18, 2019
09df834
Merge pull request #2398 from Lensual/master
madeye Jun 20, 2019
a161265
Reduce the verbosity on plugin terminating error
madeye Jun 21, 2019
c04e6df
Change from network.target to network-online.target in systemd servic…
Jun 26, 2019
42d4cb1
Merge pull request #2411 from liangsuilong/master
madeye Jun 26, 2019
6c28add
Enable -Wcas-align for #2412
madeye Jun 30, 2019
ab9764d
Fix building issues on Linux
madeye Jun 30, 2019
f0205e7
Refine the helper function
madeye Jun 30, 2019
d0285d6
Specify the alignment of all structs
madeye Jul 1, 2019
59417b9
Revert "Specify the alignment of all structs"
madeye Jul 1, 2019
9aa46cb
Remove -Wcast-align
madeye Jul 1, 2019
ebdf279
Allow long idle connections in server
Mygod Jul 4, 2019
5e08034
Merge pull request #2421 from Mygod/idle
madeye Jul 4, 2019
a5daf4d
Fix #2427
madeye Jul 11, 2019
70d8951
Update build badge
madeye Jul 16, 2019
64b97cd
Clean up
madeye Jul 17, 2019
05f4fe7
Refine #2402
madeye Jul 24, 2019
f5e8519
Fix #2438
madeye Jul 26, 2019
e3c6c80
Fix #2443
madeye Jul 30, 2019
1c4ddd3
Fix #2449
madeye Aug 9, 2019
615588b
Bump version
madeye Aug 9, 2019
21fc899
Remove PPA and recommend installing from snap
madeye Aug 9, 2019
a1b691c
Update README.md
madeye Aug 9, 2019
3a46907
Update README.md
madeye Aug 9, 2019
3e8a577
Update README.md
madeye Aug 19, 2019
7a428d0
Clean up
madeye Aug 27, 2019
b4cda9d
Add option '--long-idle' for server
lixingcong Aug 31, 2019
11c9a02
Merge pull request #2463 from lixingcong/long-idle
madeye Aug 31, 2019
03fb8c9
Revert "Add option '--long-idle' for server"
madeye Sep 2, 2019
313b9a7
Refine #2463, set default min timeout to 24h
madeye Sep 2, 2019
715f26e
Change the default timeout value to 24h
madeye Sep 2, 2019
ec91e4f
Update FUNDING.yml
madeye Sep 3, 2019
2f61bac
Update Dockerfile
lkebin Sep 17, 2019
5e3f571
Add IPv4-mapped IPv6 localhost
madeye Sep 20, 2019
345ef5c
Fix #2481
madeye Sep 20, 2019
9109b63
Avoid confusion of the return value of aead_cipher_decrypt()
madeye Sep 21, 2019
74e87ba
Merge pull request #2475 from lkebin/patch-1
madeye Sep 25, 2019
e911625
Revert "Add echo for stat API"
madeye Sep 25, 2019
6cc9e01
Delete FUNDING.yml
madeye Sep 26, 2019
964f145
readme: add manjaro
unl89 Oct 5, 2019
936f328
Merge pull request #2503 from unl89/patch-1
madeye Oct 5, 2019
7132ff1
cache: Remove unused return from 'cache_key_exist'
Oct 7, 2019
7351722
Merge pull request #2508 from CertifiedBlyndGuy/master
madeye Oct 7, 2019
5da991a
Refine the handling of fragment request
madeye Oct 12, 2019
346ab1b
Bump version
madeye Oct 12, 2019
2993662
Refine the timeout logic
madeye Oct 12, 2019
4889879
Update FreeBSD section
xiaoding Oct 25, 2019
602cacd
Merge pull request #1 from xiaoding/xiaoding-patch-freebsd
xiaoding Oct 25, 2019
3125c8c
Merge pull request #2521 from xiaoding/master
madeye Oct 25, 2019
22d5e59
Remove request timeout
madeye Oct 30, 2019
e276584
Bump version
madeye Oct 31, 2019
f60057d
Update README.md
jessie-backports Nov 6, 2019
f7a0822
Fix #2532
madeye Nov 6, 2019
7763b96
Merge pull request #2531 from jessie-backports/patch-1
madeye Nov 6, 2019
1ba753a
Fix #2536
madeye Nov 8, 2019
ce71f49
Fix #2537
madeye Nov 8, 2019
748e6f3
Refine #2537
madeye Nov 8, 2019
6d73201
Fix #2539
madeye Nov 10, 2019
16bd9af
Fix QoS
eycorsican Nov 15, 2019
e95c02b
Merge pull request #2543 from mellow-io/fix-tos
madeye Nov 15, 2019
97ee013
Merge pull request #2549 from rogers0/PR/fix_pc_in
madeye Nov 24, 2019
0b737a9
Fix redir default cipher
Nov 30, 2019
4261a3d
Merge pull request #2552 from ivq/fix-redir
madeye Nov 30, 2019
a7d57ab
Fix of PATH_MAX for GNU/Hurd
Dec 3, 2019
20a6ad6
Merge pull request #2555 from rogers0/PR/fix_hurd_max_path
madeye Dec 3, 2019
4c660f6
Set cap_net_bind_service for docker
oszi Dec 20, 2019
ffc2ea4
Merge pull request #2563 from oszi/master
madeye Dec 20, 2019
74daa50
Fix #2565 #2566
madeye Dec 24, 2019
f6bc4cc
Delete test.json
madeye Dec 27, 2019
7fe555c
Remove unnecessary memmove
Jan 7, 2020
f1b185e
Merge pull request #2577 from babarosaM33/master
madeye Jan 7, 2020
72d7d92
Bump version
madeye Jan 10, 2020
80b887d
Warn users when using stream ciphers
Mygod Jan 12, 2020
6b5025b
Merge pull request #2581 from shadowsocks/stream-warning
madeye Jan 13, 2020
9ae5981
ppbloom:remove unnecessay bloom_check
Jan 13, 2020
9576dce
initialize after pass check
Jan 13, 2020
40ba7c7
Merge pull request #2582 from babarosaM33/master
madeye Jan 13, 2020
3908f3a
crypto: md5 hash works without hmac mode
Jan 15, 2020
8811ec2
Merge pull request #2586 from babarosaM33/master
madeye Jan 15, 2020
b48dcdd
server: fix setTosFromConnmark typo
Jan 17, 2020
5eeff4d
Merge pull request #2590 from babarosaM33/master
madeye Jan 17, 2020
4d617ad
refine tos setsockopt in redir and udprelay
Jan 17, 2020
bebdcbe
Merge pull request #2592 from babarosaM33/master
madeye Jan 17, 2020
6b85c98
Fix #2595
madeye Jan 18, 2020
247d530
server: replace memmove with idx
Jan 19, 2020
8c03d25
udprelay: fix more tos
Jan 19, 2020
ddd0df5
Merge pull request #2598 from babarosaM33/udprelay
madeye Jan 19, 2020
0318168
Merge pull request #2596 from babarosaM33/master
madeye Jan 19, 2020
d31fba3
Fix #2599
madeye Jan 19, 2020
4f577a0
Fix #2600
madeye Jan 19, 2020
4214894
Fix a typo
madeye Jan 20, 2020
0f87d7c
Fix sockopt level.
kuangniu Jan 24, 2020
b6a83d9
Merge pull request #2606 from kuangniu/master
madeye Jan 24, 2020
30d5b85
Revert "ppbloom:remove unnecessay bloom_check"
Jan 29, 2020
88c4d2a
crypto: lower bloom filter error rate
Jan 29, 2020
5cd8095
Merge pull request #2608 from babarosaM33/master
madeye Jan 29, 2020
a500566
ppbloom: save free() and subsequent init() overhead
Jan 29, 2020
6f9bd72
Merge pull request #2609 from babarosaM33/bloom_slots
madeye Jan 29, 2020
0686909
Merge pull request #2610 from babarosaM33/bloom_reset
madeye Jan 29, 2020
defa4f8
tests/test.py: Make script compatible with python3
hosiet Jan 31, 2020
a0ef1a5
Merge pull request #2611 from hosiet/patch-1
madeye Jan 31, 2020
21e3224
readme(docker): remove "--fast-open"
imba-tjd Feb 6, 2020
3752579
Merge pull request #2618 from imba-tjd/patch-1
madeye Feb 6, 2020
a5111fe
updrelay: cleanup
Feb 7, 2020
f5c140d
Merge pull request #2619 from babarosaM33/master
madeye Feb 7, 2020
81bbd98
udprelay: exclude udp remote_recv_sendto buff full
Feb 8, 2020
ac61025
Merge pull request #2623 from babarosaM33/master
madeye Feb 9, 2020
5c16299
Use classic mode to install shadowsocks-libev
Mygod Feb 11, 2020
bb12209
Merge pull request #2626 from shadowsocks/snapd-classic
madeye Feb 12, 2020
301fea6
Remove sniparser
Mygod Feb 12, 2020
355addd
Remove unused is_remote_dns option
Mygod Feb 12, 2020
1c818eb
Fix build
Mygod Feb 12, 2020
8c251b2
Fix build
madeye Feb 12, 2020
3397655
Revert "Use classic mode to install shadowsocks-libev"
madeye Feb 14, 2020
69b79e5
Merge pull request #2631 from shadowsocks/revert-2626-snapd-classic
madeye Feb 14, 2020
64d3235
Fix #2620
madeye Feb 15, 2020
6f7a6fd
Merge pull request #2628 from Mygod/kill-sniparser
madeye Feb 20, 2020
cafdd77
Update README.md
madeye Mar 1, 2020
af722a4
Fix a tiny memory leak
ideal Mar 14, 2020
f34b362
Merge pull request #2659 from ideal/master
madeye Mar 14, 2020
b6ddbbe
Add Dockerfile timezone, Update readme.
Mar 20, 2020
57e0c9f
Update Dockerfile set default timezone to UTC.
Mar 20, 2020
b9ce095
Merge pull request #2666 from imMMX/add-dockerfile-timezone
madeye Mar 20, 2020
0d96da4
Sync debian/ folder with debian version 3.3.4+ds-3
Mar 29, 2020
0aa55a2
Replace CMAKE_XXX_DIR with PROJECT_XXX_DIR, so that this project can …
JamisHoo Mar 29, 2020
138186b
Add include_directories property for shared_libraries
JamisHoo Mar 29, 2020
2cdcb41
Merge pull request #2672 from rogers0/PR/sync_debian
madeye Mar 29, 2020
34f1bbe
Merge pull request #2673 from JamisHoo/master
madeye Mar 29, 2020
bab75a8
Update public libraries
wyzdot Mar 30, 2020
cc658e4
Merge pull request #2674 from cyber386/work
madeye Mar 30, 2020
bbb2849
Also apply LIB_ONLY for shared library, fix #2443
JamisHoo Apr 13, 2020
4baff35
Remove the unmaintained Fedora COPR section
librehat Apr 14, 2020
870f9d9
Merge pull request #2686 from shadowsocks/rm-fedora-copr-librehat
madeye Apr 14, 2020
33a1932
Fix #2687
madeye Apr 17, 2020
1cce832
Update China Mainland IPv4
Loyalsoldier Apr 17, 2020
d258132
Update local IPs
Loyalsoldier Apr 17, 2020
1e5d557
Update gfwlist on 2020.04.18
Loyalsoldier Apr 17, 2020
1d78159
Merge pull request #2688 from Loyalsoldier/update-acl
madeye Apr 18, 2020
4d33f01
Update telegram CIDR
Loyalsoldier Apr 18, 2020
9ea9aa0
Merge pull request #2690 from Loyalsoldier/update-telegram-CIDR
madeye Apr 18, 2020
5f947a8
debian/rules: Fix #2675
Apr 18, 2020
401d323
Merge pull request #2691 from rogers0/PR/fix_debian_rules
madeye Apr 18, 2020
aa9fe8c
Fix #2692
madeye Apr 27, 2020
1e7bb45
`xchacha20-ietf-poly1305` completion
wxh06 Apr 28, 2020
2cc9282
`xchacha20-ietf-poly1305` doc
wxh06 Apr 28, 2020
2ae8006
*Shadowsocks-libev* accepts 19 different ciphers
wxh06 Apr 29, 2020
236c98d
Merge pull request #2685 from JamisHoo/master
madeye Apr 29, 2020
bc77b61
Merge pull request #2694 from wangxinhe2006/master
madeye Apr 29, 2020
02f25e5
add ss-manager read manager_address from config.json
May 2, 2020
597ceec
Merge pull request #2697 from hxzh/master
madeye May 2, 2020
f1f3e9d
Fix support for building with CMake and MinGW.
DDoSolitary May 2, 2020
93336ad
Fix static linking issues on Windows.
DDoSolitary May 2, 2020
3ff9d33
Merge pull request #2698 from DDoSolitary/patch-cmake-mingw
madeye May 2, 2020
1bde462
added workflow for buildx
morlay Jun 16, 2020
99645ff
Merge pull request #2719 from morlay/master
madeye Jun 16, 2020
b3762a4
fix workflow build to make docker release with tags or edge for master
morlay Jun 16, 2020
163cd3d
Merge pull request #2720 from morlay/master
madeye Jun 16, 2020
e8ca659
report suspicious UDP packet for fail2ban
madeye Jun 19, 2020
25be24c
Align the report format for UDP packet
madeye Jun 19, 2020
cd6ac18
add snap service
ipcjs Jun 26, 2020
a360b2c
Merge pull request #2728 from ipcjs/master
madeye Jul 1, 2020
982f1e1
fix broken anchor
billzhong Jul 4, 2020
1b90919
Merge pull request #2730 from billzhong/patch-1
madeye Jul 4, 2020
54fa884
Fix detection of netinet/tcp.h on Cygwin.
DDoSolitary Jul 13, 2020
cab663a
Merge pull request #2733 from DDoSolitary/patch-cygwin-tcp.h-detect
madeye Jul 14, 2020
7878450
add `tcp_tproxy` option, use tproxy instead of redirect (tcp)
zfl9 Jul 18, 2020
37cdf8d
add `tcp_tproxy` option, completions bash/zsh
zfl9 Jul 18, 2020
6d4a3ad
add `tcp_tproxy` option, asciidoc update
zfl9 Jul 18, 2020
cde88d4
add `tcp_tproxy` option, README.md update
zfl9 Jul 18, 2020
03df264
add `tcp_tproxy` option, add a sample script in readme.md
zfl9 Jul 18, 2020
31dd816
Merge pull request #2736 from zfl9/master
madeye Jul 20, 2020
a727596
jconf: fix memory leak
Aug 4, 2020
8285e5a
Bump version
madeye Sep 15, 2020
2a249b0
added support for Docker secrets and password file in the Docker image
JohnTheNerd Sep 19, 2020
8be4f19
Merge pull request #2753 from JohnTheNerd/password-file
madeye Sep 21, 2020
53ca5eb
bump workflow actions to docker official provided
morlay Sep 30, 2020
b5d6225
Merge pull request #2759 from morlay/master
madeye Sep 30, 2020
72db525
Fix manager not passing -i option
aodemov Oct 17, 2020
89b5f98
Merge pull request #2762 from thesamhurwitz/manager-iface-option
madeye Oct 19, 2020
aed81a1
Create FUNDING.yml
madeye Dec 13, 2020
5617841
Add --tcp-incoming-sndbuf and --tcp-outgoing-sndbuf which allow preci…
notsure2 Dec 22, 2020
920dbac
Missing config file parsing logic.
notsure2 Dec 22, 2020
36d9993
Add --tcp-incoming-rcvbuf and --tcp-outgoing-rcvbuf which allow preci…
notsure2 Dec 22, 2020
b68157e
Fix typo.
notsure2 Dec 22, 2020
cfe0c2c
Fix ftbfs for Hurd since there is no IPV6_TCLASS defined
Dec 19, 2020
13f4720
Fix "ERROR: [udp] remote_recv_bind: Address already in use" when mult…
oakaigh Jan 29, 2021
8e0fe4e
update libsodium url
t0nyt4ng Feb 8, 2021
7e5922a
configure.ac: use pkg-config to find netfilter_conntrack
ffontaine Nov 23, 2020
e04b73d
Fix memory leak
lixingcong Mar 17, 2021
6329526
Run systemd service after network is available (unit file fix)
Mar 30, 2021
da3aa4d
Bump docker/setup-buildx-action from 1 to 1.3.0
dependabot[bot] May 12, 2021
ada0bae
Bump docker/build-push-action from 2 to 2.4.0
dependabot[bot] May 12, 2021
a4a8fc1
Bump docker/login-action from 1 to 1.9.0
dependabot[bot] May 12, 2021
3b3ba96
Bump actions/checkout from 2 to 2.3.4
dependabot[bot] May 12, 2021
16867e1
Bump docker/setup-qemu-action from 1 to 1.1.0
dependabot[bot] May 12, 2021
ca4caab
"DynamicUser=true" makes "/etc/init.d/shadowsocks-libev start" fail.
Mar 27, 2021
ed23402
Fix memory leak in manager
lixingcong Mar 17, 2021
d1171f4
Revert ""DynamicUser=true" makes "/etc/init.d/shadowsocks-libev start…
May 13, 2021
4bbbe21
Add support of nftables firewall
Jun 29, 2021
8bcffa5
fix check for return value of open when redirecting to null device
gdepeyrot Jul 15, 2021
a19328a
close socket to avoid memory leak when error occurs
gdepeyrot Jul 15, 2021
49ead5e
apply memory leak fix for create_and_bind to create_server_socket
gdepeyrot Jul 15, 2021
0a7d178
properly terminate string which recvfrom does not do
gdepeyrot Jul 15, 2021
abcf85e
fix order of tests to avoid strstr on NULL value
gdepeyrot Jul 15, 2021
b911755
Remove the fragmentation check for the first AEAD chunk
madeye Aug 19, 2021
3654658
Add git submodule to the build docs
joeytwiddle Aug 27, 2021
46382c2
Disable fragmentation for all the outgoing UDP packets
madeye Feb 15, 2022
0c23224
fix maybe-uninitialized errors
ffontaine Apr 7, 2022
e21f824
fix: being able to use empty DNS_ADDRS with docker image
alexandre-abrioux Dec 8, 2021
1630764
Fix --mptcp on kernels with mainlined MPTCP.
tschmelcher May 22, 2022
90f21ab
Update README.md
chenshaoju May 28, 2022
c2fc967
fix .copr build
billzhong May 27, 2022
01dd7df
Redir UDP send back sockets should always be IPv6
zonyitoo Jun 3, 2022
d61d09a
Detect kernel support for MPTCP at runtime
darkwrat Jun 22, 2022
9eeadf9
Add submodules to git safe.directory for .copr build
darkwrat Jun 24, 2022
549b9be
Fix rpm build for fedora 36
darkwrat Jun 24, 2022
05e70d4
fix c-ares link dep
DDoSolitary Mar 13, 2022
c13c464
Update
vndroid Jun 28, 2022
5fdb662
Update
vndroid Jun 28, 2022
d3e73c6
fixes grammatical errors in README.md
nishans08 Jul 27, 2022
a3b1dc7
update MbedTLS dependency link and add Debian / Ubuntu apt pkg-config
rickyrick2002 Oct 18, 2022
7f7f68a
replace fixed mbedtls version with variable $MBEDTLS_VER
rickyrick2002 Oct 25, 2022
3bcf258
Fix "missing configuration file" error during custom build using auto…
micl2e2 Nov 15, 2022
288cba7
fix snap link and badge
billzhong Nov 29, 2022
d83ace0
Translation of README.md into Brazilian Portuguese. (#2946)
GabrielReverso Nov 30, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 23 additions & 0 deletions .copr/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.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
git config --global --add safe.directory $(TOP_DIR)
git config --global --add safe.directory $(TOP_DIR)/libbloom
git config --global --add safe.directory $(TOP_DIR)/libcork
git config --global --add safe.directory $(TOP_DIR)/libipset
$(RPM_DIR)/genrpm.sh -o $(outdir)
27 changes: 27 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
custom: ['https://crowdfunding.lfx.linuxfoundation.org/projects/shadowsocks']
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
22 changes: 22 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -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)?
52 changes: 52 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: build

on:
push:
push:
branches:
- master
tags:
- v*
- latest

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
submodules: true

- uses: docker/[email protected]
- uses: docker/[email protected]
- uses: docker/[email protected]
with:
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ secrets.DOCKER_USERNAME }}

- name: check and set image version
id: prepare
run: |
case ${{ github.ref }} in
refs/heads/master)
echo ::set-output name=version::edge
echo ::set-output name=push::true
;;
refs/tags/*)
echo ::set-output name=version::$(echo ${{ github.ref }} | sed -E 's|refs/tags/||')
echo ::set-output name=push::true
;;
*)
echo ::set-output name=version::${{ github.sha }}
echo ::set-output name=push::false
;;
esac;

- name: build & push image
uses: docker/[email protected]
with:
context: .
file: docker/alpine/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ steps.prepare.outputs.push }}
tags: ${{ github.repository }}:${{ steps.prepare.outputs.version }}
53 changes: 49 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
*~
Expand All @@ -50,6 +88,13 @@ debian/*.debhelper*
*.so
*.pcf.gz
*.pdb
*.tar
*.tar.bz2
*.tar.gz
*.tgz
*.snap
#

# Visual Studio Code
.vscode/*
.devcontainer/*
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
53 changes: 51 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading