fix debian package builds (#554)

* fix debian builds

issue described: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/550

* add cmake3 dependency (for ubuntu 14.04)

* "compat" belongs to debian/ subfolder

that file is not needed in root folder

* update debian package version

* compare debian/changelog and src/CurrentBuild.txt

.ci/check-debian-package-version.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+while IFS=$'\n\r' read -r line || [[ -n "$line" ]]; do
+    echo "Text read from file: $line"
+    case $line in
+      BUILD_NUMBER\ *)
+        BUILD_NUMBER=${line#BUILD_NUMBER }
+      ;;
+      VERSION\ *)
+        VERSION=${line#VERSION }
+      ;;
+      BUILD_NAME\ *)
+        BUILD_NAME=${line#BUILD_NAME }
+      ;;
+
+    esac
+done < "src/CurrentBuild.txt"
+
+VERSION=${VERSION:0:1}.${VERSION:1} # Add a colon after the first character. ("501" => "5.01")
+
+CHANGELOG_VERSION="(0:$VERSION.$BUILD_NUMBER) $BUILD_NAME"
+
+IFS=$'\n\r' read -r line < "debian/changelog"
+if [[ $line == *$CNANGELOG_VERSION* ]]; then
+  echo "debian/changelog matches src/CurrentBuild.txt"
+else
+  echo "debian/changelog does not match src/CurrentBuild.txt"
+  exit 1
+fi

.travis.yml

@@ -20,6 +20,12 @@ matrix:
     - env: OPENSSL_VERSION="1.1.0f"
       os: linux
       compiler: clang
+    - env: DESCRIPTION="check debian package version"
+      os: linux
+      before_install:
+        - true
+      script:
+        - .ci/check-debian-package-version.sh
     - os: osx
       compiler: clang
       before_install:

compat

@@ -1 +0,0 @@
-9

configure

@@ -21,7 +21,12 @@ if [ ! -d "tmp" ]; then
   mkdir tmp
 fi
 
-(cd tmp && cmake .. || exit 1)
+if [ ! -z ${CMAKE_INSTALL_PREFIX+x} ]; then
+	CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
+fi
+
+(cd tmp && cmake ${CMAKE_FLAGS} .. || exit 1)
+
 
 echo ""
 

debian/changelog

@@ -1,5 +1,5 @@
-softether-vpn (0:4.23.9647) unstable; urgency=low
+softether-vpn (0:5.01.9657) unstable; urgency=low
 
   * Updated release version
 
- -- Quintin Beukes <[email protected]>  Thu, 14 Dec 2017 13:41:00 +0000
+ -- Ilya Shipitsin <[email protected]>  Mon, 11 Jun 2018 22:50:39 +05

debian/control

@@ -2,7 +2,7 @@ Source: softether-vpn
 Section: net
 Priority: optional
 Maintainer: Dmitry Orlov <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, linux-libc-dev, libssl-dev, zlib1g-dev, libreadline-dev, build-essential, cmake, dh-exec
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, linux-libc-dev, libssl-dev, zlib1g-dev, libreadline-dev, build-essential, cmake3 | cmake, dh-exec
 Standards-Version: 3.9.1
 Homepage: http://www.softether.org/
 

debian/rules

@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DH_VERBOSE=1
+export CMAKE_INSTALL_PREFIX=`pwd`/../../usr
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
@@ -9,13 +10,14 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 override_dh_auto_configure: configure_config
 
+override_dh_auto_make:
+	make -C tmp
+
 override_dh_auto_clean:
 	rm -fr Makefile* usr bin tmp src/bin/BuiltHamcoreFiles
 
 override_dh_auto_install:
-	patch -f < debian/makefile.patch
-	mkdir -p usr/bin
-	make install
+	make -C tmp install
 
 configure_config:
 	if [ $(shell uname -m) = 'x86_64' ]; then echo -e "1\n2\n" | ./configure; fi

debian/softether-vpnbridge.install

@@ -1,3 +1,3 @@
 #! /usr/bin/dh-exec
 debian/bin/vpnbridge usr/bin/
-usr/vpnbridge opt/
+usr/bin/vpnbridge opt/

debian/softether-vpnclient.install

@@ -1,3 +1,3 @@
 #! /usr/bin/dh-exec
 debian/bin/vpnclient usr/bin/
-usr/vpnclient opt/
+usr/bin/vpnclient opt/

debian/softether-vpncmd.install

@@ -1,3 +1,3 @@
 #! /usr/bin/dh-exec
 debian/bin/vpncmd usr/bin/
-usr/vpncmd opt/
+usr/bin/vpncmd opt/

debian/softether-vpnserver.install

@@ -1,3 +1,3 @@
 #! /usr/bin/dh-exec
 debian/bin/vpnserver usr/bin/
-usr/vpnserver opt/
+usr/bin/vpnserver opt/