summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cvsignore1
-rw-r--r--update.mk56
2 files changed, 54 insertions, 3 deletions
diff --git a/.cvsignore b/.cvsignore
index 0e26ecd..ddd8ccf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
stage
+update \ No newline at end of file
diff --git a/update.mk b/update.mk
index cde2601..50a3eb3 100644
--- a/update.mk
+++ b/update.mk
@@ -4,6 +4,25 @@
# These are the packages that were updated from Kolab Server version
# 2.2.2 to 2.2.3.
+UPDATES_2.2.3_2.2.4=openssl \
+ http://files.kolab.org/incoming/wrobel/x509-0-20090125.src.rpm@ \
+ http://files.kolab.org/server/release/kolab-server-2.2.3/sources/apr-1.2.12-20080101.src.rpm@with_ldap \
+ http://files.kolab.org/server/release/kolab-server-2.2.3/sources/imap-2006k-20080101.src.rpm@with_annotate \
+ http://files.kolab.org/server/release/kolab-server-2.2.3/sources/curl-7.17.1-20080101.src.rpm@ \
+ http://files.kolab.org/server/release/kolab-server-2.2.3/sources/perl-crypto-5.10.0-20080101.src.rpm@ \
+ http://files.kolab.org/server/release/kolab-server-2.2.3/sources/perl-ssl-5.10.0-20080101.src.rpm@ \
+ http://files.kolab.org/server/release/kolab-server-2.2.3/sources/sasl-2.1.22-20080101.src.rpm@with_login,with_ldap,with_ntlm \
+ apache \
+ apache-php \
+ php \
+ openldap \
+ imapd \
+ postfix \
+ kolabd \
+ clamav \
+
+# These are the packages that were updated from Kolab Server version
+# 2.2.2 to 2.2.3.
UPDATES_2.2.2_2.2.3=clamav \
db \
imapd \
@@ -18,7 +37,7 @@ UPDATES_2.2.2_2.2.3=clamav \
# perl-kolab
# Set the new version we are aiming at after each release.
-CVS_VERSION=2.2.3
+CVS_VERSION=2.2.4
# Determines the current version
CURRENT_VERSION=$(shell $(KOLABDIR)/bin/openpkg rpm -q kolabd | sed -e 's/kolabd-\([0-9.]*\)-[0-9]*/\1/')
@@ -33,12 +52,43 @@ update: current
current: $(KOLAB_SERVER_CVS)
.PHONY:$(KOLAB_SERVER_CVS)
-$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.2
+$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.3
+ @mkdir -p update
+ @for UPDATE in $(UPDATES_2.2.3_2.2.4); \
+ do \
+ if [ "x`echo $$UPDATE | grep http://`" == "x" ]; then \
+ make -C $$UPDATE install || exit $$?; \
+ else \
+ TARGET=`echo $${UPDATE} | sed -e 's#.*/\([^/]*\).src.rpm@.*#\1.$(PLATTAG).rpm#'`; \
+ PACKAGE=`echo $${UPDATE} | sed -e 's#\([^@]*\)@.*#\1#'`; \
+ if [ ! -e update/$$TARGET ]; then \
+ OPTIONS=`echo $${UPDATE} | sed -e 's#.*@\([^@]*\)#\1#' | sed -e "s#\([^,]*\),\?#--define '\1 yes' #g"`; \
+ LOCAL=`echo $${UPDATE} | sed -e 's#.*/\([^/]*\).src.rpm@.*#\1.src.rpm#'`; \
+ cd update; wget -c $$PACKAGE; echo "openpkg rpm --rebuild $$OPTIONS $$LOCAL" | sh;\
+ cp /kolab/RPM/PKG/$$TARGET .; \
+ /kolab/bin/openpkg rpm -Uhv --force $$TARGET; \
+ cd ..; \
+ fi; \
+ fi; \
+ done
+ @for UPDATE in kolab-webadmin perl-kolab; \
+ do \
+ echo "Please update $$UPDATE manually using 'make dist' and 'openpkg rpm'"; \
+ done
+
+ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.3"
+.PHONY:KOLAB_SERVER-2.2.3
+KOLAB_SERVER-2.2.3:
+ @echo "You are using Kolab Server 2.2.3. Updating from there..."
+else
+.PHONY:KOLAB_SERVER-2.2.3
+KOLAB_SERVER-2.2.3: KOLAB_SERVER-2.2.2
+ @echo "You are using Kolab Server 2.2.3. Updating from there..."
for UPDATE in $(UPDATES_2.2.2_2.2.3); \
do \
make -C $$UPDATE install || exit $$?; \
done
-
+endif
ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.2"
.PHONY:KOLAB_SERVER-2.2.2