Change cyrus-sasl from package to common.

diff --git a/config/rootfiles/packages/cyrus-sasl b/config/rootfiles/common/cyrus-sasl
similarity index 100%
rename from config/rootfiles/packages/cyrus-sasl
rename to config/rootfiles/common/cyrus-sasl

diff --git a/config/rootfiles/core/36/filelists/cyrus-sasl b/config/rootfiles/core/36/filelists/cyrus-sasl
new file mode 120000 (symlink)
index 0000000..bb51b4c
--- /dev/null
+++ b/config/rootfiles/core/36/filelists/cyrus-sasl
@@ -0,0 +1 @@
+../../../common/cyrus-sasl
\ No newline at end of file

diff --git a/config/rootfiles/core/36/update.sh b/config/rootfiles/core/36/update.sh
index 7ea483f923a5e33459e0313e557b64a98740996b..48abc246e3565bc54ccc671d143911eaf6ea6b53 100644 (file)
--- a/config/rootfiles/core/36/update.sh
+++ b/config/rootfiles/core/36/update.sh
@@ -32,6 +32,10 @@ extract_files
 #
 #Start services
 
+#
+#Delete cyrus-sasl metafiles
+rm -f /opt/pakfire/db/installed/meta-cyrus-sasl
+rm -f /opt/pakfire/db/meta/meta-cyrus-sasl
 #
 #Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

diff --git a/lfs/cups b/lfs/cups
index aab56d17720b83ed8726bc612ae5e3e904ef544e..96e232138eaa1b67f7f81dcc8b0530b9caf18c15 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 3
+PAK_VER    = 4
 
-DEPS       = "ghostscript cyrus-sasl"
+DEPS       = "ghostscript"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index b2041c1aecc6d6eb7011da0ed342ac81646abb6e..c9969d291247301b440a942ad2ee68c43256de3f 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = "cyrus-sasl"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/openldap b/lfs/openldap
index 346524e9aa35c3bf4233785c0408b63abda4a105..9771ae44108b758fb3bf2eabea658ebeb904c0d7 100644 (file)
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = openldap
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = "cyrus-sasl"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/samba b/lfs/samba
index b09d67b64f772b2be7b0c6b55e861bc35e27c2b9..2e00b5997b965ea3f2026e558061531a2c6e4f44 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 22
+PAK_VER    = 23
 
-DEPS       = "cups cyrus-sasl"
+DEPS       = "cups"
 
 ###############################################################################
 # Top-level Rules