Merge branch 'master' into master

centos/README.md

@@ -14,7 +14,7 @@ You can also have it start automatically:
 
 ## Files
 
-This project containts the following files to build an RPM of SoftEther VPN:
+This project contains the following files to build an RPM of SoftEther VPN:
 
 * SPEC/softethervpn.spec - The main spec file
 * SOURCES/fix-makefiles.sh - Script that modifies the original makefiles so it properly makes with BUILDROOT.

centos/SOURCES/linux_32bit.mak

@@ -1,7 +1,7 @@
 # SoftEther VPN Source Code
 # 
-# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan.
-# Copyright (c) 2012-2016 Daiyuu Nobori.
+# Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.
+# Copyright (c) Daiyuu Nobori.
 # All Rights Reserved.
 # 
 # http://www.softether.org/

centos/SOURCES/linux_64bit.mak

@@ -1,7 +1,7 @@
 # SoftEther VPN Source Code
 # 
-# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan.
-# Copyright (c) 2012-2016 Daiyuu Nobori.
+# Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.
+# Copyright (c) Daiyuu Nobori.
 # All Rights Reserved.
 # 
 # http://www.softether.org/

centos/SPECS/softethervpn.spec

@@ -1,8 +1,8 @@
-%define majorversion 4
-%define minorversion 22
-%define buildversion 9634
-%define dateversion 2016.11.27
-%define buildrelease beta
+%define majorversion 5
+%define minorversion 01
+%define buildversion 9657
+%define dateversion 2018.01.14
+%define buildrelease unstable
 
 Name:           softethervpn
 Version:        %{majorversion}.%{minorversion}.%{buildversion}
@@ -116,6 +116,10 @@ fi
 
 
 %changelog
+
+* Thu Dec 14 2017 Quintin Beukes <github.com@last.za.net> - 4.23-9647
+- Update upstream to 4.23-9647
+
 * Tue Feb 14 2017 Oleg Zaitsev <me@ozaitsev.ru> - 4.22.9634-1
 - Update upstream to 4.22.9634-beta
 - More macrofication