diff --git a/dependencies/debian b/dependencies/debian index d7577ef..ae401dd 100755 --- a/dependencies/debian +++ b/dependencies/debian @@ -16,10 +16,10 @@ fi echo "$MSG_BUILDDEP" if [ "$SUDO" = "yes" ]; then $UNENCRYTEDPASSWD - echo $PASSWD | sudo -SE apt-get install --no-install-recommends gettext build-essential autoconf libtool asciidoc xmlto automake asciidoc xmlto git curl pkg-config python3-jsonschema python3-jinja2 -y + echo $PASSWD | sudo -SE apt-get install --no-install-recommends gettext build-essential autoconf libtool cmake asciidoc xmlto automake asciidoc xmlto git curl pkg-config libpcre2-dev python3-jsonschema python3-jinja2 libnetfilter-conntrack-dev libmnl-dev libnftnl-dev -y $ENCRYTEDPASSWD elif [ "$SUDO" = "no" ]; then - apt-get install --no-install-recommends gettext build-essential autoconf libtool asciidoc xmlto automake asciidoc xmlto git curl pkg-config python3-jsonschema python3-jinja2 -y + apt-get install --no-install-recommends gettext build-essential autoconf libtool cmake asciidoc xmlto asciidoc xmlto automake git curl pkg-config libpcre2-dev python3-jsonschema python3-jinja2 libnetfilter-conntrack-dev libmnl-dev libnftnl-dev -y fi # Install port occupancy detection tool diff --git a/dependencies/redhat b/dependencies/redhat index d8fb3f4..e8f4925 100755 --- a/dependencies/redhat +++ b/dependencies/redhat @@ -3,10 +3,10 @@ echo "$MSG_BUILDDEP" if [ $SUDO = yes ]; then $UNENCRYTEDPASSWD - echo $PASSWD | sudo -SE yum install gettext gcc autoconf libtool automake make asciidoc xmlto curl git python3-jinja2 -y + echo $PASSWD | sudo -SE yum install gettext gcc cmake autoconf libtool automake make pkg-config pcre2-devel asciidoc xmlto curl git python3-jinja2 libnetfilter_conntrack-devel libmnl-devel libnftnl-devel -y $ENCRYTEDPASSWD elif [ $SUDO = no ]; then - yum install gettext gcc autoconf libtool automake make asciidoc xmlto curl git python3-jinja2 -y + yum install gettext gcc cmake autoconf libtool automake make pkg-config pcre2-devel asciidoc xmlto curl git python3-jinja2 libnetfilter_conntrack-devel libmnl-devel libnftnl-devel -y fi # Install port occupancy detection tool diff --git a/dependencies/shadowsocks b/dependencies/shadowsocks index de93826..9bb3c51 100755 --- a/dependencies/shadowsocks +++ b/dependencies/shadowsocks @@ -9,9 +9,9 @@ else fi cd shadowsocks-libev -./autogen.sh -CFLAGS="$CFLAGS -I${WORKDIRECTORY}/include" LDFLAGS="$LDFLAGS -L${WORKDIRECTORY}/lib --static" ./configure --prefix=$WORKDIRECTORY --disable-shared --disable-silent-rules && make -j$CPU_NUM -make install +mkdir -p build && cd build +cmake .. -DCMAKE_PREFIX_PATH="${WORKDIRECTORY}" -DCMAKE_BUILD_TYPE=Release -DWITH_SHARED=OFF -DWITH_STATIC=ON -DENABLE_CONNMARKTOS=ON -DENABLE_NFTABLES=ON && make -j$CPU_NUM +mv bin/ss-server ${WORKDIRECTORY}/bin/ss-server if [ "$SUDO" = "yes" ]; then $UNENCRYTEDPASSWD diff --git a/dependencies/shadowsocks_update b/dependencies/shadowsocks_update index b1b153f..9336b80 100755 --- a/dependencies/shadowsocks_update +++ b/dependencies/shadowsocks_update @@ -1,13 +1,13 @@ #!/bin/sh #Update Shadowsocks-libev static cd shadowsocks-libev -make distclean +rm -rf build git fetch git reset --hard origin/master git submodule update --init --recursive -./autogen.sh -CFLAGS="$CFLAGS -I${WORKDIRECTORY}/include" LDFLAGS="$LDFLAGS -L${WORKDIRECTORY}/lib --static" ./configure --prefix=$WORKDIRECTORY --disable-shared --disable-silent-rules && make -j$CPU_NUM -make install +mkdir -p build && cd build +cmake .. -DCMAKE_PREFIX_PATH="${WORKDIRECTORY}" -DCMAKE_BUILD_TYPE=Release -DWITH_SHARED=OFF -DWITH_STATIC=ON -DENABLE_CONNMARKTOS=ON -DENABLE_NFTABLES=ON && make -j$CPU_NUM +mv bin/ss-server ${WORKDIRECTORY}/bin/ss-server if [ $SUDO = yes ]; then $UNENCRYTEDPASSWD