From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 24 Jan 2010 14:21:07 +0000 (+0100)
Subject: Change cyrus-sasl from package to common.
X-Git-Tag: v2.9-beta1~497
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=6e725fc4f1f3d440dbc2b423fa333a926c5e0654

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
index 0000000000..bb51b4c92c
--- /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 7ea483f923..48abc246e3 100644
--- 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 aab56d1772..96e232138e 100644
--- 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 b2041c1aec..c9969d2912 100644
--- 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 346524e9aa..9771ae4410 100644
--- 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 b09d67b64f..2e00b5997b 100644
--- 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