From c13e562b6e403808f90703e90b717a2193a2592f Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 15 May 2022 18:02:19 +0200
Subject: [PATCH] krb5: Move package into core system.

On one hand, the key.dns_resolver binary is linked against libkrb5, so this
library at least is required by the base system.

On the other hand this easily allows different services on the firewall
to use kerberos for authentication (ssh etc).

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 config/rootfiles/{packages => common}/krb5 | 0
 lfs/cups                                   | 4 ++--
 lfs/krb5                                   | 4 ----
 lfs/netatalk                               | 2 +-
 lfs/samba                                  | 2 +-
 lfs/tshark                                 | 4 ++--
 6 files changed, 6 insertions(+), 10 deletions(-)
 rename config/rootfiles/{packages => common}/krb5 (100%)

diff --git a/config/rootfiles/packages/krb5 b/config/rootfiles/common/krb5
similarity index 100%
rename from config/rootfiles/packages/krb5
rename to config/rootfiles/common/krb5
diff --git a/lfs/cups b/lfs/cups
index cd4519b633..7d4dc20c2d 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 25
+PAK_VER    = 26
 
-DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
+DEPS       = avahi cups-filters dbus ghostscript libtiff
 
 SERVICES   = cups
 
diff --git a/lfs/krb5 b/lfs/krb5
index 399f9338e7..e089480053 100644
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -33,10 +33,6 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)/src
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = krb5
-PAK_VER    = 7
-
-DEPS       =
 
 SERVICES   =
 
diff --git a/lfs/netatalk b/lfs/netatalk
index 9e8ce454b8..ef75c89fe6 100644
--- a/lfs/netatalk
+++ b/lfs/netatalk
@@ -36,7 +36,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = netatalk
 PAK_VER    = 3
 
-DEPS       = avahi dbus krb5
+DEPS       = avahi dbus
 
 SERVICES   = netatalk
 
diff --git a/lfs/samba b/lfs/samba
index 896e7e71ea..a48a0ecb1c 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
 PAK_VER    = 85
 
-DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp perl-JSON
+DEPS       = avahi cups libtirpc perl-Parse-Yapp perl-JSON
 
 SERVICES   = samba
 
diff --git a/lfs/tshark b/lfs/tshark
index eb89f74745..ee9c06dc41 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -34,8 +34,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tshark
-DEPS       = krb5 c-ares
-PAK_VER    = 12
+DEPS       = c-ares
+PAK_VER    = 13
 
 SERVICES   =
 
-- 
2.39.5