--- rpms/softethervpn/contribs9/softethervpn.spec 2020/03/27 20:37:43 1.2 +++ rpms/softethervpn/contribs9/softethervpn.spec 2020/03/28 18:36:31 1.4 @@ -4,16 +4,19 @@ %define dateversion 2020.03.20 %define buildrelease beta %define version %{majorversion}.%{minorversion}.%{buildversion} -%define release 1 +%define release 2 + Name: softethervpn Version: %{majorversion}.%{minorversion}.%{buildversion} -Release: %{release}%{?dist} +Release: %{release}%{dist} Summary: An Open-Source Free Cross-platform Multi-protocol VPN Program Group: Applications/Internet License: GPLv2 URL: http://www.softether.org/ Source0: http://www.softether-download.com/files/softether/v%{majorversion}.%{minorversion}-%{buildversion}-%{buildrelease}-%{dateversion}-tree/Source_Code/softether-src-v%{majorversion}.%{minorversion}-%{buildversion}-%{buildrelease}.tar.gz +Patch0: softethervpn-pr202-merge5.01.9672.patch + BuildRequires: ncurses-devel BuildRequires: openssl-devel @@ -29,12 +32,19 @@ SoftEther VPN is one of the world's most %prep %setup -q -n v%{majorversion}.%{minorversion}-%{buildversion} +%patch0 -p1 + +%ifarch i386 i686 +cp centos/SOURCES/linux_32bit.mak Makefile +%else +cp centos/SOURCES/linux_64bit.mak Makefile +%endif %build %ifarch i386 i686 -cp $RPM_SOURCE_DIR/linux_32bit.mak Makefile +#cp $RPM_SOURCE_DIR/v%{majorversion}.%{minorversion}-%{buildversion}/linux_32bit.mak Makefile %else -cp $RPM_SOURCE_DIR/linux_64bit.mak Makefile +#cp $RPM_SOURCE_DIR/v%{majorversion}.%{minorversion}-%{buildversion}/linux_64bit.mak Makefile %endif make @@ -43,11 +53,13 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -m 755 -d $RPM_BUILD_ROOT/usr/bin/ install -m 755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d -install -m 755 $RPM_SOURCE_DIR/scripts/vpnserver $RPM_BUILD_ROOT/usr/bin/vpnserver -install -m 755 $RPM_SOURCE_DIR/scripts/vpnbridge $RPM_BUILD_ROOT/usr/bin/vpnbridge -install -m 755 $RPM_SOURCE_DIR/scripts/vpnclient $RPM_BUILD_ROOT/usr/bin/vpnclient -install -m 755 $RPM_SOURCE_DIR/scripts/vpncmd $RPM_BUILD_ROOT/usr/bin/vpncmd -install -m 755 $RPM_SOURCE_DIR/init.d/vpnserver $RPM_BUILD_ROOT/etc/rc.d/init.d/vpnserver +pwd +ls -lR +install -m 755 centos/SOURCES/scripts/vpnserver $RPM_BUILD_ROOT/usr/bin/vpnserver +install -m 755 centos/SOURCES/scripts/vpnbridge $RPM_BUILD_ROOT/usr/bin/vpnbridge +install -m 755 centos/SOURCES/scripts/vpnclient $RPM_BUILD_ROOT/usr/bin/vpnclient +install -m 755 centos/SOURCES/scripts/vpncmd $RPM_BUILD_ROOT/usr/bin/vpncmd +install -m 755 centos/SOURCES/init.d/vpnserver $RPM_BUILD_ROOT/etc/rc.d/init.d/vpnserver %clean rm -rf $RPM_BUILD_ROOT @@ -88,6 +100,14 @@ if [ $1 -eq 0 ]; then fi %changelog +* Sat Mar 28 2020 Jean-Philipe Pialasse 4.34.9744-2.sme +- add PR202 for ListenIP parameter in order to bind softethernet only on one IP + this will allow to keep https on internal interface for server-gateway mode + this has been merged to 5.01.9672 + +* Fri Mar 27 2020 Jean-Philipe Pialasse 4.34.9744-1.sme +- initial release SME 9 + * Wed Sep 30 2015 Jeff Tang - 4.19.9582-1 - Update upstream to 4.19.9582-beta