From 37cd07400c2e8ee95b271d17052e38f3f4bd2229 Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Wed, 22 Sep 2021 17:07:01 +0300
Subject: [PATCH] workstation: Reoder lists to avoid conflicts

Package openssh-gostcrypto from extras list conflicts with openssh
which pulled by openuds-client from raccess list and gtk2-ssh-askpass
from kvm list. Thus, these lists are moved as far apart as possible.
---
 conf.d/basealt.mk                |  4 ++--
 conf.d/mixin-basealt.mk          |  4 ++--
 pkg.in/lists/workstation/extras  | 19 +++++++++++--------
 pkg.in/lists/workstation/raccess |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/conf.d/basealt.mk b/conf.d/basealt.mk
index 371707af..d56aeb45 100644
--- a/conf.d/basealt.mk
+++ b/conf.d/basealt.mk
@@ -1,8 +1,8 @@
 ifeq (distro,$(IMAGE_CLASS))
 
 distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
-	3rdparty clamav cloud-clients freecad \
-	gtk-dictionary kvm smartcard voip-clients vlc)
+	3rdparty kvm clamav cloud-clients freecad \
+	gtk-dictionary smartcard voip-clients vlc)
 
 distro/alt-workstation: distro/.base +vmguest +wireless +efi \
 	mixin/desktop-installer mixin/alt-workstation \
diff --git a/conf.d/mixin-basealt.mk b/conf.d/mixin-basealt.mk
index dea4bf54..fddd5444 100644
--- a/conf.d/mixin-basealt.mk
+++ b/conf.d/mixin-basealt.mk
@@ -2,8 +2,8 @@
 
 mixin/alt-workstation-install: workstation_groups = $(addprefix workstation/,\
 	10-office 20-networking 30-multimedia 40-virtualization 50-publishing \
-	agents emulators ganttproject gnome-peer-to-peer graphics-editing \
-	libreoffice mate-usershare pidgin raccess scanning scribus \
+	raccess agents emulators ganttproject gnome-peer-to-peer graphics-editing \
+	libreoffice mate-usershare pidgin scanning scribus \
 	sound-editing thunderbird freeipa-client admc)
 
 mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
diff --git a/pkg.in/lists/workstation/extras b/pkg.in/lists/workstation/extras
index bc91ef26..052bbc79 100644
--- a/pkg.in/lists/workstation/extras
+++ b/pkg.in/lists/workstation/extras
@@ -1,14 +1,6 @@
 # GOST encryption
 openssl-engines
 
-# gostcrypo repo component is needed
-openssh-gostcrypto
-openssh-clients-gostcrypto openssh-askpass-common-gostcrypto
-openssh-server-gostcrypto openssh-server-control-gostcrypto
-openssh-common-gostcrypto
-openvpn-gostcrypto openvpn-plugins-gostcrypto
-alterator-openvpn-server
-
 # for AltHa
 alterator-secsetup
 
@@ -30,3 +22,14 @@ kernel-headers-un-def
 chromium
 
 chromium-gost
+
+# gostcrypo repo component is needed
+openvpn-gostcrypto openvpn-plugins-gostcrypto
+alterator-openvpn-server
+
+openssh-gostcrypto
+openssh-common-gostcrypto
+openssh-askpass-common-gostcrypto
+openssh-clients-gostcrypto
+openssh-server-control-gostcrypto
+openssh-server-gostcrypto
diff --git a/pkg.in/lists/workstation/raccess b/pkg.in/lists/workstation/raccess
index 444c2928..8c773d32 100644
--- a/pkg.in/lists/workstation/raccess
+++ b/pkg.in/lists/workstation/raccess
@@ -1,6 +1,6 @@
+openuds-client
 remmina
 remmina-plugins
 rdesktop
 connector
 ansible
-openuds-client