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>

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 cd4519b633da4acd3bc47493bcc59722da2695fc..7d4dc20c2de8941f75efdd1c22132a78d32bd61b 100644 (file)
--- 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 399f9338e77e8e081321b15eb012593ead742ae4..e08948005386461208edc434cec6f00d125985eb 100644 (file)
--- 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 9e8ce454b851e0e1884158d67d210110339190a7..ef75c89fe6b723aeebbe3b573e26143fc19b4ccc 100644 (file)
--- 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 896e7e71ead3eb9d93ac9195d948f36278444f10..a48a0ecb1c34de5e9f5962f6892b21e60f74f83d 100644 (file)
--- 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 eb89f74745d570f657055f894ff150303ed9f9e1..ee9c06dc41bb62b8a4d65e8936496aa62bbf12e7 100644 (file)
--- 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   =