thomas: server 1st.README, 1.1.2.18, 1.1.2.19 release-notes.txt, 1.398.2.128, 1.398.2.129 install-kolab.sh, 1.54.2.17, 1.54.2.18

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv9138

Modified Files:
      Tag: kolab_2_2_branch
	1st.README release-notes.txt install-kolab.sh 
Log Message:
install-kolab.sh: Use clean /kolab/RPM/PKG directory

This way existing files with identical version numbers do not disturb the
build process. Needed for unchanged packages that have to be recompiled to link
against new openssl. Side effect of this that we can move the temporary files
into this directory, important for the openpkg base files.


Index: 1st.README
===================================================================
RCS file: /kolabrepository/server/1st.README,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- 1st.README	29 Jun 2010 07:47:17 -0000	1.1.2.18
+++ 1st.README	29 Jun 2010 10:10:08 -0000	1.1.2.19
@@ -420,10 +420,8 @@
 To generate this file, you always need all .src.rpm files, so link or copy
 them in a new directory (needs to be writable by the kolab user of your
 installation). After this you can link/copy the install-kolab.sh file and
-your binary rpm files (e.g. openpkg-20071227-20071227_kolab1.*-kolab.rpm from
-/tmp/install-kolab.*/ and the others from /kolab/RPM/PKG/) into this
-directory and run the following command as user kolab or root to create the
-new 00INDEX.rdf file:
+your binary rpm files (from /kolab/RPM/PKG/) into this directory and run the
+following command as user kolab or root to create the new 00INDEX.rdf file:
 
 $ sh install-kolab.sh -X
 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.128
retrieving revision 1.398.2.129
diff -u -d -r1.398.2.128 -r1.398.2.129
--- release-notes.txt	29 Jun 2010 07:47:17 -0000	1.398.2.128
+++ release-notes.txt	29 Jun 2010 10:10:08 -0000	1.398.2.129
@@ -101,6 +101,17 @@
 	                 which is from a now *not* shared, before
 	                 shared calendar folder)
 
+    - install-kolab.sh
+
+	Add defines for build options of imapd and kolab-webclient:
+	imapd::with_crossdomain_acl and kolab-webclient::with_activesync=no
+
+	Use clean /kolab/RPM/PKG directory so existing files with identical
+	version numbers do not disturb the build process. Needed for unchanged
+	packages that have to be recompiled to link against new openssl.
+	Side effect of this that we can move the temporary files into this
+	directory, important for the openpkg base files.
+
     - imapd-2.3.13-20081020_kolab5
 
 	kolab/issue1141 (Cannot give users from other domains access

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.17
retrieving revision 1.54.2.18
diff -u -d -r1.54.2.17 -r1.54.2.18
--- install-kolab.sh	25 Jun 2010 14:18:37 -0000	1.54.2.17
+++ install-kolab.sh	29 Jun 2010 10:10:08 -0000	1.54.2.18
@@ -18,6 +18,7 @@
 TAG="kolab"
 USER=""
 PREFIX=""
+UNIQEXT="$RANDOM.$RANDOM.$RANDOM.$$"
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
 DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl -D kolab-webclient::with_activesync=no"
@@ -71,7 +72,7 @@
 fi
 
 mktmpdir() {
-  newtmp="${TMPDIR-/tmp}/install-kolab.$RANDOM.$RANDOM.$RANDOM.$$"
+  newtmp="${TMPDIR-/tmp}/install-kolab.$UNIQEXT"
   mkdir "$newtmp" || {
     echo "Could not create temporary directory! Exiting." 1>&2
     exit 1
@@ -79,6 +80,16 @@
   echo "$newtmp"
 }
 
+mkpkgbackup() {
+  pkgbackup="$1.$UNIQEXT"
+  mkdir "$pkgbackup" || {
+    echo "Could not create PKG backup directory! Exiting." 1>&2
+    exit 1
+  }
+  mv "$1/"* "$pkgbackup"
+  echo "$pkgbackup"
+}
+
 shtool_get_plattag() {
   [ -f shtool ] || sh "$INSTALLER" -t | tar xf - shtool
   echo `sh shtool platform --type=binary`-$TAG
@@ -305,6 +316,10 @@
 fi
 
 if [ -n "$DIR" ]; then
+    PKGDIR="$PREFIX/RPM/PKG"
+    PKGBACKUP=`mkpkgbackup "$PKGDIR"`
+    cd "$PKGDIR" && mv "$WORKDIR"/* "$PKGDIR" && rmdir "$WORKDIR" || exit $?
+
     [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/bin/openpkg" rpm -q --qf="%{ARCH}-%{OS}" openpkg`-$TAG
     if [ -n "$KOLAB_VERSION" ]; then
         DEFINE="$DEFINE
@@ -314,16 +329,18 @@
     fi
 
     PACKAGES=`remove_from_list "$EXCLUDEPKGS" "$PACKAGES"`
-
-    find "$DIR" $FIND1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \;
     echo "----------- SETUP COMPLETED -----------"
     echo
     echo " Now running:"
     echo
-    echo "   $PREFIX/bin/openpkg build -kKBuZ -r \"$DIR\" -p \"$PLATTAG\" $DEFINE $PACKAGES | sh"
+    echo "   $PREFIX/bin/openpkg build -kKBuZ -r \"$PKGDIR\" -p \"$PLATTAG\" $DEFINE $PACKAGES | sh"
     echo
     echo "---------------------------------------"
-    "$PREFIX/bin/openpkg" build -kKBuZ -r "$DIR" -p "$PLATTAG" $DEFINE $PACKAGES | sh || exit $?
+    "$PREFIX/bin/openpkg" build -kKBuZ -r "$PKGDIR" -p "$PLATTAG" $DEFINE $PACKAGES | sh
+    rc=$?
+    echo "$PKGDIR now contains the installed packages."
+    echo "Previous contents were moved to $PKGBACKUP"
+    exit $?
 fi
 
 exit 0