softether: 4.25 -> 4.29 (#60665)

* softether: 4.25 -> 4.29

* softether_4_29: restrict to x86_64-linux
Does not build on aarch64 because of upstream "-m64" compile flag

4 files changed, 40 insertions, 109 deletions

diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix
deleted file mode 100644
index 5b0d15136f8..00000000000
--- a/pkgs/servers/softether/4.18.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl
-, openssl, readline, ncurses, zlib
-, dataDir ? "/var/lib/softether" }:
-
-let
-  os = if stdenv.isLinux then "1"
-       else if stdenv.isFreeBSD then "2"
-       else if stdenv.isSunOS then "3"
-       else if stdenv.isDarwin then "4"
-       else if stdenv.isOpenBSD then "5"
-       else "";
-  cpuBits = if stdenv.is64bit then "2" else "1";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "softether-${version}";
-  version = "4.18";
-  build = "9570";
-  compiledDate = "2015.07.26";
-
-  src = fetchurl {
-    url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
-    sha256 = "585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574";
-  };
-
-  buildInputs = [ openssl readline ncurses zlib ];
-
-  preConfigure = ''
-      echo "${os}
-      ${cpuBits}
-      " | ./configure
-      rm configure
-  '';
-
-  buildPhase = ''
-      mkdir -p $out/bin
-      sed -i \
-          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
-          -e "/_DIR=/s|/usr|${dataDir}|g" \
-          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
-          -e "/echo/s|echo $out/|echo |g" \
-          Makefile
-  '';
-
-  meta = with stdenv.lib; {
-    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
-    homepage = https://www.softether.org/;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.rick68 ];
-    platforms = filter (p: p != "aarch64-linux") platforms.linux;
-  };
-}
diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix
deleted file mode 100644
index 91dd0d0411f..00000000000
--- a/pkgs/servers/softether/4.20.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl
-, openssl, readline, ncurses, zlib
-, dataDir ? "/var/lib/softether" }:
-
-let
-  os = if stdenv.isLinux then "1"
-       else if stdenv.isFreeBSD then "2"
-       else if stdenv.isSunOS then "3"
-       else if stdenv.isDarwin then "4"
-       else if stdenv.isOpenBSD then "5"
-       else "";
-  cpuBits = if stdenv.is64bit then "2" else "1";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "softether-${version}";
-  version = "4.20";
-  build = "9608";
-  compiledDate = "2016.04.17";
-
-  src = fetchurl {
-    url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
-    sha256 = "e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e";
-  };
-
-  buildInputs = [ openssl readline ncurses zlib ];
-
-  preConfigure = ''
-      echo "${os}
-      ${cpuBits}
-      " | ./configure
-      rm configure
-  '';
-
-  buildPhase = ''
-      mkdir -p $out/bin
-      sed -i \
-          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
-          -e "/_DIR=/s|/usr|${dataDir}|g" \
-          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
-          -e "/echo/s|echo $out/|echo |g" \
-          Makefile
-  '';
-
-  meta = with stdenv.lib; {
-    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
-    homepage = https://www.softether.org/;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.rick68 ];
-    platforms = filter (p: p != "aarch64-linux") platforms.linux;
-  };
-}
diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix
new file mode 100644
index 00000000000..e26e8f057b6
--- /dev/null
+++ b/pkgs/servers/softether/4.29.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl
+, openssl, readline, ncurses, zlib
+, dataDir ? "/var/lib/softether" }:
+
+stdenv.mkDerivation rec {
+  name = "softether-${version}";
+  version = "4.29";
+  build = "9680";
+
+  src = fetchurl {
+    url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz";
+    sha256 = "1r169s5dr31060r2mxkmm08riy6zrxgapmrc6kdrpxdav6kmy0z6";
+  };
+
+  buildInputs = [ openssl readline ncurses zlib ];
+
+  preConfigure = ''
+      ./configure
+  '';
+
+  buildPhase = ''
+      mkdir -p $out/bin
+      sed -i \
+          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
+          -e "/_DIR=/s|/usr|${dataDir}|g" \
+          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
+          -e "/echo/s|echo $out/|echo |g" \
+          Makefile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
+    homepage = https://www.softether.org/;
+    license = licenses.asl20;
+    maintainers = [ maintainers.rick68 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 477d2a7c9f0..6fe00d164ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14307,10 +14307,9 @@ in
 
   oracleXE = callPackage ../servers/sql/oracle-xe { };
 
-  softether_4_18 = callPackage ../servers/softether/4.18.nix { };
-  softether_4_20 = callPackage ../servers/softether/4.20.nix { };
   softether_4_25 = callPackage ../servers/softether/4.25.nix { };
-  softether = softether_4_25;
+  softether_4_29 = callPackage ../servers/softether/4.29.nix { };
+  softether = softether_4_29;
 
   qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };