steffen: server obmtool,1.2,1.3 obmtool.conf,1.13,1.14
cvs at intevation.de
cvs at intevation.de
Tue May 18 03:55:41 CEST 2004
Author: steffen
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv30828
Modified Files:
obmtool obmtool.conf
Log Message:
opgraded obmtool to 1.38 and updated obmtool.conf
Index: obmtool
===================================================================
RCS file: /kolabrepository/server/obmtool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- obmtool 17 Apr 2004 22:35:34 -0000 1.2
+++ obmtool 18 May 2004 01:55:39 -0000 1.3
@@ -3,7 +3,7 @@
## obmtool -- OpenPKG poor man's Boot, Build & Management Tool
## based on Ralf S. Engelschall's "devtool -- Development Tool"
## Copyright (c) 2003 Thomas Lotterer <thomas at lotterer.net>
-## Id: obmtool,v 1.37 2004/04/06 21:40:36 thl cvs.ZfOS.org
+## Id: obmtool,v 1.38 2004/05/05 10:44:07 thl cvs.ZfOS.org
## $Id$
##
@@ -305,8 +305,8 @@
fi
fi
fi
- # download source RPM
- if [ ".${MPX}${RPM}" -a ! -f ${PREFIX}/RPM/PKG/${PKG}.src.rpm ]; then
+ # download source RPM only if binary RPM is missing, too
+ if [ ".${MPX}${RPM}" != . -a ! -f ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm -a ! -f ${PREFIX}/RPM/PKG/${PKG}.src.rpm ]; then
for retrygaps in 1 4 16; do
@fetch ${LOC}/${PKG}.src.rpm ${PREFIX}/RPM/PKG/
if [ -f ${PREFIX}/RPM/PKG/${PKG}.src.rpm ]; then
@@ -408,7 +408,6 @@
ln "$dire/$file" "$dst/$file" 2>/dev/null
[ $? -eq 0 -a -f "$dst/$file" ] && return 0
[ ".${debug}" = .1 ] && echo "DEBUG: fetch: trying local copy \"$dire/$file\" to \"$dst/$file\""
- echo cp "$dire/$file" "$dst/$file" 2>/dev/null
cp "$dire/$file" "$dst/$file" 2>/dev/null
[ $? -eq 0 -a -f "$dst/$file" ] && return 0
return 1
@@ -602,15 +601,24 @@
echo "obmtool:ERROR: rpm multiplexer/binary missing" 1>&2
exit 1
fi
+ if [ -f ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm ]; then
+ ${MPX} ${RPM} --checksig ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm | egrep ' md5 ' >/dev/null
+ if [ $? -ne 0 ]; then
+ echo "obmtool:WARNING: removing damaged file ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm (md5)" 1>&2
+ rm -f ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm 2>/dev/null || true
+ fi
+ fi
${MPX} ${RPM} -q >/dev/null ${PKG}
- if [ $? -ne 0 ]; then
+ if [ $? -eq 0 ]; then
if [ -f ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm ]; then
- ${MPX} ${RPM} --checksig ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm | egrep ' md5 ' >/dev/null
- if [ $? -ne 0 ]; then
- echo "obmtool:WARNING: removing damaged file ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm (md5)" 1>&2
- rm -f ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm 2>/dev/null || true
+ MD5QP=`${MPX} ${RPM} -qp --qf '%{SIGMD5}' ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm`
+ MD5DB=`${MPX} ${RPM} -q --qf '%{SIGMD5}' ${PKG}`
+ if [ ".$MD5QP" != ".$MD5DB" ]; then
+ echo "obmtool:WARNING: replacing installed ${PKG} with same name-version-release file having different message digest" 1>&2
+ ${MPX} ${RPM} -Uvh --oldpackage --nodeps ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm 2>&1 | tee /tmp/${PRG}-${PKG}.install.log
fi
fi
+ else
@rebuild ${ARGS}
if [ -f ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm ]; then
${MPX} ${RPM} -Uvh --oldpackage --nodeps ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm 2>&1 | tee /tmp/${PRG}-${PKG}.install.log
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- obmtool.conf 17 May 2004 12:14:06 -0000 1.13
+++ obmtool.conf 18 May 2004 01:55:39 -0000 1.14
@@ -67,7 +67,7 @@
@install ${loc}perl-sys-5.8.3-20040325
@install ${loc}perl-ldap-5.8.3-20040318
@install ${loc}perl-db-5.8.3-20040318
- @install ${loc}perl-kolab-5.8.3-20040426
+ @install ${loc}perl-kolab-5.8.3-20040517
@install ${loc}imapd-2.2.3-20040328 --with=group --with=atvdom
@install ${loc}m4-1.4o-20040209
@install ${loc}bison-1.35-20040212
@@ -89,13 +89,14 @@
--with=mod_php_pear \
--with=mod_php_xml \
--with=mod_ssl
- $install ${loc}php-smarty-2.6.2-20040517
+ @install ${loc}php-smarty-2.6.2-20040518
@install ${loc}spamassassin-2.63-20040218
@install ${loc}amavisd-20030616p9-20040423
@install ${loc}clamav-0.70-20040417
@install ${loc}vim-6.2.504-20040426
@install ${loc}dcron-2.9-20040207
- @install ${loc}kolab-1.9.0-20040428 --without=genuine
+ @install ${loc}kolab-1.9.0-20040517 --without=genuine
+ @install ${loc}kolab-webadmin-0.1.0-20040518
@check
%dump
More information about the commits
mailing list