♻️ New release / Version 3.3.7.2979

diff --git a/FULLNAMES b/FULLNAMES
index ecbac4ccb3be1c4ff83f6ba45e4e673419967567..8515ba94b14e7840a2be3341d1d531f34b42f619 100644 (file)
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1 +1 @@
-TAP-Windows 9.23.3
+OpenVPN Connect 3

diff --git a/LICENSE b/LICENSE
index c70fc0db0a1550ac33aa46a1388e2a32ad5bb17e..2423a30e2652783cde4cf462a7748f3ba99734f6 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1 @@
-Copyright (c) 2017 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file
+Copyright (c) 2023 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file

diff --git a/Makefile b/Makefile
index 38fc928ce5115e8de779022fcf3414ced8411f5f..7152a2a811d644a7771a483759860a92d474b260 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 PACKAGE         = $(shell basename `pwd` )
 DESTDIR         = /
 REPO            = /srv/www/repo/salt-packages/
-VERSION         = 2.4.7
+VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
-YEAR           = $(shell date +%Y )
+YEAR                   = $(shell date +%Y )
 
 package:
        sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec
@@ -24,7 +24,7 @@ package:
        find $(REPO)/noarch -name "oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm"  -exec rm {} \;
        mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
        echo $(NRELEASE) > RELEASE
-       git commit -a -m "New release"
+       git commit -a -m "♻️ New release / Version $(VERSION)"
 #      git push
        createrepo $(REPO)
 

diff --git a/OpenVPN.sls b/OpenVPN.sls
index f452394d221ea267da19652f54cab85295eee274..6a12b68b992a737990ec76f9089ce8a93cc3838c 100644 (file)
--- a/OpenVPN.sls
+++ b/OpenVPN.sls
@@ -1,11 +1,11 @@
 ###############################################################################
 # SLS: PACKAGE
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Author:               Helmuth Varkoly
+# Author:               Helmuth Varkoly, Maximilian Grunow
 #
-# Description:          SLS to use with OSS's softwaremanagement              
+# Description:          SLS to use with Cranix's softwaremanagement              
 ###############################################################################
 PACKAGE:
   pkg:

diff --git a/RELEASE b/RELEASE
index d00491fd7e5bb6fa28c517a0bb32b8b506539d4d..0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1
+2

diff --git a/VERSION b/VERSION
index 3faa67ab55f1111f9fe3bd68140ce8d5f4f49809..d91fc1fdea8b31b607cc0b117b995be22cf1c1a4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.7-1607-Win10
+3.3.7.2979

diff --git a/oss-pkg-OpenVPN.spec b/oss-pkg-OpenVPN.spec
index 53ce673853007958fddc67caa7a27d5b99bc1bcb..976d834fcd00d7f04272466a8321fa34feab1ac7 100644 (file)
--- a/oss-pkg-OpenVPN.spec
+++ b/oss-pkg-OpenVPN.spec
@@ -1,12 +1,12 @@
 #
-# Spec file for OpenVPN
-# Copyright (c) 2021 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
+# Spec file for OpenVPN Connect Client
+# Copyright (c) 2023 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
 #
 
 Name:         oss-pkg-OpenVPN
-Summary:      Package to install OpenVPN on OSS-Clients
-Version:      2.4.7
-Release:      1
+Summary:      Package to install OpenVPN on Cranix-Clients
+Version:      3.3.7.2979
+Release:      2
 License:      GPL-2.0
 Vendor:       Peter Varkoly and Helmuth Varkoly
 Packager:     peter@varkoly.de
@@ -21,12 +21,13 @@ PreReq:       %fillup_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-Package to install OpenVPN on OSS-Clients
+Package to install OpenVPN on Cranix-Clients
 
 Authors:
 --------
         helmuth@varkoly.de
         peter@varkoly.de
+        maximilian@grunow.at
 
 
 %prep
@@ -54,5 +55,3 @@ rm -rf %{buildroot}
 %defattr(644,root,root)
 /srv/salt/win/repo-ng/OpenVPN
 /srv/salt/packages/OpenVPN.sls
-
-

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index bbd92a20132c0ebfe87d9c1b28bc7f1dcf4f9ada..4bbd06f6b2eab2cc94e295f7306e35f6449012d8 100644 (file)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,18 +1,17 @@
 ###############################################################################
-# SLS:  VEYON
-# Copyright (c) 2019 Helmuth Varkoly, Nuermberg, Germany.
+# SLS:  OpenVPN Connect
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Authors:              Helmuth Varkoly
+# Authors:              Helmuth Varkoly, Maximilian Grunow
 #
 # Description:          Package SLS
 ###############################################################################
 
-
 OpenVPN:
-  '2.4.7-1607-Win10':
-    installer: salt://win/repo-ng/OpenVPN/openvpn-install-Win10.exe
-    full_name: 'OpenVPN 2.4.7-1607-Win10'
+  '3.3.7.2979':
+    installer: salt://win/repo-ng/OpenVPN/openvpn-connect-3.3.7.2979_signed.msi
+    full_name: 'OpenVPN Connect 3'
     uninstaller: "C:\\Program Files\\TAP-Windows\\Uninstall.exe"
     install_flags: '/S /VERYSILENT' 
     uninstall_flags: '/S'

diff --git a/repo-ng/openvpn-install-Win10.exe b/repo-ng/openvpn-install-Win10.exe
deleted file mode 100644 (file)
index e9eaade..0000000
Binary files a/repo-ng/openvpn-install-Win10.exe and /dev/null differ