+ + +

January 4th, 2010

» + Security Issue 26 for Kolab Server (SpamAssassin) +

+ A new kolabd RPM which fixes a problem with SpamAssassin is available. See the + Kolab Security Issue 26 for details. +

+ + + + + + + + + + + + + $fbperm) { if ($user != $owner) { ?> + + + + + + + + + + + + +hasCapability('list')): ?> + + + + + + + + + + + + -- tg: (0175a71..) t/kronolith/HK/GW/XfbAccess (depends on: t/kronolith/HK/GW/FbviewRelevance) -- TOPGIT patch commit log ======================= commit 2d1588fad36f7b13bb534d70f14aa4f75ef8d35f Author: Gunnar Wrobel
Date: Sun Feb 1 22:29:11 2009 +0000 Added patch kronolith/HK-GW-Fbview_xfb_access.patch from the mercurial release queue. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/series,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- series 22 Jan 2010 18:47:50 -0000 1.1 +++ series 22 Jan 2010 18:55:27 -0000 1.2 @@ -1 +1,3 @@ t_kronolith_HK_GW_AuthenticatedFreeBusy.diff +t_kronolith_HK_GW_FbviewRelevance.diff +t_kronolith_HK_GW_XfbAccess.diff From cvs at kolab.org Fri Jan 22 20:01:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:01:48 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith kronolith.spec,1.2,1.3 Message-ID: <20100122190148.18A8F600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith In directory doto:/tmp/cvs-serv16119/kronolith Modified Files: kronolith.spec Log Message: Merge additional kronolith patches. Index: kronolith.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/kronolith/kronolith.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kronolith.spec 22 Jan 2010 16:02:06 -0000 1.2 +++ kronolith.spec 22 Jan 2010 19:01:45 -0000 1.3 @@ -88,7 +88,7 @@ rm test.php - #find . -type f | grep '\.orig$' | xargs rm -f + find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith From cvs at kolab.org Fri Jan 22 20:01:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:01:48 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_kronolith_HK_SB_ExtraParameters.diff, 1.2, NONE t_kronolith_HK_SB_SaveEventAttendees.diff, 1.2, NONE t_kronolith_H_JS_FixHolidayDriver.diff, 1.1, NONE Message-ID: <20100122190148.4CF93600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv16119/patches/1.2.0/KOLAB Removed Files: t_kronolith_HK_SB_ExtraParameters.diff t_kronolith_HK_SB_SaveEventAttendees.diff t_kronolith_H_JS_FixHolidayDriver.diff Log Message: Merge additional kronolith patches. --- t_kronolith_HK_SB_ExtraParameters.diff DELETED --- --- t_kronolith_HK_SB_SaveEventAttendees.diff DELETED --- --- t_kronolith_H_JS_FixHolidayDriver.diff DELETED --- From cvs at kolab.org Fri Jan 22 20:01:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:01:48 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 t_kronolith_HK_SB_ExtraParameters.diff, NONE, 1.1 t_kronolith_HK_SB_SaveEventAttendees.diff, NONE, 1.1 series, 1.2, 1.3 Message-ID: <20100122190148.47D6F600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3 In directory doto:/tmp/cvs-serv16119/kronolith/patches/kronolith-2.3.3 Modified Files: series Added Files: t_kronolith_HK_SB_ExtraParameters.diff t_kronolith_HK_SB_SaveEventAttendees.diff Log Message: Merge additional kronolith patches. --- NEW FILE: t_kronolith_HK_SB_ExtraParameters.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/kronolith/HK/SB/ExtraParameters Add additional event parameters to the Free/Busy view. Signed-off-by: Gunnar Wrobel
--- lib/FBView.php | 27 +++++++++++++++++-- .../kronolith/templates/fbview/busyblock.html | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/lib/FBView.php b/lib/FBView.php index f0bb03f..db402d3 100644 --- a/lib/FBView.php +++ b/lib/FBView.php @@ -87,7 +87,7 @@ class Kronolith_FreeBusy_View { $rows = ''; foreach ($this->_requiredMembers as $member) { $member->simplify(); - $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy")); + $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams()); $template = new Horde_Template(); $template->set('blocks', $blocks); $template->set('name', $member->getName()); @@ -109,7 +109,7 @@ class Kronolith_FreeBusy_View { $rows = ''; foreach ($this->_optionalMembers as $member) { $member->simplify(); - $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy")); + $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams()); $template = new Horde_Template(); $template->set('blocks', $blocks); $template->set('name', $member->getName()); @@ -125,6 +125,9 @@ class Kronolith_FreeBusy_View { $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.html'); } + //********** + //This has been disabled in kolab-fbview. Make this optional? + // Possible meeting times. $optimal->setAttribute('ORGANIZER', _("All Attendees")); $blocks = $this->_getBlocks($optimal, @@ -147,6 +150,9 @@ class Kronolith_FreeBusy_View { $template->set('blocks', $blocks); $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html'); + //This has been disabled in kolab-fbview. Make this optional? + //********** + // Reset locale. setlocale(LC_NUMERIC, $lc); @@ -215,7 +221,7 @@ class Kronolith_FreeBusy_View { return $instances[$view]; } - function _getBlocks($member, $periods, $blockfile, $label) + function _getBlocks($member, $periods, $blockfile, $label, $extra = array()) { $template = new Horde_Template(); $template->set('label', $label); @@ -248,6 +254,21 @@ class Kronolith_FreeBusy_View { $template->set('left', $left . '%'); $template->set('width', $width . '%'); + $template->set('evclick', ''); + + if (isset($extra[$periodStart])) { + if (!empty($extra[$periodStart]['X-UID'])) { + $link = "javascript:performAction('viewaction', '" + . addslashes($member->getName() . "#" + . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), + 'UTF-8',NLS::getCharset())) . "')"; + $template->set('evclick', $link); + } + if (!empty($extra[$periodStart]['X-SUMMARY'])) { + $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8', + NLS::getCharset())); + } + } $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile); } else { diff --git a/templates/fbview/busyblock.html b/templates/fbview/busyblock.html index 223ee21..a442b54 100644 --- a/templates/fbview/busyblock.html +++ b/templates/fbview/busyblock.html @@ -1 +1 @@ -
+ -- tg: (cd7f4fe..) t/kronolith/HK/SB/ExtraParameters (depends on: t/kronolith/HK/SB/SaveEventAttendees) -- TOPGIT patch commit log ======================= commit 2b897516731f83d8acfc3d09c4ecb99c4699f6be Author: Gunnar Wrobel
Date: Sat Mar 14 01:10:42 2009 +0100 Removed stray .orig file. commit 925627f7aa47741226eeacdf09b15dcc38ab5225 Author: Gunnar Wrobel
Date: Sun Feb 1 22:26:49 2009 +0000 Added patch kronolith/HK-SB-Fbview_extra_params.patch from the mercurial release queue. --- NEW FILE: t_kronolith_HK_SB_SaveEventAttendees.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/kronolith/HK/SB/SaveEventAttendees Allow to save attendees when adding them to kronolith events. FIXME: It would be better to save these as distribution lists now. Signed-off-by: Gunnar Wrobel
--- attendees.php | 18 +++++ config/prefs.php.dist | 8 ++ savedattlist.php | 77 ++++++++++++++++++++ .../kronolith/templates/attendees/attendees.inc | 2 + .../templates/javascript/open_savedattlist_win.js | 36 +++++++++ .../templates/savedattlist/savedattlist.inc | 68 +++++++++++++++++ 6 files changed, 209 insertions(+), 0 deletions(-) diff --git a/attendees.php b/attendees.php index a2d8b3e..e1b15c0 100644 --- a/attendees.php +++ b/attendees.php @@ -178,6 +178,16 @@ case 'clear': $attendees = array(); $_SESSION['kronolith']['attendees'] = $attendees; break; + +case 'save': + if (empty($attendees)) { + break; + } + $savedattlist = unserialize($prefs->getValue('saved_attendee_list')); + $savedattlist[] = array_keys($attendees); + $prefs->setValue('saved_attendee_list', serialize($savedattlist)); + $notification->push(_('Successfully saved attendee list'), 'horde.success'); + break; } // Get the current Free/Busy view; default to the 'day' view if none specified. @@ -264,6 +274,14 @@ Imple::factory('ContactAutoCompleter', array('triggerId' => 'newAttendees')); $title = _("Edit attendees"); require KRONOLITH_TEMPLATES . '/common-header.inc'; + +if ($browser->hasFeature('javascript')) { + Horde::addScriptFile('open_savedattlist_win.js'); + $savedattlist_url = 'javascript:open_savedattlist_win();'; +} else { + $savedattlist_url = Horde::applicationUrl('savedattlist.php'); +} + $notification->notify(array('status')); require KRONOLITH_TEMPLATES . '/attendees/attendees.inc'; require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/config/prefs.php.dist b/config/prefs.php.dist index 22c08c3..b1c49d8 100644 --- a/config/prefs.php.dist +++ b/config/prefs.php.dist @@ -497,3 +497,11 @@ $_prefs['last_kronolith_maintenance'] = array( 'shared' => false, 'type' => 'implicit' ); + +$_prefs['saved_attendee_list'] = array( + 'value' => 'a:0:{}', + 'locked' => false, + 'shared' => false, + 'type' => 'implicit', + 'desc' => _("A saved list of attendees") +); diff --git a/savedattlist.php b/savedattlist.php new file mode 100644 index 0000000..631b994 --- /dev/null +++ b/savedattlist.php @@ -0,0 +1,77 @@ + + * Stuart Binge + * + * See the enclosed file COPYING for license information (GPL). If you + * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. + */ + + at define('KRONOLITH_BASE', dirname(__FILE__)); +require_once KRONOLITH_BASE . '/lib/base.php'; +require_once KRONOLITH_BASE . '/lib/FBView.php'; + +$title = _('Load Attendee List'); + +Horde::addScriptFile('tooltip.js', 'horde'); +require KRONOLITH_TEMPLATES . '/common-header.inc'; + +// Get our list of saved attendees +$savedattlist = unserialize($prefs->getValue('saved_attendee_list')); + +// Preformat our image urls +$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde')); +$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde')); + +// Get our Action ID & Value. This specifies what action the user initiated. +$actionID = Util::getFormData('actionID', false); +$actionValue = Util::getFormData('actionValue', false); +if (!$actionID) { + $actionID = (Util::getFormData('addNew', false) ? 'add' : false); + $actionValue = Util::getFormData('newAttendees', ''); +} + +// Perform the specified action, if there is one. +switch ($actionID) { +case 'remove': + // Remove the specified attendee + if (array_key_exists($actionValue, $savedattlist)) { + unset($savedattlist[$actionValue]); + $prefs->setValue('saved_attendee_list', serialize($savedattlist)); + } + + break; + +case 'dismiss': + // Make sure we're actually allowed to dismiss + if (!$allow_dismiss) break; + + // Close the attendee window + global $browser; + + if ($browser->hasFeature('javascript')) { + Util::closeWindowJS(); + } else { + $url = Util::getFormData('url'); + + if (!empty($url)) { + $location = Horde::applicationUrl($url, true); + } else { + $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month')); + $url = Util::addParameter($url, 'year', Util::getFormData('year')); + $location = Horde::applicationUrl($url, true); + } + + // Make sure URL is unique. + $location = Util::addParameter($location, 'unique', md5(microtime())); + + header('Location: ' . $location); + } + break; +} + +$form_handler = Horde::applicationUrl('savedattlist.php'); +require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc'; +require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc'; diff --git a/templates/attendees/attendees.inc b/templates/attendees/attendees.inc index b057ea0..88f77eb 100644 --- a/templates/attendees/attendees.inc +++ b/templates/attendees/attendees.inc @@ -92,6 +92,8 @@ function switchDateView(view, timestamp)
" /> " /> + " onclick="" /> + " onclick="performAction('save', '');" /> " />
diff --git a/templates/javascript/open_savedattlist_win.js b/templates/javascript/open_savedattlist_win.js new file mode 100644 index 0000000..388a4b7 --- /dev/null +++ b/templates/javascript/open_savedattlist_win.js @@ -0,0 +1,36 @@ + + diff --git a/templates/savedattlist/savedattlist.inc b/templates/savedattlist/savedattlist.inc new file mode 100644 index 0000000..2489f25 --- /dev/null +++ b/templates/savedattlist/savedattlist.inc @@ -0,0 +1,68 @@ + + + + + + + + +
+ +

December 23rd, 2009 » Kolab Server 2.2.3 Final Release From cvs at kolab.org Mon Jan 4 16:50:18 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 4 Jan 2010 16:50:18 +0100 (CET) Subject: gunnar: server/make-helper hg-patch-queue.mk,1.1,1.2 Message-ID: <20100104155018.85C7E600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv20777/make-helper Modified Files: hg-patch-queue.mk Log Message: Only download the new source if it does not exist yet. Add a clean target Index: hg-patch-queue.mk =================================================================== RCS file: /kolabrepository/server/make-helper/hg-patch-queue.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- hg-patch-queue.mk 4 Dec 2009 09:43:21 -0000 1.1 +++ hg-patch-queue.mk 4 Jan 2010 15:50:16 -0000 1.2 @@ -7,14 +7,13 @@ .PHONY: update update: @if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi - rm -rf tmp mkdir -p tmp ifeq "x$(COMPRESSION)" "xGZ" - cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.gz + cd tmp && test -e $(PN)-$(OLD_VERSION).tar.gz || wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.gz cd tmp && tar xfz $(PN)-$(OLD_VERSION).tar.gz endif ifeq "x$(COMPRESSION)" "xBZ2" - cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.bz2 + cd tmp && test -e $(PN)-$(OLD_VERSION).tar.bz2 || wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.bz2 cd tmp && tar xfj $(PN)-$(OLD_VERSION).tar.bz2 endif cd tmp/$(PN)-$(OLD_VERSION) && hg init && hg commit --addremove -m "$(PN)-$(OLD_VERSION)" @@ -65,3 +64,7 @@ cp tmp/$(PN)-PATCHED/.hg/patches/series $(PN)-$(NEW_VERSION)/ rm -rf tmp +.PHONY: clean +clean: + rm -rf tmp + rm -f *~ From cvs at kolab.org Mon Jan 4 16:52:00 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 4 Jan 2010 16:52:00 +0100 (CET) Subject: gunnar: server/php .cvsignore,1.5,1.6 Message-ID: <20100104155200.1404B600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv20832/php Modified Files: .cvsignore Log Message: Ignore tar.gz files. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .cvsignore 20 May 2008 17:11:08 -0000 1.5 +++ .cvsignore 4 Jan 2010 15:51:57 -0000 1.6 @@ -1 +1,2 @@ *.src.rpm +*.tar.gz \ No newline at end of file From cvs at kolab.org Mon Jan 4 16:51:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 4 Jan 2010 16:51:59 +0100 (CET) Subject: gunnar: server/apache-php .cvsignore,1.1,1.2 Message-ID: <20100104155159.C8963600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/apache-php In directory doto:/tmp/cvs-serv20832/apache-php Modified Files: .cvsignore Log Message: Ignore tar.gz files. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/apache-php/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 20 May 2008 17:11:08 -0000 1.1 +++ .cvsignore 4 Jan 2010 15:51:57 -0000 1.2 @@ -1 +1,2 @@ *.src.rpm +*.tar.gz \ No newline at end of file From cvs at kolab.org Mon Jan 4 16:54:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 4 Jan 2010 16:54:59 +0100 (CET) Subject: gunnar: server Makefile,1.91,1.92 Message-ID: <20100104155459.F34EC600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20934 Modified Files: Makefile Log Message: Use kolab.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- Makefile 9 Sep 2009 05:52:28 -0000 1.91 +++ Makefile 4 Jan 2010 15:54:57 -0000 1.92 @@ -1,13 +1,4 @@ -ifeq "x$(HOME)" "x" - HOME = /kolab -endif - -# Don't know if this is correct but if somebody -# calls this makefile as root we assume that there -# is an installation in /kolab -ifeq "x$(HOME)" "x/root" - HOME = /kolab -endif +include make-helper/kolab.mk BASE_PACKAGES=php-smarty \ openldap \ From cvs at kolab.org Tue Jan 5 00:01:21 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 00:01:21 +0100 (CET) Subject: gunnar: server/kolab-webadmin Makefile,1.17,1.18 Message-ID: <20100104230121.B669F600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin In directory doto:/tmp/cvs-serv7580/kolab-webadmin Modified Files: Makefile Log Message: Merge kolab.mk include directive from 2.2.3 Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile 4 Mar 2009 11:58:35 -0000 1.17 +++ Makefile 4 Jan 2010 23:01:19 -0000 1.18 @@ -1,21 +1,10 @@ +include ../make-helper/kolab.mk + PACKAGE=kolab-webadmin VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,$.*$)/\1/'` RELEASE:=`date '+%Y%m%d'` KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"$.*$".*/\1/') -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif - all: test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \ @@ -38,7 +27,7 @@ .PHONY: clean clean: - rm -rf $(HOME)/RPM/TMP/$(PACKAGE)* + rm -rf $(KOLABDIR)/RPM/TMP/$(PACKAGE)* find . -name "*~" | xargs rm -rf rm -rf *.src.rpm rm -rf *.tar.bz2 From cvs at kolab.org Tue Jan 5 00:02:21 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 00:02:21 +0100 (CET) Subject: gunnar: server/make-helper openpkg-patched.mk, 1.1, 1.2 package.mk, 1.1, 1.2 Message-ID: <20100104230221.10495600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv7653/make-helper Modified Files: openpkg-patched.mk package.mk Log Message: Fix make dist targets. The 'dist' target is working again. Index: openpkg-patched.mk =================================================================== RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- openpkg-patched.mk 9 Dec 2009 23:08:07 -0000 1.1 +++ openpkg-patched.mk 4 Jan 2010 23:02:19 -0000 1.2 @@ -1,5 +1,5 @@ # Target for preparing the source area and building the package -$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) +$(KOLABRPMSRC)/$(PACKAGE)/kolab.patch: $(EXTRA) cp $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) # Target for fetching the original openpkg package @@ -9,9 +9,13 @@ # Target for the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE): $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm $(RPM) -ihv $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm + touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec + +# Target for the src rpm spec file. +$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) # Target for patching the spec file -$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec +$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/kolab.patch cd $(KOLABRPMSRC)/$(PACKAGE) && patch < kolab.patch touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- package.mk 9 Dec 2009 23:08:07 -0000 1.1 +++ package.mk 4 Jan 2010 23:02:19 -0000 1.2 @@ -6,16 +6,12 @@ # includes building the binary package which is an additional check for # the final release. Thus it is the default target. .PHONY: dist -dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm all - test -d $(STAGING) || mkdir $(STAGING) - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) +dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm # Target for placing the source rpm in the staging area. This is the soft # variant that is quicker and omits the binary package. .PHONY: sdist -sdist: all - test -d $(STAGING) || mkdir $(STAGING) - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) +sdist: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm # Target for installing the binary rpm package in our current Kolab # server installation @@ -37,7 +33,7 @@ # Target for fetching the source rpm into the current directory $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . + cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . # Target for the source file in the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0) @@ -54,3 +50,11 @@ do \ cat $$PATCH >> package.patch; \ done + +# Prepare the staging area +$(STAGING): + mkdir -p $(STAGING) + +# Final package location +$(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(STAGING) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm + cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) From cvs at kolab.org Tue Jan 5 08:54:04 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 08:54:04 +0100 (CET) Subject: gunnar: server/clamav Makefile,1.7,1.8 Message-ID: <20100105075404.EFED2600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/clamav In directory doto:/tmp/cvs-serv7638 Modified Files: Makefile Log Message: Use kolab.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/clamav/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 19 Jan 2009 16:23:53 -0000 1.7 +++ Makefile 5 Jan 2010 07:54:02 -0000 1.8 @@ -1,20 +1,9 @@ +include ../make-helper/kolab.mk + NAME = clamav PACKAGE = $(NAME) VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*$[0-9]*$.*/\1/") - -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz EXTRA=clamav.patch rc.clamav From cvs at kolab.org Tue Jan 5 10:42:25 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 10:42:25 +0100 (CET) Subject: gunnar: server/gmp Makefile,1.2,1.3 Message-ID: <20100105094225.DED1F600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/gmp In directory doto:/tmp/cvs-serv11012 Modified Files: Makefile Log Message: Convert to using the make helper scripts. Index: Makefile =================================================================== RCS file: /kolabrepository/server/gmp/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 24 Mar 2009 16:29:41 -0000 1.2 +++ Makefile 5 Jan 2010 09:42:23 -0000 1.3 @@ -1,37 +1,21 @@ -ifeq "x$(KOLABPKGURI)" "x" - KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/ -endif -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif -ifeq "x$(KOLABCVSDIR)" "x" - KOLABCVSDIR = $(CURDIR) -endif -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif +OPENPKGURI=http://files.kolab.org/server/release/kolab-server-2.2.0/sources/ + +include ../make-helper/kolab.mk PACKAGE=gmp +DOWNLOAD_VERSION=4.2.2 +OPENPKG_RELEASE=20080101 VERSION=4.2.2 -RELEASE=20080101 -KOLABRELEASE=20080101_kolab - -all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm +RELEASE=20080101_kolab -$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile - $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +SOURCE_URL= +SOURCE_0= - cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR) +PATCHES= -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: - wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +EXTRA=kolab.patch -dist: all - cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/ +BUILD_OPTIONS= -clean: - rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm +include ../make-helper/package.mk +include ../make-helper/openpkg-patched.mk From cvs at kolab.org Tue Jan 5 12:49:06 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 12:49:06 +0100 (CET) Subject: gunnar: server release-notes.txt,1.483,1.484 Message-ID: <20100105114906.62C10600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv15096 Modified Files: release-notes.txt Log Message: Sync the release notes with 2.2.3 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.483 retrieving revision 1.484 diff -u -d -r1.483 -r1.484 --- release-notes.txt 19 Dec 2009 11:53:30 -0000 1.483 +++ release-notes.txt 5 Jan 2010 11:49:04 -0000 1.484 @@ -102,9 +102,10 @@ kolab/issue3439 (FreeBusy display in web client and fbview depends on kolabHomeServer in LDAP) - - kolab-webclient-2.?.?-2009???? + - kolab-webadmin-2.?.?-2009???? - kolab/issue991 (Better error message when connecting to sieve fails) + kolab/issue991 (Better error message when connecting to sieve fails) + kolab/issue3401 (Change font color of the kolab-webadmin) - kolab-webclient-1.2.0-2009???? @@ -166,7 +167,7 @@ TODO: kolab/issue2982 (OpenLDAP segmentation fault on 64bit) - - imapd-2.3.13-20081020_kolab3 + - imapd-2.3.13-20081020_kolab4 TODO: Fix buffer size calculations for sieve actions_string (CVE-2009-2632) @@ -179,7 +180,7 @@ kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all find implementations) - - kolabd-2.2.3-2009???? + - kolabd-2.2.3-20091217 kolab/issue840 (Annotations needs to be more robust (skiplist problems)) as the now integrated imapd-2.3.13 @@ -203,16 +204,7 @@ kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf) - - kolab-webadmin-2.2.3-2009???? - -TODO: kolab/issue1340 (RFC: restrict users to sending mail only to - internal recipients) - kolab/issue3401 (Change font color of the kolab-webadmin) - kolab/issue3428 (Present the checkbox in the "accept internet email" - nicer) -TODO: kolab/issue3499 (Kolab web admin does not use LDAP escaping) - - - Kolab_Filter-0.1.4-2009???? + - Kolab_Filter-0.1.4-20091203 TODO: kolab/issue973 (Rewritten from shown inconveniently in kontact) kolab/issue2495 (The reply to an invitation with umlauts of a @@ -233,7 +225,21 @@ Calendar folder ist not writable for the calendar user) - - kolab-webclient-1.2.0-20090514 + - Kolab_Server-0.4.0-20091013 + +TODO: Added ability to map arbitrary ldap attributes to those + expected by kolab. This feature is experimental and very + little tested. + + - kolab-webadmin-2.2.3-20091217 + +TODO: kolab/issue1340 (RFC: restrict users to sending mail only to + internal recipients) + kolab/issue3428 (Present the checkbox in the "accept internet email" + nicer) +TODO: kolab/issue3499 (Kolab web admin does not use LDAP escaping) + + - kolab-webclient-1.2.0-20091202 TODO: SECURITY: Fixed image upload form issue. @@ -280,7 +286,11 @@ TODO: Fixed cflags for amd64 systems. Related to: kolab/issue2982 (OpenLDAP segmentation fault on 64bit) - - perl-kolab-2.2.3-2009???? + - PEAR-Net_LDAP2-2.0.0RC5-1 + + New package, needed for ldap attribute mapping. + + - perl-kolab-2.2.3-20091217 kolab/issue919 (kolab server has problems with some characters in passwords) @@ -297,10 +307,160 @@ kolab/issue3952 (Version in kolabconf is not replaced in the build process) + - procmail-3.22-20090727 + +TODO: kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic) + Packages in the OpenPKG based Kolab server release: - ??? + - Kolab packages: + + Added: + + PEAR-Net_LDAP2-2.0.0RC5-1 + + Updated: + + Kolab_Filter-0.1.4-20091203 + Kolab_Server-0.4.0-20091013 + clamav-0.95.3-20091030 + kolab-webadmin-2.2.3-20091217 + kolab-webclient-1.2.0-20091202 + kolabd-2.2.3-20091217 + perl-kolab-2.2.3-20091217 + + Unchanged: + + Horde_Argv-0.1.0-20081209 + Horde_Auth-0.1.1-20081209 + Horde_Browser-0.0.2-20081209 + Horde_CLI-0.0.2-20081209 + Horde_Cache-0.0.2-20081209 + Horde_Cipher-0.0.2-20081209 + Horde_DOM-0.1.0-20081209 + Horde_DataTree-0.0.3-20081209 + Horde_Date-0.1.0-20081209 + Horde_Framework-0.0.2-20081209 + Horde_Group-0.1.0-20081209 + Horde_History-0.0.2-20081209 + Horde_LDAP-0.0.2-20081209 + Horde_MIME-0.0.2-20081209 + Horde_NLS-0.0.2-20081209 + Horde_Notification-0.0.2-20090223 + Horde_Perms-0.1.0-20081209 + Horde_Prefs-0.0.3-20090223 + Horde_Secret-0.0.2-20081209 + Horde_Serialize-0.0.2-20081209 + Horde_SessionObjects-0.0.2-20081209 + Horde_Util-0.1.0-20081209 + Horde_iCalendar-0.1.0-20081209 + Kolab_Format-1.0.0-20090402 + Kolab_FreeBusy-0.1.2-20090406 + Kolab_Storage-0.4.0-20090224 + PEAR-Auth_SASL-1.0.2-1 + PEAR-Date-1.4.7-1 + PEAR-HTTP_Request-1.4.3-1 + PEAR-Horde-Channel-1.0-20090119 + PEAR-Log-1.11.2-1 + PEAR-Mail-1.1.14-1 + PEAR-Mail_mimeDecode-1.5.0-20081209 + PEAR-Net_LMTP-1.0.1-1 + PEAR-Net_SMTP-1.3.1-1 + PEAR-Net_Socket-1.0.9-1 + PEAR-Net_URL-1.0.15-1 + PEAR-PHPUnit-Channel-1.0-20090119 + PHPUnit-3.3.3-1 + kolab-fbview-1.2.0-20081227 + openldap-2.3.43-20081212 + perl-ldap-5.10.0-20081028_kolab1 + php-smarty-2.6.20-20081212 + sqlite-3.6.4-20081212 + + - OpenPKG packages: + + Updated: + + db-4.5.20.2-20070628_kolab1 + imapd-2.3.13-20081020_kolab4 + openpkg-20071227-20071227_kolab2 + procmail-3.22-20090727 + + Unchanged: + + amavisd-2.5.3-20080101 + apache-2.2.10-20081111 + apache-php-5.2.8-20081209_kolab2 + apr-1.2.12-20080101 + autoconf-2.61-20080101 + automake-1.10-20080101 + bc-1.06-20080101 + binutils-2.18-20080101 + bison-2.3-20080101 + bzip2-1.0.5-20080318 + config-20060923-20080101 + curl-7.17.1-20080101 + diffutils-2.8.7-20080101 + expat-2.0.1-20080101 + file-4.23-20080101 + flex-2.5.34-20080101 + freetype-2.3.5-20080101 + fsl-1.7.0-20080101 + gawk-3.1.6-20080101 + gcc-4.2.2-20080101 + gd-2.0.35-20080101 + gettext-0.17-20080101 + gmp-4.2.2-20080101_kolab + grep-2.5.3-20080101 + groff-1.19.2-20080101 + gzip-1.3.12-20080101 + imap-2006k-20080101 + jpeg-6b-20080101 + libiconv-1.12-20080101 + libmcrypt-2.5.8-20080101 + libxml-2.6.31-20080111 + libxslt-1.1.22-20080101 + lzo-2.02-20080101 + m4-1.4.9-20080101 + make-3.81-20080101 + mhash-0.9.9-20080101 + mm-1.4.2-20080101 + ncurses-5.6.20080112-20080113 + openpkg-tools-1.4.6-20071231 + openssl-0.9.8g-20080101 + pcre-7.5-20080110 + perl-5.10.0-20080103 + perl-comp-5.10.0-20080110 + perl-conv-5.10.0-20080101 + perl-crypto-5.10.0-20080101 + perl-db-5.10.0-20080118 + perl-dns-5.10.0-20080101 + perl-ds-5.10.0-20080104 + perl-locale-5.10.0-20080112 + perl-mail-5.10.0-20080117 + perl-module-5.10.0-20080101 + perl-net-5.10.0-20080101 + perl-openpkg-5.10.0-20080109 + perl-parse-5.10.0-20080117 + perl-ssl-5.10.0-20080101 + perl-stats-5.10.0-20080101 + perl-sys-5.10.0-20080101 + perl-term-5.10.0-20080116 + perl-text-5.10.0-20080101 + perl-time-5.10.0-20080101 + perl-util-5.10.0-20080116 + perl-www-5.10.0-20080103 + perl-xml-5.10.0-20080101 + php-5.2.8-20081209_kolab2 + pkgconfig-0.23-20080117 + png-1.2.24-20080101 + postfix-2.4.6-20080101_kolab + readline-5.2.12-20080101 + sasl-2.1.22-20080101 + sed-4.1.5-20080101 + spamassassin-3.2.4-20080107 + texinfo-4.11-20080101 + zlib-1.2.3-20080101 Changes between 2.2.1 and 2.2.2: From cvs at kolab.org Tue Jan 5 12:49:37 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 12:49:37 +0100 (CET) Subject: gunnar: server/make-helper package.mk,1.2,1.3 Message-ID: <20100105114937.56FA3600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv15150/make-helper Modified Files: package.mk Log Message: Disable target if no source has to be downloaded. Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- package.mk 4 Jan 2010 23:02:19 -0000 1.2 +++ package.mk 5 Jan 2010 11:49:35 -0000 1.3 @@ -35,6 +35,9 @@ $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . + +ifeq ($(SOURCE_0),) +else # Target for the source file in the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0) cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/ @@ -42,6 +45,7 @@ # Target for retrieving the source package $(SOURCE_0): wget -c "$(SOURCE_URL)/$(SOURCE_0)" +endif # Prepare the patch for the package. package.patch: $(PATCHES) From cvs at kolab.org Tue Jan 5 12:51:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 12:51:42 +0100 (CET) Subject: gunnar: server/db Makefile, 1.5, 1.6 .cvsignore, 1.1, 1.2 kolab.patch, 1.2, 1.3 Message-ID: <20100105115142.AA30C600561@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/db In directory doto:/tmp/cvs-serv15235 Added Files: Makefile .cvsignore kolab.patch Log Message: Add the db package from kolab_2_2_branch. From cvs at kolab.org Tue Jan 5 12:52:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 12:52:41 +0100 (CET) Subject: gunnar: server release-notes.txt,1.484,1.485 Message-ID: <20100105115241.91242600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv15293 Modified Files: release-notes.txt Log Message: Added the db package from kolab_2_2_branch. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.484 retrieving revision 1.485 diff -u -d -r1.484 -r1.485 --- release-notes.txt 5 Jan 2010 11:49:04 -0000 1.484 +++ release-notes.txt 5 Jan 2010 11:52:39 -0000 1.485 @@ -165,7 +165,7 @@ - db-4.5.20.2-20070628_kolab1 -TODO: kolab/issue2982 (OpenLDAP segmentation fault on 64bit) + kolab/issue2982 (OpenLDAP segmentation fault on 64bit) - imapd-2.3.13-20081020_kolab4 From cvs at kolab.org Tue Jan 5 13:48:06 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 13:48:06 +0100 (CET) Subject: mathieu: server/perl-kolab/bin kolabpasswd.in,1.3,1.4 Message-ID: <20100105124806.0A822600170@lists.intevation.de> Author: mathieu Update of /kolabrepository/server/perl-kolab/bin In directory doto:/tmp/cvs-serv17240/perl-kolab/bin Modified Files: kolabpasswd.in Log Message: Correct spelling error Index: kolabpasswd.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/bin/kolabpasswd.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolabpasswd.in 23 Nov 2009 22:47:05 -0000 1.3 +++ kolabpasswd.in 5 Jan 2010 12:48:04 -0000 1.4 @@ -12,7 +12,7 @@ The kolabpasswd script is used for changing the manager password on a Kolab Server. In multi-location Kolab setups the script must be run on each individual host -seperately. +separately. After changing the manager password it is highly recommended to restart the Kolab server. From cvs at kolab.org Tue Jan 5 13:58:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 13:58:45 +0100 (CET) Subject: gunnar: server/make-helper package-new.mk, NONE, 1.1 openpkg-patched.mk, 1.2, 1.3 package.mk, 1.3, 1.4 Message-ID: <20100105125845.EB90B600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv17600/make-helper Modified Files: openpkg-patched.mk package.mk Added Files: package-new.mk Log Message: MFB: kolab/issue3513 (Clamav - new upstream version 0.95.3). In addition the Makefile was adapted to the make helper scripts. --- NEW FILE: package-new.mk --- # Target for the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE): mkdir -p $(KOLABRPMSRC)/$(PACKAGE) # Target for the src rpm spec file. $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) # Target for building the source package $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec # Target for building the binary package $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS) Index: openpkg-patched.mk =================================================================== RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- openpkg-patched.mk 4 Jan 2010 23:02:19 -0000 1.2 +++ openpkg-patched.mk 5 Jan 2010 12:58:43 -0000 1.3 @@ -27,3 +27,10 @@ $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS) +# Prepare the patch for the package. +package.patch: $(PATCHES) + echo > package.patch + for PATCH in $(PATCHES); \ + do \ + cat $$PATCH >> package.patch; \ + done Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.mk 5 Jan 2010 11:49:35 -0000 1.3 +++ package.mk 5 Jan 2010 12:58:43 -0000 1.4 @@ -47,14 +47,6 @@ wget -c "$(SOURCE_URL)/$(SOURCE_0)" endif -# Prepare the patch for the package. -package.patch: $(PATCHES) - echo > package.patch - for PATCH in $(PATCHES); \ - do \ - cat $$PATCH >> package.patch; \ - done - # Prepare the staging area $(STAGING): mkdir -p $(STAGING) From cvs at kolab.org Tue Jan 5 13:58:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 13:58:45 +0100 (CET) Subject: gunnar: server release-notes.txt,1.485,1.486 Message-ID: <20100105125845.B528C600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv17600 Modified Files: release-notes.txt Log Message: MFB: kolab/issue3513 (Clamav - new upstream version 0.95.3). In addition the Makefile was adapted to the make helper scripts. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.485 retrieving revision 1.486 diff -u -d -r1.485 -r1.486 --- release-notes.txt 5 Jan 2010 11:52:39 -0000 1.485 +++ release-notes.txt 5 Jan 2010 12:58:43 -0000 1.486 @@ -161,7 +161,7 @@ - clamav-0.95.3-20091030 -TODO: kolab/issue3513 (Clamav - new upstream version 0.95.3) + kolab/issue3513 (Clamav - new upstream version 0.95.3) - db-4.5.20.2-20070628_kolab1 From cvs at kolab.org Tue Jan 5 13:58:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 13:58:45 +0100 (CET) Subject: gunnar: server/clamav .cvsignore, 1.3, 1.4 Makefile, 1.8, 1.9 clamav.patch, 1.2, 1.3 clamav.spec, 1.6, 1.7 Message-ID: <20100105125845.C3755600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/clamav In directory doto:/tmp/cvs-serv17600/clamav Modified Files: .cvsignore Makefile clamav.patch clamav.spec Log Message: MFB: kolab/issue3513 (Clamav - new upstream version 0.95.3). In addition the Makefile was adapted to the make helper scripts. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/clamav/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 5 Dec 2008 16:01:11 -0000 1.3 +++ .cvsignore 5 Jan 2010 12:58:43 -0000 1.4 @@ -1 +1,2 @@ *.src.rpm +*.tar.gz Index: Makefile =================================================================== RCS file: /kolabrepository/server/clamav/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 5 Jan 2010 07:54:02 -0000 1.8 +++ Makefile 5 Jan 2010 12:58:43 -0000 1.9 @@ -1,32 +1,12 @@ include ../make-helper/kolab.mk -NAME = clamav -PACKAGE = $(NAME) +PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*$[a-z-]*$.*/\1/") VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*$[0-9]*$.*/\1/") -SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz +SOURCE_URL=http://files.kolab.org/server/development-2.2/externals +SOURCE_0=$(PACKAGE)-$(VERSION).tar.gz EXTRA=clamav.patch rc.clamav -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -.PHONY: dist -dist: all - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/ - -.PHONY: clean -clean: - rm -rf $(KOLABRPMTMP)/$(NAME)* - rm -rf $(KOLABRPMTMP)/$(PACKAGE) - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA) - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/ - - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +include ../make-helper/package.mk +include ../make-helper/package-new.mk Index: clamav.patch =================================================================== RCS file: /kolabrepository/server/clamav/clamav.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- clamav.patch 2 Dec 2008 14:59:15 -0000 1.2 +++ clamav.patch 5 Jan 2010 12:58:43 -0000 1.3 @@ -1,108 +1,43 @@ -diff -urN clamav-0.94.1.orig/clamav-milter/clamav-milter.c clamav-0.94.1/clamav-milter/clamav-milter.c ---- clamav-0.94.1.orig/clamav-milter/clamav-milter.c 2008-10-16 10:29:55.000000000 +0200 -+++ clamav-0.94.1/clamav-milter/clamav-milter.c 2008-11-17 12:29:53.149435000 +0100 -@@ -77,9 +77,7 @@ - #include - #include - #include --#if HAVE_LIBMILTER_MFAPI_H +diff -urN clamav-0.95.3.orig/clamav-milter/clamav-milter.c clamav-0.95.3/clamav-milter/clamav-milter.c +--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c 2009-10-28 16:34:13.000000000 +0100 ++++ clamav-0.95.3/clamav-milter/clamav-milter.c 2009-10-30 17:14:50.137580674 +0100 +@@ -32,7 +32,7 @@ + #include + #endif + #include -#include --#endif +#include "milter/mfapi.h" - #include - #include - #include -@@ -113,6 +111,8 @@ - - #ifdef C_LINUX - #include /* FIXME: use sendfile on BSD not Linux */ -+#endif -+#if 0 - #include - #include -@@ -435,6 +435,10 @@ - * Send a 550 rejection when a virus is - * found - */ -+static int nosubject = 0; /* -+ * Do not change the Subject header -+ * in case a virus is found. -+ */ - static int hflag = 0; /* - * Include original message headers in - * report -@@ -679,6 +683,7 @@ - puts(_("\t--max-childen\t\t-m\tMaximum number of concurrent scans.")); - puts(_("\t--outgoing\t\t-o\tScan outgoing messages from this machine.")); - puts(_("\t--noreject\t\t-N\tDon't reject viruses, silently throw them away.")); -+ puts(_("\t--nosubject\t\t-N\tDon't change Subject header.")); - puts(_("\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers.")); - puts(_("\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile.")); - puts(_("\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster].")); -@@ -774,7 +779,7 @@ - else - progname = "clamav-milter"; - --#ifdef C_LINUX -+#if 0 - setlocale(LC_ALL, ""); - bindtextdomain(progname, DATADIR"/clamav-milter/locale"); - textdomain(progname); -@@ -863,6 +868,9 @@ - "noreject", 0, NULL, 'N' - }, - { -+ "nosubject", 0, NULL, 'Z' -+ }, -+ { - "noxheader", 0, NULL, 'n' - }, - { -@@ -1037,6 +1045,9 @@ - case 'N': /* Do we reject mail or silently drop it */ - rejectmail = 0; - break; -+ case 'Z': -+ nosubject = 1; -+ break; - case 'o': /* scan outgoing mail */ - oflag++; - break; -@@ -1142,11 +1153,13 @@ - } - port = argv[optind]; + #include "clamav.h" -+#if 0 - if(rootdir == NULL) /* FIXME: Handle CHROOT */ - if(checkCF && verifyIncomingSocketName(port) < 0) { - fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port); - return EX_CONFIG; - } -+#endif +diff -urN clamav-0.95.3.orig/clamav-milter/clamfi.c clamav-0.95.3/clamav-milter/clamfi.c +--- clamav-0.95.3.orig/clamav-milter/clamfi.c 2009-10-28 16:34:13.000000000 +0100 ++++ clamav-0.95.3/clamav-milter/clamfi.c 2009-10-30 17:14:50.137580674 +0100 +@@ -29,7 +29,7 @@ + #include + #include - if(strncasecmp(port, "inet:", 5) == 0) - if(!lflag) { -@@ -5260,6 +5273,7 @@ - struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx); - char subject[128]; +-#include ++#include "milter/mfapi.h" -+ if (!nosubject) { - if(privdata->subject) - smfi_addheader(ctx, "X-Original-Subject", privdata->subject); + #include "shared/optparser.h" + #include "shared/output.h" +diff -urN clamav-0.95.3.orig/clamav-milter/clamfi.h clamav-0.95.3/clamav-milter/clamfi.h +--- clamav-0.95.3.orig/clamav-milter/clamfi.h 2009-07-06 15:21:58.000000000 +0200 ++++ clamav-0.95.3/clamav-milter/clamfi.h 2009-10-30 17:14:50.137580674 +0100 +@@ -22,7 +22,7 @@ + #define _CLAMFI_H -@@ -5268,6 +5282,7 @@ - smfi_chgheader(ctx, "Subject", 1, subject); - else - smfi_addheader(ctx, "Subject", subject); -+ } - } + #include "shared/optparser.h" +-#include ++#include "milter/mfapi.h" - #if 0 -diff -urN clamav-0.94.1.orig/configure clamav-0.94.1/configure ---- clamav-0.94.1.orig/configure 2008-10-30 17:12:07.000000000 +0100 -+++ clamav-0.94.1/configure 2008-11-17 12:32:01.499435000 +0100 -@@ -18454,9 +18454,6 @@ + extern uint64_t maxfilesize; + extern int addxvirus; +diff -urN clamav-0.95.3.orig/configure clamav-0.95.3/configure +--- clamav-0.95.3.orig/configure 2009-10-28 16:34:13.000000000 +0100 ++++ clamav-0.95.3/configure 2009-10-30 17:15:15.994173225 +0100 +@@ -16692,9 +16692,6 @@ save_LIBS="$LIBS" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" @@ -110,21 +45,49 @@ - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" - fi LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS" - { echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5 - echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6; } -@@ -18684,7 +18681,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5 + $as_echo_n "checking for mi_stop in -lmilter... " >&6; } +@@ -16834,7 +16831,7 @@ + CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS" + else + +- as_fn_error "Cannot find libmilter" "$LINENO" 5 ++ as_fn_error "Cannot find milter" "$LINENO" 5 + + fi + +@@ -16842,10 +16839,10 @@ + fi LIBS="$save_LIBS" +- for ac_header in libmilter/mfapi.h ++ for ac_header in milter/mfapi.h + do : +- ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default" +-if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_milter_mfapi_h" "$ac_includes_default" ++if test "x$ac_cv_header_milter_mfapi_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBMILTER_MFAPI_H 1 + _ACEOF +diff -urN clamav-0.95.3.orig/libclamav/others.c clamav-0.95.3/libclamav/others.c +--- clamav-0.95.3.orig/libclamav/others.c 2009-10-28 16:34:13.000000000 +0100 ++++ clamav-0.95.3/libclamav/others.c 2009-10-30 17:14:50.141580766 +0100 +@@ -177,8 +177,10 @@ + if(is_rar_initd) return; + is_rar_initd = 1; --for ac_header in libmilter/mfapi.h -+for ac_header in milter/mfapi.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -diff -urN clamav-0.94.1.orig/shared/output.c clamav-0.94.1/shared/output.c ---- clamav-0.94.1.orig/shared/output.c 2008-08-16 19:18:00.000000000 +0200 -+++ clamav-0.94.1/shared/output.c 2008-11-17 12:29:53.169435000 +0100 -@@ -61,7 +61,7 @@ ++#if 0 + rhandle = lt_dlfind("libclamunrar_iface", "unrar"); + if (!rhandle) ++#endif + return; + + if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) || +diff -urN clamav-0.95.3.orig/shared/output.c clamav-0.95.3/shared/output.c +--- clamav-0.95.3.orig/shared/output.c 2009-10-28 16:34:13.000000000 +0100 ++++ clamav-0.95.3/shared/output.c 2009-10-30 17:14:50.141580766 +0100 +@@ -67,7 +67,7 @@ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; #endif Index: clamav.spec =================================================================== RCS file: /kolabrepository/server/clamav/clamav.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- clamav.spec 12 Dec 2008 14:54:49 -0000 1.6 +++ clamav.spec 5 Jan 2010 12:58:43 -0000 1.7 @@ -1,6 +1,6 @@ ## ## clamav.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -29,8 +29,8 @@ Packager: Intevation GmbH Group: AntiVirus License: GPL -Version: 0.94.2 -Release: 20081212 +Version: 0.95.3 +Release: 20091030 # package options %option with_milter no @@ -43,8 +43,8 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 2.4.3, gcc, bzip2 -PreReq: OpenPKG, openpkg >= 2.4.3 +BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc +PreReq: OpenPKG, openpkg >= 20060823 BuildPreReq: zlib, bzip2, curl, gmp, libiconv, openssl PreReq: zlib, bzip2, curl, gmp, libiconv, openssl %if "%{with_milter}" == "yes" @@ -67,7 +67,7 @@ %track prog clamav = { version = %{version} - url = http://prdownloads.sourceforge.net/clamav/ + url = http://sourceforge.net/projects/clamav/files/ regex = clamav-(\d+\.\d+(\.\d+)*)\.tar\.gz } @@ -78,7 +78,7 @@ %build # configure package CC="%{l_cc}" \ - CFLAGS="%{l_cflags}" \ + CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ GREP="grep" \ @@ -101,6 +101,7 @@ %else --disable-milter \ %endif + --disable-unrar \ --disable-shared # build package From cvs at kolab.org Tue Jan 5 14:07:25 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 14:07:25 +0100 (CET) Subject: gunnar: server release-notes.txt,1.486,1.487 Message-ID: <20100105130725.09A2C600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv18282 Modified Files: release-notes.txt Log Message: Nothing to do for CVE-2009-2632. The code is part of cyrus-imapd-2.3.16 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.486 retrieving revision 1.487 diff -u -d -r1.486 -r1.487 --- release-notes.txt 5 Jan 2010 12:58:43 -0000 1.486 +++ release-notes.txt 5 Jan 2010 13:07:22 -0000 1.487 @@ -169,7 +169,7 @@ - imapd-2.3.13-20081020_kolab4 -TODO: Fix buffer size calculations for sieve actions_string (CVE-2009-2632) + Fix buffer size calculations for sieve actions_string (CVE-2009-2632) kolab/issue3838 (no logging for pop3) From cvs at kolab.org Tue Jan 5 14:58:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 14:58:54 +0100 (CET) Subject: gunnar: server/openldap Makefile, 1.25, 1.26 openldap.spec, 1.15, 1.16 rc.openldap, 1.4, 1.5 Message-ID: <20100105135854.C8E0B600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv19481 Modified Files: Makefile openldap.spec rc.openldap Log Message: Update to OpenLDAP-2.4.19. The server seems to run fine. Index: Makefile =================================================================== RCS file: /kolabrepository/server/openldap/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Makefile 8 Jul 2009 08:31:35 -0000 1.25 +++ Makefile 5 Jan 2010 13:58:52 -0000 1.26 @@ -1,37 +1,14 @@ -include ../Base.mk +include ../make-helper/kolab.mk -NAME = openldap -PACKAGE = $(NAME) +PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*$[a-z-]*$.*/\1/") VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*$[0-9]*$.*/\1/") -KOLABRELEASE = $(RELEASE) -SOURCE_0=ftp://ftp.openldap.org/pub/openldap/openldap-release/$(NAME)-$(VERSION).tgz +SOURCE_URL=ftp://ftp.openldap.org/pub/openldap/openldap-release +SOURCE_0=$(PACKAGE)-$(VERSION).tgz EXTRA=fsl.openldap openldap.patch openldap.pc rc.openldap -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -.PHONY: dist -dist: all - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/ - -.PHONY: clean -clean: - rm -rf $(KOLABRPMTMP)/$(NAME)* - rm -rf $(KOLABRPMTMP)/$(PACKAGE) - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA) - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)" - - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_pth no' - - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +BUILD_OPTIONS=--define 'with_pth no' -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm +include ../make-helper/package.mk +include ../make-helper/package-new.mk Index: openldap.spec =================================================================== RCS file: /kolabrepository/server/openldap/openldap.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- openldap.spec 8 Jul 2009 08:31:35 -0000 1.15 +++ openldap.spec 5 Jan 2010 13:58:52 -0000 1.16 @@ -31,8 +31,8 @@ Class: BASE Group: LDAP License: GPL -Version: 2.4.16 -Release: 20090516 +Version: 2.4.19 +Release: 20100105 # package options %option with_server yes Index: rc.openldap =================================================================== RCS file: /kolabrepository/server/openldap/rc.openldap,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- rc.openldap 24 Apr 2008 15:36:09 -0000 1.4 +++ rc.openldap 5 Jan 2010 13:58:52 -0000 1.5 @@ -16,25 +16,15 @@ %common openldap_slapd_cfgfile="@l_prefix@/etc/openldap/slapd.conf" openldap_slapd_pidfile="@l_prefix@/var/openldap/run/slapd.pid" - openldap_slurpd_pidfile="@l_prefix@/var/openldap/run/slurpd.pid" openldap_slapd_signal () { [ -f $openldap_slapd_pidfile ] && kill -$1 `cat $openldap_slapd_pidfile` } - openldap_slurpd_signal () { - [ -f $openldap_slurpd_pidfile ] && kill -$1 `cat $openldap_slurpd_pidfile` - } - openldap_slurpd_needed () { - [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0 - return 1 - } %status -u @l_susr@ -o openldap_usable="unknown" openldap_active="no" rcService openldap enable yes && \ openldap_slapd_signal 0 && openldap_active="yes" - rcService openldap enable yes && openldap_slurpd_needed && \ - openldap_slurpd_signal 0 && openldap_active="yes" echo "openldap_enable=\"$openldap_enable\"" echo "openldap_usable=\"$openldap_usable\"" echo "openldap_active=\"$openldap_active\"" @@ -50,17 +40,11 @@ fi eval @l_prefix@/libexec/openldap/slapd $flags || exit $? fi - openldap_slurpd_needed || exit 0 - openldap_slurpd_signal 0 - if [ $? -ne 0 ]; then - @l_prefix@/libexec/openldap/slurpd || exit $? - fi %stop -p 700 -u @l_susr@ rcService openldap enable yes || exit 0 rcService openldap active no && exit 0 openldap_slapd_signal INT - openldap_slurpd_signal INT sleep 2 %restart -u @l_susr@ From cvs at kolab.org Tue Jan 5 15:26:20 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 15:26:20 +0100 (CET) Subject: gunnar: server TODO,1.2,1.3 Message-ID: <20100105142620.D261C600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20538 Modified Files: TODO Log Message: Rough draft of my current TODO list for HEAD Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TODO 4 Dec 2009 13:45:00 -0000 1.2 +++ TODO 5 Jan 2010 14:26:18 -0000 1.3 @@ -17,7 +17,55 @@ - merges (from kolab_2_2_branch): + clamav [DONE] + db [DONE] + imapd [DONE] + kolab-webadmin + kolab-webclient + kolabd + openpkg + perl-kolab + php-kolab + - small effort: + + Fix the Build system for ... + + apache-php [DONE] + clamav [DONE] + db [DONE] + gmp [DONE] + imapd [DONE] + kolab-fbview + kolab-webadmin + kolab-webclient + kolabd + openldap [DONE] + openpkg + pear packages + perl-kolab + perl-ldap + php [DONE] + php-kolab + php-smarty + postfix + sqlite + + Short test of updated packages ... + + apache-php + clamav [DONE] + imapd [DONE] + kolab-fbview + kolab-webadmin + kolab-webclient + kolabd + openldap + perl-kolab + php + php-kolab + postfix + sqlite - larger effort: From cvs at kolab.org Tue Jan 5 16:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 16:15:28 +0100 (CET) Subject: gunnar: server TODO,1.3,1.4 Message-ID: <20100105151528.94E54600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv22493 Modified Files: TODO Log Message: After recompiling the dependencies imapd works with the newer openldap. Users get created and can log in. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- TODO 5 Jan 2010 14:26:18 -0000 1.3 +++ TODO 5 Jan 2010 15:15:26 -0000 1.4 @@ -60,7 +60,7 @@ kolab-webadmin kolab-webclient kolabd - openldap + openldap [DONE] perl-kolab php php-kolab From cvs at kolab.org Tue Jan 5 17:24:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 17:24:57 +0100 (CET) Subject: gunnar: server/make-helper openpkg-patched.mk, 1.3, 1.4 package-new.mk, 1.1, 1.2 package.mk, 1.4, 1.5 Message-ID: <20100105162457.16E2E600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv25158/make-helper Modified Files: openpkg-patched.mk package-new.mk package.mk Log Message: MFB: Fixed cflags for amd64 systems. Related to: kolab/issue2982 (OpenLDAP segmentation fault on 64bit). In addition: Updated build system to use the make helper scripts. Index: openpkg-patched.mk =================================================================== RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- openpkg-patched.mk 5 Jan 2010 12:58:43 -0000 1.3 +++ openpkg-patched.mk 5 Jan 2010 16:24:55 -0000 1.4 @@ -20,11 +20,11 @@ touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched # Target for building the source package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched +$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec # Target for building the binary package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched +$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS) # Prepare the patch for the package. Index: package-new.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package-new.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- package-new.mk 5 Jan 2010 12:58:43 -0000 1.1 +++ package-new.mk 5 Jan 2010 16:24:55 -0000 1.2 @@ -3,11 +3,11 @@ mkdir -p $(KOLABRPMSRC)/$(PACKAGE) # Target for the src rpm spec file. -$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) +$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) $(EXTRA) cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) # Target for building the source package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) +$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec # Target for building the binary package Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.mk 5 Jan 2010 12:58:43 -0000 1.4 +++ package.mk 5 Jan 2010 16:24:55 -0000 1.5 @@ -1,17 +1,21 @@ +ifeq ($(RELEASETARGET),) +RELEASETARGET=$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +endif + # Default target to generate the source rpm package .PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +all: $(RELEASETARGET) # Target for placing the source rpm in the staging area. This target # includes building the binary package which is an additional check for # the final release. Thus it is the default target. .PHONY: dist -dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(STAGING)/$(RELEASETARGET) # Target for placing the source rpm in the staging area. This is the soft # variant that is quicker and omits the binary package. .PHONY: sdist -sdist: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +sdist: $(RELEASETARGET) # Target for installing the binary rpm package in our current Kolab # server installation @@ -24,16 +28,16 @@ clean: rm -rf $(KOLABRPMSRC)/$(PACKAGE) rm -rf $(KOLABRPMTMP)/$(PACKAGE)* - rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm + rm -f $(KOLABRPMPKG)/$(RELEASETARGET) rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - rm -f $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -f *.tar.gz + rm -f $(RELEASETARGET) + rm -f *.tar.gz *.tgz *.tar.bz2 rm -f *~ rm -f package.patch # Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +$(RELEASETARGET): $(KOLABRPMPKG)/$(RELEASETARGET) + cp $(KOLABRPMPKG)/$(RELEASETARGET) . ifeq ($(SOURCE_0),) @@ -52,5 +56,5 @@ mkdir -p $(STAGING) # Final package location -$(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(STAGING) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) +$(STAGING)/$(RELEASETARGET): $(STAGING) $(RELEASETARGET) + cp $(RELEASETARGET) $(STAGING) From cvs at kolab.org Tue Jan 5 17:24:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 17:24:57 +0100 (CET) Subject: gunnar: server TODO,1.4,1.5 release-notes.txt,1.487,1.488 Message-ID: <20100105162457.0FFA2600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv25158 Modified Files: TODO release-notes.txt Log Message: MFB: Fixed cflags for amd64 systems. Related to: kolab/issue2982 (OpenLDAP segmentation fault on 64bit). In addition: Updated build system to use the make helper scripts. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TODO 5 Jan 2010 15:15:26 -0000 1.4 +++ TODO 5 Jan 2010 16:24:54 -0000 1.5 @@ -23,7 +23,7 @@ kolab-webadmin kolab-webclient kolabd - openpkg + openpkg [DONE] perl-kolab php-kolab @@ -41,7 +41,7 @@ kolab-webclient kolabd openldap [DONE] - openpkg + openpkg [DONE] pear packages perl-kolab perl-ldap Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.487 retrieving revision 1.488 diff -u -d -r1.487 -r1.488 --- release-notes.txt 5 Jan 2010 13:07:22 -0000 1.487 +++ release-notes.txt 5 Jan 2010 16:24:54 -0000 1.488 @@ -283,7 +283,7 @@ - openpkg-20071227-20071227_kolab2 -TODO: Fixed cflags for amd64 systems. Related to: + Fixed cflags for amd64 systems. Related to: kolab/issue2982 (OpenLDAP segmentation fault on 64bit) - PEAR-Net_LDAP2-2.0.0RC5-1 From cvs at kolab.org Tue Jan 5 17:24:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 17:24:57 +0100 (CET) Subject: gunnar: server/openpkg .cvsignore, 1.1, 1.2 Makefile, 1.1, 1.2 kolab.patch, 1.1, 1.2 Message-ID: <20100105162457.5B6E3600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/openpkg In directory doto:/tmp/cvs-serv25158/openpkg Modified Files: .cvsignore Makefile kolab.patch Log Message: MFB: Fixed cflags for amd64 systems. Related to: kolab/issue2982 (OpenLDAP segmentation fault on 64bit). In addition: Updated build system to use the make helper scripts. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/openpkg/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 26 Mar 2009 14:26:42 -0000 1.1 +++ .cvsignore 5 Jan 2010 16:24:55 -0000 1.2 @@ -1,2 +1,4 @@ *.src.rpm openpkg-*.sh +*.tar.gz +tar.patch Index: Makefile =================================================================== RCS file: /kolabrepository/server/openpkg/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 26 Mar 2009 14:26:42 -0000 1.1 +++ Makefile 5 Jan 2010 16:24:55 -0000 1.2 @@ -1,46 +1,41 @@ -ifeq "x$(KOLABPKGURI)" "x" - KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/ -endif -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif -ifeq "x$(KOLABCVSDIR)" "x" - KOLABCVSDIR = $(CURDIR) -endif -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif +OPENPKGURI=http://files.kolab.org/server/release/kolab-server-2.2.0/sources/ + +include ../make-helper/kolab.mk PACKAGE=openpkg +DOWNLOAD_VERSION=20071227 +OPENPKG_RELEASE=20071227 VERSION=20071227 -RELEASE=20071227 -KOLABRELEASE=$(RELEASE)_kolab1 +RELEASE=$(OPENPKG_RELEASE)_kolab2 + +SOURCE_URL= +SOURCE_0= + +PATCHES= + +EXTRA=$(PATCHES) kolab.patch $(PACKAGE2)-${VERSION2}.tar.gz $(PACKAGE2).patch KOLABPKGURI2 = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/ PACKAGE2=tar VERSION2=1.22 RELEASE2=20090305 -all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh +RELEASETARGET=$(PACKAGE)-$(VERSION)-$(RELEASE).src.sh -$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm - $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - $(RPM) -ihv $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm +include ../make-helper/package.mk +include ../make-helper/openpkg-patched.mk - cd $(KOLABRPMSRC)/$(PACKAGE) && patch -p1 < $(KOLABCVSDIR)/kolab.patch && rm $(PACKAGE2)-*.tar.gz && cp ../$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz ../$(PACKAGE2)/$(PACKAGE2).patch . && ./openpkg.boot -s - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh $(KOLABCVSDIR) +$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm + cd $(KOLABRPMSRC)/$(PACKAGE) && rm $(PACKAGE2)-*.tar.gz && ./openpkg.boot -s -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: - wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +$(PACKAGE2).patch: $(KOLABRPMSRC)/$(PACKAGE2) + cp $(KOLABRPMSRC)/$(PACKAGE2)/$(PACKAGE2).patch . -$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm: - wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm +$(PACKAGE2)-${VERSION2}.tar.gz: $(KOLABRPMSRC)/$(PACKAGE2) + cp $(KOLABRPMSRC)/$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz . -dist: all - cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh ../stage/ +$(KOLABRPMSRC)/$(PACKAGE2): $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm + $(RPM) -ihv $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm -clean: - rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh +$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm: + wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/openpkg/kolab.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab.patch 26 Mar 2009 14:26:42 -0000 1.1 +++ kolab.patch 5 Jan 2010 16:24:55 -0000 1.2 @@ -1,6 +1,6 @@ -diff -urN openpkg.orig/openpkg.boot openpkg/openpkg.boot ---- openpkg.orig/openpkg.boot 2007-07-18 19:47:35.000000000 +0200 -+++ openpkg/openpkg.boot 2009-03-26 14:20:04.566281335 +0100 +diff -urN openpkg/openpkg.boot openpkg-kolab/openpkg.boot +--- openpkg/openpkg.boot 2007-07-18 19:47:35.000000000 +0200 ++++ openpkg-kolab/openpkg.boot 2009-09-23 15:09:39.603405000 +0200 @@ -142,7 +142,7 @@ name="openpkg" spec="$name.spec" @@ -10,14 +10,14 @@ ## ## display headline -diff -urN openpkg.orig/openpkg.spec openpkg/openpkg.spec ---- openpkg.orig/openpkg.spec 2007-12-27 11:41:34.000000000 +0100 -+++ openpkg/openpkg.spec 2009-03-26 14:20:39.026995207 +0100 +diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec +--- openpkg/openpkg.spec 2007-12-27 11:41:34.000000000 +0100 ++++ openpkg-kolab/openpkg.spec 2009-09-23 15:09:39.603405000 +0200 @@ -40,6 +40,7 @@ # the package version/release %define V_openpkg 20071227 -+%define V_release 20071227_kolab1 ++%define V_release 20071227_kolab2 # the used software versions %define V_rpm 4.2.1 @@ -39,3 +39,15 @@ # list of sources Source0: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz +diff -urN openpkg/rpmtool openpkg-kolab/rpmtool +--- openpkg/rpmtool 2007-10-11 22:40:43.000000000 +0200 ++++ openpkg-kolab/rpmtool 2009-09-23 15:45:25.946152864 +0200 +@@ -475,7 +475,7 @@ + # more than required. We also can assume that the C + # compiler is always GCC, either the OpenPKG one or + # the FreeBSD one. +- cflags="-fPIC" ++ cflags="-fPIC $cflags" + ;; + esac + echo "x$cflags" | sed -e 's;^x;;' From cvs at kolab.org Tue Jan 5 18:20:08 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 18:20:08 +0100 (CET) Subject: gunnar: server release-notes.txt,1.488,1.489 Message-ID: <20100105172008.C71E1600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv30321 Modified Files: release-notes.txt Log Message: Nothing to do for kolab/issue3938 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.488 retrieving revision 1.489 diff -u -d -r1.488 -r1.489 --- release-notes.txt 5 Jan 2010 16:24:54 -0000 1.488 +++ release-notes.txt 5 Jan 2010 17:20:06 -0000 1.489 @@ -309,7 +309,7 @@ - procmail-3.22-20090727 -TODO: kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic) + kolab/issue3938 (compiling procmail fails on Fedora 11 and Ubuntu karmic) Packages in the OpenPKG based Kolab server release: From cvs at kolab.org Tue Jan 5 18:27:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 18:27:40 +0100 (CET) Subject: gunnar: server/php-smarty .cvsignore,1.1,1.2 Makefile,1.8,1.9 Message-ID: <20100105172740.8DC9D600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-smarty In directory doto:/tmp/cvs-serv31161/php-smarty Modified Files: .cvsignore Makefile Log Message: Convert to using the make helper scripts. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-smarty/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 27 Jul 2007 19:50:44 -0000 1.1 +++ .cvsignore 5 Jan 2010 17:27:38 -0000 1.2 @@ -1 +1,2 @@ *.src.rpm +*.tar.gz Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-smarty/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 21 Oct 2008 17:03:57 -0000 1.8 +++ Makefile 5 Jan 2010 17:27:38 -0000 1.9 @@ -1,44 +1,14 @@ -NAME = Smarty -PACKAGE = php-smarty +include ../make-helper/kolab.mk + +PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*$[a-z-]*$.*/\1/") VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*$[0-9]*$.*/\1/") -KOLABRELEASE = $(RELEASE) - -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif - -#SOURCE_0=http://www.smarty.net/distributions/$(NAME)-$(VERSION).tar.gz -SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(VERSION).tar.gz - -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -.PHONY: dist -dist: all - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/ - -.PHONY: clean -clean: - rm -rf $(KOLABRPMTMP)/$(NAME)* - rm -rf $(KOLABRPMTMP)/$(PACKAGE) - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/ +#SOURCE_URL=http://www.smarty.net/distributions/ +SOURCE_URL=http://files.kolab.org/server/development-2.2/externals +SOURCE_0=Smarty-$(VERSION).tar.gz - cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec +BUILD_OPTIONS= - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +include ../make-helper/package.mk +include ../make-helper/package-new.mk From cvs at kolab.org Tue Jan 5 18:27:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 18:27:40 +0100 (CET) Subject: gunnar: server TODO,1.5,1.6 Message-ID: <20100105172740.897BC600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv31161 Modified Files: TODO Log Message: Convert to using the make helper scripts. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TODO 5 Jan 2010 16:24:54 -0000 1.5 +++ TODO 5 Jan 2010 17:27:38 -0000 1.6 @@ -47,7 +47,7 @@ perl-ldap php [DONE] php-kolab - php-smarty + php-smarty [DONE] postfix sqlite From cvs at kolab.org Tue Jan 5 18:46:02 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 18:46:02 +0100 (CET) Subject: gunnar: server/perl-kolab/sbin kolab_bootstrap.in,1.16,1.17 Message-ID: <20100105174602.EBA21600561@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab/sbin In directory doto:/tmp/cvs-serv1015/sbin Modified Files: kolab_bootstrap.in Log Message: MFB: kolab/issue919 (kolab server has problems with some characters in passwords). While the patches actually did not solve the problem they also did not make it worse. They simply inverted the problem and you get double encoded UTF-8 characters in passwords now when using UTF-8 only. So this was merged from the kolab_2_2_branch to have the same state in both branches. Index: kolab_bootstrap.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- kolab_bootstrap.in 1 Jan 2010 21:53:25 -0000 1.16 +++ kolab_bootstrap.in 5 Jan 2010 17:46:00 -0000 1.17 @@ -65,6 +65,7 @@ use Time::localtime; use Digest::SHA1; use MIME::Base64; +use Encode; # Reload only kolab.globals into our configuration. Kolab::reloadConfig("@CONFIG_DIR@/kolab.globals", 1); @@ -401,8 +402,8 @@ if ($bind_pw =~ /\@\@\@/) { $bind_pw = `$Kolab::config{'bindir'}/openssl rand -base64 12`; chomp $bind_pw; - $bind_pw = getUserInput("Please choose a manager password", $bind_pw); - print " bind_pw : $bind_pw\n"; + $bind_pw = Encode::encode_utf8(getUserInput("Please choose a manager password", $bind_pw)); + print " bind_pw : " . Encode::decode_utf8($bind_pw) . "\n"; $bind_pw_hash = hashPassword2($bind_pw); } @@ -440,7 +441,7 @@ chmod 0600, $kolab_config; kolab_chown "$Kolab::config{'kolab_musr'}","$Kolab::config{'kolab_mgrp'}", $kolab_config; print "IMPORTANT NOTE:\n"; - print "use login=manager and passwd=$bind_pw when you log into the webinterface!\n\n"; + print "use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into the webinterface!\n\n"; } # Set up slapd to replicate to slave server's kolabds @@ -750,7 +751,7 @@ print "proceeding with base DN $base_dn\n"; $bind_dn = "cn=manager,cn=internal,$base_dn"; - $bind_pw = getUserInput("Manager password"); + $bind_pw = Encode::encode_utf8(getUserInput("Manager password")); $bind_pw_hash = hashPassword2($bind_pw); my $confname = "$Kolab::config{'sasl_smtpconffile'}"; @@ -942,5 +943,5 @@ #system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn"); print "kolab is now ready to run!\n"; print "please run '$Kolab::config{'KOLABRC'} rc all start'\n"; -print ("Use login=manager and passwd=$bind_pw when you log into\n"); +print ("Use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into\n"); print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n"); From cvs at kolab.org Tue Jan 5 18:46:02 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 18:46:02 +0100 (CET) Subject: gunnar: server/perl-kolab/bin kolabpasswd.in,1.4,1.5 Message-ID: <20100105174602.E77B5600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab/bin In directory doto:/tmp/cvs-serv1015/bin Modified Files: kolabpasswd.in Log Message: MFB: kolab/issue919 (kolab server has problems with some characters in passwords). While the patches actually did not solve the problem they also did not make it worse. They simply inverted the problem and you get double encoded UTF-8 characters in passwords now when using UTF-8 only. So this was merged from the kolab_2_2_branch to have the same state in both branches. Index: kolabpasswd.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/bin/kolabpasswd.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- kolabpasswd.in 5 Jan 2010 12:48:04 -0000 1.4 +++ kolabpasswd.in 5 Jan 2010 17:46:00 -0000 1.5 @@ -140,6 +140,8 @@ ReadMode 'noecho'; my $old_password = ReadLine 0; chomp $old_password; + $old_password = Encode::encode_utf8($old_password); + $mesg = $ldap->bind( $account_dn, password => $old_password ) || die "\nkolabpasswd: Failed to bind to LDAP server"; if( $mesg->code ) { print "\nError: ".$mesg->error.". Please try again\n"; } } while ( $mesg->code ); @@ -154,6 +156,8 @@ print "\n"; ReadMode 'normal'; ($new_password eq $new_password2) || die "Sorry, passwords do not match.\n"; + +$new_password = Encode::encode_utf8($new_password); my $bind_pw_hash; From cvs at kolab.org Tue Jan 5 18:46:02 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 18:46:02 +0100 (CET) Subject: gunnar: server/perl-kolab ChangeLog,1.78,1.79 Message-ID: <20100105174602.E2D8B600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv1015 Modified Files: ChangeLog Log Message: MFB: kolab/issue919 (kolab server has problems with some characters in passwords). While the patches actually did not solve the problem they also did not make it worse. They simply inverted the problem and you get double encoded UTF-8 characters in passwords now when using UTF-8 only. So this was merged from the kolab_2_2_branch to have the same state in both branches. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- ChangeLog 1 Jan 2010 21:53:25 -0000 1.78 +++ ChangeLog 5 Jan 2010 17:46:00 -0000 1.79 @@ -21,6 +21,14 @@ users does not work if master Kolab server is not master LDAP (rt5889)) +2009-12-14 Gunnar Wrobel + + * bin/kolabpasswd.in: kolab/issue919 (kolab server has problems + with some characters in passwords) + + * sbin/kolab_bootstrap.in: kolab/issue919 (kolab server has + problems with some characters in passwords) + 2009-12-13 Mathieu Parent * lib/Kolab/Conf.pm, sbin/kolab_bootstrap.in: From cvs at kolab.org Tue Jan 5 19:26:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 19:26:41 +0100 (CET) Subject: gunnar: server release-notes.txt,1.489,1.490 Message-ID: <20100105182641.3355C600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2925 Modified Files: release-notes.txt Log Message: MFB: kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.489 retrieving revision 1.490 diff -u -d -r1.489 -r1.490 --- release-notes.txt 5 Jan 2010 17:20:06 -0000 1.489 +++ release-notes.txt 5 Jan 2010 18:26:38 -0000 1.490 @@ -296,7 +296,7 @@ passwords) TODO: kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) -TODO: kolab/issue1448 (Users might add an account on the nonHome Server + kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.) kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves, causes OpenLDAP restarts) From cvs at kolab.org Tue Jan 5 19:26:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 19:26:41 +0100 (CET) Subject: gunnar: server/perl-kolab ChangeLog,1.79,1.80 Message-ID: <20100105182641.402CA600561@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv2925/perl-kolab Modified Files: ChangeLog Log Message: MFB: kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- ChangeLog 5 Jan 2010 17:46:00 -0000 1.79 +++ ChangeLog 5 Jan 2010 18:26:39 -0000 1.80 @@ -54,6 +54,11 @@ getCyrusGroups(), getPostfixMap(map). This removed the use of %special_templates, %haschanged, Kolab::Conf::reload() +2009-12-07 Gunnar Wrobel + + * lib/Kolab/LDAP.pm (createObject): kolab/issue1448 (Users might + add an account on the nonHome Server and write emails in there.) + 2009-11-24 Gunnar Wrobel * Makefile.PL: kolab/issue3952 (Version in kolabconf is not From cvs at kolab.org Tue Jan 5 19:26:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 19:26:41 +0100 (CET) Subject: gunnar: server/perl-kolab/lib/Kolab LDAP.pm,1.16,1.17 Message-ID: <20100105182641.3E89E600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab/lib/Kolab In directory doto:/tmp/cvs-serv2925/perl-kolab/lib/Kolab Modified Files: LDAP.pm Log Message: MFB: kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- LDAP.pm 16 Dec 2009 16:08:55 -0000 1.16 +++ LDAP.pm 5 Jan 2010 18:26:39 -0000 1.17 @@ -548,7 +548,7 @@ } if( $p ne 'sf' && !$islocal ) { # Hide user mailboxes on other servers - Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rswipcda"]); + Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rs"]); } elsif( $p ne 'sf' ) { # Deal with group and resource accounts my $edn = Net::LDAP::Util::ldap_explode_dn($object->dn(), casefold=>'lower' ); From cvs at kolab.org Tue Jan 5 19:37:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 19:37:40 +0100 (CET) Subject: gunnar: server release-notes.txt,1.490,1.491 Message-ID: <20100105183740.20817600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3360 Modified Files: release-notes.txt Log Message: MFB: kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.490 retrieving revision 1.491 diff -u -d -r1.490 -r1.491 --- release-notes.txt 5 Jan 2010 18:26:38 -0000 1.490 +++ release-notes.txt 5 Jan 2010 18:37:37 -0000 1.491 @@ -294,7 +294,7 @@ kolab/issue919 (kolab server has problems with some characters in passwords) -TODO: kolab/issue1340 (RFC: restrict users to sending mail only to + kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.) From cvs at kolab.org Tue Jan 5 19:37:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 19:37:40 +0100 (CET) Subject: gunnar: server/perl-kolab/bin kolab_smtpdpolicy.in,1.2,1.3 Message-ID: <20100105183740.2449C600561@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab/bin In directory doto:/tmp/cvs-serv3360/perl-kolab/bin Modified Files: kolab_smtpdpolicy.in Log Message: MFB: kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) Index: kolab_smtpdpolicy.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/bin/kolab_smtpdpolicy.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab_smtpdpolicy.in 20 Jan 2009 17:22:12 -0000 1.2 +++ kolab_smtpdpolicy.in 5 Jan 2010 18:37:38 -0000 1.3 @@ -281,6 +281,59 @@ return 1; } +sub check_restricted_sender { + my $username = shift; + my $recipient = shift; + my $tries = 0; + AGAIN: + my $mesg = $ldap->search( base=> $conf_basedn, + scope=> 'sub', + filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$username)(uid=$username)))", + attrs => [ 'kolabAllowSMTPRecipient' ]); + if( !$mesg->code && $mesg->count() > 0 ) { + mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose; + my $global_permit = 1; + foreach my $entry ( $mesg->entries ) { + my $allowed_recipient; + my $permit; + for $allowed_recipient ($entry->get_value('kolabAllowSMTPRecipient')) { + mylog($syslog_priority, lc($username." has allowed recipient ".$allowed_recipient)) if $verbose; + # Return early with REJECT if the sender may not send at all ('-') + return undef if $allowed_recipient eq '-'; + # Check if the entry is a negation (leading '-') + if ( $allowed_recipient =~ /^-(.*)/ ) { + $permit = undef; + $allowed_recipient = $1; + } else { + # Once there is a non-negating entry we need REJECT if no rule matched + $global_permit = undef; + $permit = 1; + } + if ( $allowed_recipient =~ /@/ ) { + # If the entry contains '@' the leading segment must match + return $permit if $recipient =~ /^$allowed_recipient/; + } elsif ( $allowed_recipient =~ /^\.(.*)/ ) { + # If the entry starts with '.' the trailing domain must match + return $permit if $recipient =~ /${1}$/; + } else { + # All other entries must match the last part of the mail address + return $permit if $recipient =~ /\@${allowed_recipient}$/; + } + } + } + # Allow sending if there was no entry or no negated entry rejected + return $global_permit; + } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) { + mylog($syslog_priority, "LDAP Connection error during CHECKRESTRICTEDSENDER: ".$mesg->error.", trying to reconnect" ); + ldap_connect; + goto AGAIN; + } elsif( $mesg->code ) { + mylog( $syslog_priority, "LDAP Error during CHECKRESTRICTEDSENDER: ".$mesg->error ) if $verbose; + # Just fall through and accept the message in case there was an LDAP problem. + } + return 1; +} + # # SMTPD access policy routine. The result is an action just like # it would be specified on the right-hand side of a Postfix access @@ -306,6 +359,9 @@ return "REJECT Access denied" if( !$username && !$conf_allowunauth ); eval{ $username = lookup_uid($username) }; return "DEFER_IF_PERMIT $@" if $@; + + # Check for valid access from a restricted sender + return "REJECT Recipient denied" unless check_restricted_sender($username, $recipient); # See if sender is owned by someone my @uids; From cvs at kolab.org Tue Jan 5 19:37:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 5 Jan 2010 19:37:40 +0100 (CET) Subject: gunnar: server/perl-kolab ChangeLog,1.80,1.81 Message-ID: <20100105183740.1C3BF600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv3360/perl-kolab Modified Files: ChangeLog Log Message: MFB: kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- ChangeLog 5 Jan 2010 18:26:39 -0000 1.80 +++ ChangeLog 5 Jan 2010 18:37:38 -0000 1.81 @@ -59,6 +59,19 @@ * lib/Kolab/LDAP.pm (createObject): kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.) + * bin/kolab_smtpdpolicy.in (check_restricted_sender): + kolab/issue1340 (RFC: restrict users to sending mail only to + internal recipients) + +2009-12-04 Gunnar Wrobel + + * bin/kolab_smtpdpolicy.in (check_restricted_sender): + kolab/issue1340 (RFC: restrict users to sending mail only to + internal recipients) + + Only the first stub that reacts solely to "-" (Denying all + recipients). + 2009-11-24 Gunnar Wrobel * Makefile.PL: kolab/issue3952 (Version in kolabconf is not From cvs at kolab.org Wed Jan 6 00:04:02 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 6 Jan 2010 00:04:02 +0100 (CET) Subject: gunnar: server/perl-kolab MANIFEST,1.10,1.11 Makefile.PL,1.19,1.20 Message-ID: <20100105230402.9555C600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv15460 Modified Files: MANIFEST Makefile.PL Log Message: User kolab.mk instead of Base.mk Index: MANIFEST =================================================================== RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MANIFEST 4 Dec 2009 11:23:19 -0000 1.10 +++ MANIFEST 5 Jan 2010 23:04:00 -0000 1.11 @@ -1,5 +1,4 @@ AUTHORS -Base.mk ChangeLog INSTALL bin/kolabdcachetool.in @@ -24,5 +23,6 @@ lib/Kolab/LDAP/Backend/fds.pm lib/Kolab/Util.pm Makefile.PL +kolab.mk MANIFEST README Index: Makefile.PL =================================================================== RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile.PL 4 Dec 2009 14:06:40 -0000 1.19 +++ Makefile.PL 5 Jan 2010 23:04:00 -0000 1.20 @@ -96,11 +96,11 @@ } sub MY::postamble { - if (-e "../Base.mk") + if (-e "../make-helper/kolab.mk") { - copy("../Base.mk", "./") or die "Could not copy ../Base.mk"; + copy("../make-helper/kolab.mk", "./") or die "Could not copy ../make-helper/kolab.mk"; } - my $add = "include Base.mk + my $add = "include kolab.mk PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\$[a-z\\_-]*\$.*/\\1/') VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;') From cvs at kolab.org Wed Jan 6 00:04:26 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 6 Jan 2010 00:04:26 +0100 (CET) Subject: gunnar: server/perl-kolab .cvsignore,1.3,1.4 Message-ID: <20100105230426.827F1600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv15511 Modified Files: .cvsignore Log Message: User kolab.mk instead of Base.mk Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/perl-kolab/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 4 Dec 2009 14:06:15 -0000 1.3 +++ .cvsignore 5 Jan 2010 23:04:24 -0000 1.4 @@ -3,4 +3,4 @@ blib pm_to_blib *.src.rpm -Base.mk \ No newline at end of file +kolab.mk From cvs at kolab.org Fri Jan 8 22:03:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 8 Jan 2010 22:03:29 +0100 (CET) Subject: gunnar: server release-notes.txt,1.491,1.492 Message-ID: <20100108210329.7123060058A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23112 Modified Files: release-notes.txt Log Message: Note the TODO on the recent spamassassin bug fix Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.491 retrieving revision 1.492 diff -u -d -r1.491 -r1.492 --- release-notes.txt 5 Jan 2010 18:37:37 -0000 1.491 +++ release-notes.txt 8 Jan 2010 21:03:27 -0000 1.492 @@ -155,6 +155,12 @@ ??? +Changes between 2.2.3 and 2.2.x: + + - kolabd-2.2.?-20?????? + +TODO: Disable FH_DATE_PAST_20XX spamassassin test, which is broken + for 2010 and later... Changes between 2.2.2 and 2.2.3: (TODOs might need to be merged from kolab_2_2_branch!) From cvs at kolab.org Sat Jan 9 00:34:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 9 Jan 2010 00:34:47 +0100 (CET) Subject: gunnar: server/kolabd Makefile,1.19,1.20 Message-ID: <20100108233447.D7D14600588@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv27793/kolabd Modified Files: Makefile Log Message: Use kolab.mk instead of Base.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolabd/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile 8 Jul 2009 10:26:20 -0000 1.19 +++ Makefile 8 Jan 2010 23:34:45 -0000 1.20 @@ -1,4 +1,4 @@ -include ../Base.mk +include ../make-helper/kolab.mk PWD := $(shell pwd) From cvs at kolab.org Sat Jan 9 00:35:22 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 9 Jan 2010 00:35:22 +0100 (CET) Subject: gunnar: server/kolabd/kolabd configure.ac,1.13,1.14 Message-ID: <20100108233522.F2D5C60058B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv27863/kolabd/kolabd Modified Files: configure.ac Log Message: Merge from branch kolab_2_2_branch. Index: configure.ac =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- configure.ac 14 May 2009 14:41:18 -0000 1.13 +++ configure.ac 8 Jan 2010 23:35:19 -0000 1.14 @@ -1,7 +1,7 @@ AC_PREREQ(2.59) # not the real version -m4_define(_VERSION,2.2.2) +m4_define(_VERSION,2.2.3) AC_INIT([kolabd],[_VERSION],[kolab-devel at kolab.org]) AC_CONFIG_AUX_DIR(.) From cvs at kolab.org Sat Jan 9 00:39:00 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 9 Jan 2010 00:39:00 +0100 (CET) Subject: gunnar: server/kolabd/kolabd/templates php.ini.template.in, 1.11, 1.12 Message-ID: <20100108233900.B192A60058C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv27990/kolabd/kolabd/templates Modified Files: php.ini.template.in Log Message: Added a dirty hack that adds a fixed timezone setting in php.ini. This needs somewhat more elaborate fixing as it is probably required to put the choice of the timezone into the bootstrapping. Index: php.ini.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- php.ini.template.in 13 Dec 2009 18:04:37 -0000 1.11 +++ php.ini.template.in 8 Jan 2010 23:38:58 -0000 1.12 @@ -39,5 +39,15 @@ include_path = ".:@phplibdir@:@phplibdir2@:@phppeardir@" safe_mode_include_dir = "@phplibdir@/" +; FIXME: Do not hardcode the timezone setting +; +; The value used below is of course no acceptable setting: +; But the parameter is required for newer PHP versions as these +; versions refrain from using the timezone detected via the system setting. +; +; It is probably necessary to add the parameter to kolab_bootstrap but +; before doing that I add this temporary setting to allow Horde to run. +date.timezone = Europe/Berlin + [Session] session.save_path = @webserver_sessions@ From cvs at kolab.org Sat Jan 9 00:39:00 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 9 Jan 2010 00:39:00 +0100 (CET) Subject: gunnar: server/kolabd/kolabd ChangeLog,1.276,1.277 Message-ID: <20100108233900.B6FE960058D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv27990/kolabd/kolabd Modified Files: ChangeLog Log Message: Added a dirty hack that adds a fixed timezone setting in php.ini. This needs somewhat more elaborate fixing as it is probably required to put the choice of the timezone into the bootstrapping. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.276 retrieving revision 1.277 diff -u -d -r1.276 -r1.277 --- ChangeLog 24 Dec 2009 08:55:26 -0000 1.276 +++ ChangeLog 8 Jan 2010 23:38:58 -0000 1.277 @@ -1,3 +1,8 @@ +2010-01-09 Gunnar Wrobel
+ + * templates/php.ini.template.in (safe_mode_include_dir): Dirty + hack that adds a hardcoded timezone setting to the php.ini. + 2009-12-24 Gunnar Wrobel
* kolabd.spec.in (PreReq): Fix the php and apache-php From cvs at kolab.org Sat Jan 9 00:42:38 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 9 Jan 2010 00:42:38 +0100 (CET) Subject: gunnar: server TODO,1.6,1.7 Message-ID: <20100108234238.0363F60058E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv28118 Modified Files: TODO Log Message: Nice. Things do not look bad for Kolab server HEAD. perl-kolab is merged completely from the 2_2_branch now. It seems to work fine. I also tested kolabd which also showed no problems. Updateing to PHP-5.3.1 also caused no problem with the webadmin or horde nor the PHP CLI scripts. At least during very basic testing. Two issues are new: User apparently cannot create subfolders in their INBOX. And the newer PHP version needs a timezone setting that we should probably offer during bootstrapping. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TODO 5 Jan 2010 17:27:38 -0000 1.6 +++ TODO 8 Jan 2010 23:42:35 -0000 1.7 @@ -24,11 +24,13 @@ kolab-webclient kolabd openpkg [DONE] - perl-kolab + perl-kolab [DONE] php-kolab - small effort: + Check that users may create folders in their INBOX. + Fix the Build system for ... apache-php [DONE] @@ -53,22 +55,25 @@ Short test of updated packages ... - apache-php + apache-php [DONE] clamav [DONE] imapd [DONE] kolab-fbview kolab-webadmin kolab-webclient - kolabd + kolabd [DONE] openldap [DONE] - perl-kolab - php + perl-kolab [DONE] + php [DONE] php-kolab postfix sqlite - larger effort: + Handle the php.ini timezone setting correctly. Check if + it is absolutely necessary to put this choice into kolab_bootstrap. + Maybe the bootstrap could also determine it automatically. Sascha (wilde): From cvs at kolab.org Mon Jan 11 09:36:39 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 09:36:39 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin configure.ac,1.31,1.32 Message-ID: <20100111083639.BEC7E600574@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv31270/kolab-webadmin Modified Files: configure.ac Log Message: MFB: Version number Index: configure.ac =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- configure.ac 14 May 2009 14:38:33 -0000 1.31 +++ configure.ac 11 Jan 2010 08:36:37 -0000 1.32 @@ -1,6 +1,6 @@ AC_PREREQ(2.57) -m4_define(_VERSION,2.2.2) +m4_define(_VERSION,2.2.3) AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org]) AC_CONFIG_AUX_DIR(.) From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php.in, 1.4, 1.5 Message-ID: <20100111093013.1B69A60057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/distributionlist Modified Files: list.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: list.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- list.php.in 16 Mar 2007 12:17:24 -0000 1.4 +++ list.php.in 11 Jan 2010 09:30:11 -0000 1.5 @@ -184,7 +184,7 @@ if ($action == "save") { if (!$errors) { - if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$dl_root; + if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$dl_root; else $newdn = $dn; if (strcmp($dn,$newdn) != 0) { if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) && @@ -192,7 +192,7 @@ ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) { // Try to rename the object - if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $dl_root, true)) { + if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $dl_root, true)) { array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn, $newdn, ldap_error($ldap->connection))); } @@ -226,7 +226,7 @@ // firstsave if (!$errors) { if( !$ldap_object['member'] ) unset($ldap_object['member']); - $dn = "cn=".$ldap_object['cn'].",".$dl_root; + $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$dl_root; if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) { array_push($errors, sprintf( _("LDAP Error: Could not add object %s: %s"), $dn, ldap_error($ldap->connection))); @@ -242,7 +242,7 @@ if( $ldap->countMail( $_SESSION['base_dn'], $ldap_object['cn'].'@'.$domain, $dn ) > 0 ) { // Ups!!! $cn = $ldap_object['cn']; - $newcn = md5sum( $dn.$cn ); + $newcn = md5( $dn.$cn ); $ldap_object['cn'] = $newcn; $ldap_object['dn'] = 'cn='.$ldap->escape($newcn).','.$dl_root; if (!ldap_rename($ldap->connection, $dn, 'cn='.$ldap->escape($newcn), $dl_root,true)) { From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.119,1.120 Message-ID: <20100111093013.06103600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv970/kolab-webadmin Modified Files: ChangeLog Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- ChangeLog 25 Nov 2009 19:18:47 -0000 1.119 +++ ChangeLog 11 Jan 2010 09:30:10 -0000 1.120 @@ -1,3 +1,10 @@ +2009-12-03 Gunnar Wrobel
+ + * php/admin/include/ldap.class.php.in: + * www/admin/*: + + kolab/issue3499 (Kolab web admin does not use LDAP escaping) + 2009-11-25 Richard Bos * www/admin/style.css: a better implemention of kolab/issue3401. From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder sf.php.in, 1.10, 1.11 Message-ID: <20100111093013.2398760057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/sharedfolder Modified Files: sf.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: sf.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- sf.php.in 12 Jul 2007 16:28:23 -0000 1.10 +++ sf.php.in 11 Jan 2010 09:30:11 -0000 1.11 @@ -215,7 +215,7 @@ if ($action == "save") { if (!$errors) { - if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$sf_root; + if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$sf_root; else $newdn = $dn; if (strcmp($dn,$newdn) != 0) { if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) && @@ -223,7 +223,7 @@ ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) { // Try to rename the object - if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $sf_root, true)) { + if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $sf_root, true)) { array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn, $newdn, ldap_error($ldap->connection))); } @@ -255,7 +255,7 @@ } } else { if (!$errors) { - $dn = "cn=".$ldap_object['cn'].",".$sf_root; + $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$sf_root; $ldap_object['kolabHomeServer'] = trim($_POST['kolabhomeserver']); if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn, From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer maintainer.php.in, 1.10, 1.11 Message-ID: <20100111093013.2A11860057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/maintainer Modified Files: maintainer.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: maintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- maintainer.php.in 21 Nov 2007 18:11:37 -0000 1.10 +++ maintainer.php.in 11 Jan 2010 09:30:11 -0000 1.11 @@ -194,7 +194,7 @@ if ($action == "save") { if (!$errors) { - if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn; + if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn; else $newdn = $dn; if (!$visible && !strstr($newdn,$dn_add)) { list($cn,$rest) = split(',', $newdn, 2); @@ -209,7 +209,7 @@ $ldap_object['userPassword'] = $oldattrs['userPassword'][0]; // Try to rename the object - if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) { + if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), "cn=internal,".$domain_dn, true)) { array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn, $newdn, ldap_error($ldap->connection))); } @@ -251,7 +251,7 @@ } else { // firstsave if (!$errors) { - $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn; + $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn; debug("Calling ldap_add with dn=$dn"); if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) array_push($errors, sprintf( _("LDAP Error: could not add object %s: %s"), $dn, From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php.in, 1.11, 1.12 Message-ID: <20100111093013.32899600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/addressbook Modified Files: addr.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: addr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- addr.php.in 14 May 2009 14:35:37 -0000 1.11 +++ addr.php.in 11 Jan 2010 09:30:11 -0000 1.12 @@ -163,7 +163,7 @@ if ($action == "save") { if (!$errors) { - if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$addressbook_root; + if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$addressbook_root; else $newdn = $dn; debug("action=save, dn=$dn, newdn=$newdn
\n"); if (strcmp($dn,$newdn) != 0) { @@ -185,7 +185,7 @@ foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] ); // Try to rename the object - if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $addressbook_root, true)) { + if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $addressbook_root, true)) { array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn, $newdn, ldap_error($ldap->connection))); } @@ -221,7 +221,7 @@ } } else { if (!$errors) { - $dn = "cn=".$ldap_object['cn'].",".$addressbook_root; + $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$addressbook_root; foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] ); if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) { array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn, From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php.in, 1.15, 1.16 Message-ID: <20100111093013.3A36860057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/domainmaintainer Modified Files: domainmaintainer.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: domainmaintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- domainmaintainer.php.in 21 Nov 2007 18:11:37 -0000 1.15 +++ domainmaintainer.php.in 11 Jan 2010 09:30:11 -0000 1.16 @@ -181,7 +181,7 @@ if ($action == "save") { if (!$errors) { - if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn; + if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn; else $newdn = $dn; if (!$visible && !strstr($newdn,$dn_add)) { list($cn,$rest) = split(',', $newdn, 2); @@ -196,7 +196,7 @@ $ldap_object['userPassword'] = $oldattrs['userPassword'][0]; // Try to rename the object - if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) { + if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), "cn=internal,".$domain_dn, true)) { array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn, $newdn, ldap_error($ldap->connection))); } @@ -255,7 +255,7 @@ } else { // firstsave if (!$errors) { - $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn; + $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn; debug("Calling ldap_add with dn=$dn"); if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn, From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php.in, 1.8, 1.9 Message-ID: <20100111093013.0AED560057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/administrator Modified Files: admin.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: admin.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- admin.php.in 21 Nov 2007 18:11:37 -0000 1.8 +++ admin.php.in 11 Jan 2010 09:30:11 -0000 1.9 @@ -197,7 +197,7 @@ if ($action == "save") { if (!$errors) { - if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn; + if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn; else $newdn = $dn; if (!$visible && !strstr($newdn,$dn_add)) { list($cn,$rest) = split(',', $newdn, 2); @@ -212,7 +212,7 @@ $ldap_object['userPassword'] = $oldattrs['userPassword'][0]; // Try to rename the object - if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) { + if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), "cn=internal,".$domain_dn, true)) { array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn, $newdn, ldap_error($ldap->connection))); } @@ -249,7 +249,7 @@ } else { // firstsave if (!$errors) { - $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn; + $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",cn=internal,".$domain_dn; debug("Calling ldap_add with dn=$dn"); // Add object to db if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.28, 1.29 Message-ID: <20100111093013.27BA360057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/user Modified Files: user.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: user.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- user.php.in 4 Mar 2008 18:12:03 -0000 1.28 +++ user.php.in 11 Jan 2010 09:30:11 -0000 1.29 @@ -613,7 +613,7 @@ if ( !$errors ) { // Try to rename the object - if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $domain_dn, true)) { + if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $domain_dn, true)) { array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn, $newdn, ldap_error($ldap->connection))); } @@ -656,7 +656,7 @@ if( $ldap->countMail( $_SESSION['base_dn'], $alias, $dn ) > 0 ) { // Ups!!! $alias = $ldap_object['alias'][$i]; - $newalias = md5sum( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) ); + $newalias = md5( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) ); $ldap_object['alias'][$i] = $newalias; if (!ldap_modify($ldap->connection, $dn, $ldap_object)) { $errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn, @@ -693,7 +693,7 @@ if( $ldap->countMail( $_SESSION['base_dn'], $ldap_object['mail'], $dn ) > 0 ) { // Ups!!! $mail = $ldap_object['mail']; - $newmail = md5sum( $dn.$mail ).'@'.substr( $mail, 0, strpos( $mail, '@' ) ); + $newmail = md5( $dn.$mail ).'@'.substr( $mail, 0, strpos( $mail, '@' ) ); $ldap_object['uid'] = $ldap_object['mail'] = $newmail; if (!ldap_modify($ldap->connection, $dn, $ldap_object)) { $errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn, @@ -708,7 +708,7 @@ if( $ldap->countMail( $_SESSION['base_dn'], $alias, $dn ) > 0 ) { // Ups!!! $alias = $ldap_object['alias'][$i]; - $newalias = md5sum( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) ); + $newalias = md5( $dn.$alias ).'@'.substr( $alias, 0, strpos( $alias, '@' ) ); $ldap_object['alias'][$i] = $newalias; if (!ldap_modify($ldap->connection, $dn, $ldap_object)) { $errors[] = sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn, From cvs at kolab.org Mon Jan 11 10:30:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:30:13 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php.in, 1.2, 1.3 Message-ID: <20100111093013.39CB7600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv970/kolab-webadmin/php/admin/include Modified Files: ldap.class.php.in Log Message: MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping) Index: ldap.class.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ldap.class.php.in 7 Mar 2009 16:23:33 -0000 1.2 +++ ldap.class.php.in 11 Jan 2010 09:30:10 -0000 1.3 @@ -96,21 +96,78 @@ return $str; } - function dn_escape( $str ) { - /* - DN component escaping as described in RFC-2253 - */ - $str = str_replace( '\\', '\\\\', $str ); - $str = str_replace( ',', '\\,', $str ); - $str = str_replace( '+', '\\,', $str ); - $str = str_replace( '<', '\\<', $str ); - $str = str_replace( '>', '\\>', $str ); - $str = str_replace( ';', '\\;', $str ); - if( $str[0] == '#' ) $str = '\\'.$str; - // PENDING(steffen): Escape leading/trailing spaces - return $str; + // Taken from PEAR_Net_LDAP2 + public function dn_escape($val) + { + // Escaping of filter meta characters + $val = str_replace('\\', '\\\\', $val); + $val = str_replace(',', '\,', $val); + $val = str_replace('+', '\+', $val); + $val = str_replace('"', '\"', $val); + $val = str_replace('<', '\<', $val); + $val = str_replace('>', '\>', $val); + $val = str_replace(';', '\;', $val); + $val = str_replace('#', '\#', $val); + $val = str_replace('=', '\=', $val); + + // ASCII < 32 escaping + $val = KolabLDAP::asc2hex32($val); + + // Convert all leading and trailing spaces to sequences of \20. + if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) { + $val = $matches[2]; + for ($i = 0; $i < strlen($matches[1]); $i++) { + $val = '\20'.$val; + } + for ($i = 0; $i < strlen($matches[3]); $i++) { + $val = $val.'\20'; + } + } + + if (null === $val) $val = '\0'; // apply escaped "null" if string is empty + + return $val; } - + + // Taken from PEAR_Net_LDAP2 + public function asc2hex32($string) + { + for ($i = 0; $i < strlen($string); $i++) { + $char = substr($string, $i, 1); + if (ord($char) < 32) { + $hex = dechex(ord($char)); + if (strlen($hex) == 1) $hex = '0'.$hex; + $string = str_replace($char, '\\'.$hex, $string); + } + } + return $string; + } + + + // Taken from PEAR_Net_LDAP2 + function unescape_dn_value($val) + { + // strip slashes from special chars + $val = str_replace('\\\\', '\\', $val); + $val = str_replace('\,', ',', $val); + $val = str_replace('\+', '+', $val); + $val = str_replace('\"', '"', $val); + $val = str_replace('\<', '<', $val); + $val = str_replace('\>', '>', $val); + $val = str_replace('\;', ';', $val); + $val = str_replace('\#', '#', $val); + $val = str_replace('\=', '=', $val); + + return KolabLDAP::hex2asc($val); + } + + // Taken from PEAR_Net_LDAP2 + function hex2asc($string) + { + $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string); + return $string; + } + function bind( $dn = false , $pw = '' ) { if( !$dn ) { // Default ldap auth @@ -361,14 +418,14 @@ ) (uid='.$this->escape($mail).') )'; - $res = $this->search( $base, $filter, array( 'dn' ) ); + $res = $this->search( $this->dn_escape($base), $filter, array( 'dn' ) ); $count = 0; $entries = ldap_get_entries( $this->connection, $res ); if( $excludedn ) { for ( $i = 0; $i < count( $entries ); $i++ ) { if( is_null( $entries[$i] ) ) continue; - if( $entries[$i]['dn'] == $excludedn ) continue; + if( KolabLDAP::unescape_dn_value($entries[$i]['dn']) == KolabLDAP::unescape_dn_value($excludedn) ) continue; debug("found ".$entries[$i]['dn'] ); $count++; } From cvs at kolab.org Mon Jan 11 10:33:34 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:33:34 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.120,1.121 Message-ID: <20100111093334.17128600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv1214/kolab-webadmin Modified Files: ChangeLog Log Message: MFB: kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- ChangeLog 11 Jan 2010 09:30:10 -0000 1.120 +++ ChangeLog 11 Jan 2010 09:33:32 -0000 1.121 @@ -1,3 +1,8 @@ +2009-12-07 Gunnar Wrobel + + * www/admin/user/user.php.in: kolab/issue1340 (RFC: restrict users + to sending mail only to internal recipients) + 2009-12-03 Gunnar Wrobel
* php/admin/include/ldap.class.php.in: From cvs at kolab.org Mon Jan 11 10:33:34 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:33:34 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.29, 1.30 Message-ID: <20100111093334.1DA4860057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv1214/kolab-webadmin/www/admin/user Modified Files: user.php.in Log Message: MFB: kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) Index: user.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- user.php.in 11 Jan 2010 09:30:11 -0000 1.29 +++ user.php.in 11 Jan 2010 09:33:32 -0000 1.30 @@ -148,6 +148,59 @@ return ''; } +function checksmtprecipient ( $form, $key, $value ) { + $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') ); + $str = ''; + require_once 'Mail/RFC822.php'; + foreach( $lst as $SMTPRecipient ) { + $trimmed = ltrim($SMTPRecipient, "-."); // potentially every entry is negated with a '-' + // $SMTPRecipient is either an + // - email address + // - local part of an email address with an @ suffix + // - a domain part + if (valid_domain($SMTPRecipient)) { + return ''; + } + if (valid_local_part($SMTPRecipient)) { + return sprintf(_("Syntax for Recipient %s is invalid"), $SMTPRecipient); + } + $result = valid_email_address($SMTPRecipient); + if (is_a($result, 'PEAR_Error')) { + return $result->getMessage(); + } else { + return ''; + } + } + return ''; +} + + +function valid_email_address($address) { +// the following addresses are invalid +// email1.. at kolab.org +// email1.- at kolab.org +// email1._ at kolab.org +// email1 at 2sub.kolab.org +// email1 at sub.sub.2sub.kolab.org + $check = new Mail_RFC822($address); + return $check->parseAddressList(null, null, null, true); +} + +function valid_domain($domain) { +// the following subdomains are invalid +// 2sub.kolab.org +// sub.sub.2sub.kolab.org + $check = new Mail_RFC822(); + return $check->_validateDomain($domain); +} + +function valid_local_part($local_part) { + // the local part always has an @ appended + $local_part = rtrim($local_part, '@'); + $check = new Mail_RFC822(); + return $check->_validateLocalPart($local_part); +} + // Check uid/gid used in invitation policy // We're pretty relaxed about what is entered // here and only check some basic syntax @@ -302,6 +355,15 @@ else $v = ""; if(array_key_exists('kolabdelegate',$form->entries)) $form->entries['kolabdelegate']['value'] = $v; + // kolabAllowSMTPRecipient + if (is_array($ldap_object['kolabAllowSMTPRecipient'])) { + $arr = $ldap_object['kolabAllowSMTPRecipient']; + unset( $arr['count'] ); + $v = join("\n", $arr ); + } + else $v = ""; + if(array_key_exists('kolabAllowSMTPRecipient',$form->entries)) $form->entries['kolabAllowSMTPRecipient']['value'] = $v; + // kolabhomeserver if(array_key_exists('kolabhomeserver',$form->entries)) { if( is_array($ldap_object['kolabHomeServer']) ) { @@ -430,6 +492,12 @@ 'comment' => _('Others allowed to send emails with a "from" address of this account.') . '
' . _('One email address per line.') ); +$entries['kolabAllowSMTPRecipient'] =array( 'name' => _('Allowed Recipients'), + 'type' => 'textarea', + 'validation' => 'checksmtprecipient', + 'comment' => _('Restrict allowed recipients of SMTP messages') . '
' . + _('One entry per line.') ); + $entries['title_0'] = array( 'name' => _('Title') ); $entries['o_0'] = array( 'name' => _('Organisation') ); $entries['ou_0'] = array( 'name' => _('Organisational Unit') ); @@ -552,6 +620,11 @@ $ldap_object['kolabDelegate'] = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_POST['kolabdelegate'] ) ), 'strlen') ); if( !$ldap_object['kolabDelegate'] && $action == 'firstsave' ) unset($ldap_object['kolabDelegate']); + + // kolabAllowSMTPRecipient + $ldap_object['kolabAllowSMTPRecipient'] = array_unique( array_filter( array_map( 'trim', + preg_split( '/\n/', $_POST['kolabAllowSMTPRecipient'] ) ), 'strlen') ); + if( !$ldap_object['kolabAllowSMTPRecipient'] && $action == 'firstsave' ) unset($ldap_object['kolabAllowSMTPRecipient']); if ($auth->group() == "maintainer" || $auth->group() == "admin") { From cvs at kolab.org Mon Jan 11 10:35:24 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 10:35:24 +0100 (CET) Subject: gunnar: server TODO,1.7,1.8 release-notes.txt,1.492,1.493 Message-ID: <20100111093524.C8C05600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv1336 Modified Files: TODO release-notes.txt Log Message: kolab-webadmin merges completed. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TODO 8 Jan 2010 23:42:35 -0000 1.7 +++ TODO 11 Jan 2010 09:35:22 -0000 1.8 @@ -21,7 +21,7 @@ db [DONE] imapd [DONE] kolab-webadmin - kolab-webclient + kolab-webclient [DONE] kolabd openpkg [DONE] perl-kolab [DONE] Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.492 retrieving revision 1.493 diff -u -d -r1.492 -r1.493 --- release-notes.txt 8 Jan 2010 21:03:27 -0000 1.492 +++ release-notes.txt 11 Jan 2010 09:35:22 -0000 1.493 @@ -239,11 +239,11 @@ - kolab-webadmin-2.2.3-20091217 -TODO: kolab/issue1340 (RFC: restrict users to sending mail only to + kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients) kolab/issue3428 (Present the checkbox in the "accept internet email" nicer) -TODO: kolab/issue3499 (Kolab web admin does not use LDAP escaping) + kolab/issue3499 (Kolab web admin does not use LDAP escaping) - kolab-webclient-1.2.0-20091202 From cvs at kolab.org Mon Jan 11 11:28:09 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 11:28:09 +0100 (CET) Subject: gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.22, 1.23 Message-ID: <20100111102809.C1427600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv3681 Modified Files: freebusy.conf.template.in Log Message: MFB: Support configurable attribute mapping. Index: freebusy.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- freebusy.conf.template.in 13 Dec 2009 18:04:37 -0000 1.22 +++ freebusy.conf.template.in 11 Jan 2010 10:28:07 -0000 1.23 @@ -59,6 +59,24 @@ $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@'; $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@'; +/** + * If you use customized LDAP attributes on your LDAP server the + * following configuration setting allows you to map the standard + * Kolab attribute names to your customizations. + * + * Specify the mapping line by line: + * + * $conf['kolab']['ldap']['map']['uid'] = 'uid2'; + * $conf['kolab']['ldap']['map']['mobile'] = 'handy'; + * + * or use a hash structure: + * + * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2', + * 'mobile' => 'handy'); + * + */ +//$conf['kolab']['ldap']['map']['uid'] = 'uid2'; + /* Horde::Kolab::IMAP configuration */ $conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@'; $conf['kolab']['imap']['port'] = 143; From cvs at kolab.org Mon Jan 11 11:30:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 11:30:58 +0100 (CET) Subject: gunnar: server release-notes.txt,1.493,1.494 Message-ID: <20100111103058.3BFC660014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3800 Modified Files: release-notes.txt Log Message: This is part of the Kolab_Server-0.5.0 release. All that was still needed was merging the template changes into kolabd. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.493 retrieving revision 1.494 diff -u -d -r1.493 -r1.494 --- release-notes.txt 11 Jan 2010 09:35:22 -0000 1.493 +++ release-notes.txt 11 Jan 2010 10:30:56 -0000 1.494 @@ -233,7 +233,7 @@ - Kolab_Server-0.4.0-20091013 -TODO: Added ability to map arbitrary ldap attributes to those + Added ability to map arbitrary ldap attributes to those expected by kolab. This feature is experimental and very little tested. From cvs at kolab.org Mon Jan 11 11:29:24 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 11:29:24 +0100 (CET) Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.37, 1.38 Message-ID: <20100111102924.42A60600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv3749 Modified Files: resmgr.conf.template.in Log Message: MFB: Support configurable attribute mapping. Index: resmgr.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- resmgr.conf.template.in 13 Dec 2009 18:04:37 -0000 1.37 +++ resmgr.conf.template.in 11 Jan 2010 10:29:22 -0000 1.38 @@ -139,6 +139,24 @@ /* What password should we use with the above DN when binding? */ $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@'; +/** + * If you use customized LDAP attributes on your LDAP server the + * following configuration setting allows you to map the standard + * Kolab attribute names to your customizations. + * + * Specify the mapping line by line: + * + * $conf['kolab']['ldap']['map']['uid'] = 'uid2'; + * $conf['kolab']['ldap']['map']['mobile'] = 'handy'; + * + * or use a hash structure: + * + * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2', + * 'mobile' => 'handy'); + * + */ +//$conf['kolab']['ldap']['map']['uid'] = 'uid2'; + /* What account should we use to read/write calendar data? This * account should have access to the calendar mailbox of all * resource/group mailboxes. From cvs at kolab.org Mon Jan 11 13:53:05 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 13:53:05 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec,1.24,1.25 Message-ID: <20100111125305.C3A5060014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv9159 Modified Files: Kolab_Filter.spec Log Message: Update to Kolab_Filter-0.1.8 Index: Kolab_Filter.spec =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Kolab_Filter.spec 16 Nov 2009 21:40:13 -0000 1.24 +++ Kolab_Filter.spec 11 Jan 2010 12:53:03 -0000 1.25 @@ -1,7 +1,7 @@ # Variables %define V_package Kolab_Filter -%define V_version 0.1.7 -%define V_release 20091116 +%define V_version 0.1.8 +%define V_release 20100111 %define V_sourceurl http://pear.horde.org/get # Package Information @@ -19,7 +19,6 @@ Source0: %{V_sourceurl}/%{V_package}-%{V_version}.tgz # List of patches -Patch0: dovecotlda-quoting.patch # Build Info Prefix: %{l_prefix} @@ -53,8 +52,6 @@ %prep %setup -n %{V_package}-%{V_version} - - %patch -p1 -P 0 cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml %build From cvs at kolab.org Mon Jan 11 13:53:36 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 13:53:36 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Filter dovecotlda-quoting.patch, 1.2, NONE Message-ID: <20100111125336.3584460014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv9221 Removed Files: dovecotlda-quoting.patch Log Message: Patch not required any longer. --- dovecotlda-quoting.patch DELETED --- From cvs at kolab.org Mon Jan 11 13:55:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 13:55:40 +0100 (CET) Subject: gunnar: server release-notes.txt,1.494,1.495 TODO,1.8,1.9 Message-ID: <20100111125540.C2E9560014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9293 Modified Files: release-notes.txt TODO Log Message: Merged Kolab_Filter from kolab_2_2_branch Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.494 retrieving revision 1.495 diff -u -d -r1.494 -r1.495 --- release-notes.txt 11 Jan 2010 10:30:56 -0000 1.494 +++ release-notes.txt 11 Jan 2010 12:55:38 -0000 1.495 @@ -22,7 +22,7 @@ kolab/issue3428 (Present the checkbox in the "accept internet email" nicer) - - Kolab_Filter-0.1.7-2009???? + - Kolab_Filter-0.1.8-2010???? Added french translation. Submitted by Mathieu Parent (mathieuparent at users.sourceforge.net). @@ -212,7 +212,7 @@ - Kolab_Filter-0.1.4-20091203 -TODO: kolab/issue973 (Rewritten from shown inconveniently in kontact) + kolab/issue973 (Rewritten from shown inconveniently in kontact) kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.) kolab/issue2499 (Notification messages by the resource manager @@ -221,13 +221,13 @@ kolab/issue3462 (DIMP does not decode UTF-8 encoded From: headers) kolab/issue3464 (kolab-filter inserts wrong/undecodeable utf-8 code into From: header) -TODO: kolab/issue3594 (Mail containing NUL byte not delivered, Kolab + kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error) kolab/issue3610 (Mail to unknown at something.example.com gets accepted and yields kolabmailboxfilter exit 38) kolab/issue3868 (Resmgr eats up all memory and dies on some recuring events) -TODO: kolab/issue3965 (Always accept: invitations get lost when + kolab/issue3965 (Always accept: invitations get lost when Calendar folder ist not writable for the calendar user) Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- TODO 11 Jan 2010 09:35:22 -0000 1.8 +++ TODO 11 Jan 2010 12:55:38 -0000 1.9 @@ -25,7 +25,7 @@ kolabd openpkg [DONE] perl-kolab [DONE] - php-kolab + php-kolab [DONE] - small effort: From cvs at kolab.org Mon Jan 11 14:12:35 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 14:12:35 +0100 (CET) Subject: gunnar: server release-notes.txt,1.495,1.496 Message-ID: <20100111131235.9F38B60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv10167 Modified Files: release-notes.txt Log Message: issue2499 has already been merged in kolabd. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.495 retrieving revision 1.496 diff -u -d -r1.495 -r1.496 --- release-notes.txt 11 Jan 2010 12:55:38 -0000 1.495 +++ release-notes.txt 11 Jan 2010 13:12:33 -0000 1.496 @@ -199,7 +199,7 @@ TODO: kolab/issue973 (Rewritten from shown inconveniently in kontact) kolab/issue1880 (Poor handling of apostrophes in ldap and admin webpages) -TODO: kolab/issue2499 (Notification messages by the resource manager + kolab/issue2499 (Notification messages by the resource manager should be localized) kolab/issue3654 (Special character issue in Kolab web interface (e.g. vacation message)) From cvs at kolab.org Mon Jan 11 14:13:07 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 14:13:07 +0100 (CET) Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.38, 1.39 Message-ID: <20100111131307.7BA7360014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv10224/templates Modified Files: resmgr.conf.template.in Log Message: MFB: kolab/issue973 (Rewritten from shown inconveniently in kontact) Index: resmgr.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- resmgr.conf.template.in 11 Jan 2010 10:29:22 -0000 1.38 +++ resmgr.conf.template.in 11 Jan 2010 13:13:05 -0000 1.39 @@ -116,9 +116,14 @@ $conf['kolab']['filter']['reject_forged_from_header'] = false; @@@endif@@@ -/* Text to be inserted in From: when rewriting untrusted mails */ -// $conf['kolab']['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)"; -// $conf['kolab']['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)"; +/* Text to be inserted in From: when rewriting untrusted mails + * The following format specifiers can be used: + * - %1$s denotes the envelope sender + * - %2$s denotes the address in the original from header + * - %3$s denotes the name part in the original from header if any + */ +// $conf['kolab']['filter']['untrusted_subject_insert'] = '(UNTRUSTED, sender is <%1$s>)'; +// $conf['kolab']['filter']['unauthenticated_subject_insert'] = '(UNTRUSTED, sender <%1$s> is not authenticated)'; /* Should we allow forwarded ical messages from Outlook * by encapsulating them in a MIME multipart From cvs at kolab.org Mon Jan 11 14:17:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 14:17:03 +0100 (CET) Subject: gunnar: server/kolabd/kolabd ChangeLog,1.277,1.278 Message-ID: <20100111131703.F364460014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv10332 Modified Files: ChangeLog Log Message: Update changelog for the two recent merges. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.277 retrieving revision 1.278 diff -u -d -r1.277 -r1.278 --- ChangeLog 8 Jan 2010 23:38:58 -0000 1.277 +++ ChangeLog 11 Jan 2010 13:17:01 -0000 1.278 @@ -49,6 +49,11 @@ directive, see kolab/issue3594 (Mail containing NUL byte not delivered, Kolab Filter does not report lmtp error) +2009-11-25 Sascha Wilde + + * templates/resmgr.conf.template.in: kolab/issue973 (Rewritten + from shown inconveniently in kontact) + 2009-11-24 Richard Bos * templates/local.cf.template.in: Modify the hardcoded location @@ -166,6 +171,14 @@ * dist_conf/debian: Prepare kolabd for additional webclient configuration templates. +2009-04-23 Gunnar Wrobel
+ + * templates/freebusy.conf.template.in: Configuration support for + LDAP attribute mapping. + + * templates/resmgr.conf.template.in: Configuration support for + LDAP attribute mapping. + 2009-04-20 Thomas Arendsen Hein * templates/slapd.conf.template.in: Make kolabAllowSMTPRecipient From cvs at kolab.org Mon Jan 11 14:18:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 14:18:56 +0100 (CET) Subject: gunnar: server TODO,1.9,1.10 release-notes.txt,1.496,1.497 Message-ID: <20100111131856.0B4BA60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv10433 Modified Files: TODO release-notes.txt Log Message: Merged template changes from kolab_2_2_branch into HEAD. kolabd clean. Updated TODO Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- TODO 11 Jan 2010 12:55:38 -0000 1.9 +++ TODO 11 Jan 2010 13:18:54 -0000 1.10 @@ -20,9 +20,9 @@ clamav [DONE] db [DONE] imapd [DONE] - kolab-webadmin - kolab-webclient [DONE] - kolabd + kolab-webadmin [DONE] + kolab-webclient + kolabd [DONE] openpkg [DONE] perl-kolab [DONE] php-kolab [DONE] @@ -59,7 +59,7 @@ clamav [DONE] imapd [DONE] kolab-fbview - kolab-webadmin + kolab-webadmin [DONE] kolab-webclient kolabd [DONE] openldap [DONE] Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.496 retrieving revision 1.497 diff -u -d -r1.496 -r1.497 --- release-notes.txt 11 Jan 2010 13:12:33 -0000 1.496 +++ release-notes.txt 11 Jan 2010 13:18:54 -0000 1.497 @@ -196,7 +196,7 @@ switched back to skiplist as default. kolab/issue919 (kolab server has problems with some characters in passwords) -TODO: kolab/issue973 (Rewritten from shown inconveniently in kontact) + kolab/issue973 (Rewritten from shown inconveniently in kontact) kolab/issue1880 (Poor handling of apostrophes in ldap and admin webpages) kolab/issue2499 (Notification messages by the resource manager From cvs at kolab.org Mon Jan 11 15:13:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 15:13:11 +0100 (CET) Subject: gunnar: server/kolab-webclient-h4 - New directory Message-ID: <20100111141311.3D08160014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient-h4 In directory doto:/tmp/cvs-serv13754/kolab-webclient-h4 Log Message: Directory /kolabrepository/server/kolab-webclient-h4 added to the repository From cvs at kolab.org Mon Jan 11 15:13:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 15:13:11 +0100 (CET) Subject: gunnar: server/kolab-webclient-h4/horde - New directory Message-ID: <20100111141311.40E7160014C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient-h4/horde In directory doto:/tmp/cvs-serv13754/kolab-webclient-h4/horde Log Message: Directory /kolabrepository/server/kolab-webclient-h4/horde added to the repository From cvs at kolab.org Mon Jan 11 15:13:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 15:13:11 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde - New directory Message-ID: <20100111141311.46B9D600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv13754/kolab-webclient/horde Log Message: Directory /kolabrepository/server/kolab-webclient/horde added to the repository From cvs at kolab.org Mon Jan 11 16:50:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 16:50:43 +0100 (CET) Subject: gunnar: server/make-helper kolab.mk,1.2,1.3 Message-ID: <20100111155043.E218D600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv16958 Modified Files: kolab.mk Log Message: Simplify setting undefined variables in make. Index: kolab.mk =================================================================== RCS file: /kolabrepository/server/make-helper/kolab.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab.mk 23 Dec 2009 20:25:40 -0000 1.2 +++ kolab.mk 11 Jan 2010 15:50:41 -0000 1.3 @@ -4,55 +4,37 @@ $(error Did not find the "openpkg" tool. Make sure your environment settings are sane. On a standard kolab system you might need to run "eval `/kolab/etc/rc --eval all env`") endif -# Set KOLABDIR to the base directory of the OpenPKG/Kolab installation: -KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg) +# Set KOLABDIR to the base directory of the OpenPKG/Kolab installation if it is unset +KOLABDIR ?= $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg) # Error out if there is no kolab directory ifeq ($(KOLABDIR),) $(error Could not determine KOLABDIR!) endif -# Set the location of the rpm binary -ifeq ($(RPM),) - RPM = $(KOLABDIR)/bin/openpkg rpm -endif +# Set the location of the rpm binary if it is unset +RPM ?= $(KOLABDIR)/bin/openpkg rpm -# Set the location for rpm source package installations -ifeq ($(KOLABRPMSRC),) - KOLABRPMSRC = $(KOLABDIR)/RPM/SRC -endif +# Set the location for rpm source package installations if it is unset +KOLABRPMSRC ?= $(KOLABDIR)/RPM/SRC -# Set the location for rpm packages -ifeq ($(KOLABRPMPKG),) - KOLABRPMPKG = $(KOLABDIR)/RPM/PKG -endif +# Set the location for rpm packages if it is unset +KOLABRPMPKG ?= $(KOLABDIR)/RPM/PKG -# Set the location for the rpm temporary directory -ifeq ($(KOLABRPMTMP),) - KOLABRPMTMP = $(KOLABDIR)/RPM/TMP -endif +# Set the location for the rpm temporary directory if it is unset +KOLABRPMTMP ?= $(KOLABDIR)/RPM/TMP -# Set the current working directory -ifeq ($(CURSRCDIR),) - CURSRCDIR = $(CURDIR) -endif +# Set the current working directory if it is unset +CURSRCDIR ?= $(CURDIR) -# Set the download location for Kolab source RPMs -ifeq ($(KOLABPKGURI),) - KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/ -endif +# Set the download location for Kolab source RPMs if it is unset +KOLABPKGURI ?= http://files.kolab.org/server/release/kolab-server-2.2.0/sources/ -# Set the download location for OpenPKG source RPMs -ifeq ($(OPENPKGURI),) - OPENPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/ -endif +# Set the download location for OpenPKG source RPMs if it is unset +OPENPKGURI ?= http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/ -# Determine the suffix for binary packages on this system -ifeq ($(PLATTAG),) - PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%) -endif +# Determine the suffix for binary packages on this system if it is unset +PLATTAG ?= $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(KOLABDIR:/%=%) -# Determine the staging area for collecting new source rpms -ifeq "x$(STAGING)" "x" - STAGING = ../stage -endif +# Determine the staging area for collecting new source rpms if it is unset +STAGING ?= ../stage From cvs at kolab.org Mon Jan 11 16:52:14 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 16:52:14 +0100 (CET) Subject: gunnar: server/make-helper package.mk,1.5,1.6 Message-ID: <20100111155214.72A77600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv17079 Modified Files: package.mk Log Message: Set basic variables if they are undefined. Link target all to dist as this is correctly described as the default target. Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- package.mk 5 Jan 2010 16:24:55 -0000 1.5 +++ package.mk 11 Jan 2010 15:52:12 -0000 1.6 @@ -1,10 +1,19 @@ -ifeq ($(RELEASETARGET),) -RELEASETARGET=$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm -endif +PACKAGE ?= $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package $[a-z-]*$.*/\1/") +VERSION ?= $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9._a-z]*$.*/\1/") +RELEASE ?= $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_rekease\s*$[0-9._a-z]*$.*/\1/") + +SOURCE_URL ?= +SOURCE_FORMAT ?= tar.gz +SOURCE_0 ?= $(PACKAGE)-$(VERSION).$(SOURCE_FORMAT) +EXTRA ?= + +BUILD_OPTIONS ?= + +RELEASETARGET ?= $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm # Default target to generate the source rpm package .PHONY: all -all: $(RELEASETARGET) +all: dist # Target for placing the source rpm in the staging area. This target # includes building the binary package which is an additional check for From cvs at kolab.org Mon Jan 11 16:52:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 16:52:47 +0100 (CET) Subject: gunnar: server/make-helper openpkg-patched.mk,1.4,1.5 Message-ID: <20100111155247.2148B600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv17124 Modified Files: openpkg-patched.mk Log Message: Just reordered to keep the core targets at the bottom. Index: openpkg-patched.mk =================================================================== RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- openpkg-patched.mk 5 Jan 2010 16:24:55 -0000 1.4 +++ openpkg-patched.mk 11 Jan 2010 15:52:45 -0000 1.5 @@ -19,14 +19,6 @@ cd $(KOLABRPMSRC)/$(PACKAGE) && patch < kolab.patch touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched -# Target for building the source package -$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec - -# Target for building the binary package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS) - # Prepare the patch for the package. package.patch: $(PATCHES) echo > package.patch @@ -34,3 +26,11 @@ do \ cat $$PATCH >> package.patch; \ done + +# Target for building the source package +$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) + cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec + +# Target for building the binary package +$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) + cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS) From cvs at kolab.org Mon Jan 11 17:37:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 17:37:48 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/templates - New directory Message-ID: <20100111163748.65E5D600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/templates In directory doto:/tmp/cvs-serv19177/templates Log Message: Directory /kolabrepository/server/kolab-webclient/horde/templates added to the repository From cvs at kolab.org Mon Jan 11 17:37:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 17:37:48 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/templates/horde-3.3.6 - New directory Message-ID: <20100111163748.66C5B60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6 In directory doto:/tmp/cvs-serv19177/templates/horde-3.3.6 Log Message: Directory /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6 added to the repository From cvs at kolab.org Mon Jan 11 17:38:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 17:38:58 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/templates/horde-3.3.6 webclient-config_hooks.php.template, NONE, 1.1 webclient-config_mime_drivers.php.template, NONE, 1.1 webclient-config_motd.php.template, NONE, 1.1 webclient-config_nls.php.template, NONE, 1.1 webclient-config_prefs.php.template, NONE, 1.1 webclient-config_registry.php.template, NONE, 1.1 webclient-kolab-conf.template, NONE, 1.1 Message-ID: <20100111163858.A1C0160014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6 In directory doto:/tmp/cvs-serv19301/templates/horde-3.3.6 Added Files: webclient-config_hooks.php.template webclient-config_mime_drivers.php.template webclient-config_motd.php.template webclient-config_nls.php.template webclient-config_prefs.php.template webclient-config_registry.php.template webclient-kolab-conf.template Log Message: A first version of a separate horde base package. It does not build yet (only src.rpm yet). --- NEW FILE: webclient-config_hooks.php.template --- KOLAB_META_START TARGET=@@@horde_confdir@@@/hooks.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv19301 Added Files: .cvsignore Makefile horde.spec Log Message: A first version of a separate horde base package. It does not build yet (only src.rpm yet). --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) EXTRA = package.patch $(TEMPLATES) include ../../make-helper/package-new.mk --- NEW FILE: horde.spec --- # Macros %define V_package horde %define V_version 3.3.6 %define V_release 20100111 # Package Information Name: %{V_package} Summary: The Horde base application. URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-%{V_version}.tar.gz Source1: webclient-kolab-conf.template Source2: webclient-config_hooks.php.template Source3: webclient-config_mime_drivers.php.template Source4: webclient-config_motd.php.template Source5: webclient-config_nls.php.template Source6: webclient-config_prefs.php.template Source7: webclient-config_registry.php.template # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: kolabd PreReq: Horde_Alarm PreReq: Horde_Block PreReq: Horde_Compress PreReq: Horde_Crypt PreReq: Horde_Data PreReq: Horde_Editor PreReq: Horde_Feed PreReq: Horde_File_PDF PreReq: Horde_Form PreReq: Horde_Http_Client PreReq: Horde_Image PreReq: Horde_Maintenance PreReq: Horde_Mobile PreReq: Horde_Net_SMS PreReq: Horde_RPC PreReq: Horde_SessionHandler PreReq: Horde_Share PreReq: Horde_SyncML PreReq: Horde_Template PreReq: Horde_Text_Filter PreReq: Horde_Text_Flowed PreReq: Horde_Tree PreReq: Kolab_Format >= 1.0.1 PreReq: Kolab_Server >= 0.5.0 PreReq: Kolab_Storage >= 0.4.0 # Needed by horde PreReq: PEAR-Services_Weather PreReq: PEAR-DB AutoReq: no AutoReqProv: no %description The Horde Application Framework is a general-purpose web application framework in PHP, providing classes for dealing with preferences, compression, browser detection, connection tracking, MIME handling, and more. This specific package does however remove all components of the actual Horde framework and solely installs the base Horde application that needs to be installed as a basis for the other Horde applications. The Horde framework is installed using PEAR based packages. %prep %setup -q -c %{V_package}-%{V_version} cd %{V_package}-%{V_version} %patch -p2 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/tmp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/sessions %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-%{V_version} rm test.php find . -type f | grep '\.orig$' | xargs rm cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ # The following section removes libraries again so that we # only need to patch/install them once in the system. # # kolab/issue3293 (Big code duplication and code version messup: Horde # libs in 2.2.1) rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/bundle.php rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/File rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Net rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/SyncML* rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Text rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/VFS* rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/XML sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/groupware.sql cd .. %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-kolab-conf.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_hooks.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_mime_drivers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_motd.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage/horde.db \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/tmp \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/sessions \ '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Mon Jan 11 17:51:19 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 17:51:19 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde horde.spec,1.1,1.2 Message-ID: <20100111165119.3EF1F60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv19732 Modified Files: horde.spec Log Message: Building of the binary package works now but the package itself is probably not functional yet. Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- horde.spec 11 Jan 2010 16:38:56 -0000 1.1 +++ horde.spec 11 Jan 2010 16:51:17 -0000 1.2 @@ -98,9 +98,13 @@ cd %{V_package}-%{V_version} + cd config + for CONFIG in *.dist; do cp $CONFIG `basename $CONFIG .dist`; done + cd .. + rm test.php - find . -type f | grep '\.orig$' | xargs rm + #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ @@ -118,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/VFS* rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/XML - sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/groupware.sql + sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_syncml.sql cd .. From cvs at kolab.org Mon Jan 11 17:52:00 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 17:52:00 +0100 (CET) Subject: gunnar: server/make-helper patch-series.mk,NONE,1.1 Message-ID: <20100111165200.CEEE960014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv19779 Added Files: patch-series.mk Log Message: Added a helper for packages providing a patch series. --- NEW FILE: patch-series.mk --- # Define the patch directory PATCHES = patches/$(PACKAGE)-$(VERSION) # Get the list of patches if there are any in the patch directory PATCH_FILES = $(shell ls $(PATCHES)/series 2> /dev/null) \ $(shell ls $(PATCHES)/*.patch 2> /dev/null) \ $(shell ls $(PATCHES)/*.diff 2> /dev/null) # Prepare the patch for the package. package.patch: $(PATCH_FILES) rm -f $@ touch $@ if [ -e "$(PATCHES)/series" ]; then \ for PATCH in `cat $(PATCHES)/series`;\ do \ cat $(PATCHES)/$$PATCH >> $@; \ done; \ fi From cvs at kolab.org Mon Jan 11 17:52:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 17:52:45 +0100 (CET) Subject: gunnar: server/make-helper package-new.mk, 1.2, 1.3 package.mk, 1.6, 1.7 Message-ID: <20100111165245.29AB4600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv19825 Modified Files: package-new.mk package.mk Log Message: Fix typo. Move EXTRA to the helper actually using it. Include the spec file in out dependencies. Index: package-new.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package-new.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- package-new.mk 5 Jan 2010 16:24:55 -0000 1.2 +++ package-new.mk 11 Jan 2010 16:52:43 -0000 1.3 @@ -1,9 +1,11 @@ +EXTRA ?= + # Target for the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE): mkdir -p $(KOLABRPMSRC)/$(PACKAGE) # Target for the src rpm spec file. -$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) $(EXTRA) +$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) $(PACKAGE).spec $(EXTRA) cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) # Target for building the source package Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- package.mk 11 Jan 2010 15:52:12 -0000 1.6 +++ package.mk 11 Jan 2010 16:52:43 -0000 1.7 @@ -1,11 +1,10 @@ PACKAGE ?= $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package $[a-z-]*$.*/\1/") VERSION ?= $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9._a-z]*$.*/\1/") -RELEASE ?= $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_rekease\s*$[0-9._a-z]*$.*/\1/") +RELEASE ?= $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*$[0-9._a-z]*$.*/\1/") SOURCE_URL ?= SOURCE_FORMAT ?= tar.gz SOURCE_0 ?= $(PACKAGE)-$(VERSION).$(SOURCE_FORMAT) -EXTRA ?= BUILD_OPTIONS ?= @@ -47,7 +46,6 @@ # Target for fetching the source rpm into the current directory $(RELEASETARGET): $(KOLABRPMPKG)/$(RELEASETARGET) cp $(KOLABRPMPKG)/$(RELEASETARGET) . - ifeq ($(SOURCE_0),) else From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Argv package.info,1.4,1.5 Message-ID: <20100111221528.9E6DB600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Argv In directory doto:/tmp/cvs-serv29639/Horde_Argv Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Argv/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Argv' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Auth package.info,1.5,1.6 Message-ID: <20100111221528.9EB12600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Auth In directory doto:/tmp/cvs-serv29639/Horde_Auth Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Auth/package.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- package.info 8 Dec 2009 07:12:18 -0000 1.5 +++ package.info 11 Jan 2010 22:15:26 -0000 1.6 @@ -16,16 +16,16 @@ pear_pkgdir='Auth' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.1dev20090914' +version='0.1.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Alarm package.info,1.4,1.5 Message-ID: <20100111221528.9D9EF60014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Alarm In directory doto:/tmp/cvs-serv29639/Horde_Alarm Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Alarm/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Alarm' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Browser package.info,1.4,1.5 Message-ID: <20100111221528.A800660057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Browser In directory doto:/tmp/cvs-serv29639/Horde_Browser Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Browser/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Browser' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Block package.info,1.4,1.5 Message-ID: <20100111221528.A48C1600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Block In directory doto:/tmp/cvs-serv29639/Horde_Block Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Block/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Block' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_CLI package.info,1.4,1.5 Message-ID: <20100111221528.AE04A60057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_CLI In directory doto:/tmp/cvs-serv29639/Horde_CLI Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_CLI/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='CLI' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Compress package.info,1.4,1.5 Message-ID: <20100111221528.BD25D600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Compress In directory doto:/tmp/cvs-serv29639/Horde_Compress Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Compress/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Compress' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_DOM package.info,1.4,1.5 Message-ID: <20100111221528.C5A6360057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_DOM In directory doto:/tmp/cvs-serv29639/Horde_DOM Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_DOM/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='DOM' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.2.0dev20090914' +version='0.2.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Crypt package.info,1.4,1.5 Message-ID: <20100111221528.C0A6360014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Crypt In directory doto:/tmp/cvs-serv29639/Horde_Crypt Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Crypt/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Crypt' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Cache package.info,1.4,1.5 Message-ID: <20100111221528.B521260057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Cache In directory doto:/tmp/cvs-serv29639/Horde_Cache Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Cache/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Cache' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Data package.info,1.5,1.6 Message-ID: <20100111221528.E8B91600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Data In directory doto:/tmp/cvs-serv29639/Horde_Data Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Data/package.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- package.info 8 Dec 2009 07:12:18 -0000 1.5 +++ package.info 11 Jan 2010 22:15:26 -0000 1.6 @@ -16,16 +16,16 @@ pear_pkgdir='Data' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.3dev20090914' +version='0.0.3dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Editor package.info,1.3,1.4 Message-ID: <20100111221529.14BD7600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Editor In directory doto:/tmp/cvs-serv29639/Horde_Editor Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Editor/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:18 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Editor' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Date package.info,1.3,1.4 Message-ID: <20100111221529.11D6C600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Date In directory doto:/tmp/cvs-serv29639/Horde_Date Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Date/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:18 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Date' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_DataTree package.info,1.5,1.6 Message-ID: <20100111221529.0F0BA60014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_DataTree In directory doto:/tmp/cvs-serv29639/Horde_DataTree Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_DataTree/package.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- package.info 8 Dec 2009 07:12:18 -0000 1.5 +++ package.info 11 Jan 2010 22:15:27 -0000 1.6 @@ -16,16 +16,16 @@ pear_pkgdir='DataTree' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.3dev20090914' +version='0.0.3dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:28 +0100 (CET) Subject: gunnar: server/pear/Horde_Cipher package.info,1.4,1.5 Message-ID: <20100111221528.BB1B560057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Cipher In directory doto:/tmp/cvs-serv29639/Horde_Cipher Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Cipher/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:26 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Cipher' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Form package.info,1.4,1.5 Message-ID: <20100111221529.22E8160057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Form In directory doto:/tmp/cvs-serv29639/Horde_Form Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Form/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:19 -0000 1.4 +++ package.info 11 Jan 2010 22:15:27 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Form' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_IMAP package.info,1.3,1.4 Message-ID: <20100111221529.31FEE600581@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_IMAP In directory doto:/tmp/cvs-serv29639/Horde_IMAP Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_IMAP/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='IMAP' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.3dev20090914' +version='0.0.3dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Feed package.info,1.3,1.4 Message-ID: <20100111221529.18B9F60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Feed In directory doto:/tmp/cvs-serv29639/Horde_Feed Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Feed/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:18 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Feed' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.2.1dev20090914' +version='0.2.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_File_PDF package.info,1.4,1.5 Message-ID: <20100111221529.20C4360057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_File_PDF In directory doto:/tmp/cvs-serv29639/Horde_File_PDF Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_File_PDF/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:18 -0000 1.4 +++ package.info 11 Jan 2010 22:15:27 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='File_PDF' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.3.2dev20090914' +version='0.3.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Framework package.info,1.4,1.5 Message-ID: <20100111221529.26B6860057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Framework In directory doto:/tmp/cvs-serv29639/Horde_Framework Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Framework/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:19 -0000 1.4 +++ package.info 11 Jan 2010 22:15:27 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Horde' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_History package.info,1.4,1.5 Message-ID: <20100111221529.2CDC4600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_History In directory doto:/tmp/cvs-serv29639/Horde_History Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_History/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:19 -0000 1.4 +++ package.info 11 Jan 2010 22:15:27 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='History' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Group package.info,1.4,1.5 Message-ID: <20100111221529.2895460057F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Group In directory doto:/tmp/cvs-serv29639/Horde_Group Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Group/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:19 -0000 1.4 +++ package.info 11 Jan 2010 22:15:27 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Group' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Http_Client package.info,1.4,1.5 Message-ID: <20100111221529.2FFA5600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Http_Client In directory doto:/tmp/cvs-serv29639/Horde_Http_Client Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Http_Client/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:19 -0000 1.4 +++ package.info 11 Jan 2010 22:15:27 -0000 1.5 @@ -16,16 +16,16 @@ pear_pkgdir='Http_Client' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.3.0dev20090914' +version='0.3.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_File_CSV package.info,1.3,1.4 Message-ID: <20100111221529.1F0C160057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_File_CSV In directory doto:/tmp/cvs-serv29639/Horde_File_CSV Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_File_CSV/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:18 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='File_CSV' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.1dev20090914' +version='0.1.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Log package.info,1.3,1.4 Message-ID: <20100111221529.4D07E60057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Log In directory doto:/tmp/cvs-serv29639/Horde_Log Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Log/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Log' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab_FreeBusy package.info,1.3,1.4 Message-ID: <20100111221529.444AD600587@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab_FreeBusy In directory doto:/tmp/cvs-serv29639/Horde_Kolab_FreeBusy Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab_FreeBusy/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Kolab_FreeBusy' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.5dev20090914' +version='0.1.5dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab_Format package.info,1.3,1.4 Message-ID: <20100111221529.40AA1600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab_Format In directory doto:/tmp/cvs-serv29639/Horde_Kolab_Format Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab_Format/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Kolab_Format' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='1.0.1dev20090914' +version='1.0.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_MIME package.info,1.2,1.3 Message-ID: <20100111221529.507DC600589@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_MIME In directory doto:/tmp/cvs-serv29639/Horde_MIME Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_MIME/package.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- package.info 8 Dec 2009 07:12:19 -0000 1.2 +++ package.info 11 Jan 2010 22:15:27 -0000 1.3 @@ -16,16 +16,16 @@ pear_pkgdir='MIME' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Net_SMS package.info,1.3,1.4 Message-ID: <20100111221529.6402160058B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Net_SMS In directory doto:/tmp/cvs-serv29639/Horde_Net_SMS Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Net_SMS/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Net_SMS' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.2.0dev20090914' +version='0.2.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Memcache package.info,1.3,1.4 Message-ID: <20100111221529.57AAC60014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Memcache In directory doto:/tmp/cvs-serv29639/Horde_Memcache Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Memcache/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Memcache' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Net_IMSP package.info,1.3,1.4 Message-ID: <20100111221529.608E260057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Net_IMSP In directory doto:/tmp/cvs-serv29639/Horde_Net_IMSP Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Net_IMSP/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Net_IMSP' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.6dev20090914' +version='0.0.6dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_SessionHandler package.info,1.3,1.4 Message-ID: <20100111221529.7D32660057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SessionHandler In directory doto:/tmp/cvs-serv29639/Horde_SessionHandler Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_SessionHandler/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='SessionHandler' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.3dev20090914' +version='0.0.3dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Maintenance package.info,1.3,1.4 Message-ID: <20100111221529.53E8860058A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Maintenance In directory doto:/tmp/cvs-serv29639/Horde_Maintenance Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Maintenance/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Maintenance' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_NLS package.info,1.3,1.4 Message-ID: <20100111221529.5E39D600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_NLS In directory doto:/tmp/cvs-serv29639/Horde_NLS Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_NLS/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='NLS' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Perms package.info,1.3,1.4 Message-ID: <20100111221529.6774060058C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Perms In directory doto:/tmp/cvs-serv29639/Horde_Perms Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Perms/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Perms' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Lock package.info,1.3,1.4 Message-ID: <20100111221529.49853600588@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Lock In directory doto:/tmp/cvs-serv29639/Horde_Lock Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Lock/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Lock' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.1dev20090914' +version='0.0.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Share package.info,1.3,1.4 Message-ID: <20100111221529.8443460057F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Share In directory doto:/tmp/cvs-serv29639/Horde_Share Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Share/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Share' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.3dev20090914' +version='0.0.3dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_RPC package.info,1.2,1.3 Message-ID: <20100111221529.6E74460057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_RPC In directory doto:/tmp/cvs-serv29639/Horde_RPC Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_RPC/package.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- package.info 8 Dec 2009 07:12:19 -0000 1.2 +++ package.info 11 Jan 2010 22:15:27 -0000 1.3 @@ -16,16 +16,16 @@ pear_pkgdir='RPC' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Flowed package.info,1.3,1.4 Message-ID: <20100111221529.999EF600594@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Flowed In directory doto:/tmp/cvs-serv29639/Horde_Text_Flowed Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Flowed/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Text_Flowed' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_SpellChecker package.info,1.3,1.4 Message-ID: <20100111221529.880EC60058F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SpellChecker In directory doto:/tmp/cvs-serv29639/Horde_SpellChecker Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_SpellChecker/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='SpellChecker' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Tree package.info,1.3,1.4 Message-ID: <20100111221529.A7A2F600597@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Tree In directory doto:/tmp/cvs-serv29639/Horde_Tree Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Tree/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Tree' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_SessionObjects package.info,1.3,1.4 Message-ID: <20100111221529.80AB260058E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SessionObjects In directory doto:/tmp/cvs-serv29639/Horde_SessionObjects Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_SessionObjects/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='SessionObjects' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.3dev20090914' +version='0.0.3dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_SyncML package.info,1.3,1.4 Message-ID: <20100111221529.90000600591@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SyncML In directory doto:/tmp/cvs-serv29639/Horde_SyncML Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_SyncML/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='SyncML' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.7.0dev20090914' +version='0.7.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Prefs package.info,1.4,1.5 Message-ID: <20100111221529.6AE1260058D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Prefs In directory doto:/tmp/cvs-serv29639/Horde_Prefs Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Prefs/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 8 Dec 2009 07:12:19 -0000 1.4 +++ package.info 11 Jan 2010 22:15:27 -0000 1.5 @@ -16,13 +16,13 @@ pear_pkgdir='Prefs' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.3dev20090914' +version='0.0.3dev20091215' # Package release number release='20090910' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_SQL package.info,1.3,1.4 Message-ID: <20100111221529.7255260057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SQL In directory doto:/tmp/cvs-serv29639/Horde_SQL Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_SQL/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='SQL' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Notification package.info,1.3,1.4 Message-ID: <20100111221529.775C1600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Notification In directory doto:/tmp/cvs-serv29639/Horde_Notification Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Notification/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Notification' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Template package.info,1.3,1.4 Message-ID: <20100111221529.92626600592@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Template In directory doto:/tmp/cvs-serv29639/Horde_Template Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Template/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Template' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Util package.info,1.3,1.4 Message-ID: <20100111221529.A534E600596@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Util In directory doto:/tmp/cvs-serv29639/Horde_Util Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Util/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Util' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab package.info,1.3,1.4 Message-ID: <20100111221529.3A6FC600583@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab In directory doto:/tmp/cvs-serv29639/Horde_Kolab Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Kolab' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.6dev20090914' +version='0.0.6dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_VC package.info,1.3,1.4 Message-ID: <20100111221529.AB149600598@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_VC In directory doto:/tmp/cvs-serv29639/Horde_VC Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_VC/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='VC' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.4dev20090914' +version='0.0.4dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Diff package.info,1.3,1.4 Message-ID: <20100111221529.8DD3A600590@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Diff In directory doto:/tmp/cvs-serv29639/Horde_Text_Diff Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Diff/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Text_Diff' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='1.2.0dev20090914' +version='1.2.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab_Filter package.info,1.3,1.4 Message-ID: <20100111221529.3CF43600584@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab_Filter In directory doto:/tmp/cvs-serv29639/Horde_Kolab_Filter Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab_Filter/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Kolab_Filter' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.6dev20090914' +version='0.1.6dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Filter package.info,1.3,1.4 Message-ID: <20100111221529.961DC600593@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Filter In directory doto:/tmp/cvs-serv29639/Horde_Text_Filter Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Filter/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Text_Filter' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Xml_Element package.info,1.3,1.4 Message-ID: <20100111221529.EA82D60C4A5@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Xml_Element In directory doto:/tmp/cvs-serv29639/Horde_Xml_Element Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Xml_Element/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Xml_Element' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Serialize package.info,1.3,1.4 Message-ID: <20100111221529.E51E860059F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Serialize In directory doto:/tmp/cvs-serv29639/Horde_Serialize Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Serialize/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Serialize' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Token package.info,1.3,1.4 Message-ID: <20100111221529.EA73860C4A2@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Token In directory doto:/tmp/cvs-serv29639/Horde_Token Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Token/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Token' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.4dev20090914' +version='0.0.4dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_UI package.info,1.3,1.4 Message-ID: <20100111221529.A1BA9600595@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_UI In directory doto:/tmp/cvs-serv29639/Horde_UI Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_UI/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='UI' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Yaml package.info,1.3,1.4 Message-ID: <20100111221529.BB2A860059C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Yaml In directory doto:/tmp/cvs-serv29639/Horde_Yaml Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Yaml/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Yaml' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='1.0.1dev20090914' +version='1.0.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_View package.info,1.3,1.4 Message-ID: <20100111221529.AEE0D600599@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_View In directory doto:/tmp/cvs-serv29639/Horde_View Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_View/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='View' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.2.1dev20090914' +version='0.2.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_iCalendar package.info,1.3,1.4 Message-ID: <20100111221529.B891A60059B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_iCalendar In directory doto:/tmp/cvs-serv29639/Horde_iCalendar Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_iCalendar/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='iCalendar' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Mobile package.info,1.3,1.4 Message-ID: <20100111221529.E267160059D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Mobile In directory doto:/tmp/cvs-serv29639/Horde_Mobile Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Mobile/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Mobile' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_LDAP package.info,1.3,1.4 Message-ID: <20100111221529.E1675600581@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_LDAP In directory doto:/tmp/cvs-serv29639/Horde_LDAP Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_LDAP/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='LDAP' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Image package.info,1.3,1.4 Message-ID: <20100111221529.3834C600582@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Image In directory doto:/tmp/cvs-serv29639/Horde_Image Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Image/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Image' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Textile package.info,1.3,1.4 Message-ID: <20100111221529.EA5C460C4A1@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Textile In directory doto:/tmp/cvs-serv29639/Horde_Text_Textile Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Textile/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Text_Textile' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.1.0dev20090914' +version='0.1.0dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_Secret package.info,1.3,1.4 Message-ID: <20100111221529.E361C60059E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Secret In directory doto:/tmp/cvs-serv29639/Horde_Secret Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Secret/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='Secret' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.0.2dev20090914' +version='0.0.2dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:15:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:15:29 +0100 (CET) Subject: gunnar: server/pear/Horde_XML_WBXML package.info,1.3,1.4 Message-ID: <20100111221529.B257360059A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_XML_WBXML In directory doto:/tmp/cvs-serv29639/Horde_XML_WBXML Modified Files: package.info Log Message: Update to Horde-3.3.6 Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_XML_WBXML/package.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package.info 8 Dec 2009 07:12:19 -0000 1.3 +++ package.info 11 Jan 2010 22:15:27 -0000 1.4 @@ -16,16 +16,16 @@ pear_pkgdir='XML_WBXML' # Commit tag or date to user -repo_commit='HORDE_3_3_5' +repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? -repo_release='20090914' +repo_release='20091215' # Version number -version='0.5.1dev20090914' +version='0.5.1dev20091215' # Package release number -release='20091110' +release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear Pear.mk,1.14,NONE Message-ID: <20100111222054.621DA600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear In directory doto:/tmp/cvs-serv30251/pear Removed Files: Pear.mk Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk --- Pear.mk DELETED --- From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/make-helper pear.mk,NONE,1.1 Message-ID: <20100111222054.5A3D960014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv30251/make-helper Added Files: pear.mk Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk --- NEW FILE: pear.mk --- include ../../Base.mk # Determine the staging area for collecting new source rpms ifeq "x$(STAGING)" "x" STAGING = ../../stage endif # Set the default upstream directory. ifeq "x$(UPSTREAM_DIR)" "x" UPSTREAM_DIR = ../../upstream endif # Location of the PEAR script PEAR=$(HOME)/bin/pear # Determine the pear package name from the package.info file PEAR_PKGDIR = $(shell grep "^pear_pkgdir=" package.info | sed -e "s/pear_pkgdir='$[A-Za-z0-9\-\_\/]*$'\s*/\1/") # Determine the pear package name from the package.info file PEAR_PACKAGE = $(shell grep "^pear_package=" package.info | sed -e "s/pear_package='$[A-Za-z0-9\_-]*$'.*/\1/") # Determine the package info url from the package.info file PACKAGE_URL = $(shell grep "^package_url=" package.info | sed -e "s/package_url='$[A-Z]*$.*/\1/") # Determine the package origin from the package.info file PACKAGE_ORIGIN = $(shell grep "^package_origin=" package.info | sed -e "s/package_origin='$[A-Z]*$.*/\1/") # Determine the package version control type from the package.info file PACKAGE_VC = $(shell grep "^package_origin=" package.info | sed -e "s/package_origin='[A-Z]*-$[A-Z]*$'.*/\1/") # Determine the package name from the package.info file PACKAGE = $(shell grep "^package=" package.info | sed -e "s/package='$[A-Za-z0-9\_-]*$'.*/\1/") # Determine the package version from the package.info file VERSION = $(shell grep "^version=" package.info | sed -e "s/version='$[0-9.a-zA-Z]*$'.*/\1/") # Determine the file end of the source package FILEEND = $(shell grep "^pkg_fileend=" package.info | sed -e "s/pkg_fileend='*$[0-9.a-z]*$'.*/\1/") # Determine the release number from the package.info file RELEASE = $(shell grep "^release=" package.info | sed -e "s/release='$[0-9]*$'.*/\1/") # Determine the repository REPO = $(shell grep "^repo=" package.info | sed -e "s/repo='$[A-Za-z0-9_\-]*$'.*/\1/") # Determine the exact commit that should be retrieved from the repository COMMIT = $(shell grep "^repo_commit=" package.info | sed -e "s/repo_commit='$[A-Za-z0-9_:]*$'.*/\1/") SAFE_COMMIT = $(shell grep "^repo_commit=" package.info | sed -e "s/repo_commit=':*$[A-Za-z0-9_]*$'.*/\1/") # Determine the release tag a package derived from a repository checkout should get RELTAG = $(shell grep "^repo_release=" package.info | sed -e "s/repo_release='$[0-9]*$'.*/\1/") # Determine the download url for the PEAR package from the package.info file SOURCE_URL=$(shell grep "^sourceurl=" package.info | sed -e "s/sourceurl='$.*$'$$/\1/") # Additional variables for tweaking the PEAR package.xml ALTERNATE_CHANNEL= $(shell grep "^alternate_channel=" package.info | sed -e "s/alternate_channel='$.*$'$$/\1/") ALTERNATE_MAINTAINER= $(shell grep "^alternate_maintainer=" package.info | sed -e "s/alternate_maintainer='$.*$'$$/\1/") ALTERNATE_MAINTAINER_SNIPPET= $(shell grep "^alternate_maintainer_snippet=" package.info | sed -e "s/alternate_maintainer_snippet='$.*$'$$/\1/") # Allow to set the with_chroot option WITH_CHROOT = $(shell if [ -e ../.opt.chroot ]; then echo "yes"; else echo "no"; fi) # Upload location for the fileserver. Configure the kolab filesserver # in your ssh config at ~/.ssh/config. E.g.: # # Host=kolabfiles # User=wrobel # Hostname=files.kolab.org # FILESERVER = kolabfiles # Set the default package file end ifeq "x$(FILEEND)" "x" FILEEND=tgz endif # Generate the full package name SOURCE_0=$(PEAR_PACKAGE)-$(VERSION).$(FILEEND) # Get the list of patches if there are any in the patch directory PATCHES = $(shell ls patches/$(PACKAGE)-$(VERSION)/*.patch 2> /dev/null) # Get the list of php (config) files if there are any in this directory PHP_FILES = $(shell ls *.php 2> /dev/null) # Get the list of template files if there are any in this directory TEMPLATE_FILES = $(shell ls *.template 2> /dev/null) # Generate a list of extra files for the package EXTRA=ChangeLog package.patch $(PHP_FILES) $(TEMPLATE_FILES) # Temporary repository checkout location ifeq ($(PACKAGE_VC),CVS) UPSTREAM=$(UPSTREAM_DIR)/cvs else ifeq ($(PACKAGE_VC),GIT) UPSTREAM=$(UPSTREAM_DIR)/git endif endif # The current date DATE=$(shell date +%Y-%m-%d) # CVS information ifeq ($(REPO),) CVS_REPO=framework else CVS_REPO=$(REPO) endif CVS_REPO_URL=:pserver:cvsread at anoncvs.horde.org:/repository CVS_REPO_UP_CMD=cvs update CVS_REPO_CO_CMD=cvs -d $(CVS_REPO_URL) co CVS_REPO_SC_CMD=cvs update -r # GIT information ifeq ($(REPO),) GIT_REPO=horde else GIT_REPO=$(REPO) endif GIT_REPO_URL=git://dev.horde.org/horde/git/$(GIT_REPO) GIT_REPO_UP_CMD=git pull origin master GIT_REPO_CO_CMD=git clone GIT_REPO_SC_CMD=git checkout # Default target to generate the source rpm package .PHONY: all all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm # Target for placing the source rpm in the staging area .PHONY: dist dist: $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm # Target for installing the binary rpm package in our current Kolab # server installation .PHONY: install install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm # Target for cleaning up the files that can be generated with this Makefile .PHONY: clean clean: rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm rm -rf $(KOLABRPMSRC)/$(PACKAGE) rm -rf $(KOLABRPMTMP)/$(PACKAGE)* rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm rm -rf $(SOURCE_0) rm -rf *~ rm -rf tmp rm -rf $(PACKAGE).spec rm -rf package.patch # Target for fetching the source rpm into the current directory $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . # Target location for the repository checkout $(UPSTREAM)/$(SAFE_COMMIT): mkdir -p "$(UPSTREAM)/$(SAFE_COMMIT)" # Target for building the binary package $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec # Target for building the source package $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec # Target for preparing the source area and building the package $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) # Target for the source file in the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0) cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/ # Target for the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE): test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) # Target for retrieving the source package $(SOURCE_0): wget -c "$(SOURCE_URL)/$(SOURCE_0)" # Get the repository checkout ifeq ($(PACKAGE_VC),CVS) $(UPSTREAM)/$(SAFE_COMMIT)/$(CVS_REPO)/$(PEAR_PKGDIR): $(UPSTREAM)/$(SAFE_COMMIT) @echo The password is 'horde' @cvs -d $(CVS_REPO_URL) login cd "$(UPSTREAM)/$(SAFE_COMMIT)" && $(CVS_REPO_CO_CMD) $(CVS_REPO) cd "$(UPSTREAM)/$(SAFE_COMMIT)/$(CVS_REPO)" && $(CVS_REPO_SC_CMD) "$(COMMIT)" else ifeq ($(PACKAGE_VC),GIT) $(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(PEAR_PKGDIR): $(UPSTREAM)/$(SAFE_COMMIT) cd "$(UPSTREAM)/$(SAFE_COMMIT)" && $(GIT_REPO_CO_CMD) $(GIT_REPO_URL) cd "$(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)" && $(GIT_REPO_SC_CMD) "$(COMMIT)" endif endif # Generate the source package from the repository checkout ifeq ($(PACKAGE_VC),CVS) tmp/$(PACKAGE): $(UPSTREAM)/$(SAFE_COMMIT)/$(CVS_REPO)/$(PEAR_PKGDIR) rm -rf tmp mkdir tmp cp -r "$(UPSTREAM)/$(SAFE_COMMIT)/$(CVS_REPO)/$(PEAR_PKGDIR)" tmp/$(PACKAGE) else ifeq ($(PACKAGE_VC),GIT) tmp/$(PACKAGE): $(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(PEAR_PKGDIR) rm -rf tmp mkdir tmp cp -r "$(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(PEAR_PKGDIR)" tmp/$(PACKAGE) endif endif ifneq ($(PACKAGE_VC),) # Short name for the source package as a target for the command line. tmp/$(SOURCE_0): tmp/$(PACKAGE) sed -i -e "/version/,+1 s#$.*$#\1dev$(RELTAG)#" tmp/$(PACKAGE)/package.xml sed -i -e "/lead/,+1 s#.*#$(DATE)#" tmp/$(PACKAGE)/package.xml ifneq ($(ALTERNATE_CHANNEL),) sed -i -e 's#.*#$(ALTERNATE_CHANNEL)#' tmp/$(PACKAGE)/package.xml endif ifneq ($(ALTERNATE_MAINTAINER),) if [ -z "`grep $(ALTERNATE_MAINTAINER) tmp/$(PACKAGE)/package.xml`" ]; then \ sed -i -e '/lead/,/\/lead/ D' tmp/$(PACKAGE)/package.xml; \ sed -i -e '/date.*\/date/ i\ $(ALTERNATE_MAINTAINER_SNIPPET)' tmp/$(PACKAGE)/package.xml; \ fi endif cd tmp && $(PEAR) package $(PACKAGE)/package.xml # Short name for the source package as a target for the command line. tmp/.sent: tmp/$(SOURCE_0) echo "put tmp/$(SOURCE_0)" | sftp $(FILESERVER) touch tmp/.sent .PHONY:snapshot snapshot: tmp/.sent endif # Prepare the staging area $(STAGING): mkdir -p $(STAGING) # Final package location $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(STAGING) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) # Prepare the patch for the package. package.patch: $(PATCHES) echo > package.patch for PATCH in $(PATCHES); \ do \ cat $$PATCH >> package.patch; \ done $(PACKAGE).spec: ../pear.spec.template package.info source package.info && \ cat ../pear.spec.template | \ sed -e "s#[@]pear_pkgdir[@]#$${pear_pkgdir}#g" \ -e "s#[@]pear_package[@]#$${pear_package}#g" \ -e "s#[@]package[@]#$${package}#g" \ -e "s#[@]package_url[@]#$${package_url}#g" \ -e "s#[@]package_origin[@]#$${package_origin}#g" \ -e "s#[@]repo_commit[@]#$${repo_commit}#g" \ -e "s#[@]repo_release[@]#$${repo_release}#g" \ -e "s#[@]version[@]#$${version}#g" \ -e "s#[@]release[@]#$${release}#g" \ -e "s#[@]sourceurl[@]#$${sourceurl}#g" \ -e "s#[@]php_lib_loc[@]#$${php_lib_loc}#g" \ -e "s#[@]www_loc[@]#$${www_loc}#g" \ -e "s#[@]summary[@]#$${summary}#g" \ -e "s#[@]license[@]#$${license}#g" \ -e "s#[@]buildprereq[@]#$${buildprereq}#g" \ -e "s#[@]prereq[@]#$${prereq}#g" \ -e "s#[@]description[@]#$${description}#g" \ -e "s#[@]with_chroot[@]#$(WITH_CHROOT)#g" > \ $(PACKAGE).spec From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Auth Makefile,1.5,1.6 Message-ID: <20100111222054.95AF2600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Auth In directory doto:/tmp/cvs-serv30251/pear/Horde_Auth Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Auth/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 13 Jul 2009 12:39:26 -0000 1.5 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.6 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Alarm Makefile,1.1,1.2 Message-ID: <20100111222054.93FD7600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Alarm In directory doto:/tmp/cvs-serv30251/pear/Horde_Alarm Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Alarm/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 13 Jul 2009 11:41:20 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Argv Makefile,1.3,1.4 Message-ID: <20100111222054.926DA60014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Argv In directory doto:/tmp/cvs-serv30251/pear/Horde_Argv Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Argv/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 13 Jul 2009 10:50:15 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Editor Makefile,1.1,1.2 Message-ID: <20100111222054.9F8F260057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Editor In directory doto:/tmp/cvs-serv30251/pear/Horde_Editor Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Editor/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 14 Jul 2009 10:39:53 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Date Makefile,1.2,1.3 Message-ID: <20100111222054.9BCE660057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Date In directory doto:/tmp/cvs-serv30251/pear/Horde_Date Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Date/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 14 Jul 2009 07:54:31 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_File_PDF Makefile,1.1,1.2 Message-ID: <20100111222054.A8CDF60057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_File_PDF In directory doto:/tmp/cvs-serv30251/pear/Horde_File_PDF Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_File_PDF/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 14 Jul 2009 13:41:42 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_File_CSV Makefile,1.1,1.2 Message-ID: <20100111222054.ABAEE60057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_File_CSV In directory doto:/tmp/cvs-serv30251/pear/Horde_File_CSV Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_File_CSV/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 14 Jul 2009 13:41:42 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Form Makefile,1.1,1.2 Message-ID: <20100111222054.AD89360057F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Form In directory doto:/tmp/cvs-serv30251/pear/Horde_Form Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Form/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 14 Jul 2009 16:08:43 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Feed Makefile,1.1,1.2 Message-ID: <20100111222054.A3EAF60057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Feed In directory doto:/tmp/cvs-serv30251/pear/Horde_Feed Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Feed/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 14 Jul 2009 12:30:42 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Group Makefile,1.4,1.5 Message-ID: <20100111222054.B2C4C600581@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Group In directory doto:/tmp/cvs-serv30251/pear/Horde_Group Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Group/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 20 Jul 2009 14:38:19 -0000 1.4 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.5 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Crypt Makefile,1.1,1.2 Message-ID: <20100111222054.C23A6600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Crypt In directory doto:/tmp/cvs-serv30251/pear/Horde_Crypt Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Crypt/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 13 Jul 2009 17:12:28 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Compress Makefile,1.1,1.2 Message-ID: <20100111222054.BE113600584@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Compress In directory doto:/tmp/cvs-serv30251/pear/Horde_Compress Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Compress/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 13 Jul 2009 15:02:09 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Framework Makefile,1.3,1.4 Message-ID: <20100111222054.AF717600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Framework In directory doto:/tmp/cvs-serv30251/pear/Horde_Framework Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Framework/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 22 Jul 2009 07:28:16 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Cipher Makefile,1.2,1.3 Message-ID: <20100111222054.B82D2600583@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Cipher In directory doto:/tmp/cvs-serv30251/pear/Horde_Cipher Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Cipher/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 13 Jul 2009 14:41:42 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Block Makefile,1.1,1.2 Message-ID: <20100111222054.C4B92600587@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Block In directory doto:/tmp/cvs-serv30251/pear/Horde_Block Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Block/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 13 Jul 2009 13:21:48 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_History Makefile,1.2,1.3 Message-ID: <20100111222054.B4AA0600582@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_History In directory doto:/tmp/cvs-serv30251/pear/Horde_History Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_History/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 20 Jul 2009 14:53:08 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Browser Makefile,1.5,1.6 Message-ID: <20100111222054.C8294600589@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Browser In directory doto:/tmp/cvs-serv30251/pear/Horde_Browser Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Browser/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 13 Jul 2009 13:40:08 -0000 1.5 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.6 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_DataTree Makefile,1.2,1.3 Message-ID: <20100111222054.C8F2C60058A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_DataTree In directory doto:/tmp/cvs-serv30251/pear/Horde_DataTree Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_DataTree/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 14 Jul 2009 07:25:52 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab_Filter Makefile,1.1,1.2 Message-ID: <20100111222054.C79AE600588@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab_Filter In directory doto:/tmp/cvs-serv30251/pear/Horde_Kolab_Filter Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab_Filter/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:00 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab_Format Makefile,1.1,1.2 Message-ID: <20100111222054.CD66860058C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab_Format In directory doto:/tmp/cvs-serv30251/pear/Horde_Kolab_Format Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab_Format/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:00 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_CLI Makefile,1.2,1.3 Message-ID: <20100111222054.972BB600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_CLI In directory doto:/tmp/cvs-serv30251/pear/Horde_CLI Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_CLI/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 13 Jul 2009 14:52:17 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Image Makefile,1.1,1.2 Message-ID: <20100111222054.D0D8560058E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Image In directory doto:/tmp/cvs-serv30251/pear/Horde_Image Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Image/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:27:59 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Cache Makefile,1.3,1.4 Message-ID: <20100111222054.CF2F360058D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Cache In directory doto:/tmp/cvs-serv30251/pear/Horde_Cache Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Cache/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 13 Jul 2009 14:16:58 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Data Makefile,1.1,1.2 Message-ID: <20100111222054.CA81160058B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Data In directory doto:/tmp/cvs-serv30251/pear/Horde_Data Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Data/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 13 Jul 2009 17:32:39 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Maintenance Makefile,1.1,1.2 Message-ID: <20100111222054.EACB0600598@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Maintenance In directory doto:/tmp/cvs-serv30251/pear/Horde_Maintenance Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Maintenance/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:00 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_IMAP Makefile,1.1,1.2 Message-ID: <20100111222054.D1AA060058F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_IMAP In directory doto:/tmp/cvs-serv30251/pear/Horde_IMAP Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_IMAP/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:27:59 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab Makefile,1.1,1.2 Message-ID: <20100111222054.D2654600590@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab In directory doto:/tmp/cvs-serv30251/pear/Horde_Kolab Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:27:59 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_LDAP Makefile,1.2,1.3 Message-ID: <20100111222054.DBF61600593@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_LDAP In directory doto:/tmp/cvs-serv30251/pear/Horde_LDAP Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_LDAP/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 21 Jul 2009 19:28:00 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Memcache Makefile,1.1,1.2 Message-ID: <20100111222054.ED964600599@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Memcache In directory doto:/tmp/cvs-serv30251/pear/Horde_Memcache Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Memcache/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:00 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Mobile Makefile,1.1,1.2 Message-ID: <20100111222054.EFC7960059A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Mobile In directory doto:/tmp/cvs-serv30251/pear/Horde_Mobile Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Mobile/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:01 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_MIME Makefile,1.2,1.3 Message-ID: <20100111222054.E3B6F600597@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_MIME In directory doto:/tmp/cvs-serv30251/pear/Horde_MIME Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_MIME/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 10 Nov 2009 17:08:57 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Lock Makefile,1.1,1.2 Message-ID: <20100111222054.DEFA9600595@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Lock In directory doto:/tmp/cvs-serv30251/pear/Horde_Lock Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Lock/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:00 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_DOM Makefile,1.3,1.4 Message-ID: <20100111222054.D4899600591@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_DOM In directory doto:/tmp/cvs-serv30251/pear/Horde_DOM Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_DOM/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 14 Jul 2009 10:13:04 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Net_IMSP Makefile,1.1,1.2 Message-ID: <20100111222055.00B6860059B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Net_IMSP In directory doto:/tmp/cvs-serv30251/pear/Horde_Net_IMSP Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Net_IMSP/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:01 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Net_SMS Makefile,1.1,1.2 Message-ID: <20100111222055.0669D60059D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Net_SMS In directory doto:/tmp/cvs-serv30251/pear/Horde_Net_SMS Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Net_SMS/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:01 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Http_Client Makefile,1.1,1.2 Message-ID: <20100111222054.DCEBD600594@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Http_Client In directory doto:/tmp/cvs-serv30251/pear/Horde_Http_Client Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Http_Client/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:27:59 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Notification Makefile,1.3,1.4 Message-ID: <20100111222055.0850E60059E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Notification In directory doto:/tmp/cvs-serv30251/pear/Horde_Notification Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Notification/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 21 Jul 2009 19:28:01 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Perms Makefile,1.2,1.3 Message-ID: <20100111222055.0A66160059F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Perms In directory doto:/tmp/cvs-serv30251/pear/Horde_Perms Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Perms/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 21 Jul 2009 19:28:02 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Log Makefile,1.1,1.2 Message-ID: <20100111222054.E0E38600596@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Log In directory doto:/tmp/cvs-serv30251/pear/Horde_Log Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Log/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:00 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:54 +0100 (CET) Subject: gunnar: server/pear/Horde_Kolab_FreeBusy Makefile,1.1,1.2 Message-ID: <20100111222054.D92E4600592@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Kolab_FreeBusy In directory doto:/tmp/cvs-serv30251/pear/Horde_Kolab_FreeBusy Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Kolab_FreeBusy/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:00 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_SessionObjects Makefile,1.2,1.3 Message-ID: <20100111222055.1F01D60C4A9@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SessionObjects In directory doto:/tmp/cvs-serv30251/pear/Horde_SessionObjects Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_SessionObjects/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 21 Jul 2009 19:28:02 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Prefs Makefile,1.2,1.3 Message-ID: <20100111222055.0D54260C4A1@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Prefs In directory doto:/tmp/cvs-serv30251/pear/Horde_Prefs Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Prefs/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 21 Jul 2009 19:28:02 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_NLS Makefile,1.5,1.6 Message-ID: <20100111222055.015ED60059C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_NLS In directory doto:/tmp/cvs-serv30251/pear/Horde_NLS Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_NLS/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 21 Jul 2009 19:28:01 -0000 1.5 +++ Makefile 11 Jan 2010 22:20:52 -0000 1.6 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_SpellChecker Makefile,1.1,1.2 Message-ID: <20100111222055.24B9B60C4AB@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SpellChecker In directory doto:/tmp/cvs-serv30251/pear/Horde_SpellChecker Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_SpellChecker/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_RPC Makefile,1.1,1.2 Message-ID: <20100111222055.0F96360C4A2@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_RPC In directory doto:/tmp/cvs-serv30251/pear/Horde_RPC Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_RPC/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 24 Jul 2009 07:29:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Secret Makefile,1.2,1.3 Message-ID: <20100111222055.154E760C4A6@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Secret In directory doto:/tmp/cvs-serv30251/pear/Horde_Secret Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Secret/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 21 Jul 2009 19:28:02 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Serialize Makefile,1.2,1.3 Message-ID: <20100111222055.1824460C4A7@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Serialize In directory doto:/tmp/cvs-serv30251/pear/Horde_Serialize Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Serialize/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 21 Jul 2009 19:28:02 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Template Makefile,1.1,1.2 Message-ID: <20100111222055.2956A60C4AD@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Template In directory doto:/tmp/cvs-serv30251/pear/Horde_Template Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Template/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Diff Makefile,1.1,1.2 Message-ID: <20100111222055.2EED260C4AE@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Diff In directory doto:/tmp/cvs-serv30251/pear/Horde_Text_Diff Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Diff/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Filter Makefile,1.1,1.2 Message-ID: <20100111222055.3159660C4AF@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Filter In directory doto:/tmp/cvs-serv30251/pear/Horde_Text_Filter Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Filter/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_SessionHandler Makefile,1.1,1.2 Message-ID: <20100111222055.1AAF760C4A8@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SessionHandler In directory doto:/tmp/cvs-serv30251/pear/Horde_SessionHandler Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_SessionHandler/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Xml_Element Makefile,1.1,1.2 Message-ID: <20100111222055.509E360C4B6@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Xml_Element In directory doto:/tmp/cvs-serv30251/pear/Horde_Xml_Element Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Xml_Element/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:03 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_UI Makefile,1.1,1.2 Message-ID: <20100111222055.4138D60C4B4@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_UI In directory doto:/tmp/cvs-serv30251/pear/Horde_UI Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_UI/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:03 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Flowed Makefile,1.1,1.2 Message-ID: <20100111222055.335A160C4B0@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Flowed In directory doto:/tmp/cvs-serv30251/pear/Horde_Text_Flowed Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Flowed/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_SQL Makefile,1.1,1.2 Message-ID: <20100111222055.1310C60C4A5@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SQL In directory doto:/tmp/cvs-serv30251/pear/Horde_SQL Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_SQL/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_View Makefile,1.1,1.2 Message-ID: <20100111222055.4B8DF600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_View In directory doto:/tmp/cvs-serv30251/pear/Horde_View Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_View/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:03 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Tree Makefile,1.1,1.2 Message-ID: <20100111222055.3C59860C4B3@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Tree In directory doto:/tmp/cvs-serv30251/pear/Horde_Tree Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Tree/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_VC Makefile,1.1,1.2 Message-ID: <20100111222055.498AD600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_VC In directory doto:/tmp/cvs-serv30251/pear/Horde_VC Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_VC/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:03 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Text_Textile Makefile,1.1,1.2 Message-ID: <20100111222055.355ED60C4B1@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Text_Textile In directory doto:/tmp/cvs-serv30251/pear/Horde_Text_Textile Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Text_Textile/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Share Makefile,1.1,1.2 Message-ID: <20100111222055.21B3A60C4AA@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Share In directory doto:/tmp/cvs-serv30251/pear/Horde_Share Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Share/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_SyncML Makefile,1.1,1.2 Message-ID: <20100111222055.2722160C4AC@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_SyncML In directory doto:/tmp/cvs-serv30251/pear/Horde_SyncML Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_SyncML/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB Makefile,1.1,1.2 Message-ID: <20100111222055.8561B60057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB In directory doto:/tmp/cvs-serv30251/pear/PEAR-DB Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-DB/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 04:39:33 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date Makefile,1.8,1.9 Message-ID: <20100111222055.884D460057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 10 Jul 2009 04:59:50 -0000 1.8 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.9 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Util Makefile,1.7,1.8 Message-ID: <20100111222055.5161C60C4B7@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Util In directory doto:/tmp/cvs-serv30251/pear/Horde_Util Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Util/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 21 Jul 2009 19:28:03 -0000 1.7 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.8 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Denmark Makefile,1.1,1.2 Message-ID: <20100111222055.9DD5B600581@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Denmark In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Denmark Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Denmark/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:07:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Token Makefile,1.1,1.2 Message-ID: <20100111222055.3A51260C4B2@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Token In directory doto:/tmp/cvs-serv30251/pear/Horde_Token Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Token/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:02 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Austria Makefile,1.1,1.2 Message-ID: <20100111222055.8D3A660057F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Austria In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Austria Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Austria/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:06:20 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Auth_SASL Makefile,1.8,1.9 Message-ID: <20100111222055.79CC960057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Auth_SASL In directory doto:/tmp/cvs-serv30251/pear/PEAR-Auth_SASL Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 9 Jul 2009 19:39:37 -0000 1.8 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.9 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_EnglandWales Makefile, 1.1, 1.2 Message-ID: <20100111222055.A362D600583@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_EnglandWales In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_EnglandWales Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_EnglandWales/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:07:39 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Germany Makefile,1.1,1.2 Message-ID: <20100111222055.A8C9B600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Germany In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Germany Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Germany/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 07:42:19 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_iCalendar Makefile,1.5,1.6 Message-ID: <20100111222055.5C28660014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_iCalendar In directory doto:/tmp/cvs-serv30251/pear/Horde_iCalendar Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_iCalendar/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 21 Jul 2009 19:28:04 -0000 1.5 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.6 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Cache Makefile,1.1,1.2 Message-ID: <20100111222055.7BBC660057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Cache In directory doto:/tmp/cvs-serv30251/pear/PEAR-Cache Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Cache/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 04:42:53 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_XML_WBXML Makefile,1.1,1.2 Message-ID: <20100111222055.4EA0060C4B5@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_XML_WBXML In directory doto:/tmp/cvs-serv30251/pear/Horde_XML_WBXML Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_XML_WBXML/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:03 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Discordian Makefile,1.1,1.2 Message-ID: <20100111222055.A16FD600582@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Discordian In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Discordian Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Discordian/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:07:19 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Brazil Makefile,1.1,1.2 Message-ID: <20100111222055.8F245600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Brazil In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Brazil Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Brazil/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:06:41 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Japan Makefile,1.1,1.2 Message-ID: <20100111222055.B5B35600589@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Japan In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Japan Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Japan/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:08:53 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays Makefile,1.1,1.2 Message-ID: <20100111222055.8A52E60057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 07:01:36 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Italy Makefile,1.1,1.2 Message-ID: <20100111222055.B1444600588@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Italy In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Italy Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Italy/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:08:35 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Iceland Makefile,1.1,1.2 Message-ID: <20100111222055.AB468600584@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Iceland In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Iceland Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Iceland/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:07:57 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Ireland Makefile,1.1,1.2 Message-ID: <20100111222055.ADA16600587@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Ireland In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Ireland Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Ireland/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:08:15 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Console_Table Makefile,1.1,1.2 Message-ID: <20100111222055.7EA12600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Console_Table In directory doto:/tmp/cvs-serv30251/pear/PEAR-Console_Table Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Console_Table/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 05:27:15 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/Horde_Yaml Makefile,1.1,1.2 Message-ID: <20100111222055.5343160C4B8@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Yaml In directory doto:/tmp/cvs-serv30251/pear/Horde_Yaml Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/Horde_Yaml/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 21 Jul 2009 19:28:03 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Netherlands Makefile,1.1,1.2 Message-ID: <20100111222055.B81D060C4B9@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Netherlands In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Netherlands Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Netherlands/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:09:11 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Romania Makefile,1.1,1.2 Message-ID: <20100111222055.BDFDE60C4BB@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Romania In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Romania Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Romania/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:09:46 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Ukraine Makefile,1.1,1.2 Message-ID: <20100111222055.EBE1960058F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Ukraine In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Ukraine Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Ukraine/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:10:40 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Sweden Makefile,1.1,1.2 Message-ID: <20100111222055.D373460058C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Sweden In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Sweden Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Sweden/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:10:22 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Slovenia Makefile,1.1,1.2 Message-ID: <20100111222055.CA10A60058A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Slovenia In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Slovenia Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Slovenia/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:10:03 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_UNO Makefile,1.1,1.2 Message-ID: <20100111222055.E52AC60058D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_UNO In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_UNO Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_UNO/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:10:58 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_USA Makefile,1.1,1.2 Message-ID: <20100111222055.E9F3A60058E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_USA In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_USA Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_USA/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:11:16 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Log Makefile,1.8,1.9 Message-ID: <20100111222056.0F97B600591@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Log In directory doto:/tmp/cvs-serv30251/pear/PEAR-Log Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 8 Dec 2009 07:12:19 -0000 1.8 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.9 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Mail Makefile,1.8,1.9 Message-ID: <20100111222056.11E22600592@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Mail In directory doto:/tmp/cvs-serv30251/pear/PEAR-Mail Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Mail/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 11 Jul 2009 18:23:07 -0000 1.8 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.9 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-File Makefile,1.1,1.2 Message-ID: <20100111222055.EEDB6600590@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-File In directory doto:/tmp/cvs-serv30251/pear/PEAR-File Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-File/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 05:35:05 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_DIME Makefile,1.1,1.2 Message-ID: <20100111222056.1A4F2600595@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_DIME In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_DIME Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_DIME/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 11 Jul 2009 17:12:46 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-File_Find Makefile,1.1,1.2 Message-ID: <20100111222056.0045D60058B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-File_Find In directory doto:/tmp/cvs-serv30251/pear/PEAR-File_Find Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-File_Find/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 05:45:14 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Mail_Mime Makefile,1.9,1.10 Message-ID: <20100111222056.140E9600593@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Mail_Mime In directory doto:/tmp/cvs-serv30251/pear/PEAR-Mail_Mime Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 11 Jul 2009 19:14:02 -0000 1.9 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.10 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_Sieve Makefile,1.9,1.10 Message-ID: <20100111222056.27C9F600598@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_Sieve In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_Sieve Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 12 Jul 2009 06:28:14 -0000 1.9 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.10 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:55 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays_Norway Makefile,1.1,1.2 Message-ID: <20100111222055.BBCC060C4BA@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays_Norway In directory doto:/tmp/cvs-serv30251/pear/PEAR-Date_Holidays_Norway Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays_Norway/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 08:09:29 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-SOAP Makefile,1.1,1.2 Message-ID: <20100111222056.4284660059D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-SOAP In directory doto:/tmp/cvs-serv30251/pear/PEAR-SOAP Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-SOAP/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 04:33:19 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_LDAP2 Makefile,1.3,1.4 Message-ID: <20100111222056.21789600597@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_LDAP2 In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_LDAP2 Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_LDAP2/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 12 Jul 2009 06:23:16 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_Socket Makefile,1.8,1.9 Message-ID: <20100111222056.2C5BF60059C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_Socket In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_Socket Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 11 Jul 2009 17:01:34 -0000 1.8 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.9 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-HTTP_WebDAV_Server Makefile,1.1,1.2 Message-ID: <20100111222056.29D7460059A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-HTTP_WebDAV_Server In directory doto:/tmp/cvs-serv30251/pear/PEAR-HTTP_WebDAV_Server Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-HTTP_WebDAV_Server/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 05:50:21 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-XML_Parser Makefile,1.1,1.2 Message-ID: <20100111222056.46A4660059F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-XML_Parser In directory doto:/tmp/cvs-serv30251/pear/PEAR-XML_Parser Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-XML_Parser/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 05:22:19 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Mail_mimeDecode Makefile,1.1,1.2 Message-ID: <20100111222056.16FF6600594@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Mail_mimeDecode In directory doto:/tmp/cvs-serv30251/pear/PEAR-Mail_mimeDecode Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Mail_mimeDecode/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 9 Sep 2009 05:49:44 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_SMTP Makefile,1.3,1.4 Message-ID: <20100111222056.25B61600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_SMTP In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_SMTP Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_SMTP/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 11 Jul 2009 18:18:55 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-HTTP_Request Makefile,1.3,1.4 Message-ID: <20100111222056.28879600599@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-HTTP_Request In directory doto:/tmp/cvs-serv30251/pear/PEAR-HTTP_Request Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-HTTP_Request/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 11 Jul 2009 17:06:43 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:53 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Services_Weather Makefile,1.1,1.2 Message-ID: <20100111222056.4482360059E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Services_Weather In directory doto:/tmp/cvs-serv30251/pear/PEAR-Services_Weather Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Services_Weather/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 9 Sep 2009 05:52:28 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_LMTP Makefile,1.3,1.4 Message-ID: <20100111222056.2A75360059B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_LMTP In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_LMTP Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_LMTP/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 12 Jul 2009 06:31:42 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PHPUnit Makefile,1.2,1.3 Message-ID: <20100111222056.50C6260C4A1@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PHPUnit In directory doto:/tmp/cvs-serv30251/pear/PHPUnit Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PHPUnit/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 8 Dec 2009 07:12:19 -0000 1.2 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.3 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-XML_Util Makefile,1.1,1.2 Message-ID: <20100111222056.4E5E7600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-XML_Util In directory doto:/tmp/cvs-serv30251/pear/PEAR-XML_Util Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-XML_Util/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 05:09:35 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_LDAP Makefile,1.1,1.2 Message-ID: <20100111222056.1CA5D600596@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_LDAP In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_LDAP Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_LDAP/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Jul 2009 05:55:49 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-XML_Serializer Makefile,1.1,1.2 Message-ID: <20100111222056.4AC2860057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-XML_Serializer In directory doto:/tmp/cvs-serv30251/pear/PEAR-XML_Serializer Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-XML_Serializer/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 10 Jul 2009 05:25:56 -0000 1.1 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.2 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:20:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:20:56 +0100 (CET) Subject: gunnar: server/pear/PEAR-Net_URL Makefile,1.3,1.4 Message-ID: <20100111222056.40930600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Net_URL In directory doto:/tmp/cvs-serv30251/pear/PEAR-Net_URL Modified Files: Makefile Log Message: Move the pear/Pear.mk helper to make-helper/pear.mk Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Net_URL/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 11 Jul 2009 16:52:20 -0000 1.3 +++ Makefile 11 Jan 2010 22:20:54 -0000 1.4 @@ -1 +1 @@ -include ../Pear.mk +include ../../make-helper/pear.mk From cvs at kolab.org Mon Jan 11 23:35:53 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 11 Jan 2010 23:35:53 +0100 (CET) Subject: gunnar: server/make-helper package.mk,1.7,1.8 pear.mk,1.1,1.2 Message-ID: <20100111223553.8ED3A600588@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv31382 Modified Files: package.mk pear.mk Log Message: Integrate pear.mk with kolab.mk and package.mk Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- package.mk 11 Jan 2010 16:52:43 -0000 1.7 +++ package.mk 11 Jan 2010 22:35:51 -0000 1.8 @@ -10,6 +10,8 @@ RELEASETARGET ?= $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +CLEAN_EXTRA ?= + # Default target to generate the source rpm package .PHONY: all all: dist @@ -42,6 +44,10 @@ rm -f *.tar.gz *.tgz *.tar.bz2 rm -f *~ rm -f package.patch +ifeq ($(CLEAN_EXTRA),) +else + rm -rf $(CLEAN_EXTRA) +endif # Target for fetching the source rpm into the current directory $(RELEASETARGET): $(KOLABRPMPKG)/$(RELEASETARGET) Index: pear.mk =================================================================== RCS file: /kolabrepository/server/make-helper/pear.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pear.mk 11 Jan 2010 22:20:52 -0000 1.1 +++ pear.mk 11 Jan 2010 22:35:51 -0000 1.2 @@ -1,17 +1,12 @@ -include ../../Base.mk +STAGING = ../../stage -# Determine the staging area for collecting new source rpms -ifeq "x$(STAGING)" "x" - STAGING = ../../stage -endif +include ../../make-helper/kolab.mk # Set the default upstream directory. -ifeq "x$(UPSTREAM_DIR)" "x" - UPSTREAM_DIR = ../../upstream -endif +UPSTREAM_DIR ?= ../../upstream # Location of the PEAR script -PEAR=$(HOME)/bin/pear +PEAR=$(KOLABDIR)/bin/pear # Determine the pear package name from the package.info file PEAR_PKGDIR = $(shell grep "^pear_pkgdir=" package.info | sed -e "s/pear_pkgdir='$[A-Za-z0-9\-\_\/]*$'\s*/\1/") @@ -71,8 +66,8 @@ FILESERVER = kolabfiles # Set the default package file end -ifeq "x$(FILEEND)" "x" - FILEEND=tgz +ifeq ($(FILEEND),) +FILEEND=tgz endif # Generate the full package name @@ -124,37 +119,9 @@ GIT_REPO_CO_CMD=git clone GIT_REPO_SC_CMD=git checkout -# Default target to generate the source rpm package -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -# Target for placing the source rpm in the staging area -.PHONY: dist -dist: $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -# Target for cleaning up the files that can be generated with this Makefile -.PHONY: clean -clean: - rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - rm -rf $(KOLABRPMSRC)/$(PACKAGE) - rm -rf $(KOLABRPMTMP)/$(PACKAGE)* - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf $(SOURCE_0) - rm -rf *~ - rm -rf tmp - rm -rf $(PACKAGE).spec - rm -rf package.patch +CLEAN_EXTRA = tmp $(PACKAGE).spec -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +include ../../make-helper/package.mk # Target location for the repository checkout $(UPSTREAM)/$(SAFE_COMMIT): @@ -172,18 +139,10 @@ $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) -# Target for the source file in the src rpm directory. -$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0) - cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/ - # Target for the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE): test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) -# Target for retrieving the source package -$(SOURCE_0): - wget -c "$(SOURCE_URL)/$(SOURCE_0)" - # Get the repository checkout ifeq ($(PACKAGE_VC),CVS) $(UPSTREAM)/$(SAFE_COMMIT)/$(CVS_REPO)/$(PEAR_PKGDIR): $(UPSTREAM)/$(SAFE_COMMIT) @@ -238,14 +197,6 @@ .PHONY:snapshot snapshot: tmp/.sent endif - -# Prepare the staging area -$(STAGING): - mkdir -p $(STAGING) - -# Final package location -$(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(STAGING) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) # Prepare the patch for the package. package.patch: $(PATCHES) From cvs at kolab.org Tue Jan 12 11:00:20 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 11:00:20 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde Makefile, 1.1, 1.2 horde.spec, 1.2, 1.3 Message-ID: <20100112100020.021FA600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv5531 Modified Files: Makefile horde.spec Log Message: Fix the location of the staging area. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 11 Jan 2010 16:38:56 -0000 1.1 +++ Makefile 12 Jan 2010 10:00:17 -0000 1.2 @@ -1,3 +1,5 @@ +STAGING = ../../stage + include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- horde.spec 11 Jan 2010 16:51:17 -0000 1.2 +++ horde.spec 12 Jan 2010 10:00:17 -0000 1.3 @@ -113,9 +113,8 @@ # # kolab/issue3293 (Big code duplication and code version messup: Horde # libs in 2.2.1) - rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/bundle.php rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/File - rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde + rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde* rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Net rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/SyncML* rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Text From cvs at kolab.org Tue Jan 12 11:04:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 11:04:43 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/patches - New directory Message-ID: <20100112100443.B8B83600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/patches In directory doto:/tmp/cvs-serv5745/kolab-webclient/horde/patches Log Message: Directory /kolabrepository/server/kolab-webclient/horde/patches added to the repository From cvs at kolab.org Tue Jan 12 11:04:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 11:04:43 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/patches/horde-3.3.6 - New directory Message-ID: <20100112100443.BC2CA600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/patches/horde-3.3.6 In directory doto:/tmp/cvs-serv5745/kolab-webclient/horde/patches/horde-3.3.6 Log Message: Directory /kolabrepository/server/kolab-webclient/horde/patches/horde-3.3.6 added to the repository From cvs at kolab.org Tue Jan 12 11:07:05 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 11:07:05 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/patches/horde-3.3.6 series, NONE, 1.1 t_horde_HK__MP_ConfdStyleConfigurationOverride.diff, NONE, 1.1 Message-ID: <20100112100705.95291600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/patches/horde-3.3.6 In directory doto:/tmp/cvs-serv6175 Added Files: series t_horde_HK__MP_ConfdStyleConfigurationOverride.diff Log Message: Add patch from Mathieu Parent (http://bugs.horde.org/ticket/8172) to ease horde configuration on the Kolab server. --- NEW FILE: series --- t_horde_HK__MP_ConfdStyleConfigurationOverride.diff -p1 --- NEW FILE: t_horde_HK__MP_ConfdStyleConfigurationOverride.diff --- From: math.parent at gmail.com Subject: [PATCH] t/horde/HK_MP/ConfdStyleConfigurationOverride Allow conf.d style directory configuration overriding of the horde configuration. STATUS: ACCEPTED HORDE_REF: http://bugs.horde.org/ticket/8172 Signed-off-by: Gunnar Wrobel
--- framework/Horde/Horde.php | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/framework/Horde/Horde.php b/framework/Horde/Horde.php index a0692ad..ae6dc71 100644 --- a/framework/Horde/Horde.php +++ b/framework/Horde/Horde.php @@ -542,6 +542,29 @@ HTML; $was_included = true; } + // Load global configuration stanzas in .d directory + $directory = preg_replace('/\.php$/', '.d', $config_dir . $config_file); + if (file_exists($directory) && is_dir($directory)) { + $sub_files = glob("$directory/*.php"); + if ($sub_files) { + foreach ($sub_files as $sub_file) { + ob_start(); + $success = (is_null($var_names) && !$show_output) + ? include_once $sub_file + : include $sub_file; + $output = ob_get_clean(); + + if (!empty($output) && !$show_output) { + return PEAR::raiseError(sprintf('Failed to import configuration file "%s": ', $sub_file) . strip_tags($output)); + } + + if (!$success) { + return PEAR::raiseError(sprintf('Failed to import configuration file "%s".', $sub_file)); + } + } + } + } + // Load vhost configuration file. if (!empty($conf['vhosts']) || !empty($GLOBALS['conf']['vhosts'])) { $server_name = isset($GLOBALS['conf']) ? $GLOBALS['conf']['server']['name'] : $conf['server']['name']; -- tg: (b673385..) t/horde/HK_MP/ConfdStyleConfigurationOverride (depends on: master) -- TOPGIT patch commit log ======================= commit c72bf75efb524b4bc2ae6002a73cf09cca0f4b45 Author: Gunnar Wrobel
Date: Tue Jan 12 10:57:13 2010 +0100 Modified according to Jans comments in http://bugs.horde.org/ticket/8172 commit 1cf3049c77b71f41b22fbd8e98d702ec7078060b Author: Gunnar Wrobel
Date: Tue Jan 12 10:55:53 2010 +0100 Modified according to Jans comments in http://bugs.horde.org/ticket/8172 commit 3e563ed0e07e728c3f51b7d719f9b57c1c75e520 Author: Gunnar Wrobel
Date: Tue Jan 12 10:25:14 2010 +0100 Pulled patch from http://bugs.horde.org/ticket/8172 From cvs at kolab.org Tue Jan 12 14:56:34 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:56:34 +0100 (CET) Subject: gunnar: server/make-helper pear.mk,1.2,1.3 Message-ID: <20100112135634.4E8AE600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv16026/make-helper Modified Files: pear.mk Log Message: Allow to use patches that end with .diff too. Index: pear.mk =================================================================== RCS file: /kolabrepository/server/make-helper/pear.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pear.mk 11 Jan 2010 22:35:51 -0000 1.2 +++ pear.mk 12 Jan 2010 13:56:32 -0000 1.3 @@ -74,7 +74,8 @@ SOURCE_0=$(PEAR_PACKAGE)-$(VERSION).$(FILEEND) # Get the list of patches if there are any in the patch directory -PATCHES = $(shell ls patches/$(PACKAGE)-$(VERSION)/*.patch 2> /dev/null) +PATCHES = $(shell ls patches/$(PACKAGE)-$(VERSION)/*.patch 2> /dev/null) \ + $(shell ls patches/$(PACKAGE)-$(VERSION)/*.diff 2> /dev/null) # Get the list of php (config) files if there are any in this directory PHP_FILES = $(shell ls *.php 2> /dev/null) From cvs at kolab.org Tue Jan 12 14:57:50 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:57:50 +0100 (CET) Subject: gunnar: server/pear pear.spec.template,1.4,1.5 Message-ID: <20100112135750.F2AB2600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear In directory doto:/tmp/cvs-serv16110/pear Modified Files: pear.spec.template Log Message: Change the patch depth to 3. This assumes that we will have more patches on Horde packages than on PEAR packages. Index: pear.spec.template =================================================================== RCS file: /kolabrepository/server/pear/pear.spec.template,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pear.spec.template 10 Jul 2009 07:42:19 -0000 1.4 +++ pear.spec.template 12 Jan 2010 13:57:48 -0000 1.5 @@ -51,7 +51,7 @@ cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml if [ -n "`cat %{PATCH0}`" ]; then - %patch -p0 -P 0 + %patch -p3 -P 0 fi %build From cvs at kolab.org Tue Jan 12 14:57:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:57:51 +0100 (CET) Subject: gunnar: server/pear/PEAR-Date_Holidays/patches/PEAR-Date_Holidays-0.21.2 PEAR-Date_Holidays-script_parser_path.patch, 1.2, 1.3 Message-ID: <20100112135751.024E2600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Date_Holidays/patches/PEAR-Date_Holidays-0.21.2 In directory doto:/tmp/cvs-serv16110/pear/PEAR-Date_Holidays/patches/PEAR-Date_Holidays-0.21.2 Modified Files: PEAR-Date_Holidays-script_parser_path.patch Log Message: Change the patch depth to 3. This assumes that we will have more patches on Horde packages than on PEAR packages. Index: PEAR-Date_Holidays-script_parser_path.patch =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Date_Holidays/patches/PEAR-Date_Holidays-0.21.2/PEAR-Date_Holidays-script_parser_path.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PEAR-Date_Holidays-script_parser_path.patch 10 Jul 2009 07:18:39 -0000 1.2 +++ PEAR-Date_Holidays-script_parser_path.patch 12 Jan 2010 13:57:48 -0000 1.3 @@ -5,8 +5,8 @@ https://pear.php.net/bugs/bug.php?id=16423 diff -Naur pear-dh-compile-translationfile pear-dh-compile-translationfile ---- pear-dh-compile-translationfile 2009-03-24 01:18:21.000000000 +0100 -+++ pear-dh-compile-translationfile 2009-07-10 08:07:51.000000000 +0200 +--- a/a/a/pear-dh-compile-translationfile 2009-03-24 01:18:21.000000000 +0100 ++++ a/a/a/pear-dh-compile-translationfile 2009-07-10 08:07:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!@php_bin@ @@ -14,8 +14,8 @@ diff -Naur package.xml package.xml ---- package.xml 2009-03-24 01:18:21.000000000 +0100 -+++ package.xml 2009-07-10 08:07:18.000000000 +0200 +--- a/a/a/package.xml 2009-03-24 01:18:21.000000000 +0100 ++++ a/a/a/package.xml 2009-07-10 08:07:18.000000000 +0200 @@ -87,8 +87,12 @@ From cvs at kolab.org Tue Jan 12 14:58:10 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:58:10 +0100 (CET) Subject: gunnar: server/pear/Horde_Framework/patches/Horde_Framework-0.0.2dev20091215 - New directory Message-ID: <20100112135810.A7189600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Framework/patches/Horde_Framework-0.0.2dev20091215 In directory doto:/tmp/cvs-serv16140/pear/Horde_Framework/patches/Horde_Framework-0.0.2dev20091215 Log Message: Directory /kolabrepository/server/pear/Horde_Framework/patches/Horde_Framework-0.0.2dev20091215 added to the repository From cvs at kolab.org Tue Jan 12 14:58:10 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:58:10 +0100 (CET) Subject: gunnar: server/pear/Horde_Framework/patches - New directory Message-ID: <20100112135810.A426E600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Framework/patches In directory doto:/tmp/cvs-serv16140/pear/Horde_Framework/patches Log Message: Directory /kolabrepository/server/pear/Horde_Framework/patches added to the repository From cvs at kolab.org Tue Jan 12 14:59:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:59:58 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/patches/horde-3.3.6 series, 1.1, NONE t_horde_HK__MP_ConfdStyleConfigurationOverride.diff, 1.1, NONE Message-ID: <20100112135958.7DA81600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/patches/horde-3.3.6 In directory doto:/tmp/cvs-serv16266/kolab-webclient/horde/patches/horde-3.3.6 Removed Files: series t_horde_HK__MP_ConfdStyleConfigurationOverride.diff Log Message: Doh, this is a framework patch. Not a patch for the base application. --- series DELETED --- --- t_horde_HK__MP_ConfdStyleConfigurationOverride.diff DELETED --- From cvs at kolab.org Tue Jan 12 14:59:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:59:58 +0100 (CET) Subject: gunnar: server/pear/Horde_Framework package.info,1.5,1.6 Message-ID: <20100112135958.888D9600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Framework In directory doto:/tmp/cvs-serv16266/pear/Horde_Framework Modified Files: package.info Log Message: Doh, this is a framework patch. Not a patch for the base application. Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Horde_Framework/package.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- package.info 11 Jan 2010 22:15:27 -0000 1.5 +++ package.info 12 Jan 2010 13:59:56 -0000 1.6 @@ -25,7 +25,7 @@ version='0.0.2dev20091215' # Package release number -release='20100111' +release='20100112' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' From cvs at kolab.org Tue Jan 12 14:59:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 14:59:58 +0100 (CET) Subject: gunnar: server/pear/Horde_Framework/patches/Horde_Framework-0.0.2dev20091215 t_horde_HK__MP_ConfdStyleConfigurationOverride.diff, NONE, 1.1 Message-ID: <20100112135958.8B5A1600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Framework/patches/Horde_Framework-0.0.2dev20091215 In directory doto:/tmp/cvs-serv16266/pear/Horde_Framework/patches/Horde_Framework-0.0.2dev20091215 Added Files: t_horde_HK__MP_ConfdStyleConfigurationOverride.diff Log Message: Doh, this is a framework patch. Not a patch for the base application. --- NEW FILE: t_horde_HK__MP_ConfdStyleConfigurationOverride.diff --- From: math.parent at gmail.com Subject: [PATCH] t/horde/HK_MP/ConfdStyleConfigurationOverride Allow conf.d style directory configuration overriding of the horde configuration. STATUS: ACCEPTED HORDE_REF: http://bugs.horde.org/ticket/8172 Signed-off-by: Gunnar Wrobel
--- framework/Horde/Horde.php | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/framework/Horde/Horde.php b/framework/Horde/Horde.php index a0692ad..ae6dc71 100644 --- a/framework/Horde/Horde.php +++ b/framework/Horde/Horde.php @@ -542,6 +542,29 @@ HTML; $was_included = true; } + // Load global configuration stanzas in .d directory + $directory = preg_replace('/\.php$/', '.d', $config_dir . $config_file); + if (file_exists($directory) && is_dir($directory)) { + $sub_files = glob("$directory/*.php"); + if ($sub_files) { + foreach ($sub_files as $sub_file) { + ob_start(); + $success = (is_null($var_names) && !$show_output) + ? include_once $sub_file + : include $sub_file; + $output = ob_get_clean(); + + if (!empty($output) && !$show_output) { + return PEAR::raiseError(sprintf('Failed to import configuration file "%s": ', $sub_file) . strip_tags($output)); + } + + if (!$success) { + return PEAR::raiseError(sprintf('Failed to import configuration file "%s".', $sub_file)); + } + } + } + } + // Load vhost configuration file. if (!empty($conf['vhosts']) || !empty($GLOBALS['conf']['vhosts'])) { $server_name = isset($GLOBALS['conf']) ? $GLOBALS['conf']['server']['name'] : $conf['server']['name']; -- tg: (b673385..) t/horde/HK_MP/ConfdStyleConfigurationOverride (depends on: master) -- TOPGIT patch commit log ======================= commit c72bf75efb524b4bc2ae6002a73cf09cca0f4b45 Author: Gunnar Wrobel
Date: Tue Jan 12 10:57:13 2010 +0100 Modified according to Jans comments in http://bugs.horde.org/ticket/8172 commit 1cf3049c77b71f41b22fbd8e98d702ec7078060b Author: Gunnar Wrobel
Date: Tue Jan 12 10:55:53 2010 +0100 Modified according to Jans comments in http://bugs.horde.org/ticket/8172 commit 3e563ed0e07e728c3f51b7d719f9b57c1c75e520 Author: Gunnar Wrobel
Date: Tue Jan 12 10:25:14 2010 +0100 Pulled patch from http://bugs.horde.org/ticket/8172 From cvs at kolab.org Tue Jan 12 15:13:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 15:13:58 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde horde.spec,1.3,1.4 Message-ID: <20100112141358.3FB54600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv17082 Modified Files: horde.spec Log Message: Horde application patches will have depth one Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- horde.spec 12 Jan 2010 10:00:17 -0000 1.3 +++ horde.spec 12 Jan 2010 14:13:56 -0000 1.4 @@ -83,7 +83,7 @@ %setup -q -c %{V_package}-%{V_version} cd %{V_package}-%{V_version} - %patch -p2 -P 0 + %patch -p1 -P 0 cd .. %build From cvs at kolab.org Tue Jan 12 23:14:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 23:14:45 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/configuration - New directory Message-ID: <20100112221445.DBF20600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration In directory doto:/tmp/cvs-serv4205/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/horde/configuration added to the repository From cvs at kolab.org Tue Jan 12 23:14:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 23:14:45 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 - New directory Message-ID: <20100112221445.DBE36600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 In directory doto:/tmp/cvs-serv4205/configuration/horde-3.3.6 Log Message: Directory /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 added to the repository From cvs at kolab.org Tue Jan 12 23:16:14 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 23:16:14 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 10-kolab_conf_base.php, NONE, 1.1 10-kolab_hooks_base.php, NONE, 1.1 10-kolab_prefs_base.php, NONE, 1.1 Message-ID: <20100112221614.02096600572@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 In directory doto:/tmp/cvs-serv4327/configuration/horde-3.3.6 Added Files: 10-kolab_conf_base.php 10-kolab_hooks_base.php 10-kolab_prefs_base.php Log Message: Added basic configuration files. The conf file still needs a few variables that can differ per distribution. --- NEW FILE: 10-kolab_conf_base.php --- user_mail; } return ''; } } if (!function_exists('_prefs_hook_fullname')) { function _prefs_hook_fullname() { require_once 'Horde/Kolab/Session.php'; $session = Horde_Kolab_Session::singleton(); if (!is_a($session, 'PEAR_Error')) { return $session->user_name; } return ''; } } --- NEW FILE: 10-kolab_prefs_base.php --- '', 'locked' => false, 'shared' => true, 'hook' => true, 'type' => 'text', 'desc' => _("Your full name:") ); // user preferred email address for From: line // If you lock this preference, you must specify a value or a hook for it in // horde/config/hooks.php. $_prefs['from_addr'] = array( 'value' => '', 'locked' => false, 'shared' => true, 'hook' => true, 'type' => 'text', 'desc' => _("Your From: address:") ); // UI theme $_prefs['theme'] = array( 'value' => 'silver', 'locked' => false, 'shared' => true, 'type' => 'select', 'desc' => _("Select your color scheme.") ); From cvs at kolab.org Tue Jan 12 23:16:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 23:16:13 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde Makefile,1.2,1.3 Message-ID: <20100112221613.F21C1600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv4327 Modified Files: Makefile Log Message: Added basic configuration files. The conf file still needs a few variables that can differ per distribution. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 12 Jan 2010 10:00:17 -0000 1.2 +++ Makefile 12 Jan 2010 22:16:11 -0000 1.3 @@ -10,6 +10,9 @@ # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) -EXTRA = package.patch $(TEMPLATES) +# Get the list of configuration files if there are any in the configuration directory +CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) + +EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk From cvs at kolab.org Tue Jan 12 23:16:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 12 Jan 2010 23:16:55 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/templates/horde-3.3.6 webclient-config_hooks.php.template, 1.1, 1.2 webclient-config_mime_drivers.php.template, 1.1, 1.2 webclient-config_motd.php.template, 1.1, 1.2 webclient-config_nls.php.template, 1.1, 1.2 webclient-config_prefs.php.template, 1.1, 1.2 webclient-config_registry.php.template, 1.1, 1.2 webclient-kolab-conf.template, 1.1, 1.2 Message-ID: <20100112221655.922DB600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6 In directory doto:/tmp/cvs-serv4372/horde-3.3.6 Modified Files: webclient-config_hooks.php.template webclient-config_mime_drivers.php.template webclient-config_motd.php.template webclient-config_nls.php.template webclient-config_prefs.php.template webclient-config_registry.php.template webclient-kolab-conf.template Log Message: Fix templates to use the configuration capability provided with the patch from Mathieu Parent. Index: webclient-config_hooks.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-config_hooks.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-config_hooks.php.template 11 Jan 2010 16:38:56 -0000 1.1 +++ webclient-config_hooks.php.template 12 Jan 2010 22:16:53 -0000 1.2 @@ -1,9 +1,13 @@ KOLAB_META_START -TARGET=@@@horde_confdir@@@/hooks.local.php +TARGET=@@@horde_confdir@@@/hooks.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv4433 Modified Files: horde.spec Log Message: Completed the spec for to yield a first draft of a new horde base application package. The package installs and provides a working horde installation. Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- horde.spec 12 Jan 2010 14:13:56 -0000 1.4 +++ horde.spec 12 Jan 2010 22:17:57 -0000 1.5 @@ -23,6 +23,9 @@ Source5: webclient-config_nls.php.template Source6: webclient-config_prefs.php.template Source7: webclient-config_registry.php.template +Source8: 10-kolab_hooks_base.php +Source9: 10-kolab_prefs_base.php +Source10: 10-kolab_conf_base.php # List of Patches Patch0: package.patch @@ -57,6 +60,7 @@ PreReq: Horde_Text_Filter PreReq: Horde_Text_Flowed PreReq: Horde_Tree +PreReq: Horde_UI PreReq: Kolab_Format >= 1.0.1 PreReq: Kolab_Server >= 0.5.0 PreReq: Kolab_Storage >= 0.4.0 @@ -92,6 +96,7 @@ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/log %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/tmp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/sessions %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates @@ -99,7 +104,11 @@ cd %{V_package}-%{V_version} cd config - for CONFIG in *.dist; do cp $CONFIG `basename $CONFIG .dist`; done + for CONFIG in *.dist; \ + do \ + cp $CONFIG `basename $CONFIG .dist`; \ + mkdir -p `basename $CONFIG .php.dist`.d; \ + done cd .. rm test.php @@ -121,6 +130,8 @@ rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/VFS* rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/XML + sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_alarms.sql + sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_perms.sql sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_syncml.sql cd .. @@ -128,6 +139,10 @@ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/hooks.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/prefs.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/ + sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ @@ -138,6 +153,7 @@ '%config %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \ + %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/log \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage/horde.db \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/tmp \ From cvs at kolab.org Fri Jan 15 16:32:35 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 16:32:35 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.110.2.10, 1.110.2.11 Message-ID: <20100115153235.CA13A60057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv13268/kolab-webadmin/kolab-webadmin Modified Files: Tag: kolab_2_2_branch ChangeLog Log Message: kolab/issue4025 (Users can not change theire password (in 2.2.3)) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.110.2.10 retrieving revision 1.110.2.11 diff -u -d -r1.110.2.10 -r1.110.2.11 --- ChangeLog 7 Dec 2009 13:17:02 -0000 1.110.2.10 +++ ChangeLog 15 Jan 2010 15:32:33 -0000 1.110.2.11 @@ -1,3 +1,8 @@ +2010-01-15 Gunnar Wrobel + + * www/admin/user/user.php.in: kolab/issue4025 (Users can not + change theire password (in 2.2.3)) + 2009-12-07 root > * www/admin/user/user.php.in: kolab/issue1340 (RFC: restrict users From cvs at kolab.org Fri Jan 15 16:32:35 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 16:32:35 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.28.2.3, 1.28.2.4 Message-ID: <20100115153235.CC13260057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv13268/kolab-webadmin/kolab-webadmin/www/admin/user Modified Files: Tag: kolab_2_2_branch user.php.in Log Message: kolab/issue4025 (Users can not change theire password (in 2.2.3)) Index: user.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v retrieving revision 1.28.2.3 retrieving revision 1.28.2.4 diff -u -d -r1.28.2.3 -r1.28.2.4 --- user.php.in 7 Dec 2009 13:17:02 -0000 1.28.2.3 +++ user.php.in 15 Jan 2010 15:32:33 -0000 1.28.2.4 @@ -521,7 +521,9 @@ $entries['givenname']['comment'] = ''; $entries['sn']['comment'] = ''; $entries['alias']['attrs'] = 'readonly'; + $entries['kolabdelegate']['attrs'] = 'readonly'; $entries['kolabhomeserver']['attrs'] = 'readonly'; + $entries['kolabAllowSMTPRecipient']['attrs'] = 'readonly'; $entries['accttype']['attrs'] = 'readonly'; $entries['uid']['attrs'] = 'readonly'; } @@ -717,6 +719,8 @@ unset($ldap_object['mail']); unset($ldap_object['uid']); unset($ldap_object['kolabHomeServer']); + unset($ldap_object['kolabAllowSMTPRecipient']); + unset($ldap_object['kolabDelegate']); } if (!ldap_modify($ldap->connection, $dn, $ldap_object)) { array_push($errors, sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn, From cvs at kolab.org Fri Jan 15 16:32:35 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 16:32:35 +0100 (CET) Subject: gunnar: server release-notes.txt,1.398.2.103,1.398.2.104 Message-ID: <20100115153235.C8F5260057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv13268 Modified Files: Tag: kolab_2_2_branch release-notes.txt Log Message: kolab/issue4025 (Users can not change theire password (in 2.2.3)) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.398.2.103 retrieving revision 1.398.2.104 diff -u -d -r1.398.2.103 -r1.398.2.104 --- release-notes.txt 4 Jan 2010 11:20:02 -0000 1.398.2.103 +++ release-notes.txt 15 Jan 2010 15:32:33 -0000 1.398.2.104 @@ -50,6 +50,10 @@ Disable FH_DATE_PAST_20XX spamassassin test, which is broken for 2010 and later... + - kolab-webadmin-2.2.?-20?????? + + kolab/issue4025 (Users can not change theire password (in 2.2.3)) + Changes between 2.2.2 and 2.2.3: From cvs at kolab.org Fri Jan 15 16:38:49 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 16:38:49 +0100 (CET) Subject: gunnar: server release-notes.txt,1.497,1.498 Message-ID: <20100115153849.AA40360057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv13849 Modified Files: release-notes.txt Log Message: MFB: kolab/issue4025 (Users can not change theire password (in 2.2.3)) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.497 retrieving revision 1.498 diff -u -d -r1.497 -r1.498 --- release-notes.txt 11 Jan 2010 13:18:54 -0000 1.497 +++ release-notes.txt 15 Jan 2010 15:38:47 -0000 1.498 @@ -162,6 +162,11 @@ TODO: Disable FH_DATE_PAST_20XX spamassassin test, which is broken for 2010 and later... + - kolab-webadmin-2.2.?-20?????? + + kolab/issue4025 (Users can not change theire password (in 2.2.3)) + + Changes between 2.2.2 and 2.2.3: (TODOs might need to be merged from kolab_2_2_branch!) From cvs at kolab.org Fri Jan 15 16:38:49 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 16:38:49 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.30, 1.31 Message-ID: <20100115153849.B2FCE60057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv13849/kolab-webadmin/kolab-webadmin/www/admin/user Modified Files: user.php.in Log Message: MFB: kolab/issue4025 (Users can not change theire password (in 2.2.3)) Index: user.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- user.php.in 11 Jan 2010 09:33:32 -0000 1.30 +++ user.php.in 15 Jan 2010 15:38:47 -0000 1.31 @@ -521,7 +521,9 @@ $entries['givenname']['comment'] = ''; $entries['sn']['comment'] = ''; $entries['alias']['attrs'] = 'readonly'; + $entries['kolabdelegate']['attrs'] = 'readonly'; $entries['kolabhomeserver']['attrs'] = 'readonly'; + $entries['kolabAllowSMTPRecipient']['attrs'] = 'readonly'; $entries['accttype']['attrs'] = 'readonly'; $entries['uid']['attrs'] = 'readonly'; } @@ -717,6 +719,8 @@ unset($ldap_object['mail']); unset($ldap_object['uid']); unset($ldap_object['kolabHomeServer']); + unset($ldap_object['kolabAllowSMTPRecipient']); + unset($ldap_object['kolabDelegate']); } if (!ldap_modify($ldap->connection, $dn, $ldap_object)) { array_push($errors, sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn, From cvs at kolab.org Fri Jan 15 16:38:49 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 16:38:49 +0100 (CET) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.121,1.122 Message-ID: <20100115153849.AF01760057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv13849/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Log Message: MFB: kolab/issue4025 (Users can not change theire password (in 2.2.3)) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.121 retrieving revision 1.122 diff -u -d -r1.121 -r1.122 --- ChangeLog 11 Jan 2010 09:33:32 -0000 1.121 +++ ChangeLog 15 Jan 2010 15:38:47 -0000 1.122 @@ -1,3 +1,8 @@ +2010-01-15 Gunnar Wrobel + + * www/admin/user/user.php.in: kolab/issue4025 (Users can not + change theire password (in 2.2.3)) + 2009-12-07 Gunnar Wrobel * www/admin/user/user.php.in: kolab/issue1340 (RFC: restrict users From cvs at kolab.org Fri Jan 15 18:16:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 18:16:47 +0100 (CET) Subject: wilde: doc/www/src/security kolab-vendor-notice-27.txt,NONE,1.1 Message-ID: <20100115171647.C78A4600169@lists.intevation.de> Author: wilde Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv16883 Added Files: kolab-vendor-notice-27.txt Log Message: Added advisory 27. --- NEW FILE: kolab-vendor-notice-27.txt --- -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Kolab Security Issue 27 20100115 ================================ Package: Kolab Server, Kolab Web Admin Vulnerability: Users can not change their password Kolab Specific: yes Dependent Packages: none Summary ~~~~~~~ The Kolab Web Admin interface allows Kolab users to manipulate some of their user data using a web browser. Most importantly it enables users to change their passwords. In the kolab-webadmin package shipped with Kolab Server release 2.2.3, the web admin interface fails to save changed user data (an LDAP error is issued). Affected Versions ~~~~~~~~~~~~~~~~~ This affects version 2.2.3-20091217 of kolab-webadmin. Kolab Server 2.2.3 is affected. Fix ~~~ Update your kolab-webadmin package: OpenPKG packages for Kolab Server 2.2.3 are available from https://files.kolab.org/server/security-updates/20100115/ or from the mirrors listed on http://kolab.org/mirrors.html A binary RPM for Kolab Server 2.2.3 (ix86 Debian GNU/Linux Lenny) is available as kolab-webadmin-2.2.3-20100115.ix86-debian5.0-kolab.rpm A binary RPM for Kolab Server 2.2.3 (ix86 Debian GNU/Linux Etch) is available as kolab-webadmin-2.2.3-20100115.ix86-debian4.0-kolab.rpm You can check the integrity of the downloaded files with: $ gpg --keyserver keys.gnupg.net --recv-key 4BB86568 $ gpg --verify SHA1SUMS.sig $ sha1sum -c SHA1SUMS The source package can be compiled and installed on your Kolab Server with: # su - kolab $ openpkg rpm --rebuild ...path/to.../kolab-webadmin-2.2.3-20100115.src.rpm $ openpkg rpm -Uvh /kolab/RPM/PKG/kolab-webadmin-2.2.3-20100115.--kolab.rpm To install a binary package, just skip the --rebuild step. Details ~~~~~~~ https://issues.kolab.org/issue4025 Bug report in the official kolab issue tracker. Timeline ~~~~~~~~ 20100103 First report per private mail 20100112 Public problem report 20100115 Updated kolab-webadmin package available and Kolab Server security advisory published. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAktQok8ACgkQuyGFFEu4ZWigJQCgmbCIEGW28/dyWDHvXVGI2TP9 fK0An3nFwtGhQsD/M4Kl6XLh2LR8PFi9 =HSEu -----END PGP SIGNATURE----- From cvs at kolab.org Fri Jan 15 18:16:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 15 Jan 2010 18:16:55 +0100 (CET) Subject: wilde: doc/www/src index.html.m4,1.170,1.171 Message-ID: <20100115171655.D0917600169@lists.intevation.de> Author: wilde Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv16925 Modified Files: index.html.m4 Log Message: Added advisory 27. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.170 retrieving revision 1.171 diff -u -d -r1.170 -r1.171 --- index.html.m4 4 Jan 2010 12:19:11 -0000 1.170 +++ index.html.m4 15 Jan 2010 17:16:53 -0000 1.171 @@ -59,6 +59,18 @@
+ + +
January 15th, 2010 » + Security Issue 27 for Kolab Server (Kolab Web Admin) +
+
+ A new kolab-webadmin RPM which fixes a problem with password management is available. See the + Kolab Security Issue 27 for details. +
+
+ + -- tg: (f251c16..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView) -- TOPGIT patch commit log ======================= commit e9630629c7479c73d3eb156f00544c34e95f0597 Author: Gunnar Wrobel
Date: Mon Jul 20 09:36:01 2009 +0200 Fix translation and improve header. commit 57041c04c322dd7dc57da5b171923b7ab000ec0a Author: Gunnar Wrobel
Date: Sun Jun 21 23:58:30 2009 +0200 German translation. commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5 Author: Gunnar Wrobel
Date: Fri Mar 13 12:04:03 2009 +0000 Complete the patch description. commit 7a349ad9da06264378e84e54d7424f5dc78a9154 Author: Gunnar Wrobel
Date: Fri Mar 13 12:00:43 2009 +0000 Reduce the functionality of the ACL view when calling from DIMP. In addition add the call to the acl settings page within the folder context menu. commit 2fdc4d0fcd6e4956129f6ec11501112568b99c6d Author: Gunnar Wrobel
Date: Sun Mar 8 19:59:30 2009 +0000 Completed a draft. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6/series,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- series 22 Jan 2010 08:03:27 -0000 1.2 +++ series 22 Jan 2010 13:51:10 -0000 1.3 @@ -1,2 +1,3 @@ t_imp_HideGroupwareFolders.diff t_imp_H_GW_DefaultLoginView.diff +t_imp_H_GW_AclView.diff From cvs at kolab.org Fri Jan 22 14:51:12 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 14:51:12 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/patches/dimp-1.1.4 t_dimp_H_GW_AclView.diff, NONE, 1.1 series, 1.2, 1.3 Message-ID: <20100122135112.2FE8860057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4 In directory doto:/tmp/cvs-serv6880/kolab-webclient/dimp/patches/dimp-1.1.4 Modified Files: series Added Files: t_dimp_H_GW_AclView.diff Log Message: Port the AclView fix over to HEAD. Mark some TODOs as merged. --- NEW FILE: t_dimp_H_GW_AclView.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/dimp/H/GW/AclView Provide a possibility to edit IMAP folder acls within DIMP. kolab/issue3455 (There is no convenient/dimp-like way in dimp to set folder acls) https://www.intevation.de/roundup/kolab/issue3455 [#8060] Additional entry in the folder popup to set IMAP ACLs http://bugs.horde.org/ticket/8060 Signed-off-by: Gunnar Wrobel
--- js/DimpBase.js | 1 + lib/DIMP.php | 1 + .../dimp/locale/de_DE/LC_MESSAGES/dimp.mo | Bin 168731 -> 168778 bytes po/de_DE.po | 3 +++ templates/index/index.inc | 1 + 7 files changed, 29 insertions(+), 2 deletions(-) diff --git a/js/DimpBase.js b/js/DimpBase.js index 39a728b..c4eb9f4 100644 --- a/js/DimpBase.js +++ b/js/DimpBase.js @@ -1941,6 +1941,7 @@ var DimpBase = { C({ d: $('ctx_folder_rename'), f: function() { this.renameFolder(DimpCore.DMenu.element()); }.bind(this), ns: true }); C({ d: $('ctx_folder_empty'), f: function() { if (window.confirm(DIMP.text.empty_folder)) { DimpCore.doAction('EmptyFolder', { folder: DimpCore.DMenu.element().readAttribute('mbox') }, [], this._emptyFolderCallback.bind(this)); } }.bind(this), ns: true }); C({ d: $('ctx_folder_delete'), f: function() { if (window.confirm(DIMP.text.delete_folder)) { DimpCore.doAction('DeleteFolder', { folder: DimpCore.DMenu.element().readAttribute('mbox') }, [], this.bcache.get('folderC') || this.bcache.set('folderC', this._folderCallback.bind(this))); } }.bind(this), ns: true }); + C({ d: $('ctx_folder_rights'), f: function() { this.go('app:horde', DIMP.conf.folder_rights + '&' + $H({ folder: DimpCore.DMenu.element().readAttribute('mbox') }).toQueryString() ) }.bind(this), ns: true }); [ 'ctx_folder_seen', 'ctx_folder_unseen' ].each(function(a) { C({ d: $(a), f: function(type) { this.flag(type, null, DimpCore.DMenu.element().readAttribute('mbox')); }.bind(this, a == 'ctx_folder_seen' ? 'allSeen' : 'allUnseen'), ns: true }); }, this); diff --git a/lib/DIMP.php b/lib/DIMP.php index 0aa3b78..92a1e55 100644 --- a/lib/DIMP.php +++ b/lib/DIMP.php @@ -145,6 +145,7 @@ class DIMP { 'message_url' => Horde::url($dimp_webroot . '/message.php'), 'compose_url' => Horde::url($dimp_webroot . '/compose.php'), 'prefs_url' => str_replace('&', '&', Horde::getServiceLink('options', 'dimp')), + 'folder_rights' => Util::addParameter(Horde::url($registry->get('webroot', 'imp') . '/acl.php', true), array('app' => 'imp', 'group'=> 'acl'), null, false), 'sortthread' => SORTTHREAD, 'sortdate' => SORTDATE, diff --git a/locale/de_DE/LC_MESSAGES/dimp.mo b/locale/de_DE/LC_MESSAGES/dimp.mo index 2f1c11c..973776f 100644 Binary files a/locale/de_DE/LC_MESSAGES/dimp.mo and b/locale/de_DE/LC_MESSAGES/dimp.mo differ diff --git a/po/de_DE.po b/po/de_DE.po index a536db6..0486297 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -791,3 +791,6 @@ msgstr "entfernen" #: lib/DIMP.php:191 msgid "results found" msgstr "Ergebnisse gefunden" + +msgid "Share Folder" +msgstr "Berechtigungen" diff --git a/templates/index/index.inc b/templates/index/index.inc index 21939e0..7c02fe7 100644 --- a/templates/index/index.inc +++ b/templates/index/index.inc @@ -323,6 +323,7 @@ function _createDA($text, $image, $id = null, $class = '', $show_text = true) +
-- tg: (f251c16..) t/dimp/H/GW/AclView (depends on: t/dimp/H/GW/FoldersView) -- TOPGIT patch commit log ======================= commit e9630629c7479c73d3eb156f00544c34e95f0597 Author: Gunnar Wrobel
Date: Mon Jul 20 09:36:01 2009 +0200 Fix translation and improve header. commit 57041c04c322dd7dc57da5b171923b7ab000ec0a Author: Gunnar Wrobel
Date: Sun Jun 21 23:58:30 2009 +0200 German translation. commit cac1482cec6c96a8a1d7fb7c0e8c2433877728f5 Author: Gunnar Wrobel
Date: Fri Mar 13 12:04:03 2009 +0000 Complete the patch description. commit 7a349ad9da06264378e84e54d7424f5dc78a9154 Author: Gunnar Wrobel
Date: Fri Mar 13 12:00:43 2009 +0000 Reduce the functionality of the ACL view when calling from DIMP. In addition add the call to the acl settings page within the folder context menu. commit 2fdc4d0fcd6e4956129f6ec11501112568b99c6d Author: Gunnar Wrobel
Date: Sun Mar 8 19:59:30 2009 +0000 Completed a draft. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4/series,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- series 22 Jan 2010 13:01:21 -0000 1.2 +++ series 22 Jan 2010 13:51:10 -0000 1.3 @@ -1,2 +1,3 @@ t_dimp_H_MS_FixBrokenFolderImages.diff t_dimp_H_BL_CloseContextMenu.diff +t_dimp_H_GW_AclView.diff From cvs at kolab.org Fri Jan 22 15:02:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 15:02:42 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp dimp.spec,1.3,1.4 Message-ID: <20100122140242.CE7BE600570@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp In directory doto:/tmp/cvs-serv7382 Modified Files: dimp.spec Log Message: Ensure we update the patched translations after installation. Index: dimp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/dimp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dimp.spec 22 Jan 2010 13:01:21 -0000 1.3 +++ dimp.spec 22 Jan 2010 14:02:40 -0000 1.4 @@ -104,3 +104,6 @@ rm -rf $RPM_BUILD_ROOT %files -f files + +%post + PATH="%{l_prefix}/bin" %{l_prefix}/bin/php -d safe_mode=0 -f %{l_prefix}/var/kolab/www/client/po/translation.php make --module dimp --no-compendium From cvs at kolab.org Fri Jan 22 15:47:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 15:47:48 +0100 (CET) Subject: gunnar: server release-notes.txt,1.499,1.500 Message-ID: <20100122144748.4862760057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv8632 Modified Files: release-notes.txt Log Message: MFB: kolab/issue3456 (There is no view in dimp that allows folder subscription) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.499 retrieving revision 1.500 diff -u -d -r1.499 -r1.500 --- release-notes.txt 22 Jan 2010 13:51:09 -0000 1.499 +++ release-notes.txt 22 Jan 2010 14:47:46 -0000 1.500 @@ -283,7 +283,7 @@ input fields) TODO: kolab/issue3846 (fix recurring events that are counted per week and not per incident) -TODO: kolab/issue3856 (IMP/DIMP folder navigator does not allow + kolab/issue3856 (IMP/DIMP folder navigator does not allow creating/deleting/... mail folders) TODO: kolab/issue3891 (Undefined variable: suid_ts , Kolab SyncML patch update needed) @@ -512,7 +512,7 @@ configurable via templates) kolab/issue3455 (There is no convenient/dimp-like way in dimp to set folder acls) -TODO: kolab/issue3456 (There is no view in dimp that allows folder + kolab/issue3456 (There is no view in dimp that allows folder subscription) From cvs at kolab.org Fri Jan 22 15:47:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 15:47:48 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/patches/dimp-1.1.4 t_dimp_H_GW_FoldersView.diff, NONE, 1.1 series, 1.3, 1.4 Message-ID: <20100122144748.4BEBC600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4 In directory doto:/tmp/cvs-serv8632/kolab-webclient/dimp/patches/dimp-1.1.4 Modified Files: series Added Files: t_dimp_H_GW_FoldersView.diff Log Message: MFB: kolab/issue3456 (There is no view in dimp that allows folder subscription) --- NEW FILE: t_dimp_H_GW_FoldersView.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/dimp/H/GW/FoldersView Provide a folders menu for dimp. kolab/issue3456 (There is no view in dimp that allows folder subscription) https://www.intevation.de/roundup/kolab/issue3456 [#8059] DIMP provides no view to subscribe/unsubscribe to folders http://bugs.horde.org/ticket/8059 Signed-off-by: Gunnar Wrobel
--- config/menu.php | 9 ++++++++- po/de_DE.po | 3 +++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/config/menu.php b/config/menu.php index 0c6ebe9..b5e0a5c 100644 --- a/config/menu.php.dist +++ b/config/menu.php.dist @@ -28,3 +28,14 @@ // 'text' => 'Say Hi!', // 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'), // ); + +// Load configuration files in .d directory +$directory = dirname(__FILE__) . '/menu.d'; +if (file_exists($directory) && is_dir($directory)) { + $sub_files = glob("$directory/*.php"); + if ($sub_files) { + foreach ($sub_files as $sub_file) { + require_once $sub_file; + } + } + } diff --git a/po/de_DE.po b/po/de_DE.po index 65e8824..a536db6 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -16,6 +16,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "Folder Subscription" +msgstr "Ordner verwalten" + #: lib/Views/ShowMessage.php:295 #, php-format msgid "%d Attachment" -- tg: (a6f8c8b..) t/dimp/H/GW/FoldersView (depends on: t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView) -- TOPGIT patch commit log ======================= commit c16643e792c3b185bc74bef7a600c06857b19406 Author: Gunnar Wrobel
Date: Mon Nov 9 23:16:11 2009 +0100 Fix tag name from view_imp to imp_view. commit 93403a869ff14d7868d4cc9c4687ea1270e3c225 Author: Gunnar Wrobel
Date: Mon Jun 22 08:39:51 2009 +0200 Typo commit ad147a4b42d61800400a2a779e884ee050358811 Author: Gunnar Wrobel
Date: Mon Jun 22 00:06:14 2009 +0200 Fixed menu entry name, added translation, fixed image. commit a1966161022108d9bf4831a8613b1db9a4e68c4d Author: Gunnar Wrobel
Date: Fri Mar 13 11:06:45 2009 +0000 Include issue references in the patch description. commit de8c5e8cac0bfb29c9cf94989016487302da653f Author: Gunnar Wrobel
Date: Fri Mar 13 11:04:54 2009 +0000 Exclude IMP specific functionality as requested by Sascha wilde in kolab/issue3456 (There is no view in dimp that allows folder subscription). commit 9c9a343c04cf11f857bfeb4148f0ab9d9df7dce6 Author: Gunnar Wrobel
Date: Sun Mar 8 19:06:05 2009 +0000 Completed the hack. commit caa539aac138c4b77376ab9f4a4a86691709a96b Author: Gunnar Wrobel
Date: Sun Mar 8 19:01:41 2009 +0000 Completed the hack. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4/series,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- series 22 Jan 2010 13:51:10 -0000 1.3 +++ series 22 Jan 2010 14:47:46 -0000 1.4 @@ -1,3 +1,4 @@ t_dimp_H_MS_FixBrokenFolderImages.diff t_dimp_H_BL_CloseContextMenu.diff t_dimp_H_GW_AclView.diff +t_dimp_H_GW_FoldersView.diff From cvs at kolab.org Fri Jan 22 15:47:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 15:47:48 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/patches/imp-4.3.6 t_imp_H_GW_FoldersView.diff, NONE, 1.1 series, 1.3, 1.4 Message-ID: <20100122144748.B626F60057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6 In directory doto:/tmp/cvs-serv8632/kolab-webclient/imp/patches/imp-4.3.6 Modified Files: series Added Files: t_imp_H_GW_FoldersView.diff Log Message: MFB: kolab/issue3456 (There is no view in dimp that allows folder subscription) --- NEW FILE: t_imp_H_GW_FoldersView.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/dimp/H/GW/FoldersView Provide a folders menu for dimp. kolab/issue3456 (There is no view in dimp that allows folder subscription) https://www.intevation.de/roundup/kolab/issue3456 [#8059] DIMP provides no view to subscribe/unsubscribe to folders http://bugs.horde.org/ticket/8059 Signed-off-by: Gunnar Wrobel
--- folders.php | 17 ++++++++++++----- templates/folders/actions.html | 2 ++ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/folders.php b/folders.php index a0425aa..c46b0e5 100644 --- a/folders.php +++ b/folders.php @@ -324,7 +324,9 @@ $folders_url = Util::addParameter($folders_url, 'folders_token', $folders_token) $title = _("Folder Navigator"); require IMP_TEMPLATES . '/common-header.inc'; -IMP::menu(); +if ($_SESSION['imp']['default_view'] != 'dimp') { + IMP::menu(); +} IMP::status(); IMP::quota(); @@ -375,6 +377,7 @@ if ($a_template->get('javascript')) { } $a_template->set('create_folder', !empty($GLOBALS['conf']['hooks']['permsdenied']) || (IMP::hasPermission('create_folders') && IMP::hasPermission('max_folders'))); +$a_template->set('imp_view', $_SESSION['imp']['default_view'] != 'dimp'); if ($prefs->getValue('subscribe')) { $a_template->set('subscribe', true); $subToggleText = ($showAll) ? _("Hide Unsubscribed") : _("Show Unsubscribed"); @@ -414,9 +417,11 @@ $rowct = 0; $morembox = $rows = array(); foreach ($raw_rows as $val) { $val['nocheckbox'] = !empty($val['vfolder']); - if (!empty($val['vfolder']) && ($val['value'] != IMPTREE_VFOLDER_KEY)) { - $val['delvfolder'] = Horde::link($imp_search->deleteURL($val['value']), _("Delete Virtual Folder")) . _("Delete") . ''; - $val['editvfolder'] = Horde::link($imp_search->editURL($val['value']), _("Edit Virtual Folder")) . _("Edit") . ''; + if ($_SESSION['imp']['default_view'] != 'dimp') { + if (!empty($val['vfolder']) && ($val['value'] != IMPTREE_VFOLDER_KEY)) { + $val['delvfolder'] = Horde::link($imp_search->deleteURL($val['value']), _("Delete Virtual Folder")) . _("Delete") . ''; + $val['editvfolder'] = Horde::link($imp_search->editURL($val['value']), _("Edit Virtual Folder")) . _("Edit") . ''; + } } $val['class'] = (++$rowct % 2) ? 'item0' : 'item1'; @@ -433,7 +438,9 @@ foreach ($raw_rows as $val) { if (!empty($val['unseen'])) { $val['name'] = '' . $val['name'] . ''; } - $val['name'] = Horde::link(Util::addParameter($name_url, 'mailbox', $val['value']), sprintf(_("View messages in %s"), ($val['vfolder']) ? $val['base_elt']['l'] : $val['display'])) . $val['name'] . ''; + if ($_SESSION['imp']['default_view'] != 'dimp') { + $val['name'] = Horde::link(Util::addParameter($name_url, 'mailbox', $val['value']), sprintf(_("View messages in %s"), ($val['vfolder']) ? $val['base_elt']['l'] : $val['display'])) . $val['name'] . ''; + } } $dir2 = _image($val, null, 'folder'); diff --git a/templates/folders/actions.html b/templates/folders/actions.html index f882a82..619e4de 100644 --- a/templates/folders/actions.html +++ b/templates/folders/actions.html @@ -12,12 +12,14 @@

January 4th, 2010 » Security Issue 26 for Kolab Server (SpamAssassin) From cvs at kolab.org Sat Jan 16 20:33:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 16 Jan 2010 20:33:45 +0100 (CET) Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.22,1.23 Message-ID: <20100116193345.8DAB8600570@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv19393/dist_conf Modified Files: kolabsrv.in Log Message: Added mandriva to the system definitions, patch by Thomas Spuhler Index: kolabsrv.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- kolabsrv.in 23 Nov 2009 22:47:08 -0000 1.22 +++ kolabsrv.in 16 Jan 2010 19:33:43 -0000 1.23 @@ -61,6 +61,19 @@ *) SERVICE=$sname esac ;; + mandriva) + case $sname in + apache) SERVICE="httpd" ;; + openldap) SERVICE="@LDAPD@" ;; + sasl) SERVICE="saslauthd" ;; + imapd) SERVICE="cyrus-imapd" ;; + amavisd) SERVICE="amavisd" ;; + clamav) SERVICE="clamd" ;; + spamd) SERVICE="spamd" ;; + freshclam) SERVICE="freshclam" ;; + *) SERVICE=$sname + esac + ;; esac } @@ -76,7 +89,9 @@ elif [ -f /etc/gentoo-release ]; then system=gentoo elif [ -e /etc/debian_version ]; then - system=debian + system=debian +elif [ -f /etc/mandriva-release ]; then + system=mandriva elif [ -f /etc/lfs-release -a -d /etc/rc.d/init.d ]; then system=lfs else From cvs at kolab.org Sat Jan 16 20:33:45 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 16 Jan 2010 20:33:45 +0100 (CET) Subject: richard: server/kolabd/kolabd ChangeLog,1.278,1.279 Message-ID: <20100116193345.8DBF9600571@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv19393 Modified Files: ChangeLog Log Message: Added mandriva to the system definitions, patch by Thomas Spuhler Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.278 retrieving revision 1.279 diff -u -d -r1.278 -r1.279 --- ChangeLog 11 Jan 2010 13:17:01 -0000 1.278 +++ ChangeLog 16 Jan 2010 19:33:43 -0000 1.279 @@ -1,3 +1,7 @@ +2010-01-16 Richard Bos + + * dist_conf/kolabsrv.in: Added mandriva to the system definitions + 2010-01-09 Gunnar Wrobel
* templates/php.ini.template.in (safe_mode_include_dir): Dirty From cvs at kolab.org Sun Jan 17 11:20:21 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 11:20:21 +0100 (CET) Subject: richard: server/kolabd/kolabd/templates slapd.conf.template.in, 1.30, 1.31 Message-ID: <20100117102021.2E76C600573@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv29610/templates Modified Files: slapd.conf.template.in Log Message: Changed @@@ldapserver_modulepath@@@ to @ldapserver_modulepath@ as this variable is populated during the build and not by kolabconf. Index: slapd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- slapd.conf.template.in 13 Dec 2009 18:04:37 -0000 1.30 +++ slapd.conf.template.in 17 Jan 2010 10:20:19 -0000 1.31 @@ -13,7 +13,7 @@ @@@warning@@@ @@@if ldapserver_modulepath@@@ -modulepath @@@ldapserver_modulepath@@@ +modulepath @ldapserver_modulepath@ moduleload back_bdb moduleload back_monitor moduleload refint From cvs at kolab.org Sun Jan 17 11:20:21 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 11:20:21 +0100 (CET) Subject: richard: server/kolabd/kolabd ChangeLog,1.279,1.280 Message-ID: <20100117102021.274C9600571@lists.intevation.de> Author: richard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv29610 Modified Files: ChangeLog Log Message: Changed @@@ldapserver_modulepath@@@ to @ldapserver_modulepath@ as this variable is populated during the build and not by kolabconf. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.279 retrieving revision 1.280 diff -u -d -r1.279 -r1.280 --- ChangeLog 16 Jan 2010 19:33:43 -0000 1.279 +++ ChangeLog 17 Jan 2010 10:20:18 -0000 1.280 @@ -1,5 +1,11 @@ 2010-01-16 Richard Bos + * templates/slapd.conf.template.in: Changed @@@ldapserver_modulepath@@@ + to @ldapserver_modulepath@ as this variable is populated during the + build and not by kolabconf. + +2010-01-16 Richard Bos + * dist_conf/kolabsrv.in: Added mandriva to the system definitions 2010-01-09 Gunnar Wrobel
From cvs at kolab.org Sun Jan 17 11:26:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 11:26:42 +0100 (CET) Subject: richard: server/perl-kolab ChangeLog,1.81,1.82 Message-ID: <20100117102642.3522D600173@lists.intevation.de> Author: richard Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv29840 Modified Files: ChangeLog Log Message: Formatting lines like the rest of file Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- ChangeLog 5 Jan 2010 18:37:38 -0000 1.81 +++ ChangeLog 17 Jan 2010 10:26:40 -0000 1.82 @@ -32,27 +32,27 @@ 2009-12-13 Mathieu Parent * lib/Kolab/Conf.pm, sbin/kolab_bootstrap.in: - Added arguments to rebuildTemplates(): dorunonchange and templates. - Use those in kolab_bootstrap (in replacement of bootstrapConfig()). + Added arguments to rebuildTemplates(): dorunonchange and templates. + Use those in kolab_bootstrap (in replacement of bootstrapConfig()). 2009-12-13 Mathieu Parent * lib/Kolab/Conf.pm: Touch configuration only when there is a change. - This avoid postfix complaining about "database X.db is older than - source file X". - Additionnay, renamed %templatehaschanged to %confighaschanged. + This avoid postfix complaining about "database X.db is older than + source file X". + Additionnay, renamed %templatehaschanged to %confighaschanged. 2009-12-13 Mathieu Parent * lib/Kolab/Conf.pm, sbin/kolabconf.in: $Kolab::do_reload is now an - argument to Kolab::Conf::rebuildTemplates(). + argument to Kolab::Conf::rebuildTemplates(). 2009-12-13 Mathieu Parent * lib/Kolab/Conf.pm, sbin/kolabconf.in: new @@@print@@@ macro - available for: getLDAPReplicas(), getLDAPAccess(), - getCyrusGroups(), getPostfixMap(map). This removed the use of - %special_templates, %haschanged, Kolab::Conf::reload() + available for: getLDAPReplicas(), getLDAPAccess(), + getCyrusGroups(), getPostfixMap(map). This removed the use of + %special_templates, %haschanged, Kolab::Conf::reload() 2009-12-07 Gunnar Wrobel From cvs at kolab.org Sun Jan 17 14:03:50 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:03:50 +0100 (CET) Subject: gunnar: server/make-helper fetch.mk, NONE, 1.1 openpkg-patched.mk, 1.5, 1.6 package-new.mk, 1.3, 1.4 package.mk, 1.8, 1.9 pear.mk, 1.3, 1.4 Message-ID: <20100117130350.AD500600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv1702 Modified Files: openpkg-patched.mk package-new.mk package.mk pear.mk Added Files: fetch.mk Log Message: Added a fetch target to download the required sources for building. Can be used to check for the availability of all sources or for downloading before unplugging the network. Additionally some minor fixes to serveral build targets to avoid duplicating work. --- NEW FILE: fetch.mk --- # The targets we need to download FETCH_TARGETS = $(FETCH_SOURCE) $(FETCH_RPM) #Fetch target .PHONY: fetch fetch: $(FETCH_TARGETS) Index: openpkg-patched.mk =================================================================== RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- openpkg-patched.mk 11 Jan 2010 15:52:45 -0000 1.5 +++ openpkg-patched.mk 17 Jan 2010 13:03:48 -0000 1.6 @@ -2,17 +2,27 @@ $(KOLABRPMSRC)/$(PACKAGE)/kolab.patch: $(EXTRA) cp $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) +FETCH_RPM = fetch-rpm + +# Shortcut for fetching the source rpm package +.PHONY:fetch-rpm +fetch-rpm: $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm + # Target for fetching the original openpkg package $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm: wget -c $(OPENPKGURI)/$(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm -# Target for the src rpm directory. -$(KOLABRPMSRC)/$(PACKAGE): $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm +# Target for the src rpm directory. The actual target is a .dir file +# as the directory modification time will show the timepoint of the +# last modified file in the directory. This would lead to remaking +# some targets every time. +$(KOLABRPMSRC)/$(PACKAGE)/.dir: $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm $(RPM) -ihv $(PACKAGE)-$(DOWNLOAD_VERSION)-$(OPENPKG_RELEASE).src.rpm touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec + touch $(KOLABRPMSRC)/$(PACKAGE)/.dir # Target for the src rpm spec file. -$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) +$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE)/.dir # Target for patching the spec file $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/kolab.patch Index: package-new.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package-new.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- package-new.mk 11 Jan 2010 16:52:43 -0000 1.3 +++ package-new.mk 17 Jan 2010 13:03:48 -0000 1.4 @@ -1,17 +1,23 @@ EXTRA ?= -# Target for the src rpm directory. -$(KOLABRPMSRC)/$(PACKAGE): +# Target for the src rpm directory. The actual target is a .dir file +# as the directory modification time will show the timepoint of the +# last modified file in the directory. This would lead to remaking +# some targets every time. +$(KOLABRPMSRC)/$(PACKAGE)/.dir: mkdir -p $(KOLABRPMSRC)/$(PACKAGE) + touch $(KOLABRPMSRC)/$(PACKAGE)/.dir # Target for the src rpm spec file. -$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) $(PACKAGE).spec $(EXTRA) +$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE)/.dir $(PACKAGE).spec $(EXTRA) cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) +RPM_SOURCES ?= $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) + # Target for building the source package -$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) +$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(RPM_SOURCES) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec # Target for building the binary package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) +$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(RPM_SOURCES) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS) Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- package.mk 11 Jan 2010 22:35:51 -0000 1.8 +++ package.mk 17 Jan 2010 13:03:48 -0000 1.9 @@ -54,10 +54,19 @@ cp $(KOLABRPMPKG)/$(RELEASETARGET) . ifeq ($(SOURCE_0),) +FETCH_SOURCE = else +SOURCES ?= $(SOURCE_0) + # Target for the source file in the src rpm directory. $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0) cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/ + +FETCH_SOURCE = fetch-source + +# Shortcut for fetching the source archive +.PHONY: fetch-source +fetch-source: $(SOURCES) # Target for retrieving the source package $(SOURCE_0): Index: pear.mk =================================================================== RCS file: /kolabrepository/server/make-helper/pear.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pear.mk 12 Jan 2010 13:56:32 -0000 1.3 +++ pear.mk 17 Jan 2010 13:03:48 -0000 1.4 @@ -123,6 +123,7 @@ CLEAN_EXTRA = tmp $(PACKAGE).spec include ../../make-helper/package.mk +include ../../make-helper/fetch.mk # Target location for the repository checkout $(UPSTREAM)/$(SAFE_COMMIT): @@ -175,7 +176,7 @@ endif ifneq ($(PACKAGE_VC),) -# Short name for the source package as a target for the command line. +# Package the source tmp/$(SOURCE_0): tmp/$(PACKAGE) sed -i -e "/version/,+1 s#$.*$#\1dev$(RELTAG)#" tmp/$(PACKAGE)/package.xml sed -i -e "/lead/,+1 s#.*#$(DATE)#" tmp/$(PACKAGE)/package.xml @@ -190,11 +191,12 @@ endif cd tmp && $(PEAR) package $(PACKAGE)/package.xml -# Short name for the source package as a target for the command line. +# Indicator to avoid uploading the same package twice. tmp/.sent: tmp/$(SOURCE_0) echo "put tmp/$(SOURCE_0)" | sftp $(FILESERVER) touch tmp/.sent +# Short name for uploading the snapshot. .PHONY:snapshot snapshot: tmp/.sent endif @@ -207,9 +209,9 @@ cat $$PATCH >> package.patch; \ done -$(PACKAGE).spec: ../pear.spec.template package.info +$(PACKAGE).spec: ../../pear/pear.spec.template package.info source package.info && \ - cat ../pear.spec.template | \ + cat ../../pear/pear.spec.template | \ sed -e "s#[@]pear_pkgdir[@]#$${pear_pkgdir}#g" \ -e "s#[@]pear_package[@]#$${pear_package}#g" \ -e "s#[@]package[@]#$${package}#g" \ From cvs at kolab.org Sun Jan 17 14:05:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:05:03 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Filter package.info, NONE, 1.1 .cvsignore, 1.3, 1.4 Makefile, 1.11, 1.12 Message-ID: <20100117130503.5CF29600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv1779/Kolab_Filter Modified Files: .cvsignore Makefile Added Files: package.info Log Message: Move to building based on the package.info files. The patches still need to reorganized for these packages. --- NEW FILE: package.info --- # The name of Horde source package pear_package='Kolab_Filter' # The name of the RPM package package='Kolab_Filter' # Where to find information about the package package_url='http://pear.horde.org/index.php?package=' # How should the source be retrieved? # # WGET: Download via wget package_origin='WGET' # Version number version='0.1.8' # Package release number release='20100116' # Source URL to download from sourceurl='http://pear.horde.org/get' # In which PHP library location should the library get installed php_lib_loc='php' # Build prerequisites buildprereq=' \ BuildPreReq: OpenPKG, openpkg >= 20070603 \ BuildPreReq: php, php::with_pear = yes \ BuildPreReq: PEAR-Horde-Channel \ ' # Installatin prerequisites prereq=' \ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ PreReq: Kolab_Format >= 1.0.1 \ PreReq: Kolab_Server >= 0.5.0 \ PreReq: Kolab_Storage >= 0.4.0 \ PreReq: PEAR-HTTP_Request \ PreReq: PEAR-Net_LMTP \ PreReq: PEAR-Net_SMTP \ PreReq: PEAR-Mail \ PreReq: Horde_iCalendar \ PreReq: Horde_Argv \ PreReq: Horde_Notification \ PreReq: Horde_Prefs \ \ Provides: php-kolab = 2.2.1 \ Obsoletes: php-kolab < 2.2.1 PEAR-Net_IMAP kolab-filter \ ' # Package summary description summary='A package for reading/writing Kolab data formats' # Long package description description=' \ This package allows to convert Kolab data objects from XML to hashes. \ ' # Source code license license='LGPL' Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 18 Sep 2008 09:29:44 -0000 1.3 +++ .cvsignore 17 Jan 2010 13:05:01 -0000 1.4 @@ -1 +1,2 @@ *.src.rpm +*.tgz Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile 26 Apr 2009 10:33:21 -0000 1.11 +++ Makefile 17 Jan 2010 13:05:01 -0000 1.12 @@ -1,111 +1 @@ -# If home is unset this Makefile assumes the Kolab server installation -# resides in /kolab. If this is not the case this Makefile must be -# called using -# -# HOME="/mykolabroot" make TARGET -# -ifeq "x$(HOME)" "x" - HOME = /kolab -endif - -# If HOME is set to /root it is likely that somebody is calling this -# Makefile as root user. In this case this Makefile assumes that the -# Kolab server installation resides in /kolab. -# -# In the (hopefully) unlikely event that somebody really installed the -# Kolab server in /root this Makefile will fail. -ifeq "x$(HOME)" "x/root" - HOME = /kolab -endif - -# Set the location of the rpm binary -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif - -# Set the location for rpm source package installations -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif - -# Set the location for rpm packages -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif - -# Set the location for the rpm temporary directory -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif - -# Determine the suffix for binary packages on this system -ifeq "x$(PLATTAG)" "x" - PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%) -endif - -# Determine the staging area for collecting new source rpms -ifeq "x$(STAGING)" "x" - STAGING = ../../stage -endif - -# Determine the package name from the *.spec file -PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package $[A-Za-z\-\_]*$.*/\1/") - -# Determine the package version from the *.spec file -VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9.]*$.*/\1/") - -# Determine the release number from the *.spec file -RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*$[0-9]*$.*/\1/") - -# Determine the download url for the PEAR package from the *.spec file -SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*$.*$/\1/") - -# Get the list of patches if there are any in this directory -PATCHES = $(shell ls *.patch 2> /dev/null) - -# Generate the full package name -SOURCE_0=$(PACKAGE)-$(VERSION).tgz - -# Generate a list of extra files for the package -EXTRA=ChangeLog $(PATCHES) - - -# Default target to generate the source rpm package -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -# Target for placing the source rpm in the staging area -.PHONY: dist -dist: all - test -d $(STAGING) || mkdir $(STAGING) - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -# Target for retrieving the source package -$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)" - -# Target for preparing the source area and building the package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . - -# Target for cleaning up the files that can be generated with this Makefile -.PHONY: clean -clean: - rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - rm -rf $(KOLABRPMSRC)/$(PACKAGE) - rm -rf $(KOLABRPMTMP)/$(PACKAGE)* - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - +include ../../make-helper/pear.mk From cvs at kolab.org Sun Jan 17 14:05:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:05:03 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Freebusy package.info, NONE, 1.1 .cvsignore, 1.3, 1.4 Makefile, 1.8, 1.9 Message-ID: <20100117130503.6A8FE600571@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv1779/Kolab_Freebusy Modified Files: .cvsignore Makefile Added Files: package.info Log Message: Move to building based on the package.info files. The patches still need to reorganized for these packages. --- NEW FILE: package.info --- # The name of Horde source package pear_package='Kolab_FreeBusy' # The name of the RPM package package='Kolab_FreeBusy' # Where to find information about the package package_url='http://pear.horde.org/index.php?package=' # How should the source be retrieved? # # WGET: Download via wget package_origin='WGET' # Version number version='0.1.5' # Package release number release='20100116' # Source URL to download from sourceurl='http://pear.horde.org/get' # In which PHP library location should the library get installed php_lib_loc='php' # Build prerequisites buildprereq=' \ BuildPreReq: OpenPKG, openpkg >= 20070603 \ BuildPreReq: php, php::with_pear = yes \ BuildPreReq: PEAR-Horde-Channel \ ' # Installatin prerequisites prereq=' \ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: Kolab_Format >= 1.0.1 \ PreReq: Kolab_Server >= 0.5.0 \ PreReq: Kolab_Storage >= 0.4.0 \ PreReq: Horde_Date \ PreReq: Horde_iCalendar \ \ Provides: php-kolab = 2.2.1 \ Obsoletes: php-kolab < 2.2.1 kolab-freebusy \ ' # Package summary description summary='A package for reading/writing Kolab data formats' # Long package description description=' \ This package allows to convert Kolab data objects from XML to hashes. \ ' # Source code license license='LGPL' Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 12 Sep 2008 05:22:21 -0000 1.3 +++ .cvsignore 17 Jan 2010 13:05:01 -0000 1.4 @@ -1 +1,2 @@ *.src.rpm +*.tgz Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 2 Apr 2009 18:54:57 -0000 1.8 +++ Makefile 17 Jan 2010 13:05:01 -0000 1.9 @@ -1,111 +1 @@ -# If home is unset this Makefile assumes the Kolab server installation -# resides in /kolab. If this is not the case this Makefile must be -# called using -# -# HOME="/mykolabroot" make TARGET -# -ifeq "x$(HOME)" "x" - HOME = /kolab -endif - -# If HOME is set to /root it is likely that somebody is calling this -# Makefile as root user. In this case this Makefile assumes that the -# Kolab server installation resides in /kolab. -# -# In the (hopefully) unlikely event that somebody really installed the -# Kolab server in /root this Makefile will fail. -ifeq "x$(HOME)" "x/root" - HOME = /kolab -endif - -# Set the location of the rpm binary -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif - -# Set the location for rpm source package installations -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif - -# Set the location for rpm packages -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif - -# Set the location for the rpm temporary directory -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif - -# Determine the suffix for binary packages on this system -ifeq "x$(PLATTAG)" "x" - PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%) -endif - -# Determine the staging area for collecting new source rpms -ifeq "x$(STAGING)" "x" - STAGING = ../../stage -endif - -# Determine the package name from the *.spec file -PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package $[A-Za-z\-\_]*$.*/\1/") - -# Determine the package version from the *.spec file -VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9.]*$.*/\1/") - -# Determine the release number from the *.spec file -RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*$[0-9]*$.*/\1/") - -# Determine the download url for the PEAR package from the *.spec file -SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*$.*$/\1/") - -# Get the list of patches if there are any in this directory -PATCHES = $(shell ls *.patch 2> /dev/null) - -# Generate the full package name -SOURCE_0=$(PACKAGE)-$(VERSION).tgz - -# Generate a list of extra files for the package -EXTRA=ChangeLog $(PATCHES) - - -# Default target to generate the source rpm package -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -# Target for placing the source rpm in the staging area -.PHONY: dist -dist: all - test -d $(STAGING) || mkdir $(STAGING) - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -# Target for retrieving the source package -$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)" - -# Target for preparing the source area and building the package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . - -# Target for cleaning up the files that can be generated with this Makefile -.PHONY: clean -clean: - rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - rm -rf $(KOLABRPMSRC)/$(PACKAGE) - rm -rf $(KOLABRPMTMP)/$(PACKAGE)* - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - +include ../../make-helper/pear.mk From cvs at kolab.org Sun Jan 17 14:05:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:05:03 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Format package.info, NONE, 1.1 .cvsignore, 1.1, 1.2 Makefile, 1.7, 1.8 Message-ID: <20100117130503.6D678600573@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Format In directory doto:/tmp/cvs-serv1779/Kolab_Format Modified Files: .cvsignore Makefile Added Files: package.info Log Message: Move to building based on the package.info files. The patches still need to reorganized for these packages. --- NEW FILE: package.info --- # The name of Horde source package pear_package='Kolab_Format' # The name of the RPM package package='Kolab_Format' # Where to find information about the package package_url='http://pear.horde.org/index.php?package=' # How should the source be retrieved? # # WGET: Download via wget package_origin='WGET' # Version number version='1.0.1' # Package release number release='20100116' # Source URL to download from sourceurl='http://pear.horde.org/get' # In which PHP library location should the library get installed php_lib_loc='php' # Build prerequisites buildprereq=' \ BuildPreReq: OpenPKG, openpkg >= 20070603 \ BuildPreReq: php, php::with_pear = yes \ BuildPreReq: PEAR-Horde-Channel \ ' # Installatin prerequisites prereq=' \ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ PreReq: Horde_DOM>=0.1.0 \ \ PreReq: Horde_NLS \ PreReq: Horde_Util \ ' # Package summary description summary='A package for reading/writing Kolab data formats' # Long package description description=' \ This package allows to convert Kolab data objects from XML to hashes. \ ' # Source code license license='LGPL' Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Format/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 10 Sep 2008 13:51:39 -0000 1.1 +++ .cvsignore 17 Jan 2010 13:05:01 -0000 1.2 @@ -1 +1,2 @@ *.src.rpm +*.tgz Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 2 Apr 2009 20:27:15 -0000 1.7 +++ Makefile 17 Jan 2010 13:05:01 -0000 1.8 @@ -1,111 +1 @@ -# If home is unset this Makefile assumes the Kolab server installation -# resides in /kolab. If this is not the case this Makefile must be -# called using -# -# HOME="/mykolabroot" make TARGET -# -ifeq "x$(HOME)" "x" - HOME = /kolab -endif - -# If HOME is set to /root it is likely that somebody is calling this -# Makefile as root user. In this case this Makefile assumes that the -# Kolab server installation resides in /kolab. -# -# In the (hopefully) unlikely event that somebody really installed the -# Kolab server in /root this Makefile will fail. -ifeq "x$(HOME)" "x/root" - HOME = /kolab -endif - -# Set the location of the rpm binary -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif - -# Set the location for rpm source package installations -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif - -# Set the location for rpm packages -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif - -# Set the location for the rpm temporary directory -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif - -# Determine the suffix for binary packages on this system -ifeq "x$(PLATTAG)" "x" - PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%) -endif - -# Determine the staging area for collecting new source rpms -ifeq "x$(STAGING)" "x" - STAGING = ../../stage -endif - -# Determine the package name from the *.spec file -PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package $[A-Za-z\-\_]*$.*/\1/") - -# Determine the package version from the *.spec file -VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9.]*$.*/\1/") - -# Determine the release number from the *.spec file -RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*$[0-9]*$.*/\1/") - -# Determine the download url for the PEAR package from the *.spec file -SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*$.*$/\1/") - -# Get the list of patches if there are any in this directory -PATCHES = $(shell ls *.patch 2> /dev/null) - -# Generate the full package name -SOURCE_0=$(PACKAGE)-$(VERSION).tgz - -# Generate a list of extra files for the package -EXTRA=ChangeLog $(PATCHES) - - -# Default target to generate the source rpm package -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -# Target for placing the source rpm in the staging area -.PHONY: dist -dist: all - test -d $(STAGING) || mkdir $(STAGING) - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -# Target for retrieving the source package -$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)" - -# Target for preparing the source area and building the package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . - -# Target for cleaning up the files that can be generated with this Makefile -.PHONY: clean -clean: - rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - rm -rf $(KOLABRPMSRC)/$(PACKAGE) - rm -rf $(KOLABRPMTMP)/$(PACKAGE)* - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - +include ../../make-helper/pear.mk From cvs at kolab.org Sun Jan 17 14:05:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:05:03 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Storage package.info, NONE, 1.1 .cvsignore, 1.1, 1.2 Makefile, 1.7, 1.8 Message-ID: <20100117130503.75C5560057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Storage In directory doto:/tmp/cvs-serv1779/Kolab_Storage Modified Files: .cvsignore Makefile Added Files: package.info Log Message: Move to building based on the package.info files. The patches still need to reorganized for these packages. --- NEW FILE: package.info --- # The name of Horde source package pear_package='Kolab_Storage' # The name of the RPM package package='Kolab_Storage' # Where to find information about the package package_url='http://pear.horde.org/index.php?package=' # How should the source be retrieved? # # WGET: Download via wget package_origin='WGET' # Version number version='0.4.0' # Package release number release='20100116' # Source URL to download from sourceurl='http://pear.horde.org/get' # In which PHP library location should the library get installed php_lib_loc='php' # Build prerequisites buildprereq=' \ BuildPreReq: OpenPKG, openpkg >= 20070603 \ BuildPreReq: php, php::with_pear = yes \ BuildPreReq: PEAR-Horde-Channel \ ' # Installatin prerequisites prereq=' \ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ PreReq: Kolab_Format >= 1.0.1 \ PreReq: Kolab_Server >= 0.5.0 \ PreReq: Horde_Auth \ PreReq: Horde_Cache \ PreReq: Horde_Group \ PreReq: Horde_History \ PreReq: Horde_LDAP \ PreReq: Horde_Perms \ PreReq: Horde_SessionObjects \ PreReq: Horde_MIME \ PreReq: Horde_NLS \ PreReq: Horde_Util \ ' # Package summary description summary='A package for handling Kolab data stored on an IMAP server.' # Long package description description=' \ Storing user data in an IMAP account belonging to the \ user is one of the Kolab server core concepts. This package provides \ all the necessary means to deal with this type of data storage \ effectively. \ ' # Source code license license='LGPL' Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 11 Sep 2008 16:32:21 -0000 1.1 +++ .cvsignore 17 Jan 2010 13:05:01 -0000 1.2 @@ -1 +1,2 @@ *.src.rpm +*.tgz Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 24 Apr 2009 09:08:12 -0000 1.7 +++ Makefile 17 Jan 2010 13:05:01 -0000 1.8 @@ -1,111 +1 @@ -# If home is unset this Makefile assumes the Kolab server installation -# resides in /kolab. If this is not the case this Makefile must be -# called using -# -# HOME="/mykolabroot" make TARGET -# -ifeq "x$(HOME)" "x" - HOME = /kolab -endif - -# If HOME is set to /root it is likely that somebody is calling this -# Makefile as root user. In this case this Makefile assumes that the -# Kolab server installation resides in /kolab. -# -# In the (hopefully) unlikely event that somebody really installed the -# Kolab server in /root this Makefile will fail. -ifeq "x$(HOME)" "x/root" - HOME = /kolab -endif - -# Set the location of the rpm binary -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif - -# Set the location for rpm source package installations -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif - -# Set the location for rpm packages -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif - -# Set the location for the rpm temporary directory -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif - -# Determine the suffix for binary packages on this system -ifeq "x$(PLATTAG)" "x" - PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%) -endif - -# Determine the staging area for collecting new source rpms -ifeq "x$(STAGING)" "x" - STAGING = ../../stage -endif - -# Determine the package name from the *.spec file -PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package $[A-Za-z\-\_]*$.*/\1/") - -# Determine the package version from the *.spec file -VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9.]*$.*/\1/") - -# Determine the release number from the *.spec file -RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*$[0-9]*$.*/\1/") - -# Determine the download url for the PEAR package from the *.spec file -SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*$.*$/\1/") - -# Get the list of patches if there are any in this directory -PATCHES = $(shell ls *.patch 2> /dev/null) - -# Generate the full package name -SOURCE_0=$(PACKAGE)-$(VERSION).tgz - -# Generate a list of extra files for the package -EXTRA=ChangeLog $(PATCHES) - - -# Default target to generate the source rpm package -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -# Target for placing the source rpm in the staging area -.PHONY: dist -dist: all - test -d $(STAGING) || mkdir $(STAGING) - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -# Target for retrieving the source package -$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)" - -# Target for preparing the source area and building the package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . - -# Target for cleaning up the files that can be generated with this Makefile -.PHONY: clean -clean: - rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - rm -rf $(KOLABRPMSRC)/$(PACKAGE) - rm -rf $(KOLABRPMTMP)/$(PACKAGE)* - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - +include ../../make-helper/pear.mk From cvs at kolab.org Sun Jan 17 14:05:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:05:03 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Server package.info, NONE, 1.1 .cvsignore, 1.1, 1.2 Makefile, 1.7, 1.8 Message-ID: <20100117130503.77D48600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Server In directory doto:/tmp/cvs-serv1779/Kolab_Server Modified Files: .cvsignore Makefile Added Files: package.info Log Message: Move to building based on the package.info files. The patches still need to reorganized for these packages. --- NEW FILE: package.info --- # The name of Horde source package pear_package='Kolab_Server' # The name of the RPM package package='Kolab_Server' # Where to find information about the package package_url='http://pear.horde.org/index.php?package=' # How should the source be retrieved? # # WGET: Download via wget package_origin='WGET' # Version number version='0.5.0' # Package release number release='20100116' # Source URL to download from sourceurl='http://pear.horde.org/get' # In which PHP library location should the library get installed php_lib_loc='php' # Build prerequisites buildprereq=' \ BuildPreReq: OpenPKG, openpkg >= 20070603 \ BuildPreReq: php, php::with_pear = yes \ BuildPreReq: PEAR-Horde-Channel \ ' # Installatin prerequisites prereq=' \ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ PreReq: Horde_LDAP \ ' # Package summary description summary='A package for manipulating the Kolab user database.' # Long package description description=' \ This package allows read/write entries in the Kolab user \ database stored in LDAP. \ ' # Source code license license='LGPL' Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Server/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 10 Sep 2008 13:51:39 -0000 1.1 +++ .cvsignore 17 Jan 2010 13:05:01 -0000 1.2 @@ -1 +1,2 @@ *.src.rpm +*.tgz Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Server/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 24 Apr 2009 07:42:25 -0000 1.7 +++ Makefile 17 Jan 2010 13:05:01 -0000 1.8 @@ -1,111 +1 @@ -# If home is unset this Makefile assumes the Kolab server installation -# resides in /kolab. If this is not the case this Makefile must be -# called using -# -# HOME="/mykolabroot" make TARGET -# -ifeq "x$(HOME)" "x" - HOME = /kolab -endif - -# If HOME is set to /root it is likely that somebody is calling this -# Makefile as root user. In this case this Makefile assumes that the -# Kolab server installation resides in /kolab. -# -# In the (hopefully) unlikely event that somebody really installed the -# Kolab server in /root this Makefile will fail. -ifeq "x$(HOME)" "x/root" - HOME = /kolab -endif - -# Set the location of the rpm binary -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif - -# Set the location for rpm source package installations -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif - -# Set the location for rpm packages -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif - -# Set the location for the rpm temporary directory -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif - -# Determine the suffix for binary packages on this system -ifeq "x$(PLATTAG)" "x" - PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%) -endif - -# Determine the staging area for collecting new source rpms -ifeq "x$(STAGING)" "x" - STAGING = ../../stage -endif - -# Determine the package name from the *.spec file -PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package $[A-Za-z\-\_]*$.*/\1/") - -# Determine the package version from the *.spec file -VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*$[0-9.]*$.*/\1/") - -# Determine the release number from the *.spec file -RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*$[0-9]*$.*/\1/") - -# Determine the download url for the PEAR package from the *.spec file -SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*$.*$/\1/") - -# Get the list of patches if there are any in this directory -PATCHES = $(shell ls *.patch 2> /dev/null) - -# Generate the full package name -SOURCE_0=$(PACKAGE)-$(VERSION).tgz - -# Generate a list of extra files for the package -EXTRA=ChangeLog $(PATCHES) - - -# Default target to generate the source rpm package -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -# Target for placing the source rpm in the staging area -.PHONY: dist -dist: all - test -d $(STAGING) || mkdir $(STAGING) - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING) - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -# Target for retrieving the source package -$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)" - -# Target for preparing the source area and building the package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . - -# Target for cleaning up the files that can be generated with this Makefile -.PHONY: clean -clean: - rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - rm -rf $(KOLABRPMSRC)/$(PACKAGE) - rm -rf $(KOLABRPMTMP)/$(PACKAGE)* - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - +include ../../make-helper/pear.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/apache-php Makefile,1.14,1.15 Message-ID: <20100117132257.586E8600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/apache-php In directory doto:/tmp/cvs-serv2655/apache-php Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/apache-php/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile 24 Dec 2009 08:35:50 -0000 1.14 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.15 @@ -22,7 +22,8 @@ --define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \ --define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \ --define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \ - --define 'with_json yes' + --define 'with_json yes' --define 'with_tokenizer yes' include ../make-helper/package.mk include ../make-helper/openpkg-patched.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/clamav Makefile,1.9,1.10 Message-ID: <20100117132257.5BA69600571@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/clamav In directory doto:/tmp/cvs-serv2655/clamav Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/clamav/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 5 Jan 2010 12:58:43 -0000 1.9 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.10 @@ -10,3 +10,4 @@ include ../make-helper/package.mk include ../make-helper/package-new.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/db Makefile,1.6,1.7 Message-ID: <20100117132257.60547600573@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/db In directory doto:/tmp/cvs-serv2655/db Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/db/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 5 Jan 2010 11:51:40 -0000 1.6 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.7 @@ -19,3 +19,4 @@ include ../make-helper/package.mk include ../make-helper/openpkg-patched.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/gmp Makefile,1.3,1.4 Message-ID: <20100117132257.63ACE60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/gmp In directory doto:/tmp/cvs-serv2655/gmp Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/gmp/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 5 Jan 2010 09:42:23 -0000 1.3 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.4 @@ -19,3 +19,4 @@ include ../make-helper/package.mk include ../make-helper/openpkg-patched.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/php-smarty Makefile,1.9,1.10 Message-ID: <20100117132257.7770260058A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-smarty In directory doto:/tmp/cvs-serv2655/php-smarty Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-smarty/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 5 Jan 2010 17:27:38 -0000 1.9 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.10 @@ -12,3 +12,4 @@ include ../make-helper/package.mk include ../make-helper/package-new.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/openldap Makefile,1.26,1.27 Message-ID: <20100117132257.6C47D600587@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv2655/openldap Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/openldap/Makefile,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Makefile 5 Jan 2010 13:58:52 -0000 1.26 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.27 @@ -12,3 +12,4 @@ include ../make-helper/package.mk include ../make-helper/package-new.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/imapd Makefile,1.47,1.48 Message-ID: <20100117132257.67E76600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv2655/imapd Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- Makefile 23 Dec 2009 20:22:57 -0000 1.47 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.48 @@ -22,3 +22,4 @@ include ../make-helper/package.mk include ../make-helper/openpkg-patched.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/openpkg Makefile,1.2,1.3 Message-ID: <20100117132257.77B0460058B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/openpkg In directory doto:/tmp/cvs-serv2655/openpkg Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/openpkg/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 5 Jan 2010 16:24:55 -0000 1.2 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.3 @@ -24,6 +24,7 @@ include ../make-helper/package.mk include ../make-helper/openpkg-patched.mk +include ../make-helper/fetch.mk $(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm cd $(KOLABRPMSRC)/$(PACKAGE) && rm $(PACKAGE2)-*.tar.gz && ./openpkg.boot -s From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/sqlite Makefile,1.2,1.3 Message-ID: <20100117132257.7FE8860058E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/sqlite In directory doto:/tmp/cvs-serv2655/sqlite Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/sqlite/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 27 Oct 2008 17:21:39 -0000 1.2 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.3 @@ -1,46 +1,31 @@ -NAME = sqlite -PACKAGE = $(NAME) -VERSION3 = $(shell grep "define *V_v3" sqlite.spec | sed -e "s/.*V_v3\s*$[0-9.]*$.*/\1/") +include ../make-helper/kolab.mk + +PACKAGE = sqlite +VERSION = $(shell grep "define *V_v3" sqlite.spec | sed -e "s/.*V_v3\s*$[0-9.]*$.*/\1/") VERSION2 = $(shell grep "define *V_v2" sqlite.spec | sed -e "s/.*V_v2\s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "^Release:" sqlite.spec | sed -e "s/^Release:\s*$[0-9]*$.*/\1/") KOLABRELEASE = $(RELEASE) -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif -ifeq "x$(KOLABRPMTMP)" "x" - KOLABRPMTMP = $(HOME)/RPM/TMP -endif +SOURCE_URL = http://www.sqlite.org +SOURCE_0 = sqlite-$(VERSION2).tar.gz +SOURCE_1 = sqlite-$(VERSION).tar.gz -SOURCE_0=http://www.sqlite.org/sqlite-$(VERSION2).tar.gz -SOURCE_1=http://www.sqlite.org/sqlite-$(VERSION3).tar.gz +SOURCES=$(SOURCE_0) $(SOURCE_1) +RPM_SOURCES = $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1) -.PHONY: all -all: $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm +EXTRA = sqlite.patch.v2 sqlite.patch.v3 -.PHONY: dist -dist: all - cp $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm ../stage/ +BUILD_OPTIONS = -.PHONY: clean -clean: - rm -rf $(KOLABRPMTMP)/$(NAME)* - rm -rf $(KOLABRPMTMP)/$(PACKAGE) - rm -rf $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm - rm -rf *~ +# Target for retrieving the second source package +$(SOURCE_1): + wget -c "$(SOURCE_URL)/$(SOURCE_1)" -$(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)" - cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_1)" +# Target for the source file in the src rpm directory. +$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_1) + cp $(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/ - cp $(PACKAGE).spec $(PACKAGE).patch.* $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_pth no' - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm . +include ../make-helper/package.mk +include ../make-helper/package-new.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/perl-ldap Makefile,1.4,1.5 Message-ID: <20100117132257.70E99600588@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-ldap In directory doto:/tmp/cvs-serv2655/perl-ldap Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/perl-ldap/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 9 Jul 2009 15:32:34 -0000 1.4 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.5 @@ -1,37 +1,16 @@ -include ../Base.mk +include ../make-helper/kolab.mk -NAME = perl-ldap -PACKAGE = $(NAME) +PACKAGE = perl-ldap PKGVER = $(shell grep "%define[ ]*V_perl_" *.spec | sed -e "s/.*V_perl_[a-z]*\s*$[0-9.]*$.*/\1/") VERSION = $(shell grep "%define[ ]*V_perl " *.spec | sed -e "s/.*V_perl \s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*$[0-9a-z_]*$.*/\1/") -SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(PKGVER).tar.gz +SOURCE_URL=http://files.kolab.org/server/development-2.2/externals +SOURCE_0=$(PACKAGE)-$(PKGVER).tar.gz EXTRA=cookie_parsing_error.patch sync_refresh_required.patch -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -.PHONY: dist -dist: all - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/ - -.PHONY: clean -clean: - rm -rf $(KOLABRPMTMP)/$(NAME)* - rm -rf $(KOLABRPMTMP)/$(PACKAGE) - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA) - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/ - - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +BUILD_OPTIONS= -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm +include ../make-helper/package.mk +include ../make-helper/package-new.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/postfix Makefile,1.20,1.21 Message-ID: <20100117132257.7D90D60058D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/postfix In directory doto:/tmp/cvs-serv2655/postfix Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/postfix/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile 24 Mar 2009 16:29:41 -0000 1.20 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.21 @@ -1,37 +1,20 @@ -ifeq "x$(KOLABPKGURI)" "x" - KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/ -endif -ifeq "x$(KOLABRPMSRC)" "x" - KOLABRPMSRC = $(HOME)/RPM/SRC -endif -ifeq "x$(KOLABRPMPKG)" "x" - KOLABRPMPKG = $(HOME)/RPM/PKG -endif -ifeq "x$(KOLABCVSDIR)" "x" - KOLABCVSDIR = $(CURDIR) -endif -ifeq "x$(RPM)" "x" - RPM = $(HOME)/bin/openpkg rpm -endif +include ../make-helper/kolab.mk PACKAGE=postfix +DOWNLOAD_VERSION=2.4.6 +OPENPKG_RELEASE=20080101 VERSION=2.4.6 -RELEASE=20080101 -KOLABRELEASE=20080101_kolab - -all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm +RELEASE=20080101_kolab -$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile - $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +SOURCE_URL= +SOURCE_0= - cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes' - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR) +PATCHES= -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: - wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +EXTRA=kolab.patch -dist: all - cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/ +BUILD_OPTIONS=--define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes' -clean: - rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm +include ../make-helper/package.mk +include ../make-helper/openpkg-patched.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:22:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:22:57 +0100 (CET) Subject: gunnar: server/php Makefile,1.24,1.25 Message-ID: <20100117132257.73E74600589@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv2655/php Modified Files: Makefile Log Message: Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit). Index: Makefile =================================================================== RCS file: /kolabrepository/server/php/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Makefile 23 Dec 2009 23:27:16 -0000 1.24 +++ Makefile 17 Jan 2010 13:22:55 -0000 1.25 @@ -22,7 +22,8 @@ --define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \ --define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \ --define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \ - --define 'with_json yes' + --define 'with_json yes' --define 'with_tokenizer yes' include ../make-helper/package.mk include ../make-helper/openpkg-patched.mk +include ../make-helper/fetch.mk From cvs at kolab.org Sun Jan 17 14:23:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:23:57 +0100 (CET) Subject: gunnar: server/perl-ldap .cvsignore,1.1,1.2 Message-ID: <20100117132357.39AEC600571@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-ldap In directory doto:/tmp/cvs-serv2826/perl-ldap Modified Files: .cvsignore Log Message: Ignore source archives. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/perl-ldap/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 9 Jul 2009 15:33:39 -0000 1.1 +++ .cvsignore 17 Jan 2010 13:23:55 -0000 1.2 @@ -1 +1,2 @@ *.src.rpm +*.tar.gz From cvs at kolab.org Sun Jan 17 14:23:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:23:57 +0100 (CET) Subject: gunnar: server/sqlite .cvsignore,1.1,1.2 Message-ID: <20100117132357.34DD5600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/sqlite In directory doto:/tmp/cvs-serv2826/sqlite Modified Files: .cvsignore Log Message: Ignore source archives. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/sqlite/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 19 Sep 2008 20:54:56 -0000 1.1 +++ .cvsignore 17 Jan 2010 13:23:55 -0000 1.2 @@ -1,2 +1,3 @@ openldap-*.tgz *.src.rpm +*.tar.gz From cvs at kolab.org Sun Jan 17 14:24:22 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:24:22 +0100 (CET) Subject: gunnar: server/kolabd/kolabd kolabd.spec.in,1.47,1.48 Message-ID: <20100117132422.9FDB6600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv2848/kolabd/kolabd Modified Files: kolabd.spec.in Log Message: Require with_tokenizer on the php packages. Index: kolabd.spec.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- kolabd.spec.in 24 Dec 2009 08:55:26 -0000 1.47 +++ kolabd.spec.in 17 Jan 2010 13:24:20 -0000 1.48 @@ -57,8 +57,8 @@ PreReq: Kolab_FreeBusy # what about php::with_tidy = yes (for Horde Imp) -PreReq: php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_hash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_hash = yes, php::with_json = yes -PreReq: apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_hash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, php::with_hash = yes, php::with_json = yes +PreReq: php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_hash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_hash = yes, php::with_json = yes, php::with_tokenizer = yes +PreReq: apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_hash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_hash = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes PreReq: imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes PreReq: perl-ssl From cvs at kolab.org Sun Jan 17 14:30:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 17 Jan 2010 14:30:59 +0100 (CET) Subject: gunnar: server Makefile,1.92,1.93 Message-ID: <20100117133059.F187D600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3000 Modified Files: Makefile Log Message: Some cleanup and reorganization for the fetch target. Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- Makefile 4 Jan 2010 15:54:57 -0000 1.92 +++ Makefile 17 Jan 2010 13:30:57 -0000 1.93 @@ -1,15 +1,17 @@ include make-helper/kolab.mk -BASE_PACKAGES=php-smarty \ +BASE_PACKAGES=apache-php \ + clamav \ + db \ + gmp \ + imapd \ openldap \ - apache-php \ + openpkg \ + perl-ldap \ php \ + php-smarty \ postfix \ - imapd \ - clamav \ - gmp \ - sqlite \ - perl-ldap + sqlite PERL_PACKAGES=perl-kolab @@ -21,7 +23,8 @@ kolab-webclient \ kolab-fbview \ -PEAR_PACKAGES= pear/Horde_Alarm \ +PEAR_HORDE_PACKAGES= \ + pear/Horde_Alarm \ pear/Horde_Argv \ pear/Horde_Auth \ pear/Horde_Block \ @@ -46,8 +49,8 @@ pear/Horde_Http_Client \ pear/Horde_Image \ pear/Horde_LDAP \ - pear/Horde_Log \ pear/Horde_Lock \ + pear/Horde_Log \ pear/Horde_MIME \ pear/Horde_Maintenance \ pear/Horde_Mobile \ @@ -63,19 +66,26 @@ pear/Horde_SessionHandler \ pear/Horde_SessionObjects \ pear/Horde_Share \ + pear/Horde_SpellChecker \ pear/Horde_SyncML \ pear/Horde_Template \ + pear/Horde_Text_Diff \ pear/Horde_Text_Filter \ pear/Horde_Text_Flowed \ + pear/Horde_Text_Textile \ pear/Horde_Token \ pear/Horde_Tree \ + pear/Horde_UI \ pear/Horde_Util \ + pear/Horde_VC \ pear/Horde_XML_WBXML \ pear/Horde_Xml_Element \ - pear/Horde_iCalendar \ + pear/Horde_Yaml \ + pear/Horde_iCalendar + +PEAR_ONLY_PACKAGES= \ pear/PEAR-Auth_SASL \ pear/PEAR-Cache \ - pear/PEAR-Cache \ pear/PEAR-Console_Table \ pear/PEAR-DB \ pear/PEAR-Date \ @@ -100,8 +110,6 @@ pear/PEAR-Date_Holidays_Ukraine \ pear/PEAR-File_Find \ pear/PEAR-HTTP_Request \ - pear/PEAR-Horde-Channel \ - pear/PEAR-Log \ pear/PEAR-Log \ pear/PEAR-Mail \ pear/PEAR-Mail_mimeDecode \ @@ -114,21 +122,29 @@ pear/PEAR-Net_Sieve \ pear/PEAR-Net_Socket \ pear/PEAR-Net_URL \ - pear/PEAR-PHPUnit-Channel \ - pear/PEAR-SOAP \ pear/PEAR-SOAP \ pear/PEAR-Services_Weather \ pear/PEAR-XML_Parser \ pear/PEAR-XML_Serializer \ - pear/PEAR-XML_Serializer \ pear/PEAR-XML_Util \ - pear/PHPUnit \ + pear/PHPUnit + +PEAR_KOLAB_PACKAGES= \ php-kolab/Kolab_Filter \ php-kolab/Kolab_Format \ php-kolab/Kolab_Freebusy \ php-kolab/Kolab_Server \ php-kolab/Kolab_Storage +PEAR_CHANNEL_PACKAGES= \ + pear/PEAR-Horde-Channel \ + pear/PEAR-PHPUnit-Channel \ + +PEAR_PACKAGES= $(PEAR_ONLY_PACKAGES) \ + $(PEAR_KOLAB_PACKAGES) \ + $(PEAR_HORDE_PACKAGES) \ + $(PEAR_CHANNEL_PACKAGES) \ + BASE_FILES=install-kolab.sh \ 1st.README @@ -154,21 +170,57 @@ $(HOME)/lib/php/test/Kolab_Filter/Horde/Kolab/Filter/AllTests.php \ $(HOME)/lib/php/test/Kolab_FreeBusy/Horde/Kolab/FreeBusy/AllTests.php +# The default target is building the distributable Kolab Server +# packages +.PHONY: all +all: dist + +# Fetches our basic requirements. This target allows testing if the +# basic building blocks are available. But you may also use it to +# download all requirements and unplug your network before running +# "make dist" +.PHONY: fetch +fetch: fetch-base fetch-pear-only fetch-pear-horde fetch-pear-kolab + +# The core target that builds the server packages. .PHONY: dist -dist: stage base kolab pear files +dist: dist-stage dist-base kolab pear files -stage: - mkdir stage +# Clean up all directories. +.PHONY: clean +clean: clean-base clean-kolab clean-pear clean-stage + find . | grep "~$$" | xargs rm -rf -.PHONY: base -base: stage +############ +# BASE START +############ +# Sub targets for our basic Kolab Server packages. +.PHONY: fetch-base +fetch-base: + for PKG in $(BASE_PACKAGES); \ + do \ + make -C $$PKG fetch || exit $$?; \ + done + +.PHONY: dist-base +dist-base: dist-stage for PKG in $(BASE_PACKAGES); \ do \ make -e -C $$PKG dist || exit $$?;\ done +.PHONY: clean-base +clean-base: + for PKG in $(BASE_PACKAGES); \ + do \ + make -C $$PKG clean || exit $$?; \ + done +############ +# BASE END +############ + .PHONY: kolab -kolab: stage $(PERL_MAKEFILES) +kolab: dist-stage $(PERL_MAKEFILES) for PKG in $(KOLAB_PACKAGES); \ do \ cd $$PKG && make dist || exit $$?; cd ..;\ @@ -177,33 +229,32 @@ $(PERL_MAKEFILES): $(@:%=%.PL) cd $(@:%/Makefile=%) && perl Makefile.PL +.PHONY: horde-snapshots +horde-snapshots: + for PKG in $(PEAR_HORDE_PACKAGES); \ + do \ + make -C $$PKG snapshot || exit $$?; \ + done + .PHONY: pear -pear: stage - for PKG in $(PEAR_PACKAGES); \ +pear: dist-stage + for PKG in $(PEAR_PACKAGES); \ do \ make -C $$PKG dist || exit $$?; \ done +.PHONY: pear-install +pear-install: dist-stage + for PKG in $(PEAR_PACKAGES); \ + do \ + make -C $$PKG install || exit $$?; \ + done + .PHONY: files -files: stage +files: dist-stage cp $(BASE_FILES) stage/ echo 'Remember to update 00INDEX.rdf and install-kolab.sh!' -.PHONY: clean -clean: clean-base clean-kolab clean-pear clean-stage - find . | grep "~$$" | xargs rm -rf - -.PHONY: clean-stage -clean-stage: - rm -rf stage - -.PHONY: clean-base -clean-base: - for PKG in $(BASE_PACKAGES); \ - do \ - make -C $$PKG clean || exit $$?; \ - done - .PHONY: clean-kolab clean-kolab: $(PERL_MAKEFILES) for PKG in $(KOLAB_PACKAGES); \ @@ -224,6 +275,34 @@ do \ make -C $$UPDATE install || exit $$?; \ done + +.PHONY: fetch-pear-only +fetch-pear-only: + for PKG in $(PEAR_ONLY_PACKAGES); \ + do \ + make -C $$PKG fetch || exit $$?; \ + done + +.PHONY: fetch-pear-horde +fetch-pear-horde: + for PKG in $(PEAR_HORDE_PACKAGES); \ + do \ + make -C $$PKG fetch || exit $$?; \ + done + +.PHONY: fetch-pear-kolab +fetch-pear-kolab: + for PKG in $(PEAR_KOLAB_PACKAGES); \ + do \ + make -C $$PKG fetch || exit $$?; \ + done + +dist-stage: + mkdir stage + +.PHONY: clean-stage +clean-stage: + rm -rf stage .PHONY: test test: From cvs at kolab.org Mon Jan 18 10:04:04 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:04:04 +0100 (CET) Subject: gunnar: server/pear/PEAR-PHPUnit-Channel Makefile,1.4,1.5 Message-ID: <20100118090404.0332460057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-PHPUnit-Channel In directory doto:/tmp/cvs-serv20042/pear/PEAR-PHPUnit-Channel Modified Files: Makefile Log Message: Convert to newer build system. Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 8 Dec 2009 07:12:19 -0000 1.4 +++ Makefile 18 Jan 2010 09:04:01 -0000 1.5 @@ -1,49 +1,17 @@ -include ../../Base.mk +STAGING = ../../stage + +include ../../make-helper/kolab.mk PACKAGE = PEAR-PHPUnit-Channel VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*$[0-9]*$.*/\1/") +SOURCE_URL= +SOURCE_0= EXTRA=pear.phpunit.de.xml -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -.PHONY: dist -dist: all - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/ - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -.PHONY: clean -clean: - rm -rf /kolab/RPM/TMP/$(PACKAGE) - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - -# Target for the src rpm directory. -$(KOLABRPMSRC)/$(PACKAGE): - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - -# Target for preparing the source area and building the package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE) Makefile $(PACKAGE).spec $(EXTRA) - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . - - -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA) - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec +BUILD_OPTIONS= - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +include ../../make-helper/package.mk +include ../../make-helper/package-new.mk +include ../../make-helper/fetch.mk From cvs at kolab.org Mon Jan 18 10:04:04 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:04:04 +0100 (CET) Subject: gunnar: server/pear/PEAR-Horde-Channel Makefile,1.5,1.6 Message-ID: <20100118090404.033E0600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Horde-Channel In directory doto:/tmp/cvs-serv20042/pear/PEAR-Horde-Channel Modified Files: Makefile Log Message: Convert to newer build system. Index: Makefile =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 31 Jul 2009 12:46:45 -0000 1.5 +++ Makefile 18 Jan 2010 09:04:01 -0000 1.6 @@ -1,49 +1,17 @@ -include ../../Base.mk +STAGING = ../../stage + +include ../../make-helper/kolab.mk PACKAGE = PEAR-Horde-Channel VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*$[0-9.]*$.*/\1/") RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*$[0-9]*$.*/\1/") +SOURCE_URL= +SOURCE_0= EXTRA=pear.horde.org.xml -.PHONY: all -all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - -.PHONY: dist -dist: all - cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/ - -# Target for installing the binary rpm package in our current Kolab -# server installation -.PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - -.PHONY: clean -clean: - rm -rf /kolab/RPM/TMP/$(PACKAGE) - rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - rm -rf *~ - -# Target for the src rpm directory. -$(KOLABRPMSRC)/$(PACKAGE): - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - -# Target for preparing the source area and building the package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE) Makefile $(PACKAGE).spec $(EXTRA) - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec - -# Target for fetching the source rpm into the current directory -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . - - -$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA) - test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) - - cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE) - - cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec +BUILD_OPTIONS= - cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm . +include ../../make-helper/package.mk +include ../../make-helper/package-new.mk +include ../../make-helper/fetch.mk From cvs at kolab.org Mon Jan 18 10:19:52 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:19:52 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Format/patches/Kolab_Format-1.0.1 - New directory Message-ID: <20100118091952.976F0600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Format/patches/Kolab_Format-1.0.1 In directory doto:/tmp/cvs-serv21363/patches/Kolab_Format-1.0.1 Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Format/patches/Kolab_Format-1.0.1 added to the repository From cvs at kolab.org Mon Jan 18 10:19:52 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:19:52 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Format/patches - New directory Message-ID: <20100118091952.975A160057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Format/patches In directory doto:/tmp/cvs-serv21363/patches Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Format/patches added to the repository From cvs at kolab.org Mon Jan 18 10:20:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:20:28 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Format/patches/Kolab_Format-1.0.1 Kolab_Format_1.0.1_p1.patch, NONE, 1.1 Message-ID: <20100118092028.0E7A2600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Format/patches/Kolab_Format-1.0.1 In directory doto:/tmp/cvs-serv21477/patches/Kolab_Format-1.0.1 Added Files: Kolab_Format_1.0.1_p1.patch Log Message: Correct patch location for new build system. --- NEW FILE: Kolab_Format_1.0.1_p1.patch --- From: Gunnar Wrobel Subject: [PATCH] Kolab_Format_1.0.1_p1.patch Removes an additional option that does not help in dealing with XML format problems but instead breaks encoding again. https://www.intevation.de/roundup/kolab/issue3528 STATUS: MERGED http://cvs.horde.org/diff.php/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php?r1=1.15&r2=1.16 Signed-off-by: Gunnar Wrobel Index: a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php =================================================================== RCS file: /repository/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php,v retrieving revision 1.5.2.11 retrieving revision 1.5.2.12 diff -u -B -r1.5.2.11 -r1.5.2.12 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php 2 Apr 2009 20:14:51 -0000 1.5.2.11 +++ a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php 8 Apr 2009 18:34:39 -0000 1.5.2.12 @@ -597,7 +597,7 @@ { $params = array( 'xml' => $xmltext, - 'options' => HORDE_DOM_LOAD_REMOVE_BLANKS | HORDE_DOM_LOAD_RECOVER, + 'options' => HORDE_DOM_LOAD_REMOVE_BLANKS, ); $result = Horde_DOM_Document::factory($params); From cvs at kolab.org Mon Jan 18 10:20:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:20:28 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Format .cvsignore, 1.2, 1.3 Kolab_Format.spec, 1.11, NONE Kolab_Format_1.0.1_p1.patch, 1.1, NONE Message-ID: <20100118092028.0D85860057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Format In directory doto:/tmp/cvs-serv21477 Modified Files: .cvsignore Removed Files: Kolab_Format.spec Kolab_Format_1.0.1_p1.patch Log Message: Correct patch location for new build system. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Format/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 17 Jan 2010 13:05:01 -0000 1.2 +++ .cvsignore 18 Jan 2010 09:20:25 -0000 1.3 @@ -1,2 +1,5 @@ *.src.rpm *.tgz +*.spec +package.patch +tmp --- Kolab_Format.spec DELETED --- --- Kolab_Format_1.0.1_p1.patch DELETED --- From cvs at kolab.org Mon Jan 18 10:26:17 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:26:17 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Freebusy issue3438.patch,1.1,NONE Message-ID: <20100118092617.8B2B360057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv21827 Removed Files: issue3438.patch Log Message: Obsolete patch (was fixed in Kolab_FreeBusy-0.1.2) --- issue3438.patch DELETED --- From cvs at kolab.org Mon Jan 18 10:26:49 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:26:49 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Freebusy .cvsignore, 1.4, 1.5 Kolab_FreeBusy.spec, 1.22, NONE Message-ID: <20100118092649.5A26560057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv21900 Modified Files: .cvsignore Removed Files: Kolab_FreeBusy.spec Log Message: Remove the spec file. It is being generated now. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .cvsignore 17 Jan 2010 13:05:01 -0000 1.4 +++ .cvsignore 18 Jan 2010 09:26:47 -0000 1.5 @@ -1,2 +1,5 @@ *.src.rpm *.tgz +*.spec +package.patch +tmp --- Kolab_FreeBusy.spec DELETED --- From cvs at kolab.org Mon Jan 18 10:27:32 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:27:32 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Filter .cvsignore, 1.4, 1.5 Kolab_Filter.spec, 1.25, NONE Message-ID: <20100118092732.06C5760057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv21962 Modified Files: .cvsignore Removed Files: Kolab_Filter.spec Log Message: Remove the spec file. It is being generated now. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .cvsignore 17 Jan 2010 13:05:01 -0000 1.4 +++ .cvsignore 18 Jan 2010 09:27:29 -0000 1.5 @@ -1,2 +1,5 @@ *.src.rpm *.tgz +*.spec +package.patch +tmp --- Kolab_Filter.spec DELETED --- From cvs at kolab.org Mon Jan 18 10:33:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:33:47 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0 - New directory Message-ID: <20100118093347.2E068600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0 In directory doto:/tmp/cvs-serv22357/patches/Kolab_Server-0.5.0 Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0 added to the repository From cvs at kolab.org Mon Jan 18 10:33:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:33:47 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Server/patches - New directory Message-ID: <20100118093347.2A98E60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Server/patches In directory doto:/tmp/cvs-serv22357/patches Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Server/patches added to the repository From cvs at kolab.org Mon Jan 18 10:34:38 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:34:38 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0 Kolab_Server-0.5.0_p1.patch, NONE, 1.1 Message-ID: <20100118093438.04066600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0 In directory doto:/tmp/cvs-serv22474/patches/Kolab_Server-0.5.0 Added Files: Kolab_Server-0.5.0_p1.patch Log Message: Correct patch location for new build system. Remove the spec file. It is being generated now. --- NEW FILE: Kolab_Server-0.5.0_p1.patch --- ? Kolab_Server-0.5.0.tgz ? Kolab_Server-0.5.0_p1.patch Index: a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php =================================================================== RCS file: /repository/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Attic/user.php,v retrieving revision 1.2.2.11 diff -u -B -r1.2.2.11 user.php --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php 25 Apr 2009 08:56:33 -0000 1.2.2.11 +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php 25 Apr 2009 12:34:45 -0000 @@ -203,6 +203,17 @@ } /** + * Get the group mail addresses for this object + * + * @return mixed|PEAR_Error An array of group addresses, false if no groups were + * found. + */ + function getGroupAddresses() + { + return $this->_db->getGroupAddresses($this->_uid); + } + + /** * Returns the server url of the given type for this user. * * This method is used to encapsulate multidomain support. From cvs at kolab.org Mon Jan 18 10:34:38 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:34:38 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Server .cvsignore, 1.2, 1.3 Kolab_Server-0.5.0_p1.patch, 1.1, NONE Kolab_Server.spec, 1.13, NONE Message-ID: <20100118093438.0202060057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Server In directory doto:/tmp/cvs-serv22474 Modified Files: .cvsignore Removed Files: Kolab_Server-0.5.0_p1.patch Kolab_Server.spec Log Message: Correct patch location for new build system. Remove the spec file. It is being generated now. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Server/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 17 Jan 2010 13:05:01 -0000 1.2 +++ .cvsignore 18 Jan 2010 09:34:35 -0000 1.3 @@ -1,2 +1,5 @@ *.src.rpm *.tgz +*.spec +package.patch +tmp --- Kolab_Server-0.5.0_p1.patch DELETED --- --- Kolab_Server.spec DELETED --- From cvs at kolab.org Mon Jan 18 10:44:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:44:43 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Storage/patches - New directory Message-ID: <20100118094443.1087260057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches In directory doto:/tmp/cvs-serv22801/patches Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Storage/patches added to the repository From cvs at kolab.org Mon Jan 18 10:44:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:44:43 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 - New directory Message-ID: <20100118094443.13B50600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 In directory doto:/tmp/cvs-serv22801/patches/Kolab_Storage-0.4.0 Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 added to the repository From cvs at kolab.org Mon Jan 18 10:45:12 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:45:12 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Storage .cvsignore, 1.2, 1.3 Kolab_Storage.spec, 1.11, NONE Kolab_Storage_0.4.0_p1.patch, 1.1, NONE Kolab_Storage_0.4.0_p2.patch, 1.1, NONE t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch, 1.2, NONE Message-ID: <20100118094512.3F4A060057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Storage In directory doto:/tmp/cvs-serv22898 Modified Files: .cvsignore Removed Files: Kolab_Storage.spec Kolab_Storage_0.4.0_p1.patch Kolab_Storage_0.4.0_p2.patch t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch Log Message: Correct patch location for new build system. Remove the spec file. It is being generated now. Index: .cvsignore =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 17 Jan 2010 13:05:01 -0000 1.2 +++ .cvsignore 18 Jan 2010 09:45:10 -0000 1.3 @@ -1,2 +1,5 @@ *.src.rpm *.tgz +*.spec +package.patch +tmp --- Kolab_Storage.spec DELETED --- --- Kolab_Storage_0.4.0_p1.patch DELETED --- --- Kolab_Storage_0.4.0_p2.patch DELETED --- --- t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch DELETED --- From cvs at kolab.org Mon Jan 18 10:45:12 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 10:45:12 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 Kolab_Storage_0.4.0_p1.patch, NONE, 1.1 Kolab_Storage_0.4.0_p2.patch, NONE, 1.1 t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch, NONE, 1.1 Message-ID: <20100118094512.4072F600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 In directory doto:/tmp/cvs-serv22898/patches/Kolab_Storage-0.4.0 Added Files: Kolab_Storage_0.4.0_p1.patch Kolab_Storage_0.4.0_p2.patch t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch Log Message: Correct patch location for new build system. Remove the spec file. It is being generated now. --- NEW FILE: Kolab_Storage_0.4.0_p1.patch --- From: Gunnar Wrobel Subject: [PATCH] Kolab_Storage_0.4.0_p1.patch Fixes a unit test. STATUS: MERGED http://cvs.horde.org/diff.php/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php?r1=1.2.2.8&r2=1.2.2.9 Signed-off-by: Gunnar Wrobel Index: a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php =================================================================== RCS file: /repository/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php,v retrieving revision 1.2.2.8 diff -u -B -r1.2.2.8 FolderTest.php --- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php 6 Jan 2009 15:23:18 -0000 1.2.2.8 +++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php 24 Apr 2009 07:51:45 -0000 @@ -162,7 +162,7 @@ */ public function testGetImapFailNoServer() { - $session = &new Horde_Kolab_Session(); + $session = Horde_Kolab_Session::singleton('anonymous', null, true); $imap = $session->getImapParams(); $this->assertEquals('localhost', $imap['hostspec']); } --- NEW FILE: Kolab_Storage_0.4.0_p2.patch --- From: Gunnar Wrobel Subject: [PATCH] Kolab_Storage_0.4.0_p2.patch Fixes unit testing in Kolab_FreeBusy. STATUS: MERGED http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087649.html http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087650.html Signed-off-by: Gunnar Wrobel Index: a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php =================================================================== RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php,v retrieving revision 1.7.2.19 diff -u -B -r1.7.2.19 Folder.php --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php 24 Feb 2009 07:40:40 -0000 1.7.2.19 +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php 25 Apr 2009 18:41:09 -0000 @@ -1422,6 +1422,11 @@ return $iresult; } + if (!empty($this->_perms)) { + /** Refresh the cache after changing the permissions */ + $this->_perms->getPerm(); + } + $result = $this->trigger(); if (is_a($result, 'PEAR_Error')) { Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s', Index: a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php =================================================================== RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php,v retrieving revision 1.3.2.7 diff -u -B -r1.3.2.7 List.php --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php 23 Feb 2009 21:33:19 -0000 1.3.2.7 +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php 25 Apr 2009 18:41:10 -0000 @@ -96,7 +96,7 @@ * * @return Kolab_Folders_List The concrete List reference. */ - function &singleton() + function &singleton($destruct = false) { static $list; @@ -107,7 +107,7 @@ $list = $session->query('kolab_folderlist'); } - if (empty($list[Auth::getAuth()])) { + if (empty($list[Auth::getAuth()]) || $destruct) { $list[Auth::getAuth()] = new Kolab_List(); } Index: a/framework/Kolab_Storage/lib/Horde/Kolab/Test/Storage.php =================================================================== RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Test/Storage.php,v retrieving revision 1.1.2.4 diff -u -B -r1.1.2.4 Storage.php --- a/framework/Kolab_Storage/lib/Horde/Kolab/Test/Storage.php 24 Feb 2009 07:40:40 -0000 1.1.2.4 +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Test/Storage.php 25 Apr 2009 18:41:10 -0000 @@ -92,6 +92,11 @@ $folder->setName($arguments[0]); $world['folder_creation'] = $folder->save(array('type' => 'event', 'default' => true)); + $folder->setACL(Auth::getAuth(), 'alrid'); + break; + case 'allow a group full access to a folder': + $folder = $world['storage']->getFolder($arguments[1]); + $folder->setACL($arguments[0], 'alrid'); break; case 'retrieving the list of shares for the application': require_once 'Horde/Share.php'; @@ -100,6 +105,11 @@ $world['list'] = $shares->listShares(Auth::getAuth()); break; + case 'logging in as a user with a password': + $world['login'] = $world['auth']->authenticate($arguments[0], + array('password' => $arguments[1])); + $world['storage'] = &$this->prepareEmptyKolabStorage(); + return parent::runWhen($world, $action, $arguments); default: return parent::runWhen($world, $action, $arguments); } @@ -153,7 +163,7 @@ $GLOBALS['KOLAB_TESTING'] = array(); /** Prepare a Kolab test storage */ - $storage = Kolab_List::singleton(); + $storage = Kolab_List::singleton(true); return $storage; } --- NEW FILE: t_framework_HK_SW_Kolab__Storage_DovecotSharedFolderOwner.patch --- In the Kolab Cyrus Imap server mailboxes shared by other users are named following the pattern: user/USERNAME/MAILBOX Where USERNAME is the sharing users name _without_ the domain part. Other IMAP servers however might specify the USERNAME including the domain -- this is the case for example with some Dovecot setups. The current code assumes the behavior of Cyrus and adds the users domain to construct the fully qualified owner of an shared folder. This Patch looks at the extracted USERNAME and if it already contains an at-sign, if so no extra domain part is added. diff -c a/a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php --- a/a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php +++ b/a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php @@ -494,9 +494,13 @@ if (substr($matches[1], 0, 6) == 'INBOX/') { $this->_owner = Auth::getAuth(); } elseif (substr($matches[1], 0, 5) == 'user/') { - $domain = strstr(Auth::getAuth(), '@'); - $user_domain = isset($matches[4]) ? $matches[4] : $domain; - $this->_owner = $matches[2] . $user_domain; + if (strpos($matches[2], '@') === FALSE) { + $domain = strstr(Auth::getAuth(), '@'); + $user_domain = isset($matches[4]) ? $matches[4] : $domain; + $this->_owner = $matches[2] . $user_domain; + } else { + $this->_owner = $matches[2]; + } } elseif ($matches[1] == 'shared.') { $this->_owner = 'anonymous'; } Diff finished. Wed Feb 18 17:55:20 2009 From cvs at kolab.org Mon Jan 18 11:55:19 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 11:55:19 +0100 (CET) Subject: gunnar: server/kolab-webadmin Makefile,1.18,1.19 Message-ID: <20100118105519.46DE060014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin In directory doto:/tmp/cvs-serv25339/kolab-webadmin Modified Files: Makefile Log Message: Use CURDIR Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile 4 Jan 2010 23:01:19 -0000 1.18 +++ Makefile 18 Jan 2010 10:55:17 -0000 1.19 @@ -1,7 +1,7 @@ include ../make-helper/kolab.mk PACKAGE=kolab-webadmin -VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,$.*$)/\1/'` +VERSION:=`grep 'm4_define(_VERSION' $(CURDIR)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,$.*$)/\1/'` RELEASE:=`date '+%Y%m%d'` KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"$.*$".*/\1/') From cvs at kolab.org Mon Jan 18 11:55:19 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 11:55:19 +0100 (CET) Subject: gunnar: server/kolabd Makefile,1.20,1.21 Message-ID: <20100118105519.484DC600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv25339/kolabd Modified Files: Makefile Log Message: Use CURDIR Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolabd/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile 8 Jan 2010 23:34:45 -0000 1.20 +++ Makefile 18 Jan 2010 10:55:16 -0000 1.21 @@ -1,9 +1,7 @@ include ../make-helper/kolab.mk -PWD := $(shell pwd) - PACKAGE=kolabd -VERSION = $(shell grep "m4_define._VERSION" $(PWD)/$(PACKAGE)/configure.ac|sed "s/m4_define(_VERSION,$.*$)/\1/") +VERSION = $(shell grep "m4_define._VERSION" $(CURDIR)/$(PACKAGE)/configure.ac|sed "s/m4_define(_VERSION,$.*$)/\1/") RELEASE = $(shell date "+%Y%m%d") KOLAB_VERSION = $(shell { grep '^KOLAB_VERSION=".*"' ../install-kolab.sh || echo CVS; } | sed 's/.*"$.*$".*/\1/') From cvs at kolab.org Mon Jan 18 11:57:02 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 11:57:02 +0100 (CET) Subject: gunnar: server/make-helper package.mk,1.9,1.10 Message-ID: <20100118105702.537FF60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv25392/make-helper Modified Files: package.mk Log Message: Fix copying to the staging area. We need a marker in the directory rather than using the directory as it will change its modification time with files placed in the staging area. Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- package.mk 17 Jan 2010 13:03:48 -0000 1.9 +++ package.mk 18 Jan 2010 10:57:00 -0000 1.10 @@ -74,9 +74,10 @@ endif # Prepare the staging area -$(STAGING): +$(STAGING)/.dir: mkdir -p $(STAGING) + touch $(STAGING)/.dir # Final package location -$(STAGING)/$(RELEASETARGET): $(STAGING) $(RELEASETARGET) +$(STAGING)/$(RELEASETARGET): $(STAGING)/.dir $(RELEASETARGET) cp $(RELEASETARGET) $(STAGING) From cvs at kolab.org Mon Jan 18 11:57:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 11:57:43 +0100 (CET) Subject: gunnar: server/openpkg Makefile,1.3,1.4 Message-ID: <20100118105743.8C82A600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/openpkg In directory doto:/tmp/cvs-serv25450/openpkg Modified Files: Makefile Log Message: Do not rebuild openpkg if already build. Index: Makefile =================================================================== RCS file: /kolabrepository/server/openpkg/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 17 Jan 2010 13:22:55 -0000 1.3 +++ Makefile 18 Jan 2010 10:57:41 -0000 1.4 @@ -11,6 +11,8 @@ SOURCE_URL= SOURCE_0= +RPM_SOURCES= + PATCHES= EXTRA=$(PATCHES) kolab.patch $(PACKAGE2)-${VERSION2}.tar.gz $(PACKAGE2).patch @@ -29,14 +31,15 @@ $(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm cd $(KOLABRPMSRC)/$(PACKAGE) && rm $(PACKAGE2)-*.tar.gz && ./openpkg.boot -s -$(PACKAGE2).patch: $(KOLABRPMSRC)/$(PACKAGE2) +$(PACKAGE2).patch: $(KOLABRPMSRC)/$(PACKAGE2)/.dir cp $(KOLABRPMSRC)/$(PACKAGE2)/$(PACKAGE2).patch . -$(PACKAGE2)-${VERSION2}.tar.gz: $(KOLABRPMSRC)/$(PACKAGE2) +$(PACKAGE2)-${VERSION2}.tar.gz: $(KOLABRPMSRC)/$(PACKAGE2)/.dir cp $(KOLABRPMSRC)/$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz . -$(KOLABRPMSRC)/$(PACKAGE2): $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm +$(KOLABRPMSRC)/$(PACKAGE2)/.dir: $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm $(RPM) -ihv $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm + touch $(KOLABRPMSRC)/$(PACKAGE2)/.dir $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm: wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm From cvs at kolab.org Mon Jan 18 11:57:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 11:57:43 +0100 (CET) Subject: gunnar: server/make-helper openpkg-patched.mk,1.6,1.7 Message-ID: <20100118105743.89ACD60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv25450/make-helper Modified Files: openpkg-patched.mk Log Message: Do not rebuild openpkg if already build. Index: openpkg-patched.mk =================================================================== RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- openpkg-patched.mk 17 Jan 2010 13:03:48 -0000 1.6 +++ openpkg-patched.mk 18 Jan 2010 10:57:41 -0000 1.7 @@ -37,10 +37,13 @@ cat $$PATCH >> package.patch; \ done +RPM_SOURCES ?= $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) + # Target for building the source package -$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) +$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(RPM_SOURCES) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec # Target for building the binary package -$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) +$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(RPM_SOURCES) + echo S: $(SOURCES) cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS) From cvs at kolab.org Mon Jan 18 12:02:18 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 12:02:18 +0100 (CET) Subject: gunnar: server Makefile,1.93,1.94 Message-ID: <20100118110218.55205600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv25629 Modified Files: Makefile Log Message: Reorganized Makefile for the different package types and some general cleanup. The dist target should work again. The webclient is currently not part of that target as it still needs to be cleaned up. The new build system is in place nearly everywhere now. Only the kolab source packages (perl-kolab, kolabd, kolab-webadmin) remain as broken as before. Except for these packages a make dist should now only build the packages that actually had changes. Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- Makefile 17 Jan 2010 13:30:57 -0000 1.93 +++ Makefile 18 Jan 2010 11:02:16 -0000 1.94 @@ -20,8 +20,56 @@ KOLAB_PACKAGES=perl-kolab \ kolabd \ kolab-webadmin \ - kolab-webclient \ - kolab-fbview \ + +PEAR_CHANNEL_PACKAGES= \ + pear/PEAR-Horde-Channel \ + pear/PEAR-PHPUnit-Channel \ + +PEAR_ONLY_PACKAGES= \ + pear/PEAR-Auth_SASL \ + pear/PEAR-Cache \ + pear/PEAR-Console_Table \ + pear/PEAR-DB \ + pear/PEAR-Date \ + pear/PEAR-Date_Holidays \ + pear/PEAR-Date_Holidays_Austria \ + pear/PEAR-Date_Holidays_Brazil \ + pear/PEAR-Date_Holidays_Denmark \ + pear/PEAR-Date_Holidays_Discordian \ + pear/PEAR-Date_Holidays_EnglandWales \ + pear/PEAR-Date_Holidays_Germany \ + pear/PEAR-Date_Holidays_Iceland \ + pear/PEAR-Date_Holidays_Ireland \ + pear/PEAR-Date_Holidays_Italy \ + pear/PEAR-Date_Holidays_Japan \ + pear/PEAR-Date_Holidays_Netherlands \ + pear/PEAR-Date_Holidays_Norway \ + pear/PEAR-Date_Holidays_Romania \ + pear/PEAR-Date_Holidays_Slovenia \ + pear/PEAR-Date_Holidays_Sweden \ + pear/PEAR-Date_Holidays_UNO \ + pear/PEAR-Date_Holidays_USA \ + pear/PEAR-Date_Holidays_Ukraine \ + pear/PEAR-File_Find \ + pear/PEAR-HTTP_Request \ + pear/PEAR-Log \ + pear/PEAR-Mail \ + pear/PEAR-Mail_mimeDecode \ + pear/PEAR-Mail_Mime \ + pear/PEAR-Net_DIME \ + pear/PEAR-Net_LDAP \ + pear/PEAR-Net_LDAP2 \ + pear/PEAR-Net_LMTP \ + pear/PEAR-Net_SMTP \ + pear/PEAR-Net_Sieve \ + pear/PEAR-Net_Socket \ + pear/PEAR-Net_URL \ + pear/PEAR-SOAP \ + pear/PEAR-Services_Weather \ + pear/PEAR-XML_Parser \ + pear/PEAR-XML_Serializer \ + pear/PEAR-XML_Util \ + pear/PHPUnit PEAR_HORDE_PACKAGES= \ pear/Horde_Alarm \ @@ -83,52 +131,6 @@ pear/Horde_Yaml \ pear/Horde_iCalendar -PEAR_ONLY_PACKAGES= \ - pear/PEAR-Auth_SASL \ - pear/PEAR-Cache \ - pear/PEAR-Console_Table \ - pear/PEAR-DB \ - pear/PEAR-Date \ - pear/PEAR-Date_Holidays \ - pear/PEAR-Date_Holidays_Austria \ - pear/PEAR-Date_Holidays_Brazil \ - pear/PEAR-Date_Holidays_Denmark \ - pear/PEAR-Date_Holidays_Discordian \ - pear/PEAR-Date_Holidays_EnglandWales \ - pear/PEAR-Date_Holidays_Germany \ - pear/PEAR-Date_Holidays_Iceland \ - pear/PEAR-Date_Holidays_Ireland \ - pear/PEAR-Date_Holidays_Italy \ - pear/PEAR-Date_Holidays_Japan \ - pear/PEAR-Date_Holidays_Netherlands \ - pear/PEAR-Date_Holidays_Norway \ - pear/PEAR-Date_Holidays_Romania \ - pear/PEAR-Date_Holidays_Slovenia \ - pear/PEAR-Date_Holidays_Sweden \ - pear/PEAR-Date_Holidays_UNO \ - pear/PEAR-Date_Holidays_USA \ - pear/PEAR-Date_Holidays_Ukraine \ - pear/PEAR-File_Find \ - pear/PEAR-HTTP_Request \ - pear/PEAR-Log \ - pear/PEAR-Mail \ - pear/PEAR-Mail_mimeDecode \ - pear/PEAR-Mail_Mime \ - pear/PEAR-Net_DIME \ - pear/PEAR-Net_LDAP \ - pear/PEAR-Net_LDAP2 \ - pear/PEAR-Net_LMTP \ - pear/PEAR-Net_SMTP \ - pear/PEAR-Net_Sieve \ - pear/PEAR-Net_Socket \ - pear/PEAR-Net_URL \ - pear/PEAR-SOAP \ - pear/PEAR-Services_Weather \ - pear/PEAR-XML_Parser \ - pear/PEAR-XML_Serializer \ - pear/PEAR-XML_Util \ - pear/PHPUnit - PEAR_KOLAB_PACKAGES= \ php-kolab/Kolab_Filter \ php-kolab/Kolab_Format \ @@ -136,14 +138,13 @@ php-kolab/Kolab_Server \ php-kolab/Kolab_Storage -PEAR_CHANNEL_PACKAGES= \ - pear/PEAR-Horde-Channel \ - pear/PEAR-PHPUnit-Channel \ - -PEAR_PACKAGES= $(PEAR_ONLY_PACKAGES) \ - $(PEAR_KOLAB_PACKAGES) \ +PEAR_PACKAGES= $(PEAR_CHANNEL_PACKAGES) \ + $(PEAR_ONLY_PACKAGES) \ $(PEAR_HORDE_PACKAGES) \ - $(PEAR_CHANNEL_PACKAGES) \ + $(PEAR_KOLAB_PACKAGES) \ + +CLIENT_PACKAGES=kolab-webclient \ + kolab-fbview \ BASE_FILES=install-kolab.sh \ 1st.README @@ -184,126 +185,244 @@ # The core target that builds the server packages. .PHONY: dist -dist: dist-stage dist-base kolab pear files +dist: dist-base dist-pear-channel dist-kolab dist-pear-only dist-pear-horde dist-pear-kolab files # Clean up all directories. .PHONY: clean -clean: clean-base clean-kolab clean-pear clean-stage +clean: clean-base clean-pear-channel clean-kolab clean-pear-only clean-pear-horde clean-pear-kolab clean-stage find . | grep "~$$" | xargs rm -rf -############ +#################### # BASE START -############ +#################### # Sub targets for our basic Kolab Server packages. + .PHONY: fetch-base -fetch-base: - for PKG in $(BASE_PACKAGES); \ - do \ - make -C $$PKG fetch || exit $$?; \ - done +fetch-base: $(BASE_PACKAGES:%=fetch-%) -.PHONY: dist-base -dist-base: dist-stage - for PKG in $(BASE_PACKAGES); \ - do \ - make -e -C $$PKG dist || exit $$?;\ - done +.PHONY: $(BASE_PACKAGES:%=fetch-%) +$(BASE_PACKAGES:%=fetch-%): + make -e -C $(@:fetch-%=%) fetch .PHONY: clean-base -clean-base: - for PKG in $(BASE_PACKAGES); \ - do \ - make -C $$PKG clean || exit $$?; \ - done -############ +dist-base: $(BASE_PACKAGES:%=dist-%) + +.PHONY: $(BASE_PACKAGES:%=dist-%) +$(BASE_PACKAGES:%=dist-%): + make -e -C $(@:dist-%=%) dist + +.PHONY: clean-base +clean-base: $(BASE_PACKAGES:%=clean-%) + +.PHONY: $(BASE_PACKAGES:%=clean-%) +$(BASE_PACKAGES:%=clean-%): + make -e -C $(@:clean-%=%) clean + +#################### # BASE END -############ +#################### -.PHONY: kolab -kolab: dist-stage $(PERL_MAKEFILES) - for PKG in $(KOLAB_PACKAGES); \ - do \ - cd $$PKG && make dist || exit $$?; cd ..;\ - done +#################### +# KOLAB START +#################### +# Sub targets for pear packages from pear.php.net + +# +# @TODO: These packages are still unclean. kolabd and kolab-webadmin +# do not deliver clean source archives as their configure script +# produces platform dependent source code. The configuration should +# only happen via configuration files and not via configure. +# + +.PHONY: dist-kolab +dist-kolab: $(PERL_MAKEFILES) $(KOLAB_PACKAGES:%=dist-%) + +.PHONY: $(KOLAB_PACKAGES:%=dist-%) +$(KOLAB_PACKAGES:%=dist-%): + make -e -C $(@:dist-%=%) dist $(PERL_MAKEFILES): $(@:%=%.PL) cd $(@:%/Makefile=%) && perl Makefile.PL -.PHONY: horde-snapshots -horde-snapshots: - for PKG in $(PEAR_HORDE_PACKAGES); \ - do \ - make -C $$PKG snapshot || exit $$?; \ - done +.PHONY: clean-kolab +clean-kolab: $(KOLAB_PACKAGES:%=clean-%) -.PHONY: pear -pear: dist-stage - for PKG in $(PEAR_PACKAGES); \ - do \ - make -C $$PKG dist || exit $$?; \ - done +.PHONY: $(KOLAB_PACKAGES:%=clean-%) +$(KOLAB_PACKAGES:%=clean-%): + make -e -C $(@:clean-%=%) clean_all -.PHONY: pear-install -pear-install: dist-stage - for PKG in $(PEAR_PACKAGES); \ - do \ - make -C $$PKG install || exit $$?; \ - done +#################### +# KOLAB END +#################### -.PHONY: files -files: dist-stage - cp $(BASE_FILES) stage/ - echo 'Remember to update 00INDEX.rdf and install-kolab.sh!' +#################### +# PEAR ONLY START +#################### +# Sub targets for pear packages from pear.php.net -.PHONY: clean-kolab -clean-kolab: $(PERL_MAKEFILES) - for PKG in $(KOLAB_PACKAGES); \ - do \ - make -C $$PKG clean_all || exit $$?; \ - done +.PHONY: fetch-pear-only +fetch-pear-only: $(PEAR_ONLY_PACKAGES:%=fetch-%) -.PHONY: clean-pear -clean-pear: - for PKG in $(PEAR_PACKAGES); \ - do \ - make -C $$PKG clean || exit $$?; \ - done +.PHONY: $(PEAR_ONLY_PACKAGES:%=fetch-%) +$(PEAR_ONLY_PACKAGES:%=fetch-%): + make -e -C $(@:fetch-%=%) fetch -.PHONY: update -update: - for UPDATE in $(UPDATES); \ - do \ - make -C $$UPDATE install || exit $$?; \ - done +.PHONY: dist-pear-only +dist-pear-only: $(PEAR_ONLY_PACKAGES:%=dist-%) -.PHONY: fetch-pear-only -fetch-pear-only: - for PKG in $(PEAR_ONLY_PACKAGES); \ - do \ - make -C $$PKG fetch || exit $$?; \ - done +.PHONY: $(PEAR_ONLY_PACKAGES:%=dist-%) +$(PEAR_ONLY_PACKAGES:%=dist-%): + make -e -C $(@:dist-%=%) dist + +.PHONY: clean-pear-only +clean-pear-only: $(PEAR_ONLY_PACKAGES:%=clean-%) + +.PHONY: $(PEAR_ONLY_PACKAGES:%=clean-%) +$(PEAR_ONLY_PACKAGES:%=clean-%): + make -e -C $(@:clean-%=%) clean + +#################### +# PEAR ONLY END +#################### + +#################### +# PEAR HORDE START +#################### +# Sub targets for pear packages from pear.php.net .PHONY: fetch-pear-horde -fetch-pear-horde: - for PKG in $(PEAR_HORDE_PACKAGES); \ - do \ - make -C $$PKG fetch || exit $$?; \ - done +fetch-pear-horde: $(PEAR_HORDE_PACKAGES:%=fetch-%) + +.PHONY: $(PEAR_HORDE_PACKAGES:%=fetch-%) +$(PEAR_HORDE_PACKAGES:%=fetch-%): + make -e -C $(@:fetch-%=%) fetch + +.PHONY: dist-pear-horde +dist-pear-horde: $(PEAR_HORDE_PACKAGES:%=dist-%) + +.PHONY: $(PEAR_HORDE_PACKAGES:%=dist-%) +$(PEAR_HORDE_PACKAGES:%=dist-%): + make -e -C $(@:dist-%=%) dist + +.PHONY: clean-pear-horde +clean-pear-horde: $(PEAR_HORDE_PACKAGES:%=clean-%) + +.PHONY: $(PEAR_HORDE_PACKAGES:%=clean-%) +$(PEAR_HORDE_PACKAGES:%=clean-%): + make -e -C $(@:clean-%=%) clean + +.PHONY: snapshot-pear-horde +snapshot-pear-horde: $(PEAR_HORDE_PACKAGES:%=snapshot-%) + +.PHONY: $(PEAR_HORDE_PACKAGES:%=snapshot-%) +$(PEAR_HORDE_PACKAGES:%=snapshot-%): + make -e -C $(@:snapshot-%=%) snapshot + +#################### +# PEAR HORDE END +#################### + +#################### +# PEAR KOLAB START +#################### +# Sub targets for pear packages from pear.php.net .PHONY: fetch-pear-kolab -fetch-pear-kolab: - for PKG in $(PEAR_KOLAB_PACKAGES); \ - do \ - make -C $$PKG fetch || exit $$?; \ - done +fetch-pear-kolab: $(PEAR_KOLAB_PACKAGES:%=fetch-%) -dist-stage: - mkdir stage +.PHONY: $(PEAR_KOLAB_PACKAGES:%=fetch-%) +$(PEAR_KOLAB_PACKAGES:%=fetch-%): + make -e -C $(@:fetch-%=%) fetch + +.PHONY: dist-pear-kolab +dist-pear-kolab: $(PEAR_KOLAB_PACKAGES:%=dist-%) + +.PHONY: $(PEAR_KOLAB_PACKAGES:%=dist-%) +$(PEAR_KOLAB_PACKAGES:%=dist-%): + make -e -C $(@:dist-%=%) dist + +.PHONY: clean-pear-kolab +clean-pear-kolab: $(PEAR_KOLAB_PACKAGES:%=clean-%) + +.PHONY: $(PEAR_KOLAB_PACKAGES:%=clean-%) +$(PEAR_KOLAB_PACKAGES:%=clean-%): + make -e -C $(@:clean-%=%) clean + +#################### +# PEAR KOLAB END +#################### + +#################### +# PEAR CHANNEL START +#################### +# Sub targets for pear packages from pear.php.net + +.PHONY: dist-pear-channel +dist-pear-channel: $(PEAR_CHANNEL_PACKAGES:%=dist-%) + +.PHONY: $(PEAR_CHANNEL_PACKAGES:%=dist-%) +$(PEAR_CHANNEL_PACKAGES:%=dist-%): + make -e -C $(@:dist-%=%) dist + +.PHONY: clean-pear-channel +clean-pear-channel: $(PEAR_CHANNEL_PACKAGES:%=clean-%) + +.PHONY: $(PEAR_CHANNEL_PACKAGES:%=clean-%) +$(PEAR_CHANNEL_PACKAGES:%=clean-%): + make -e -C $(@:clean-%=%) clean + +#################### +# PEAR CHANNEL END +#################### + +#################### +# STAGING START +#################### +# Sub targets for the package staging area. + +stage: + mkdir -p stage .PHONY: clean-stage clean-stage: rm -rf stage +.PHONY: files +files: stage + cp $(BASE_FILES) stage/ + echo 'Remember to update 00INDEX.rdf and install-kolab.sh!' + +#################### +# STAGING END +#################### + +#################### +# UPDATE START +#################### +# Sub targets for updating an installed server to the packages +# generated from CVS. + +# +# @TODO: Needs to be completed +# + +.PHONY: update +update: dist + +#################### +# UPDATE END +#################### + +#################### +# TESTING START +#################### +# Sub targets for running test scripts on the server. +# + +# +# @TODO: Warning: Does not work yet! Needs to be completed. +# + .PHONY: test test: @for TEST in $(PHPUNIT_TESTS); \ @@ -318,9 +437,6 @@ fi; \ done -.PHONY: snapshots -snapshots: - for PKG in pear/Horde_*; \ - do \ - make -C $$PKG snapshot; \ - done +#################### +# TESTING END +#################### From cvs at kolab.org Mon Jan 18 14:40:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 14:40:13 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Format package.info,1.1,1.2 Message-ID: <20100118134013.B7ADF600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Format In directory doto:/tmp/cvs-serv30287/php-kolab/Kolab_Format Modified Files: package.info Log Message: Fix dependency. Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Format/package.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- package.info 17 Jan 2010 13:05:01 -0000 1.1 +++ package.info 18 Jan 2010 13:40:11 -0000 1.2 @@ -36,7 +36,7 @@ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ -PreReq: Horde_DOM>=0.1.0 \ \ +PreReq: Horde_DOM >= 0.1.0 \ PreReq: Horde_NLS \ PreReq: Horde_Util \ ' From cvs at kolab.org Mon Jan 18 17:00:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 17:00:23 +0100 (CET) Subject: gunnar: server/kolab-webclient kolab-webclient.spec,1.38,1.39 Message-ID: <20100118160023.27A1E600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv4522 Modified Files: kolab-webclient.spec Log Message: Use the horde package for the base installation. Index: kolab-webclient.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- kolab-webclient.spec 24 Jul 2009 07:33:06 -0000 1.38 +++ kolab-webclient.spec 18 Jan 2010 16:00:20 -0000 1.39 @@ -1,9 +1,9 @@ -# Versions +# Macros %define V_horde_name horde-webmail %define V_package kolab-webclient -%define V_year 2009 -%define V_month 07 -%define V_day 24 +%define V_year 2010 +%define V_month 01 +%define V_day 18 %define V_version 1.2.0 %define V_source_version 1.2 %define V_passwd_version 3.0.1 @@ -84,35 +84,7 @@ #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes -PreReq: kolabd -PreReq: Horde_Alarm -PreReq: Horde_Block -PreReq: Horde_Compress -PreReq: Horde_Crypt -PreReq: Horde_Data -PreReq: Horde_Editor -PreReq: Horde_Feed -PreReq: Horde_File_PDF -PreReq: Horde_Form -PreReq: Horde_Http_Client -PreReq: Horde_Image -PreReq: Horde_Maintenance -PreReq: Horde_Mobile -PreReq: Horde_Net_SMS -PreReq: Horde_RPC -PreReq: Horde_SessionHandler -PreReq: Horde_Share -PreReq: Horde_SyncML -PreReq: Horde_Template -PreReq: Horde_Text_Filter -PreReq: Horde_Text_Flowed -PreReq: Horde_Tree -PreReq: Kolab_Format >= 1.0.1 -PreReq: Kolab_Server >= 0.5.0 -PreReq: Kolab_Storage >= 0.4.0 -# Needed by horde -PreReq: PEAR-Services_Weather -PreReq: PEAR-DB +PreReq: horde >= 3.3.6 # Needed by horde (translation.php) PreReq: PEAR-Console_Table PreReq: PEAR-File_Find @@ -196,7 +168,8 @@ # Use the PEAR libraries from /kolab/lib/php rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear - sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql + # Remove the base horde application. It is now installed as a separate package. + rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/{COPYING,admin,docs,js,locale,po,rpc.php,services,templates,themes,README,config,index.php,lib,login.php,rpc,scripts,signup.php,test.php,util} cd .. From cvs at kolab.org Mon Jan 18 17:17:22 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 17:17:22 +0100 (CET) Subject: gunnar: server/kolab-webclient webclient-config_hooks.php.template, 1.2, NONE webclient-config_mime_drivers.php.template, 1.2, NONE webclient-config_motd.php.template, 1.2, NONE webclient-config_nls.php.template, 1.2, NONE webclient-config_prefs.php.template, 1.2, NONE webclient-config_registry.php.template, 1.2, NONE Message-ID: <20100118161722.DB6A6600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv5192 Removed Files: webclient-config_hooks.php.template webclient-config_mime_drivers.php.template webclient-config_motd.php.template webclient-config_nls.php.template webclient-config_prefs.php.template webclient-config_registry.php.template Log Message: Remove configuration that was moved into the horde base package. --- webclient-config_hooks.php.template DELETED --- --- webclient-config_mime_drivers.php.template DELETED --- --- webclient-config_motd.php.template DELETED --- --- webclient-config_nls.php.template DELETED --- --- webclient-config_prefs.php.template DELETED --- --- webclient-config_registry.php.template DELETED --- From cvs at kolab.org Mon Jan 18 18:43:39 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:43:39 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp - New directory Message-ID: <20100118174339.1F18C600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp In directory doto:/tmp/cvs-serv7435/imp Log Message: Directory /kolabrepository/server/kolab-webclient/imp added to the repository From cvs at kolab.org Mon Jan 18 18:43:39 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:43:39 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/configuration - New directory Message-ID: <20100118174339.1E46260014A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/configuration In directory doto:/tmp/cvs-serv7435/imp/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/imp/configuration added to the repository From cvs at kolab.org Mon Jan 18 18:43:39 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:43:39 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/templates/imp-4.3.6 - New directory Message-ID: <20100118174339.26C8D60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6 In directory doto:/tmp/cvs-serv7435/imp/templates/imp-4.3.6 Log Message: Directory /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6 added to the repository From cvs at kolab.org Mon Jan 18 18:43:39 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:43:39 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/templates - New directory Message-ID: <20100118174339.24489600573@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/templates In directory doto:/tmp/cvs-serv7435/imp/templates Log Message: Directory /kolabrepository/server/kolab-webclient/imp/templates added to the repository From cvs at kolab.org Mon Jan 18 18:43:39 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:43:39 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/configuration/imp-4.3.6 - New directory Message-ID: <20100118174339.21B9E600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6 In directory doto:/tmp/cvs-serv7435/imp/configuration/imp-4.3.6 Log Message: Directory /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6 added to the repository From cvs at kolab.org Mon Jan 18 18:44:24 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:44:24 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 imp.spec, NONE, 1.1 Message-ID: <20100118174424.9864B600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp In directory doto:/tmp/cvs-serv7556 Added Files: .cvsignore Makefile imp.spec Log Message: A first draft of the imp package. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk --- NEW FILE: imp.spec --- # Macros %define V_package imp %define V_version 4.3.6 %define V_release 20100118 # Package Information Name: %{V_package} Summary: IMP provides webmail access to IMAP and POP3 accounts. URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-imp_conf.php.template Source2: webclient-imp_header.php.template Source3: webclient-imp_hooks.php.template Source4: webclient-imp_menu.php.template Source5: webclient-imp_mime_drivers.php.template Source6: webclient-imp_motd.php.template Source7: webclient-imp_prefs.php.template Source8: webclient-imp_servers.php.template Source9: webclient-imp_spelling.php.template Source10: 10-kolab_conf_base.php Source11: 10-kolab_hooks_base.php Source12: 10-kolab_servers_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 PreReq: PEAR-Auth_SASL >= 1.0.2 PreReq: PEAR-Mail AutoReq: no AutoReqProv: no %description IMP is the Internet Messaging Program. It is written in PHP and provides webmail access to IMAP and POP3 accounts. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. rm test.php #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/header.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/hooks.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/menu.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/mime_drivers.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/motd.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/prefs.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/servers.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/spelling.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8} %{S:9} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/conf.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/hooks.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/servers.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/imp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_header.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_hooks.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_menu.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_mime_drivers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_motd.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_servers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_spelling.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/imp/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Mon Jan 18 18:44:24 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:44:24 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/templates/imp-4.3.6 webclient-imp_conf.php.template, NONE, 1.1 webclient-imp_header.php.template, NONE, 1.1 webclient-imp_hooks.php.template, NONE, 1.1 webclient-imp_menu.php.template, NONE, 1.1 webclient-imp_mime_drivers.php.template, NONE, 1.1 webclient-imp_motd.php.template, NONE, 1.1 webclient-imp_prefs.php.template, NONE, 1.1 webclient-imp_servers.php.template, NONE, 1.1 webclient-imp_spelling.php.template, NONE, 1.1 Message-ID: <20100118174424.A3F9960058D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6 In directory doto:/tmp/cvs-serv7556/templates/imp-4.3.6 Added Files: webclient-imp_conf.php.template webclient-imp_header.php.template webclient-imp_hooks.php.template webclient-imp_menu.php.template webclient-imp_mime_drivers.php.template webclient-imp_motd.php.template webclient-imp_prefs.php.template webclient-imp_servers.php.template webclient-imp_spelling.php.template Log Message: A first draft of the imp package. --- NEW FILE: webclient-imp_conf.php.template --- KOLAB_META_START TARGET=@@@imp_confdir@@@/conf.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6 In directory doto:/tmp/cvs-serv7556/configuration/imp-4.3.6 Added Files: 10-kolab_conf_base.php 10-kolab_hooks_base.php 10-kolab_servers_base.php Log Message: A first draft of the imp package. --- NEW FILE: 10-kolab_conf_base.php --- Secret::read(Secret::getKey('imp'), $_SESSION['imp']['pass']))); $imapParams = $session->getImapParams(); if (is_a($imapParams, 'PEAR_Error')) { $useDefaults = true; } else { $useDefaults = false; } $_SESSION['imp']['uniquser'] = $session->user_mail; } else { $useDefaults = true; } if ($useDefaults) { require_once 'Horde/Kolab.php'; if (is_callable('Kolab', 'getServer')) { $server = Kolab::getServer('imap'); if (is_a($server, 'PEAR_Error')) { $useDefaults = true; } else { $useDefaults = false; } } else { $useDefaults = true; } if ($useDefaults) { $server = $GLOBALS['conf']['kolab']['imap']['server']; } $imapParams = array( 'hostspec' => $server, 'port' => $GLOBALS['conf']['kolab']['imap']['port'], 'protocol' => $GLOBALS['conf']['auth']['params']['protocol'] ); } $servers['kolab'] = array( 'name' => 'Kolab Cyrus IMAP Server', 'hordeauth' => 'full', 'server' => $imapParams['hostspec'], 'port' => $imapParams['port'], 'protocol' => $imapParams['protocol'], 'maildomain' => $GLOBALS['conf']['kolab']['imap']['maildomain'], 'realm' => '', 'preferred' => '', 'quota' => array( 'driver' => 'imap', 'params' => array('hide_quota_when_unlimited' => true), ), 'acl' => array( 'driver' => 'rfc2086', ), ); From cvs at kolab.org Mon Jan 18 18:51:14 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:51:14 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde horde.spec,1.5,1.6 Message-ID: <20100118175114.7160B600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv7761/horde Modified Files: horde.spec Log Message: Prepare the configuration directories Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- horde.spec 12 Jan 2010 22:17:57 -0000 1.5 +++ horde.spec 18 Jan 2010 17:51:12 -0000 1.6 @@ -136,6 +136,14 @@ cd .. + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/hooks.d + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/mime.d + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/motd.d + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/nls.d + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/prefs.d + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/registry.d + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates From cvs at kolab.org Mon Jan 18 18:51:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 18:51:29 +0100 (CET) Subject: gunnar: server/kolab-webclient webclient-imp_conf.php.template, 1.2, NONE webclient-imp_header.php.template, 1.2, NONE webclient-imp_hooks.php.template, 1.2, NONE webclient-imp_menu.php.template, 1.2, NONE webclient-imp_mime_drivers.php.template, 1.2, NONE webclient-imp_motd.php.template, 1.2, NONE webclient-imp_prefs.php.template, 1.2, NONE webclient-imp_servers.php.template, 1.2, NONE webclient-imp_spelling.php.template, 1.2, NONE Message-ID: <20100118175129.92981600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv7802 Removed Files: webclient-imp_conf.php.template webclient-imp_header.php.template webclient-imp_hooks.php.template webclient-imp_menu.php.template webclient-imp_mime_drivers.php.template webclient-imp_motd.php.template webclient-imp_prefs.php.template webclient-imp_servers.php.template webclient-imp_spelling.php.template Log Message: Remove unneeded templates --- webclient-imp_conf.php.template DELETED --- --- webclient-imp_header.php.template DELETED --- --- webclient-imp_hooks.php.template DELETED --- --- webclient-imp_menu.php.template DELETED --- --- webclient-imp_mime_drivers.php.template DELETED --- --- webclient-imp_motd.php.template DELETED --- --- webclient-imp_prefs.php.template DELETED --- --- webclient-imp_servers.php.template DELETED --- --- webclient-imp_spelling.php.template DELETED --- From cvs at kolab.org Mon Jan 18 21:28:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:28:55 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/templates - New directory Message-ID: <20100118202855.5F3D360014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/templates In directory doto:/tmp/cvs-serv12808/dimp/templates Log Message: Directory /kolabrepository/server/kolab-webclient/dimp/templates added to the repository From cvs at kolab.org Mon Jan 18 21:28:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:28:55 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp - New directory Message-ID: <20100118202855.601D1600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp In directory doto:/tmp/cvs-serv12808/dimp Log Message: Directory /kolabrepository/server/kolab-webclient/dimp added to the repository From cvs at kolab.org Mon Jan 18 21:28:55 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:28:55 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/configuration - New directory Message-ID: <20100118202855.60101600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/configuration In directory doto:/tmp/cvs-serv12808/dimp/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/dimp/configuration added to the repository From cvs at kolab.org Mon Jan 18 21:29:14 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:29:14 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/templates/dimp-1.1.4 - New directory Message-ID: <20100118202914.3011B600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4 In directory doto:/tmp/cvs-serv12895/dimp/templates/dimp-1.1.4 Log Message: Directory /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4 added to the repository From cvs at kolab.org Mon Jan 18 21:29:14 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:29:14 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/configuration/dimp-1.1.4 - New directory Message-ID: <20100118202914.2E22860014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/configuration/dimp-1.1.4 In directory doto:/tmp/cvs-serv12895/dimp/configuration/dimp-1.1.4 Log Message: Directory /kolabrepository/server/kolab-webclient/dimp/configuration/dimp-1.1.4 added to the repository From cvs at kolab.org Mon Jan 18 21:33:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:33:58 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/configuration/dimp-1.1.4 10-kolab_servers_base.php, NONE, 1.1 Message-ID: <20100118203358.DB896600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/configuration/dimp-1.1.4 In directory doto:/tmp/cvs-serv12994/configuration/dimp-1.1.4 Added Files: 10-kolab_servers_base.php Log Message: Draft version of the dimp package. --- NEW FILE: 10-kolab_servers_base.php --- 'Kolab Cyrus IMAP Server', 'server' => $server, 'hordeauth' => 'full', 'protocol' => 'imap/notls/novalidate-cert', 'port' => $GLOBALS['conf']['kolab']['imap']['port'], 'maildomain' => $GLOBALS['conf']['kolab']['imap']['maildomain'], 'realm' => '', 'preferred' => '', 'quota' => array( 'driver' => 'imap', 'params' => array('hide_quota_when_unlimited' => true), ), 'acl' => array( 'driver' => 'rfc2086', ), ); From cvs at kolab.org Mon Jan 18 21:33:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:33:58 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 dimp.spec, NONE, 1.1 Message-ID: <20100118203358.D7C1D60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp In directory doto:/tmp/cvs-serv12994 Added Files: .cvsignore Makefile dimp.spec Log Message: Draft version of the dimp package. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk --- NEW FILE: dimp.spec --- # Macros %define V_package dimp %define V_version 1.1.4 %define V_release 20100118 # Package Information Name: %{V_package} Summary: DIMP is a project to create a version of IMP utilizing AJAX-like technologies to allow a more dynamic user experience (thus DIMP... Dynamic IMP). URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-dimp_conf.php.template Source2: webclient-dimp_hooks.php.template Source3: webclient-dimp_menu.php.template Source4: webclient-dimp_portal.php.template Source5: webclient-dimp_prefs.php.template Source6: webclient-dimp_servers.php.template Source7: 10-kolab_servers_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 PreReq: imp-4.3.6 AutoReq: no AutoReqProv: no %description IMP is the Internet Messaging Program. It is written in PHP and provides webmail access to IMAP and POP3 accounts. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/hooks.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/menu.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/portal.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/prefs.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/servers.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:7} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/servers.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/dimp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_hooks.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_menu.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_portal.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_servers.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/dimp/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Mon Jan 18 21:33:58 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 21:33:58 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/templates/dimp-1.1.4 webclient-dimp_conf.php.template, NONE, 1.1 webclient-dimp_hooks.php.template, NONE, 1.1 webclient-dimp_menu.php.template, NONE, 1.1 webclient-dimp_portal.php.template, NONE, 1.1 webclient-dimp_prefs.php.template, NONE, 1.1 webclient-dimp_servers.php.template, NONE, 1.1 Message-ID: <20100118203358.E1CE5600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4 In directory doto:/tmp/cvs-serv12994/templates/dimp-1.1.4 Added Files: webclient-dimp_conf.php.template webclient-dimp_hooks.php.template webclient-dimp_menu.php.template webclient-dimp_portal.php.template webclient-dimp_prefs.php.template webclient-dimp_servers.php.template Log Message: Draft version of the dimp package. --- NEW FILE: webclient-dimp_conf.php.template --- KOLAB_META_START TARGET=@@@dimp_confdir@@@/conf.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/openpkg In directory doto:/tmp/cvs-serv17112 Modified Files: Makefile Log Message: Fix tar packaging. Index: Makefile =================================================================== RCS file: /kolabrepository/server/openpkg/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 18 Jan 2010 10:57:41 -0000 1.4 +++ Makefile 18 Jan 2010 22:53:28 -0000 1.5 @@ -29,7 +29,7 @@ include ../make-helper/fetch.mk $(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm - cd $(KOLABRPMSRC)/$(PACKAGE) && rm $(PACKAGE2)-*.tar.gz && ./openpkg.boot -s + cd $(KOLABRPMSRC)/$(PACKAGE) && rm $(PACKAGE2)-1.19.tar.gz && ./openpkg.boot -s $(PACKAGE2).patch: $(KOLABRPMSRC)/$(PACKAGE2)/.dir cp $(KOLABRPMSRC)/$(PACKAGE2)/$(PACKAGE2).patch . From cvs at kolab.org Mon Jan 18 23:54:24 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 23:54:24 +0100 (CET) Subject: gunnar: server TODO,1.10,1.11 Message-ID: <20100118225424.73B5860014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv17170 Modified Files: TODO Log Message: Additional completed TODOs. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TODO 11 Jan 2010 13:18:54 -0000 1.10 +++ TODO 18 Jan 2010 22:54:22 -0000 1.11 @@ -44,14 +44,14 @@ kolabd openldap [DONE] openpkg [DONE] - pear packages + pear packages [DONE] perl-kolab - perl-ldap + perl-ldap [DONE] php [DONE] - php-kolab + php-kolab [DONE] php-smarty [DONE] - postfix - sqlite + postfix [DONE] + sqlite [DONE] Short test of updated packages ... @@ -77,9 +77,11 @@ Sascha (wilde): - - merges (from kolab_2_2_branch): + - small effort: + + + - larger effort: - (no public issue) Makefile cleanup (kolab.mk) Additional targets that might be done: From cvs at kolab.org Mon Jan 18 23:55:27 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 23:55:27 +0100 (CET) Subject: gunnar: server/kolab-webclient webclient-dimp_conf.php.template, 1.2, NONE webclient-dimp_hooks.php.template, 1.2, NONE webclient-dimp_menu.php.template, 1.2, NONE webclient-dimp_portal.php.template, 1.2, NONE webclient-dimp_prefs.php.template, 1.2, NONE webclient-dimp_servers.php.template, 1.2, NONE Message-ID: <20100118225527.A991460014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv17236 Removed Files: webclient-dimp_conf.php.template webclient-dimp_hooks.php.template webclient-dimp_menu.php.template webclient-dimp_portal.php.template webclient-dimp_prefs.php.template webclient-dimp_servers.php.template Log Message: The dimp templates are now available in the dimp package. --- webclient-dimp_conf.php.template DELETED --- --- webclient-dimp_hooks.php.template DELETED --- --- webclient-dimp_menu.php.template DELETED --- --- webclient-dimp_portal.php.template DELETED --- --- webclient-dimp_prefs.php.template DELETED --- --- webclient-dimp_servers.php.template DELETED --- From cvs at kolab.org Mon Jan 18 23:56:35 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 18 Jan 2010 23:56:35 +0100 (CET) Subject: gunnar: server/make-helper kolab.mk,1.3,1.4 Message-ID: <20100118225635.81C7A60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv17280/make-helper Modified Files: kolab.mk Log Message: Add a variable that carries the name of the kolab user. Index: kolab.mk =================================================================== RCS file: /kolabrepository/server/make-helper/kolab.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolab.mk 11 Jan 2010 15:50:41 -0000 1.3 +++ kolab.mk 18 Jan 2010 22:56:33 -0000 1.4 @@ -12,6 +12,9 @@ $(error Could not determine KOLABDIR!) endif +# The core Kolab server user +KOLABUSR=$(KOLABDIR:/%=%) + # Set the location of the rpm binary if it is unset RPM ?= $(KOLABDIR)/bin/openpkg rpm From cvs at kolab.org Tue Jan 19 00:01:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 00:01:48 +0100 (CET) Subject: gunnar: server/make-helper pear.mk,1.4,1.5 Message-ID: <20100118230148.DF15160014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv17399/make-helper Modified Files: pear.mk Log Message: Ensure the path is specified when sourcing package.info. Index: pear.mk =================================================================== RCS file: /kolabrepository/server/make-helper/pear.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pear.mk 17 Jan 2010 13:03:48 -0000 1.4 +++ pear.mk 18 Jan 2010 23:01:46 -0000 1.5 @@ -210,7 +210,7 @@ done $(PACKAGE).spec: ../../pear/pear.spec.template package.info - source package.info && \ + source ./package.info && \ cat ../../pear/pear.spec.template | \ sed -e "s#[@]pear_pkgdir[@]#$${pear_pkgdir}#g" \ -e "s#[@]pear_package[@]#$${pear_package}#g" \ From cvs at kolab.org Tue Jan 19 05:45:06 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:45:06 +0100 (CET) Subject: gunnar: server/kolab-webclient/ingo - New directory Message-ID: <20100119044506.18F7260014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo In directory doto:/tmp/cvs-serv6136/ingo Log Message: Directory /kolabrepository/server/kolab-webclient/ingo added to the repository From cvs at kolab.org Tue Jan 19 05:45:22 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:45:22 +0100 (CET) Subject: gunnar: server/kolab-webclient/ingo/templates - New directory Message-ID: <20100119044522.27D21600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo/templates In directory doto:/tmp/cvs-serv6175/templates Log Message: Directory /kolabrepository/server/kolab-webclient/ingo/templates added to the repository From cvs at kolab.org Tue Jan 19 05:45:22 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:45:22 +0100 (CET) Subject: gunnar: server/kolab-webclient/ingo/templates/ingo-1.2.3 - New directory Message-ID: <20100119044522.30760600571@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo/templates/ingo-1.2.3 In directory doto:/tmp/cvs-serv6175/templates/ingo-1.2.3 Log Message: Directory /kolabrepository/server/kolab-webclient/ingo/templates/ingo-1.2.3 added to the repository From cvs at kolab.org Tue Jan 19 05:45:22 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:45:22 +0100 (CET) Subject: gunnar: server/kolab-webclient/ingo/configuration - New directory Message-ID: <20100119044522.25F8460014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo/configuration In directory doto:/tmp/cvs-serv6175/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/ingo/configuration added to the repository From cvs at kolab.org Tue Jan 19 05:45:22 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:45:22 +0100 (CET) Subject: gunnar: server/kolab-webclient/ingo/configuration/ingo-1.2.3 - New directory Message-ID: <20100119044522.2D842600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo/configuration/ingo-1.2.3 In directory doto:/tmp/cvs-serv6175/configuration/ingo-1.2.3 Log Message: Directory /kolabrepository/server/kolab-webclient/ingo/configuration/ingo-1.2.3 added to the repository From cvs at kolab.org Tue Jan 19 05:45:50 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:45:50 +0100 (CET) Subject: gunnar: server/kolab-webclient/ingo/configuration/ingo-1.2.3 10-kolab_backends_base.php, NONE, 1.1 10-kolab_conf_base.php, NONE, 1.1 Message-ID: <20100119044550.44F1F600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo/configuration/ingo-1.2.3 In directory doto:/tmp/cvs-serv6240/configuration/ingo-1.2.3 Added Files: 10-kolab_backends_base.php 10-kolab_conf_base.php Log Message: Add draft for the ingo package. --- NEW FILE: 10-kolab_backends_base.php --- 'timsieved', 'preferred' => '', 'hordeauth' => 'full', 'params' => array( 'hostspec' => $server, 'logintype' => 'PLAIN', 'usetls' => false, 'port' => $GLOBALS['conf']['kolab']['imap']['sieveport'], 'scriptname' => 'kmail-vacation.siv' ), 'script' => 'sieve', 'scriptparams' => array(), 'shares' => false ); --- NEW FILE: 10-kolab_conf_base.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo/templates/ingo-1.2.3 In directory doto:/tmp/cvs-serv6240/templates/ingo-1.2.3 Added Files: webclient-ingo_backends.php.template webclient-ingo_conf.php.template webclient-ingo_fields.php.template webclient-ingo_hooks.php.template webclient-ingo_prefs.php.template Log Message: Add draft for the ingo package. --- NEW FILE: webclient-ingo_backends.php.template --- KOLAB_META_START TARGET=@@@ingo_confdir@@@/backends.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo In directory doto:/tmp/cvs-serv6240 Added Files: .cvsignore Makefile ingo.spec Log Message: Add draft for the ingo package. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk --- NEW FILE: ingo.spec --- # Macros %define V_package ingo %define V_version 1.2.3 %define V_release 20100118 # Package Information Name: %{V_package} Summary: Ingo, the Email Filter Rules Manager URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-ingo_backends.php.template Source2: webclient-ingo_conf.php.template Source3: webclient-ingo_fields.php.template Source4: webclient-ingo_hooks.php.template Source5: webclient-ingo_prefs.php.template Source6: 10-kolab_backends_base.php Source7: 10-kolab_conf_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 PreReq: imp-4.3.6 PreReq: PEAR-Net_Sieve AutoReq: no AutoReqProv: no %description Ingo, the "Email Filter Rules Manager", started as a frontend for the Sieve filter language, and is now a generic and complete filter rule frontend that currently is able to create Sieve, procmail, maildrop, and IMAP filter rules. The IMAP filter driver translates the filter rules on demand to IMAP commands, executed via PHP's IMAP extension and has replaced INGO's internal filtering code. It is now the default filtering agent in INGO H3 (4.x). %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. rm test.php #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/backends.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/fields.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/hooks.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/prefs.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:6} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/backends.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:7} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/conf.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/ingo/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_backends.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_fields.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_hooks.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_prefs.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/ingo/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Tue Jan 19 05:47:15 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:47:15 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde horde.spec,1.6,1.7 Message-ID: <20100119044715.48F5960014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv6304/kolab-webclient/horde Modified Files: horde.spec Log Message: Add missing dependencies Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- horde.spec 18 Jan 2010 17:51:12 -0000 1.6 +++ horde.spec 19 Jan 2010 04:47:13 -0000 1.7 @@ -67,6 +67,9 @@ # Needed by horde PreReq: PEAR-Services_Weather PreReq: PEAR-DB +# Needed by horde (translation.php) +PreReq: PEAR-Console_Table +PreReq: PEAR-File_Find AutoReq: no AutoReqProv: no From cvs at kolab.org Tue Jan 19 05:53:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:53:28 +0100 (CET) Subject: gunnar: server/kolab-webadmin Makefile,1.19,1.20 Message-ID: <20100119045328.BB8F9600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin In directory doto:/tmp/cvs-serv6448/kolab-webadmin Modified Files: Makefile Log Message: Allow to use the staging area for an update. Copy the binary packages into the staging area too. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile 18 Jan 2010 10:55:17 -0000 1.19 +++ Makefile 19 Jan 2010 04:53:26 -0000 1.20 @@ -20,7 +20,8 @@ $(RPM) -ba $(PACKAGE).spec dist: all - cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/ + cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/source + cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm ../stage/$(PLATTAG) .PHONY: clean_all clean_all: clean From cvs at kolab.org Tue Jan 19 05:53:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:53:28 +0100 (CET) Subject: gunnar: server/kolabd Makefile,1.21,1.22 Message-ID: <20100119045328.BF3B0600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv6448/kolabd Modified Files: Makefile Log Message: Allow to use the staging area for an update. Copy the binary packages into the staging area too. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolabd/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile 18 Jan 2010 10:55:16 -0000 1.21 +++ Makefile 19 Jan 2010 04:53:26 -0000 1.22 @@ -21,7 +21,8 @@ $(RPM) -bB $(PACKAGE).spec dist: all - cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/ + cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/source + cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm ../stage/$(PLATTAG) tar: test -d $(MAKETAR)/$(PACKAGE) || mkdir -p $(MAKETAR)/$(PACKAGE) From cvs at kolab.org Tue Jan 19 05:53:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:53:28 +0100 (CET) Subject: gunnar: server/perl-kolab Makefile.PL,1.20,1.21 Message-ID: <20100119045328.C6D16600573@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv6448/perl-kolab Modified Files: Makefile.PL Log Message: Allow to use the staging area for an update. Copy the binary packages into the staging area too. Index: Makefile.PL =================================================================== RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile.PL 5 Jan 2010 23:04:00 -0000 1.20 +++ Makefile.PL 19 Jan 2010 04:53:26 -0000 1.21 @@ -144,7 +144,8 @@ rm -rf *~ dist_openpkg: perl-kolab.spec \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm - cp \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm ../stage/ + cp \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm ../stage/source + cp \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).\$(PLATTAG).rpm ../stage/\$(PLATTAG) \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).\$(PLATTAG).rpm \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm: \$(PACKAGE).spec test -d \$(KOLABRPMSRC)/\$(PACKAGE) || mkdir \$(KOLABRPMSRC)/\$(PACKAGE) From cvs at kolab.org Tue Jan 19 05:53:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:53:28 +0100 (CET) Subject: gunnar: server Makefile,1.94,1.95 Message-ID: <20100119045328.B6E3B60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6448 Modified Files: Makefile Log Message: Allow to use the staging area for an update. Copy the binary packages into the staging area too. Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- Makefile 18 Jan 2010 11:02:16 -0000 1.94 +++ Makefile 19 Jan 2010 04:53:26 -0000 1.95 @@ -149,19 +149,8 @@ BASE_FILES=install-kolab.sh \ 1st.README -# These are the packages that already provide a "make install" -# procedure that will allow to update packages from CVS. -UPDATES=imapd \ - openldap \ - apache-php \ - php \ - kolabd \ - pear/Horde_Notification \ - pear/Horde_Prefs \ - php-kolab/Kolab_Filter \ - php-kolab/Kolab_Server \ - php-kolab/Kolab_Storage \ - kolab-webclient +CURRENT_SOURCE_RELEASE = http://files.kolab.org/server/release/kolab-server-2.2.3/sources/ +CURRENT_BINARY_RELEASE = http://files.kolab.org/server/release/kolab-server-2.2.3/$(PLATTAG)/ PHPUNIT=$(HOME)/bin/phpunit @@ -380,17 +369,17 @@ #################### # Sub targets for the package staging area. -stage: - mkdir -p stage +stage/source: + mkdir -p stage/source .PHONY: clean-stage clean-stage: rm -rf stage .PHONY: files -files: stage - cp $(BASE_FILES) stage/ - echo 'Remember to update 00INDEX.rdf and install-kolab.sh!' +files: stage/source + cp $(BASE_FILES) stage/source/ + echo 'Remember to update 00INDEX.rdf!' #################### # STAGING END @@ -402,12 +391,21 @@ # Sub targets for updating an installed server to the packages # generated from CVS. -# -# @TODO: Needs to be completed -# - .PHONY: update -update: dist +update: dist stage/update/source + +stage/release/source: + mkdir -p stage/release/source + cd stage/release/source && wget -r -l1 -nd --no-parent $(CURRENT_SOURCE_RELEASE) + +stage/update/source: stage/release/source + rm -rf stage/update/source + mkdir -p stage/update/source + rsync -avz stage/release/source/ stage/update/source/ + rsync -avz stage/source/ stage/update/source/ + chown -R $(KOLABUSR)\: stage/update/source + cd stage/update/source && sh install-kolab.sh -X + cd stage/update/source && sh install-kolab.sh 2>&1 | tee kolab-update.log #################### # UPDATE END From cvs at kolab.org Tue Jan 19 05:53:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:53:28 +0100 (CET) Subject: gunnar: server/make-helper package.mk,1.10,1.11 Message-ID: <20100119045328.C2F10600571@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv6448/make-helper Modified Files: package.mk Log Message: Allow to use the staging area for an update. Copy the binary packages into the staging area too. Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- package.mk 18 Jan 2010 10:57:00 -0000 1.10 +++ package.mk 19 Jan 2010 04:53:26 -0000 1.11 @@ -9,6 +9,7 @@ BUILD_OPTIONS ?= RELEASETARGET ?= $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +BINTARGET ?= $(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm CLEAN_EXTRA ?= @@ -20,7 +21,7 @@ # includes building the binary package which is an additional check for # the final release. Thus it is the default target. .PHONY: dist -dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(STAGING)/$(RELEASETARGET) +dist: $(KOLABRPMPKG)/$(BINTARGET) $(STAGING)/source/$(RELEASETARGET) $(STAGING)/$(PLATTAG)/$(BINTARGET) # Target for placing the source rpm in the staging area. This is the soft # variant that is quicker and omits the binary package. @@ -30,8 +31,8 @@ # Target for installing the binary rpm package in our current Kolab # server installation .PHONY: install -install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm - $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm +install: $(KOLABRPMPKG)/$(BINTARGET) + $(RPM) -Uhv --force $(KOLABRPMPKG)/$(BINTARGET) # Target for cleaning up the files that can be generated with this Makefile .PHONY: clean @@ -39,7 +40,7 @@ rm -rf $(KOLABRPMSRC)/$(PACKAGE) rm -rf $(KOLABRPMTMP)/$(PACKAGE)* rm -f $(KOLABRPMPKG)/$(RELEASETARGET) - rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm + rm -f $(KOLABRPMPKG)/$(BINTARGET) rm -f $(RELEASETARGET) rm -f *.tar.gz *.tgz *.tar.bz2 rm -f *~ @@ -74,10 +75,19 @@ endif # Prepare the staging area -$(STAGING)/.dir: +$(STAGING)/source/.dir: mkdir -p $(STAGING) - touch $(STAGING)/.dir + touch $(STAGING)/source/.dir # Final package location -$(STAGING)/$(RELEASETARGET): $(STAGING)/.dir $(RELEASETARGET) - cp $(RELEASETARGET) $(STAGING) +$(STAGING)/source/$(RELEASETARGET): $(STAGING)/source/.dir $(RELEASETARGET) + cp $(RELEASETARGET) $(STAGING)/source + +# Prepare the binary staging area +$(STAGING)/$(PLATTAG)/.dir: + mkdir -p $(STAGING)/$(PLATTAG) + touch $(STAGING)/$(PLATTAG)/.dir + +# Final binary package location +$(STAGING)/$(PLATTAG)/$(BINTARGET): $(STAGING)/$(PLATTAG)/.dir $(KOLABRPMPKG)/$(BINTARGET) + cp $(KOLABRPMPKG)/$(BINTARGET) $(STAGING)/$(PLATTAG) From cvs at kolab.org Tue Jan 19 05:54:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:54:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp - New directory Message-ID: <20100119045441.E4E5F600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp In directory doto:/tmp/cvs-serv6594/mimp Log Message: Directory /kolabrepository/server/kolab-webclient/mimp added to the repository From cvs at kolab.org Tue Jan 19 05:54:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:54:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/mnemo - New directory Message-ID: <20100119045441.E7D29600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo In directory doto:/tmp/cvs-serv6594/mnemo Log Message: Directory /kolabrepository/server/kolab-webclient/mnemo added to the repository From cvs at kolab.org Tue Jan 19 05:54:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:54:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd - New directory Message-ID: <20100119045441.ED07D600573@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd In directory doto:/tmp/cvs-serv6594/passwd Log Message: Directory /kolabrepository/server/kolab-webclient/passwd added to the repository From cvs at kolab.org Tue Jan 19 05:54:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:54:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith - New directory Message-ID: <20100119045441.E304560014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith In directory doto:/tmp/cvs-serv6594/kronolith Log Message: Directory /kolabrepository/server/kolab-webclient/kronolith added to the repository From cvs at kolab.org Tue Jan 19 05:54:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:54:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba - New directory Message-ID: <20100119045441.F07D060057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba In directory doto:/tmp/cvs-serv6594/turba Log Message: Directory /kolabrepository/server/kolab-webclient/turba added to the repository From cvs at kolab.org Tue Jan 19 05:54:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 05:54:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/nag - New directory Message-ID: <20100119045441.E9C24600571@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag In directory doto:/tmp/cvs-serv6594/nag Log Message: Directory /kolabrepository/server/kolab-webclient/nag added to the repository From cvs at kolab.org Tue Jan 19 06:01:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:01:59 +0100 (CET) Subject: gunnar: server/kolab-webclient webclient-ingo_backends.php.template, 1.2, NONE webclient-ingo_conf.php.template, 1.2, NONE webclient-ingo_fields.php.template, 1.2, NONE webclient-ingo_hooks.php.template, 1.2, NONE webclient-ingo_prefs.php.template, 1.2, NONE Message-ID: <20100119050159.6ECF860014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv6812 Removed Files: webclient-ingo_backends.php.template webclient-ingo_conf.php.template webclient-ingo_fields.php.template webclient-ingo_hooks.php.template webclient-ingo_prefs.php.template Log Message: Remove templates now available in the ingo package --- webclient-ingo_backends.php.template DELETED --- --- webclient-ingo_conf.php.template DELETED --- --- webclient-ingo_fields.php.template DELETED --- --- webclient-ingo_hooks.php.template DELETED --- --- webclient-ingo_prefs.php.template DELETED --- From cvs at kolab.org Tue Jan 19 06:24:06 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:24:06 +0100 (CET) Subject: gunnar: server/make-helper package.mk,1.11,1.12 Message-ID: <20100119052406.50DBD60014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/make-helper In directory doto:/tmp/cvs-serv7629 Modified Files: package.mk Log Message: Corrected creating the source stage. Index: package.mk =================================================================== RCS file: /kolabrepository/server/make-helper/package.mk,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- package.mk 19 Jan 2010 04:53:26 -0000 1.11 +++ package.mk 19 Jan 2010 05:24:04 -0000 1.12 @@ -76,7 +76,7 @@ # Prepare the staging area $(STAGING)/source/.dir: - mkdir -p $(STAGING) + mkdir -p $(STAGING)/source touch $(STAGING)/source/.dir # Final package location From cvs at kolab.org Tue Jan 19 06:35:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:35:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp/templates - New directory Message-ID: <20100119053559.C4CB260014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/templates In directory doto:/tmp/cvs-serv8133/templates Log Message: Directory /kolabrepository/server/kolab-webclient/mimp/templates added to the repository From cvs at kolab.org Tue Jan 19 06:35:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:35:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp/templates/mimp-1.1.3 - New directory Message-ID: <20100119053559.C7BD3600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3 In directory doto:/tmp/cvs-serv8133/templates/mimp-1.1.3 Log Message: Directory /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3 added to the repository From cvs at kolab.org Tue Jan 19 06:36:26 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:36:26 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp/templates/mimp-1.1.3 webclient-mimp_conf.php.template, NONE, 1.1 webclient-mimp_menu.php.template, NONE, 1.1 webclient-mimp_mime_drivers.php.template, NONE, 1.1 webclient-mimp_prefs.php.template, NONE, 1.1 Message-ID: <20100119053626.EC13A600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3 In directory doto:/tmp/cvs-serv8213/templates/mimp-1.1.3 Added Files: webclient-mimp_conf.php.template webclient-mimp_menu.php.template webclient-mimp_mime_drivers.php.template webclient-mimp_prefs.php.template Log Message: Draft package for mimp. --- NEW FILE: webclient-mimp_conf.php.template --- KOLAB_META_START TARGET=@@@mimp_confdir@@@/conf.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp In directory doto:/tmp/cvs-serv8213 Added Files: .cvsignore Makefile mimp.spec Log Message: Draft package for mimp. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk include ../../make-helper/fetch.mk --- NEW FILE: mimp.spec --- # Macros %define V_package mimp %define V_version 1.1.3 %define V_release 20100119 # Package Information Name: %{V_package} Summary: MIMP is a project to create a version of IMP suitable for mobile devices such as WAP phones or PDAs. URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-mimp_conf.php.template Source2: webclient-mimp_menu.php.template Source3: webclient-mimp_mime_drivers.php.template Source4: webclient-mimp_prefs.php.template # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 PreReq: imp-4.3.6 AutoReq: no AutoReqProv: no %description IMP is the Internet Messaging Program. It is written in PHP and provides webmail access to IMAP and POP3 accounts. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mimp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mimp cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mimp/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mimp/config/menu.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mimp/config/mime_drivers.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mimp/config/prefs.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/mimp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_menu.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_mime_drivers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_prefs.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/mimp/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Tue Jan 19 06:41:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:41:56 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp Makefile,1.1,1.2 Message-ID: <20100119054156.8B24460014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp In directory doto:/tmp/cvs-serv8363/dimp Modified Files: Makefile Log Message: Add fetch target. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 18 Jan 2010 20:33:56 -0000 1.1 +++ Makefile 19 Jan 2010 05:41:54 -0000 1.2 @@ -17,3 +17,4 @@ EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk +include ../../make-helper/fetch.mk From cvs at kolab.org Tue Jan 19 06:41:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:41:56 +0100 (CET) Subject: gunnar: server/kolab-webclient/ingo Makefile,1.1,1.2 Message-ID: <20100119054156.9D66D600571@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/ingo In directory doto:/tmp/cvs-serv8363/ingo Modified Files: Makefile Log Message: Add fetch target. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webclient/ingo/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 19 Jan 2010 04:45:48 -0000 1.1 +++ Makefile 19 Jan 2010 05:41:54 -0000 1.2 @@ -17,3 +17,4 @@ EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk +include ../../make-helper/fetch.mk From cvs at kolab.org Tue Jan 19 06:41:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:41:56 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde Makefile,1.3,1.4 Message-ID: <20100119054156.995FA600173@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv8363/horde Modified Files: Makefile Log Message: Add fetch target. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 12 Jan 2010 22:16:11 -0000 1.3 +++ Makefile 19 Jan 2010 05:41:54 -0000 1.4 @@ -16,3 +16,4 @@ EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk +include ../../make-helper/fetch.mk From cvs at kolab.org Tue Jan 19 06:41:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:41:56 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp Makefile,1.1,1.2 Message-ID: <20100119054156.8D017600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp In directory doto:/tmp/cvs-serv8363/imp Modified Files: Makefile Log Message: Add fetch target. Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 18 Jan 2010 17:44:22 -0000 1.1 +++ Makefile 19 Jan 2010 05:41:54 -0000 1.2 @@ -17,3 +17,4 @@ EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk +include ../../make-helper/fetch.mk From cvs at kolab.org Tue Jan 19 06:44:08 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 06:44:08 +0100 (CET) Subject: gunnar: server/kolab-webclient webclient-mimp_conf.php.template, 1.2, NONE webclient-mimp_menu.php.template, 1.2, NONE webclient-mimp_mime_drivers.php.template, 1.2, NONE webclient-mimp_prefs.php.template, 1.2, NONE Message-ID: <20100119054408.8ABD060014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv8522 Removed Files: webclient-mimp_conf.php.template webclient-mimp_menu.php.template webclient-mimp_mime_drivers.php.template webclient-mimp_prefs.php.template Log Message: Remove templates now available in the mimp package. --- webclient-mimp_conf.php.template DELETED --- --- webclient-mimp_menu.php.template DELETED --- --- webclient-mimp_mime_drivers.php.template DELETED --- --- webclient-mimp_prefs.php.template DELETED --- From cvs at kolab.org Tue Jan 19 07:58:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 07:58:29 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/templates/kronolith-2.3.3 - New directory Message-ID: <20100119065829.5030F60056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/templates/kronolith-2.3.3 In directory doto:/tmp/cvs-serv10778/templates/kronolith-2.3.3 Log Message: Directory /kolabrepository/server/kolab-webclient/kronolith/templates/kronolith-2.3.3 added to the repository From cvs at kolab.org Tue Jan 19 07:58:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 07:58:29 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/configuration/kronolith-2.3.3 - New directory Message-ID: <20100119065829.52B6960057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/configuration/kronolith-2.3.3 In directory doto:/tmp/cvs-serv10778/configuration/kronolith-2.3.3 Log Message: Directory /kolabrepository/server/kolab-webclient/kronolith/configuration/kronolith-2.3.3 added to the repository From cvs at kolab.org Tue Jan 19 07:58:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 07:58:29 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/configuration - New directory Message-ID: <20100119065829.5105C60056E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/configuration In directory doto:/tmp/cvs-serv10778/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/kronolith/configuration added to the repository From cvs at kolab.org Tue Jan 19 07:58:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 07:58:29 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/templates - New directory Message-ID: <20100119065829.5297960056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/templates In directory doto:/tmp/cvs-serv10778/templates Log Message: Directory /kolabrepository/server/kolab-webclient/kronolith/templates added to the repository From cvs at kolab.org Tue Jan 19 08:00:01 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:00:01 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/templates/kronolith-2.3.3 webclient-kronolith-kolab-conf.template, NONE, 1.1 webclient-kronolith_keywords.php.template, NONE, 1.1 webclient-kronolith_menu.php.template, NONE, 1.1 webclient-kronolith_prefs.php.template, NONE, 1.1 Message-ID: <20100119070001.1143E60056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/templates/kronolith-2.3.3 In directory doto:/tmp/cvs-serv10917/templates/kronolith-2.3.3 Added Files: webclient-kronolith-kolab-conf.template webclient-kronolith_keywords.php.template webclient-kronolith_menu.php.template webclient-kronolith_prefs.php.template Log Message: Draft of the kronolith package. --- NEW FILE: webclient-kronolith-kolab-conf.template --- KOLAB_META_START TARGET=@@@kronolith_confdir@@@/kolab.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END --- NEW FILE: webclient-kronolith_keywords.php.template --- KOLAB_META_START TARGET=@@@kronolith_confdir@@@/keywords.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith In directory doto:/tmp/cvs-serv10917 Added Files: .cvsignore Makefile kronolith.spec Log Message: Draft of the kronolith package. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk include ../../make-helper/fetch.mk --- NEW FILE: kronolith.spec --- # Macros %define V_package kronolith %define V_version 2.3.3 %define V_release 20100119 # Package Information Name: %{V_package} Summary: Kronolith Calendar Application URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-kronolith-kolab-conf.template Source2: webclient-kronolith_keywords.php.template Source3: webclient-kronolith_menu.php.template Source4: webclient-kronolith_prefs.php.template Source5: 10-kolab_conf_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 PreReq: PEAR-Date_Holidays_Austria >= 0.1.3 PreReq: PEAR-Date_Holidays_Brazil >= 0.1.2 PreReq: PEAR-Date_Holidays_Denmark >= 0.1.3 PreReq: PEAR-Date_Holidays_Discordian >= 0.1.1 PreReq: PEAR-Date_Holidays_EnglandWales >= 0.1.2 PreReq: PEAR-Date_Holidays_Germany >= 0.1.2 PreReq: PEAR-Date_Holidays_Iceland >= 0.1.2 PreReq: PEAR-Date_Holidays_Ireland >= 0.1.2 PreReq: PEAR-Date_Holidays_Italy >= 0.1.1 PreReq: PEAR-Date_Holidays_Japan >= 0.1.1 PreReq: PEAR-Date_Holidays_Netherlands >= 0.1.2 PreReq: PEAR-Date_Holidays_Norway >= 0.1.2 PreReq: PEAR-Date_Holidays_Romania >= 0.1.2 PreReq: PEAR-Date_Holidays_Slovenia >= 0.1.2 PreReq: PEAR-Date_Holidays_Sweden >= 0.1.2 PreReq: PEAR-Date_Holidays_Ukraine >= 0.1.2 PreReq: PEAR-Date_Holidays_UNO >= 0.1.3 PreReq: PEAR-Date_Holidays_USA >= 0.1.1 AutoReq: no AutoReqProv: no %description Kronolith is the Horde calendar application. It provides a stable and featureful individual calendar system for every Horde user, with integrated collaboration/scheduling features. It makes extensive use of the Horde Framework to provide integration with other applications. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. rm test.php #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith/config/keywords.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith/config/menu.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith/config/prefs.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:5} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith/config/conf.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/kronolith/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith-kolab-conf.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_keywords.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_menu.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_prefs.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/kronolith/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Tue Jan 19 08:00:01 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:00:01 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/configuration/kronolith-2.3.3 10-kolab_conf_base.php, NONE, 1.1 Message-ID: <20100119070001.0E19260056E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/configuration/kronolith-2.3.3 In directory doto:/tmp/cvs-serv10917/configuration/kronolith-2.3.3 Added Files: 10-kolab_conf_base.php Log Message: Draft of the kronolith package. --- NEW FILE: 10-kolab_conf_base.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv11712 Removed Files: webclient-kolab-conf.template webclient-kronolith-kolab-conf.template webclient-kronolith_keywords.php.template webclient-kronolith_menu.php.template webclient-kronolith_prefs.php.template Log Message: Remove templates available in the kronolith and horde packages. --- webclient-kolab-conf.template DELETED --- --- webclient-kronolith-kolab-conf.template DELETED --- --- webclient-kronolith_keywords.php.template DELETED --- --- webclient-kronolith_menu.php.template DELETED --- --- webclient-kronolith_prefs.php.template DELETED --- From cvs at kolab.org Tue Jan 19 08:36:20 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:36:20 +0100 (CET) Subject: gunnar: server/kolab-webclient/mnemo/configuration - New directory Message-ID: <20100119073620.908FB60056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo/configuration In directory doto:/tmp/cvs-serv12268/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/mnemo/configuration added to the repository From cvs at kolab.org Tue Jan 19 08:36:20 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:36:20 +0100 (CET) Subject: gunnar: server/kolab-webclient/mnemo/templates - New directory Message-ID: <20100119073620.93E2560056E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo/templates In directory doto:/tmp/cvs-serv12268/templates Log Message: Directory /kolabrepository/server/kolab-webclient/mnemo/templates added to the repository From cvs at kolab.org Tue Jan 19 08:36:20 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:36:20 +0100 (CET) Subject: gunnar: server/kolab-webclient/mnemo/templates/mnemo-2.2.3 - New directory Message-ID: <20100119073620.98FCF60057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo/templates/mnemo-2.2.3 In directory doto:/tmp/cvs-serv12268/templates/mnemo-2.2.3 Log Message: Directory /kolabrepository/server/kolab-webclient/mnemo/templates/mnemo-2.2.3 added to the repository From cvs at kolab.org Tue Jan 19 08:36:20 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:36:20 +0100 (CET) Subject: gunnar: server/kolab-webclient/mnemo/configuration/mnemo-2.2.3 - New directory Message-ID: <20100119073620.9656B60056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo/configuration/mnemo-2.2.3 In directory doto:/tmp/cvs-serv12268/configuration/mnemo-2.2.3 Log Message: Directory /kolabrepository/server/kolab-webclient/mnemo/configuration/mnemo-2.2.3 added to the repository From cvs at kolab.org Tue Jan 19 08:36:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:36:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/mnemo/configuration/mnemo-2.2.3 10-kolab_conf_base.php, NONE, 1.1 Message-ID: <20100119073659.5480160056E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo/configuration/mnemo-2.2.3 In directory doto:/tmp/cvs-serv12364/configuration/mnemo-2.2.3 Added Files: 10-kolab_conf_base.php Log Message: Draft of the mnemo package. --- NEW FILE: 10-kolab_conf_base.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo In directory doto:/tmp/cvs-serv12364 Added Files: .cvsignore Makefile mnemo.spec Log Message: Draft of the mnemo package. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk include ../../make-helper/fetch.mk --- NEW FILE: mnemo.spec --- # Macros %define V_package mnemo %define V_version 2.2.3 %define V_release 20100119 # Package Information Name: %{V_package} Summary: Mnemo is the Horde notes and memos application URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-mnemo_conf.php.template Source2: webclient-mnemo_prefs.php.template Source3: 10-kolab_conf_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 AutoReq: no AutoReqProv: no %description Mnemo is the Horde notes and memos application. It lets users keep free-text notes and other bits of information which doesnt fit as a contact, a todo item, an event, etc. It is very similar in functionality to the Palm Memo application. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mnemo %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mnemo cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mnemo/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mnemo/config/prefs.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:3} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mnemo/config/conf.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/mnemo/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-mnemo_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-mnemo_prefs.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/mnemo/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Tue Jan 19 08:36:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 08:36:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/mnemo/templates/mnemo-2.2.3 webclient-mnemo_conf.php.template, NONE, 1.1 webclient-mnemo_prefs.php.template, NONE, 1.1 Message-ID: <20100119073659.5AD6A60056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mnemo/templates/mnemo-2.2.3 In directory doto:/tmp/cvs-serv12364/templates/mnemo-2.2.3 Added Files: webclient-mnemo_conf.php.template webclient-mnemo_prefs.php.template Log Message: Draft of the mnemo package. --- NEW FILE: webclient-mnemo_conf.php.template --- KOLAB_META_START TARGET=@@@mnemo_confdir@@@/conf.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv13487 Removed Files: webclient-mnemo_conf.php.template webclient-mnemo_prefs.php.template Log Message: Remove templates available in the mnemo package. --- webclient-mnemo_conf.php.template DELETED --- --- webclient-mnemo_prefs.php.template DELETED --- From cvs at kolab.org Tue Jan 19 11:47:06 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 11:47:06 +0100 (CET) Subject: wilde: utils/admin tagedmailnote, NONE, 1.1 tagedmailnote.README, NONE, 1.1 Message-ID: <20100119104706.445EB60056C@lists.intevation.de> Author: wilde Update of /kolabrepository/utils/admin In directory doto:/tmp/cvs-serv17654 Added Files: tagedmailnote tagedmailnote.README Log Message: Added tagedmailnote script and readme. A simple script allowing to send a notification to an arbitrary email address upon arrival of email which contains a configurable tag in the subject line. --- NEW FILE: tagedmailnote --- #!/usr/bin/env python # coding=utf-8 # # Copyright (C) 2005, 2006, 2007, 2009, 2010 by Intevation GmbH # Author(s): # Thomas Arendsen Hein # Sascha Wilde # # This program is free software under the GNU GPL (>=v2) # Read the file COPYING coming with the software for details. # # In addition, as a special exception, Intevation GmbH gives # permission to link the code of this program with the OpenSSL # library (or with modified versions of OpenSSL that use the same # license as OpenSSL), and distribute linked combinations including # the two. You must obey the GNU General Public License in all # respects for all of the code used other than OpenSSL. If you # modify this file, you may extend this exception to your version # of the file, but you are not obligated to do so. If you do not # wish to do so, delete this exception statement from your version. """ tagmailnote Usage: tagmailnote Tag From-Address To-Address Sends a mail to To-Address if the mail on stdin contains Tag in its subject. """ notesubject = "A mail tagged URGENT arrived at your company account." notetext = """A mail with the keyword URGENT in the subject was send to your company account. Visit your company as soon as possible.""" import sys, smtplib, md5, mimetools, MimeWriter, rfc822, quopri, StringIO def sendmail(fromaddr, toaddr, subject, text): msgid = "<%s@%s>" % (md5.new(mimetools.choose_boundary()).hexdigest()[:16], fromaddr.split('@')[1]) message = StringIO.StringIO() writer = MimeWriter.MimeWriter(message) writer.addheader('MIME-Version', '1.0') writer.addheader('From', fromaddr) writer.addheader('To', toaddr) writer.addheader('Subject', subject) writer.addheader('Message-Id', msgid) writer.addheader('Content-Transfer-Encoding', 'quoted-printable') body = writer.startbody('text/plain; charset="utf-8"') # Add body body.write(quopri.encodestring(text)) # send the mail smtp = smtplib.SMTP('localhost') smtp.sendmail(fromaddr, toaddr, message.getvalue()) smtp.quit() if __name__ == '__main__': if len(sys.argv) >= 4: tag, fromaddr, toaddr = sys.argv[1:4] mail = rfc822.Message(sys.stdin) subject = mail.getfirstmatchingheader("Subject")[0] if subject and subject.find(tag) > -1: sendmail(fromaddr, toaddr, notesubject, notetext) else: print __doc__ --- NEW FILE: tagedmailnote.README --- Using tagedmailnote with the Kolab server: ------------------------------------------ When a mail to foo at example.net contains the tag "[URGENT]" in the subject an notification email shall be send to bar at example.com. First copy the tagedmailnote script to /kolab/sbin/, so it can be executed by the user kolab-n. Add a new service to /kolab/etc/kolab/templates/master.cf.template: # service type private unpriv chroot wakeup maxproc cmd tagedmailnote-bar-example-com unix - n n - - pipe user=kolab-n argv=/kolab/sbin/tagedmailnote [URGENT] postmaster at example.net bar at example.com Connect this service to a new address by adding the following line to the file /kolab/etc/kolab/templates/transport.template: foo-taged at example.net tagedmailnote-bar-example-com: Now you can use /kolab/etc/kolab/templates/virtual.template to forward mails to the mailattach-bar-example-com subdomain: foo at example.net @example.net, foo-taged at example.net To activate these changes, run /kolab/sbin/kolabconf Instead of modifying virtual.template you could use Sieve scripts to forward mails to the new address, too. From cvs at kolab.org Tue Jan 19 14:16:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:16:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba/configuration/turba-2.3.3 - New directory Message-ID: <20100119131641.31EC360056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba/configuration/turba-2.3.3 In directory doto:/tmp/cvs-serv21923/configuration/turba-2.3.3 Log Message: Directory /kolabrepository/server/kolab-webclient/turba/configuration/turba-2.3.3 added to the repository From cvs at kolab.org Tue Jan 19 14:16:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:16:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba/configuration - New directory Message-ID: <20100119131641.30A8A600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba/configuration In directory doto:/tmp/cvs-serv21923/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/turba/configuration added to the repository From cvs at kolab.org Tue Jan 19 14:16:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:16:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba/templates - New directory Message-ID: <20100119131641.345D460057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba/templates In directory doto:/tmp/cvs-serv21923/templates Log Message: Directory /kolabrepository/server/kolab-webclient/turba/templates added to the repository From cvs at kolab.org Tue Jan 19 14:16:41 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:16:41 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba/templates/turba-2.3.3 - New directory Message-ID: <20100119131641.3451560056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba/templates/turba-2.3.3 In directory doto:/tmp/cvs-serv21923/templates/turba-2.3.3 Log Message: Directory /kolabrepository/server/kolab-webclient/turba/templates/turba-2.3.3 added to the repository From cvs at kolab.org Tue Jan 19 14:17:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:17:13 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 turba.spec, NONE, 1.1 Message-ID: <20100119131713.AF6CB600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba In directory doto:/tmp/cvs-serv22019 Added Files: .cvsignore Makefile turba.spec Log Message: Draft turba package. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk include ../../make-helper/fetch.mk --- NEW FILE: turba.spec --- # Macros %define V_package turba %define V_version 2.3.3 %define V_release 20100119 # Package Information Name: %{V_package} Summary: Turba Contact Manager URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-turba_attributes.php.template Source2: webclient-turba_conf.php.template Source3: webclient-turba_hooks.php.template Source4: webclient-turba_menu.php.template Source5: webclient-turba_mime_drivers.php.template Source6: webclient-turba_prefs.php.template Source7: webclient-turba_sources.php.template Source8: 10-kolab_conf_base.php Source9: 10-kolab_conf_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 PreReq: PEAR-Net_LDAP AutoReq: no AutoReqProv: no %description Turba is the Horde contact management application. It is a production level address book, and makes heavy use of the Horde framework to provide integration with IMP and other Horde applications. Turba is a complete basic contact management application. SQL, LDAP, IMSP, Kolab, and Horde Preferences backends are available and are well tested. You can define the fields in your address books in a very flexible way, just by changing the config files. You can import/export from/to Pine, Mulberry, CSV, TSV, and vCard contacts. You can create distribution lists from your addressbooks, which are handled transparently by IMP and other Horde applications. You can share address books with other users. And there are Horde API functions to add and search for contacts. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. rm test.php #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/attributes.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/hooks.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/menu.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/mime_drivers.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/prefs.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/sources.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/conf.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/sources.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/turba/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-turba_attributes.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-turba_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-turba_hooks.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-turba_menu.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-turba_mime_drivers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-turba_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-turba_sources.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/turba/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Tue Jan 19 14:17:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:17:13 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba/configuration/turba-2.3.3 10-kolab_conf_base.php, NONE, 1.1 10-kolab_sources_base.php, NONE, 1.1 10-kolab_sources_base.php~, NONE, 1.1 Message-ID: <20100119131713.B477660056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba/configuration/turba-2.3.3 In directory doto:/tmp/cvs-serv22019/configuration/turba-2.3.3 Added Files: 10-kolab_conf_base.php 10-kolab_sources_base.php 10-kolab_sources_base.php~ Log Message: Draft turba package. --- NEW FILE: 10-kolab_conf_base.php --- _("Global Address Book"), 'type' => 'ldap', 'params' => array( 'server' => $_kolab_server, 'port' => $GLOBALS['conf']['kolab']['ldap']['port'], 'tls' => false, 'root' => $GLOBALS['conf']['kolab']['ldap']['basedn'], 'sizelimit' => 200, 'dn' => array('cn'), 'objectclass' => array( 'inetOrgPerson' ), 'scope' => 'sub', 'charset' => 'utf-8', 'version' => 3, 'bind_dn' => '', 'bind_password' => '', ), 'map' => array( '__key' => 'dn', 'name' => 'cn', 'firstname' => 'givenName', 'lastname' => 'sn', 'email' => 'mail', 'alias' => 'alias', 'title' => 'title', 'company' => 'o', 'workStreet' => 'street', 'workCity' => 'l', 'workProvince' => 'st', 'workPostalCode' => 'postalCode', 'workCountry' => 'c', 'homePhone' => 'homePhone', 'workPhone' => 'telephoneNumber', 'cellPhone' => 'mobile', 'fax' => 'fax', 'notes' => 'description', 'kolabHomeServer' => 'kolabHomeServer', 'freebusyUrl' => array('fields' => array('kolabHomeServer', 'email'), 'format' => 'https://%s/freebusy/%s.xfb'), ), 'search' => array( 'name', 'firstname', 'lastname', 'email', 'title', 'company', 'workAddress', 'workCity', 'workProvince', 'workPostalCode', 'workCountry', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'notes', ), 'strict' => array( 'dn', ), 'export' => true, 'browse' => true, ); } /** * The local address books for a Kolab user. These are stored in specially * flagged contact folder within the users Cyrus IMAP mailbox. * * Still missing attributes are: * * picture, sensitivity */ $cfgSources['kolab'] = array( 'title' => _("Contacts"), 'type' => 'kolab', 'params' => array( 'charset' => 'utf-8', ), 'list_name_field' => 'lastname', 'map' => array( '__key' => 'uid', '__uid' => 'uid', '__type' => '__type', '__members' => '__members', /* Personal */ 'name' => array('fields' => array('firstname', 'middlenames', 'lastname'), 'format' => '%s %s %s', 'parse' => array( array('fields' => array('firstname', 'middlenames', 'lastname'), 'format' => '%s %s %s'), array('fields' => array( 'lastname', 'firstname'), 'format' => '%s, %s'), array('fields' => array('firstname', 'lastname'), 'format' => '%s %s'), )), 'firstname' => 'given-name', 'lastname' => 'last-name', 'middlenames' => 'middle-names', 'namePrefix' => 'prefix', 'nameSuffix' => 'suffix', 'initials' => 'initials', 'nickname' => 'nick-name', 'photo' => 'photo', 'phototype' => 'phototype', 'gender' => 'gender', 'birthday' => 'birthday', 'spouse' => 'spouse-name', 'anniversary' => 'anniversary', 'children' => 'children', /* Location */ 'workStreet' => 'addr-business-street', 'workCity' => 'addr-business-locality', 'workProvince' => 'addr-business-region', 'workPostalCode' => 'addr-business-postal-code', 'workCountry' => 'addr-business-country', 'homeStreet' => 'addr-home-street', 'homeCity' => 'addr-home-locality', 'homeProvince' => 'addr-home-region', 'homePostalCode' => 'addr-home-postal-code', 'homeCountry' => 'addr-home-country', /* Communications */ 'emails' => 'emails', 'homePhone' => 'phone-home1', 'workPhone' => 'phone-business1', 'cellPhone' => 'phone-mobile', 'fax' => 'phone-businessfax', 'instantMessenger' => 'im-address', /* Organization */ 'title' => 'job-title', 'role' => 'profession', 'company' => 'organization', 'department' => 'department', 'office' => 'office-location', 'manager' => 'manager-name', 'assistant' => 'assistant', /* Other */ 'category' => 'categories', 'notes' => 'body', 'website' => 'web-page', 'freebusyUrl' => 'free-busy-url', 'language' => 'language', 'latitude' => 'latitude', 'longitude' => 'longitude', /* Invisible */ 'email' => 'email', 'pgpPublicKey' => 'pgp-publickey', ), 'tabs' => array( _("Personal") => array('name', 'firstname', 'lastname', 'middlenames', 'namePrefix', 'nameSuffix', 'initials', 'nickname', 'photo', 'gender', 'birthday', 'spouse', 'anniversary', 'children'), _("Location") => array('homeStreet', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', 'workStreet', 'workCity', 'workProvince', 'workPostalCode', 'workCountry'), _("Communications") => array('emails', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'instantMessenger'), _("Organization") => array('title', 'role', 'company', 'department', 'office', 'manager', 'assistant'), _("Other") => array('category', 'notes', 'website', 'freebusyUrl', 'language', 'latitude', 'longitude'), ), 'search' => array( /* Personal */ 'name', 'firstname', 'lastname', 'middlenames', 'namePrefix', 'nameSuffix', 'initials', 'nickname', 'gender', 'birthday', 'spouse', 'anniversary', 'children', /* Location */ 'workStreet', 'workCity', 'workProvince', 'workPostalCode', 'workCountry', 'homeStreet', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', /* Communications */ 'emails', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'instantMessenger', /* Organization */ 'title', 'role', 'company', 'department', 'office', 'manager', 'assistant', /* Other */ 'category', 'notes', 'website', 'language', ), 'strict' => array( 'uid', ), 'export' => true, 'browse' => true, 'use_shares' => true, 'shares_only' => true, ); --- NEW FILE: 10-kolab_sources_base.php~ --- _("Global Address Book"), 'type' => 'ldap', 'params' => array( 'server' => $_kolab_server, 'port' => $GLOBALS['conf']['kolab']['ldap']['port'], 'tls' => false, 'root' => $GLOBALS['conf']['kolab']['ldap']['basedn'], 'sizelimit' => 200, 'dn' => array('cn'), 'objectclass' => array( 'inetOrgPerson' ), 'scope' => 'sub', 'charset' => 'utf-8', 'version' => 3, 'bind_dn' => '', 'bind_password' => '', ), 'map' => array( '__key' => 'dn', 'name' => 'cn', 'firstname' => 'givenName', 'lastname' => 'sn', 'email' => 'mail', 'alias' => 'alias', 'title' => 'title', 'company' => 'o', 'workStreet' => 'street', 'workCity' => 'l', 'workProvince' => 'st', 'workPostalCode' => 'postalCode', 'workCountry' => 'c', 'homePhone' => 'homePhone', 'workPhone' => 'telephoneNumber', 'cellPhone' => 'mobile', 'fax' => 'fax', 'notes' => 'description', 'kolabHomeServer' => 'kolabHomeServer', 'freebusyUrl' => array('fields' => array('kolabHomeServer', 'email'), 'format' => 'https://%s/freebusy/%s.xfb'), ), 'search' => array( 'name', 'firstname', 'lastname', 'email', 'title', 'company', 'workAddress', 'workCity', 'workProvince', 'workPostalCode', 'workCountry', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'notes', ), 'strict' => array( 'dn', ), 'export' => true, 'browse' => true, ); } /** * The local address books for a Kolab user. These are stored in specially * flagged contact folder within the users Cyrus IMAP mailbox. * * Still missing attributes are: * * picture, sensitivity */ $cfgSources['kolab'] = array( 'title' => _("Contacts"), 'type' => 'kolab', 'params' => array( 'charset' => 'utf-8', ), 'list_name_field' => 'lastname', 'map' => array( '__key' => 'uid', '__uid' => 'uid', '__type' => '__type', '__members' => '__members', /* Personal */ 'name' => array('fields' => array('firstname', 'middlenames', 'lastname'), 'format' => '%s %s %s', 'parse' => array( array('fields' => array('firstname', 'middlenames', 'lastname'), 'format' => '%s %s %s'), array('fields' => array( 'lastname', 'firstname'), 'format' => '%s, %s'), array('fields' => array('firstname', 'lastname'), 'format' => '%s %s'), )), 'firstname' => 'given-name', 'lastname' => 'last-name', 'middlenames' => 'middle-names', 'namePrefix' => 'prefix', 'nameSuffix' => 'suffix', 'initials' => 'initials', 'nickname' => 'nick-name', 'photo' => 'photo', 'phototype' => 'phototype', 'gender' => 'gender', 'birthday' => 'birthday', 'spouse' => 'spouse-name', 'anniversary' => 'anniversary', 'children' => 'children', /* Location */ 'workStreet' => 'addr-business-street', 'workCity' => 'addr-business-locality', 'workProvince' => 'addr-business-region', 'workPostalCode' => 'addr-business-postal-code', 'workCountry' => 'addr-business-country', 'homeStreet' => 'addr-home-street', 'homeCity' => 'addr-home-locality', 'homeProvince' => 'addr-home-region', 'homePostalCode' => 'addr-home-postal-code', 'homeCountry' => 'addr-home-country', /* Communications */ 'emails' => 'emails', 'homePhone' => 'phone-home1', 'workPhone' => 'phone-business1', 'cellPhone' => 'phone-mobile', 'fax' => 'phone-businessfax', 'instantMessenger' => 'im-address', /* Organization */ 'title' => 'job-title', 'role' => 'profession', 'company' => 'organization', 'department' => 'department', 'office' => 'office-location', 'manager' => 'manager-name', 'assistant' => 'assistant', /* Other */ 'category' => 'categories', 'notes' => 'body', 'website' => 'web-page', 'freebusyUrl' => 'free-busy-url', 'language' => 'language', 'latitude' => 'latitude', 'longitude' => 'longitude', /* Invisible */ 'email' => 'email', 'pgpPublicKey' => 'pgp-publickey', ), 'tabs' => array( _("Personal") => array('name', 'firstname', 'lastname', 'middlenames', 'namePrefix', 'nameSuffix', 'initials', 'nickname', 'photo', 'gender', 'birthday', 'spouse', 'anniversary', 'children'), _("Location") => array('homeStreet', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', 'workStreet', 'workCity', 'workProvince', 'workPostalCode', 'workCountry'), _("Communications") => array('emails', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'instantMessenger'), _("Organization") => array('title', 'role', 'company', 'department', 'office', 'manager', 'assistant'), _("Other") => array('category', 'notes', 'website', 'freebusyUrl', 'language', 'latitude', 'longitude'), ), 'search' => array( /* Personal */ 'name', 'firstname', 'lastname', 'middlenames', 'namePrefix', 'nameSuffix', 'initials', 'nickname', 'gender', 'birthday', 'spouse', 'anniversary', 'children', /* Location */ 'workStreet', 'workCity', 'workProvince', 'workPostalCode', 'workCountry', 'homeStreet', 'homeCity', 'homeProvince', 'homePostalCode', 'homeCountry', /* Communications */ 'emails', 'homePhone', 'workPhone', 'cellPhone', 'fax', 'instantMessenger', /* Organization */ 'title', 'role', 'company', 'department', 'office', 'manager', 'assistant', /* Other */ 'category', 'notes', 'website', 'language', ), 'strict' => array( 'uid', ), 'export' => true, 'browse' => true, 'use_shares' => true, 'shares_only' => true, ); } /* End Kolab sources. */ From cvs at kolab.org Tue Jan 19 14:17:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:17:13 +0100 (CET) Subject: gunnar: server/kolab-webclient/turba/templates/turba-2.3.3 webclient-turba_attributes.php.template, NONE, 1.1 webclient-turba_conf.php.template, NONE, 1.1 webclient-turba_hooks.php.template, NONE, 1.1 webclient-turba_menu.php.template, NONE, 1.1 webclient-turba_mime_drivers.php.template, NONE, 1.1 webclient-turba_prefs.php.template, NONE, 1.1 webclient-turba_sources.php.template, NONE, 1.1 Message-ID: <20100119131713.B98C560056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/turba/templates/turba-2.3.3 In directory doto:/tmp/cvs-serv22019/templates/turba-2.3.3 Added Files: webclient-turba_attributes.php.template webclient-turba_conf.php.template webclient-turba_hooks.php.template webclient-turba_menu.php.template webclient-turba_mime_drivers.php.template webclient-turba_prefs.php.template webclient-turba_sources.php.template Log Message: Draft turba package. --- NEW FILE: webclient-turba_attributes.php.template --- KOLAB_META_START TARGET=@@@turba_confdir@@@/attributes.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/configuration In directory doto:/tmp/cvs-serv22097/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/passwd/configuration added to the repository From cvs at kolab.org Tue Jan 19 14:19:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:19:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd/configuration/passwd-3.1.2 - New directory Message-ID: <20100119131959.B9C9660056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/configuration/passwd-3.1.2 In directory doto:/tmp/cvs-serv22097/configuration/passwd-3.1.2 Log Message: Directory /kolabrepository/server/kolab-webclient/passwd/configuration/passwd-3.1.2 added to the repository From cvs at kolab.org Tue Jan 19 14:19:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:19:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd/templates/passwd-3.1.2 - New directory Message-ID: <20100119131959.BC4D460057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/templates/passwd-3.1.2 In directory doto:/tmp/cvs-serv22097/templates/passwd-3.1.2 Log Message: Directory /kolabrepository/server/kolab-webclient/passwd/templates/passwd-3.1.2 added to the repository From cvs at kolab.org Tue Jan 19 14:19:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:19:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd/templates - New directory Message-ID: <20100119131959.B730060056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/templates In directory doto:/tmp/cvs-serv22097/templates Log Message: Directory /kolabrepository/server/kolab-webclient/passwd/templates added to the repository From cvs at kolab.org Tue Jan 19 14:20:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:20:47 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd/templates/passwd-3.1.2 webclient-passwd_backends.php.template, NONE, 1.1 webclient-passwd_backends.php.template~, NONE, 1.1 webclient-passwd_conf.php.template, NONE, 1.1 webclient-passwd_conf.php.template~, NONE, 1.1 Message-ID: <20100119132047.E2D8160056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/templates/passwd-3.1.2 In directory doto:/tmp/cvs-serv22192/templates/passwd-3.1.2 Added Files: webclient-passwd_backends.php.template webclient-passwd_backends.php.template~ webclient-passwd_conf.php.template webclient-passwd_conf.php.template~ Log Message: Draft version of the passwd package. --- NEW FILE: webclient-passwd_backends.php.template --- KOLAB_META_START TARGET=@@@horde_confdir@@@/passwd/backends.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd In directory doto:/tmp/cvs-serv22192 Added Files: .cvsignore Makefile passwd.spec Log Message: Draft version of the passwd package. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk include ../../make-helper/fetch.mk --- NEW FILE: passwd.spec --- # Macros %define V_package passwd %define V_version 3.1.2 %define V_release 20100119 # Package Information Name: %{V_package} Summary: Passwd is the Horde password changing application. URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-passwd_conf.php.template Source2: webclient-passwd_backends.php.template Source3: 10-kolab_backends_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 AutoReq: no AutoReqProv: no %description Passwd is the Horde password changing application. Right now, Passwd provides fairly complete support for changing passwords via Poppassd, LDAP, Unix expect scripts, the Unix smbpasswd command for SMB/CIFS passwords, Kolab, ADSI, Pine, Serv-U FTP, VMailMgr, vpopmail, and SQL passwords. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config/backends.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:3} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config/backends.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/passwd/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-passwd_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-passwd_backends.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/passwd/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Tue Jan 19 14:20:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:20:47 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd/configuration/passwd-3.1.2 10-kolab_backends_base.php, NONE, 1.1 Message-ID: <20100119132047.DD9F960056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/configuration/passwd-3.1.2 In directory doto:/tmp/cvs-serv22192/configuration/passwd-3.1.2 Added Files: 10-kolab_backends_base.php Log Message: Draft version of the passwd package. --- NEW FILE: 10-kolab_backends_base.php --- 'Local Kolab Server', 'preferred' => '', 'password policy' => array( 'minLength' => 3, 'maxLength' => 8 ), 'driver' => 'kolab', 'params' => array() ); From cvs at kolab.org Tue Jan 19 14:22:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:22:43 +0100 (CET) Subject: gunnar: server/kolab-webclient backends.php, 1.1, NONE conf.php, 1.1, NONE webclient-nag_conf.php.template, 1.2, NONE webclient-nag_menu.php.template, 1.2, NONE webclient-nag_prefs.php.template, 1.2, NONE webclient-turba_attributes.php.template, 1.2, NONE webclient-turba_conf.php.template, 1.2, NONE webclient-turba_hooks.php.template, 1.2, NONE webclient-turba_menu.php.template, 1.2, NONE webclient-turba_mime_drivers.php.template, 1.2, NONE webclient-turba_prefs.php.template, 1.2, NONE webclient-turba_sources.php.template, 1.2, NONE Message-ID: <20100119132243.0661F600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient In directory doto:/tmp/cvs-serv22318 Removed Files: backends.php conf.php webclient-nag_conf.php.template webclient-nag_menu.php.template webclient-nag_prefs.php.template webclient-turba_attributes.php.template webclient-turba_conf.php.template webclient-turba_hooks.php.template webclient-turba_menu.php.template webclient-turba_mime_drivers.php.template webclient-turba_prefs.php.template webclient-turba_sources.php.template Log Message: Remove files now present in the sub packages. --- backends.php DELETED --- --- conf.php DELETED --- --- webclient-nag_conf.php.template DELETED --- --- webclient-nag_menu.php.template DELETED --- --- webclient-nag_prefs.php.template DELETED --- --- webclient-turba_attributes.php.template DELETED --- --- webclient-turba_conf.php.template DELETED --- --- webclient-turba_hooks.php.template DELETED --- --- webclient-turba_menu.php.template DELETED --- --- webclient-turba_mime_drivers.php.template DELETED --- --- webclient-turba_prefs.php.template DELETED --- --- webclient-turba_sources.php.template DELETED --- From cvs at kolab.org Tue Jan 19 14:25:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:25:40 +0100 (CET) Subject: gunnar: server/kolab-webclient/nag/configuration - New directory Message-ID: <20100119132540.E5E54600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag/configuration In directory doto:/tmp/cvs-serv22440/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/nag/configuration added to the repository From cvs at kolab.org Tue Jan 19 14:25:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:25:40 +0100 (CET) Subject: gunnar: server/kolab-webclient/nag/configuration/nag-2.3.4 - New directory Message-ID: <20100119132540.EADF860056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag/configuration/nag-2.3.4 In directory doto:/tmp/cvs-serv22440/configuration/nag-2.3.4 Log Message: Directory /kolabrepository/server/kolab-webclient/nag/configuration/nag-2.3.4 added to the repository From cvs at kolab.org Tue Jan 19 14:25:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:25:40 +0100 (CET) Subject: gunnar: server/kolab-webclient/nag/templates/nag-2.3.4 - New directory Message-ID: <20100119132540.EDAA260057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag/templates/nag-2.3.4 In directory doto:/tmp/cvs-serv22440/templates/nag-2.3.4 Log Message: Directory /kolabrepository/server/kolab-webclient/nag/templates/nag-2.3.4 added to the repository From cvs at kolab.org Tue Jan 19 14:25:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:25:40 +0100 (CET) Subject: gunnar: server/kolab-webclient/nag/templates - New directory Message-ID: <20100119132540.E83A960056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag/templates In directory doto:/tmp/cvs-serv22440/templates Log Message: Directory /kolabrepository/server/kolab-webclient/nag/templates added to the repository From cvs at kolab.org Tue Jan 19 14:27:50 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:27:50 +0100 (CET) Subject: gunnar: server/kolab-webclient/nag/configuration/nag-2.3.4 10-kolab_conf_base.php, NONE, 1.1 Message-ID: <20100119132750.A4C7960056C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag/configuration/nag-2.3.4 In directory doto:/tmp/cvs-serv22573/configuration/nag-2.3.4 Added Files: 10-kolab_conf_base.php Log Message: Draft package for nag. --- NEW FILE: 10-kolab_conf_base.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag In directory doto:/tmp/cvs-serv22573 Added Files: .cvsignore Makefile nag.spec Log Message: Draft package for nag. --- NEW FILE: .cvsignore --- *.src.rpm *.tar.gz package.patch tmp --- NEW FILE: Makefile --- STAGING = ../../stage include ../../make-helper/kolab.mk SOURCE_URL=http://ftp.horde.org/pub/$(PACKAGE) SOURCE_0 ?= $(PACKAGE)-h3-$(VERSION).$(SOURCE_FORMAT) include ../../make-helper/package.mk include ../../make-helper/patch-series.mk # Get the list of templates if there are any in the template directory TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) # Get the list of configuration files if there are any in the configuration directory CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null) EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION) include ../../make-helper/package-new.mk include ../../make-helper/fetch.mk --- NEW FILE: nag.spec --- # Macros %define V_package nag %define V_version 2.3.4 %define V_release 20100119 # Package Information Name: %{V_package} Summary: Nag Tasklist Application URL: http://www.horde.org/ Packager: Gunnar Wrobel (p at rdus) Version: %{V_version} Release: %{V_release} License: GPL Group: MAIL Distribution: OpenPKG # List of Sources Source0: http://ftp.horde.org/pub/%{V_package}/%{V_package}-h3-%{V_version}.tar.gz Source1: webclient-nag_conf.php.template Source2: webclient-nag_menu.php.template Source3: webclient-nag_prefs.php.template Source4: 10-kolab_conf_base.php # List of Patches Patch0: package.patch # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes PreReq: horde-3.3.6 AutoReq: no AutoReqProv: no %description Nag is the Horde task list application. It stores todo items, things due later this week, etc. It is very similar in functionality to the Palm ToDo application. %prep %setup -q -c %{V_package}-h3-%{V_version} cd %{V_package}-h3-%{V_version} %patch -p1 -P 0 cd .. %build %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} cd config for CONFIG in *.dist; \ do \ cp $CONFIG `basename $CONFIG .dist`; \ mkdir -p `basename $CONFIG .php.dist`.d; \ done cd .. #find . -type f | grep '\.orig$' | xargs rm -f cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag/config/menu.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag/config/prefs.d %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag/config/conf.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/nag/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-nag_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-nag_menu.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-nag_prefs.php.template' \ # '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/nag/config/conf.php %clean rm -rf $RPM_BUILD_ROOT %files -f files From cvs at kolab.org Tue Jan 19 14:27:50 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Jan 2010 14:27:50 +0100 (CET) Subject: gunnar: server/kolab-webclient/nag/templates/nag-2.3.4 webclient-nag_conf.php.template, NONE, 1.1 webclient-nag_menu.php.template, NONE, 1.1 webclient-nag_prefs.php.template, NONE, 1.1 Message-ID: <20100119132750.A7A2560056F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/nag/templates/nag-2.3.4 In directory doto:/tmp/cvs-serv22573/templates/nag-2.3.4 Added Files: webclient-nag_conf.php.template webclient-nag_menu.php.template webclient-nag_prefs.php.template Log Message: Draft package for nag. --- NEW FILE: webclient-nag_conf.php.template --- KOLAB_META_START TARGET=@@@nag_confdir@@@/conf.local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23644 Modified Files: Makefile Log Message: Add a webclient build section. This is not yet linked into the dist target. Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- Makefile 19 Jan 2010 04:53:26 -0000 1.95 +++ Makefile 19 Jan 2010 13:56:05 -0000 1.96 @@ -143,8 +143,18 @@ $(PEAR_HORDE_PACKAGES) \ $(PEAR_KOLAB_PACKAGES) \ -CLIENT_PACKAGES=kolab-webclient \ - kolab-fbview \ +CLIENT_PACKAGES=kolab-webclient/dimp \ + kolab-webclient/horde \ + kolab-webclient/imp \ + kolab-webclient/ingo \ + kolab-webclient/kronolith \ + kolab-webclient/mimp \ + kolab-webclient/mnemo \ + kolab-webclient/passwd \ + kolab-webclient/nag \ + kolab-webclient/turba \ +# kolab-webclient/kolab-webclient \ +# kolab-fbview \ BASE_FILES=install-kolab.sh \ 1st.README @@ -362,6 +372,36 @@ #################### # PEAR CHANNEL END +#################### + +#################### +# CLIENT START +#################### +# Sub targets for the web client + +.PHONY: fetch-client +fetch-client: $(CLIENT_PACKAGES:%=fetch-%) + +.PHONY: $(CLIENT_PACKAGES:%=fetch-%) +$(CLIENT_PACKAGES:%=fetch-%): + make -e -C $(@:fetch-%=%) fetch + +.PHONY: dist-client +dist-client: $(CLIENT_PACKAGES:%=dist-%) + +.PHONY: $(CLIENT_PACKAGES:%=dist-%) +$(CLIENT_PACKAGES:%=dist-%): + make -e -C $(@:dist-%=%) dist + +.PHONY: clean-client +clean-client: $(CLIENT_PACKAGES:%=clean-%) + +.PHONY: $(CLIENT_PACKAGES:%=clean-%) +$(CLIENT_PACKAGES:%=clean-%): + make -e -C $(@:clean-%=%) clean + +#################### +# CLIENT END #################### #################### From cvs at kolab.org Thu Jan 21 12:32:31 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 12:32:31 +0100 (CET) Subject: greve: doc/www/src about-kolab-clients.html.m4,1.29,1.30 Message-ID: <20100121113231.C12CB60014A@lists.intevation.de> Author: greve Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv27286 Modified Files: about-kolab-clients.html.m4 Log Message: Bynari release 4.0 Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- about-kolab-clients.html.m4 19 May 2009 09:13:56 -0000 1.29 +++ about-kolab-clients.html.m4 21 Jan 2010 11:32:29 -0000 1.30 @@ -116,6 +116,22 @@ + +
+ +
+
+
Bynari Insight Connector 4.0 for Microsoft Outlook
+License: proprietary, with a gratis 30 day evaluation
+Status: stable release 4.0 for Kolab 2
+Homepage: http://www.bynari.net +
+The Bynari Insight Connector 4.0 for Microsoft Outlook supports the Kolab 2 XML Storage +format and the Kolab 2 server. The latest release features several performance enhancements, +sieve rules/vacation notification, mobility support for cradle sync, enhanced offline support +and more. +
+
@@ -162,25 +178,6 @@ SyncKolab works nicely with Thunderbird 2 and Lightning 0.8.
- - - -
- - - -
-
- -
Microsoft Outlook Plugin: Bynari Insight Connector
- -License: proprietary, with a gratis 30 day evaluation
-Status: 3.1.x
-Homepage: http://bynari.net -
-. -
-
Clients for Kolab 1
From cvs at kolab.org Thu Jan 21 14:34:53 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 14:34:53 +0100 (CET) Subject: greve: doc/www/src/images logo-bynari.png,1.1,1.2 Message-ID: <20100121133453.43A48600168@lists.intevation.de> Author: greve Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv30103 Modified Files: logo-bynari.png Log Message: downsized Index: logo-bynari.png =================================================================== RCS file: /kolabrepository/doc/www/src/images/logo-bynari.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsVvbtdu and /tmp/cvs6U98fO differ From cvs at kolab.org Thu Jan 21 20:53:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:53:57 +0100 (CET) Subject: gunnar: server/pear/Horde_Loader - New directory Message-ID: <20100121195357.88B83600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Loader In directory doto:/tmp/cvs-serv5878/Horde_Loader Log Message: Directory /kolabrepository/server/pear/Horde_Loader added to the repository From cvs at kolab.org Thu Jan 21 20:54:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:54:40 +0100 (CET) Subject: gunnar: server/pear/Horde_Loader .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 Makefile, NONE, 1.1 package.info, NONE, 1.1 Message-ID: <20100121195440.19501600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Horde_Loader In directory doto:/tmp/cvs-serv5933 Added Files: .cvsignore ChangeLog Makefile package.info Log Message: Add the Horde_Loader package which was still missing and is required to pull in feeds into horde. --- NEW FILE: .cvsignore --- *.src.rpm *.tgz *.spec package.patch tmp --- NEW FILE: ChangeLog --- 2010-01-21 Gunnar Wrobel
* package.info: Added package to Kolab CVS. --- NEW FILE: Makefile --- include ../../make-helper/pear.mk --- NEW FILE: package.info --- # The name of Horde source package pear_package='Horde_Loader' # The name of the RPM package package='Horde_Loader' # Where to find information about the package package_url='http://pear.horde.org/index.php?package=' # How should the source be retrieved? # # WGET: Download via wget package_origin='VC-CVS' # The name of the package in the source repository pear_pkgdir='Loader' # Commit tag or date to user repo_commit='HORDE_3_3_6' # What release number should the source snapshot get (usually a date)? repo_release='20091215' # Version number version='0.1.0dev20091215' # Package release number release='20100111' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel/' # In which PHP library location should the library get installed php_lib_loc='php' # Build prerequisites buildprereq=' \ BuildPreReq: OpenPKG, openpkg >= 20070603 \ BuildPreReq: php, php::with_pear = yes \ BuildPreReq: PEAR-Horde-Channel \ ' # Installatin prerequisites prereq=' \ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ ' # Package summary description summary='Horde Class Loader' # Long package description description=' \ Autoload implementation and class loading manager for Horde \ ' # Source code license license='LGPL' From cvs at kolab.org Thu Jan 21 20:55:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:55:54 +0100 (CET) Subject: gunnar: server Makefile,1.96,1.97 Message-ID: <20100121195554.B99B7600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv5969 Modified Files: Makefile Log Message: Add Horde_Loader to the dist targets. Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- Makefile 19 Jan 2010 13:56:05 -0000 1.96 +++ Makefile 21 Jan 2010 19:55:52 -0000 1.97 @@ -97,6 +97,7 @@ pear/Horde_Http_Client \ pear/Horde_Image \ pear/Horde_LDAP \ + pear/Horde_Loader \ pear/Horde_Lock \ pear/Horde_Log \ pear/Horde_MIME \ From cvs at kolab.org Thu Jan 21 20:56:25 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:56:25 +0100 (CET) Subject: gunnar: server TODO,1.11,1.12 Message-ID: <20100121195625.122CA60056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv5993 Modified Files: TODO Log Message: Still need to check if it makes sense to keep the tag cloud portal block. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- TODO 18 Jan 2010 22:54:22 -0000 1.11 +++ TODO 21 Jan 2010 19:56:23 -0000 1.12 @@ -61,6 +61,8 @@ kolab-fbview kolab-webadmin [DONE] kolab-webclient + -> horde + - Blocks: cloud.php kolabd [DONE] openldap [DONE] perl-kolab [DONE] From cvs at kolab.org Thu Jan 21 20:57:44 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:57:44 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 10-kolab_conf_base.php, 1.1, 1.2 Message-ID: <20100121195744.25AEB600581@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 In directory doto:/tmp/cvs-serv6026/horde/configuration/horde-3.3.6 Modified Files: 10-kolab_conf_base.php Log Message: Removed two useless portal blocks and ensured the other ones are working. Index: 10-kolab_conf_base.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/10-kolab_conf_base.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- 10-kolab_conf_base.php 12 Jan 2010 22:16:11 -0000 1.1 +++ 10-kolab_conf_base.php 21 Jan 2010 19:57:42 -0000 1.2 @@ -11,6 +11,10 @@ $conf['auth']['driver'] = 'kolab'; +$conf['accounts']['driver'] = 'kolab'; +$conf['accounts']['params']['attr'] = 'mail'; +$conf['accounts']['params']['strip'] = false; + $conf['log']['priority'] = PEAR_LOG_DEBUG; $conf['log']['ident'] = 'HORDE'; $conf['log']['params'] = array(); From cvs at kolab.org Thu Jan 21 20:57:44 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:57:44 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde horde.spec,1.7,1.8 Message-ID: <20100121195744.21FFF60056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv6026/horde Modified Files: horde.spec Log Message: Removed two useless portal blocks and ensured the other ones are working. Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- horde.spec 19 Jan 2010 04:47:13 -0000 1.7 +++ horde.spec 21 Jan 2010 19:57:42 -0000 1.8 @@ -49,6 +49,7 @@ PreReq: Horde_Form PreReq: Horde_Http_Client PreReq: Horde_Image +PreReq: Horde_Loader PreReq: Horde_Maintenance PreReq: Horde_Mobile PreReq: Horde_Net_SMS @@ -65,7 +66,6 @@ PreReq: Kolab_Server >= 0.5.0 PreReq: Kolab_Storage >= 0.4.0 # Needed by horde -PreReq: PEAR-Services_Weather PreReq: PEAR-DB # Needed by horde (translation.php) PreReq: PEAR-Console_Table @@ -132,6 +132,15 @@ rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Text rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/VFS* rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/XML + + # Remove the Google search portal block. It requires applying for a search API key + # and is not really explained. It will confuse users as does nothing without + # admin intervention. + rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Block/google.php + + # Remove the weather data portal block. It is not really documented and I don't + # think the effort is worth it. In its current state it is simply confusing. + rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Block/metar.php sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_alarms.sql sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_perms.sql From cvs at kolab.org Thu Jan 21 20:58:36 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:58:36 +0100 (CET) Subject: gunnar: server/kolabd/kolabd ChangeLog,1.280,1.281 Message-ID: <20100121195836.59AC460056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv6079/kolabd Modified Files: ChangeLog Log Message: Make sure we don't end up with thousands of deprecated notices in the PHP log. Our apps are not yet ready for that. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.280 retrieving revision 1.281 diff -u -d -r1.280 -r1.281 --- ChangeLog 17 Jan 2010 10:20:18 -0000 1.280 +++ ChangeLog 21 Jan 2010 19:58:34 -0000 1.281 @@ -1,3 +1,9 @@ +2010-01-21 Gunnar Wrobel
+ + * templates/php.ini.template.in (error_reporting): Remove + E_DEPRECATED from PHP error reporting. PHP-5.3.1 added too many + such warnings and none of our PHP-Code is already ready for that. + 2010-01-16 Richard Bos * templates/slapd.conf.template.in: Changed @@@ldapserver_modulepath@@@ From cvs at kolab.org Thu Jan 21 20:58:36 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:58:36 +0100 (CET) Subject: gunnar: server/kolabd/kolabd/templates php.ini.template.in, 1.12, 1.13 Message-ID: <20100121195836.5FE60600581@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv6079/kolabd/templates Modified Files: php.ini.template.in Log Message: Make sure we don't end up with thousands of deprecated notices in the PHP log. Our apps are not yet ready for that. Index: php.ini.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- php.ini.template.in 8 Jan 2010 23:38:58 -0000 1.12 +++ php.ini.template.in 21 Jan 2010 19:58:34 -0000 1.13 @@ -30,7 +30,7 @@ ; the setting is "1". The setting will be removed in PHP 6 and "0" ; will be the default then. -error_reporting = E_ALL +error_reporting = E_ALL & ~E_DEPRECATED error_log = @webserver_logdir@/php/php-errors.log upload_tmp_dir = @webserver_tmpdir@ From cvs at kolab.org Thu Jan 21 20:59:07 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 20:59:07 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Server package.info,1.1,1.2 Message-ID: <20100121195907.24E4360056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Server In directory doto:/tmp/cvs-serv6104/Kolab_Server Modified Files: package.info Log Message: Add missing dependency. Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Server/package.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- package.info 17 Jan 2010 13:05:01 -0000 1.1 +++ package.info 21 Jan 2010 19:59:05 -0000 1.2 @@ -37,6 +37,7 @@ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ PreReq: Horde_LDAP \ +PreReq: PEAR-Net_LDAP2 \ ' # Package summary description From cvs at kolab.org Thu Jan 21 22:14:44 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 22:14:44 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_GLOBAL_HK_GW_Config.diff, 1.1, NONE t_GLOBAL_HK_GW_ConfigOpenPKG.diff, 1.1, NONE t_GLOBAL_HK_GW_ConfigTemplateSupport.diff, 1.1, NONE t_GLOBAL_HK_GW_SystemLibInclude.diff, 1.1, NONE t_horde_SC_CH_SecIssues20090128.diff, 1.1, NONE t_pear_HK_GW_AddNetIMAP.diff, 1.1, NONE t_pear_HK_GW_AddNetLDAP2__.diff, 1.1, NONE Message-ID: <20100121211444.5B7B4600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv8148 Removed Files: t_GLOBAL_HK_GW_Config.diff t_GLOBAL_HK_GW_ConfigOpenPKG.diff t_GLOBAL_HK_GW_ConfigTemplateSupport.diff t_GLOBAL_HK_GW_SystemLibInclude.diff t_horde_SC_CH_SecIssues20090128.diff t_pear_HK_GW_AddNetIMAP.diff t_pear_HK_GW_AddNetLDAP2__.diff Log Message: Remove obsolete patches (already part of the horde base package or not needed anymore because solved in a different way). --- t_GLOBAL_HK_GW_Config.diff DELETED --- --- t_GLOBAL_HK_GW_ConfigOpenPKG.diff DELETED --- --- t_GLOBAL_HK_GW_ConfigTemplateSupport.diff DELETED --- --- t_GLOBAL_HK_GW_SystemLibInclude.diff DELETED --- --- t_horde_SC_CH_SecIssues20090128.diff DELETED --- --- t_pear_HK_GW_AddNetIMAP.diff DELETED --- --- t_pear_HK_GW_AddNetLDAP2__.diff DELETED --- From cvs at kolab.org Thu Jan 21 22:17:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 22:17:30 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB/patches - New directory Message-ID: <20100121211730.B1772600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB/patches In directory doto:/tmp/cvs-serv8220/patches Log Message: Directory /kolabrepository/server/pear/PEAR-DB/patches added to the repository From cvs at kolab.org Thu Jan 21 22:17:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 22:17:30 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB/patches/DB-1.7.13 - New directory Message-ID: <20100121211730.B3E3460056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB/patches/DB-1.7.13 In directory doto:/tmp/cvs-serv8220/patches/DB-1.7.13 Log Message: Directory /kolabrepository/server/pear/PEAR-DB/patches/DB-1.7.13 added to the repository From cvs at kolab.org Thu Jan 21 22:19:00 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 22:19:00 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB/patches/DB-1.7.13 t_framework_HK_GW_DB_SqliteErrorChecking.diff, NONE, 1.1 Message-ID: <20100121211900.15C0A600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB/patches/DB-1.7.13 In directory doto:/tmp/cvs-serv8312/patches/DB-1.7.13 Added Files: t_framework_HK_GW_DB_SqliteErrorChecking.diff Log Message: Move a patch from kolab-webclient to the PEAR package. The patch is required to correctly handle sqlite error return values --- NEW FILE: t_framework_HK_GW_DB_SqliteErrorChecking.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/framework/HK/GW/DB/SqliteErrorChecking Fix error checking in the sqlite PEAR implementation. Signed-off-by: Gunnar Wrobel
--- horde-webmail/pear/DB/sqlite.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/horde-webmail/pear/DB/sqlite.php b/horde-webmail/pear/DB/sqlite.php index bf2acec..00e65f4 100644 --- a/horde-webmail/pear/DB/sqlite.php +++ b/horde-webmail/pear/DB/sqlite.php @@ -742,7 +742,7 @@ class DB_sqlite extends DB_common // PHP 5.2+ prepends the function name to $php_errormsg, so we need // this hack to work around it, per bug #9599. - $errormsg = preg_replace('/^sqlite[a-z_]+: /', '', $errormsg); + $errormsg = preg_replace('/^sqlite[a-z_]+ \[[^\]]*\]: /', '', $errormsg); if (!isset($error_regexps)) { $error_regexps = array( -- tg: (018dab9..) t/framework/HK/GW/DB/SqliteErrorChecking (depends on: t/framework/HK/GW/Kolab/XfbFixes) -- TOPGIT patch commit log ======================= commit 1dd36cf01fd707c95af690339799bc5ce73a05c0 Author: Gunnar Wrobel
Date: Sun Feb 1 16:52:24 2009 +0000 Added patch release/HK-GW-DB_sqlite-Incorrect_error_check.patch from the mercurial release queue. From cvs at kolab.org Thu Jan 21 22:19:38 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 22:19:38 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_framework_HK_GW_DB_SqliteErrorChecking.diff, 1.1, NONE Message-ID: <20100121211938.C3DB0600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv8334 Removed Files: t_framework_HK_GW_DB_SqliteErrorChecking.diff Log Message: Moved the patch into the corresponding PEAR package. --- t_framework_HK_GW_DB_SqliteErrorChecking.diff DELETED --- From cvs at kolab.org Thu Jan 21 22:23:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 22:23:42 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp imp.spec,1.1,1.2 Message-ID: <20100121212342.44F5A600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp In directory doto:/tmp/cvs-serv8408 Modified Files: imp.spec Log Message: Fix dependency information. Index: imp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- imp.spec 18 Jan 2010 17:44:22 -0000 1.1 +++ imp.spec 21 Jan 2010 21:23:40 -0000 1.2 @@ -39,7 +39,7 @@ #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes -PreReq: horde-3.3.6 +PreReq: horde >= 3.3.6 PreReq: PEAR-Auth_SASL >= 1.0.2 PreReq: PEAR-Mail From cvs at kolab.org Thu Jan 21 23:23:15 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 23:23:15 +0100 (CET) Subject: gunnar: server TODO,1.12,1.13 Message-ID: <20100121222315.EF58C600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9625 Modified Files: TODO Log Message: More TODOs. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TODO 21 Jan 2010 19:56:23 -0000 1.12 +++ TODO 21 Jan 2010 22:23:13 -0000 1.13 @@ -61,8 +61,6 @@ kolab-fbview kolab-webadmin [DONE] kolab-webclient - -> horde - - Blocks: cloud.php kolabd [DONE] openldap [DONE] perl-kolab [DONE] @@ -70,6 +68,14 @@ php-kolab postfix sqlite + + The web client: + + -> horde + - Blocks: cloud.php + - Check the admin section + - how to handle the secret key setting ($conf[secret_key]) + - larger effort: From cvs at kolab.org Thu Jan 21 23:23:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 23:23:30 +0100 (CET) Subject: gunnar: server Makefile,1.97,1.98 Message-ID: <20100121222330.C84E3600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9668 Modified Files: Makefile Log Message: Add missing pear packages. Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- Makefile 21 Jan 2010 19:55:52 -0000 1.97 +++ Makefile 21 Jan 2010 22:23:28 -0000 1.98 @@ -96,6 +96,8 @@ pear/Horde_History \ pear/Horde_Http_Client \ pear/Horde_Image \ + pear/Horde_IMAP \ + pear/Horde_Kolab \ pear/Horde_LDAP \ pear/Horde_Loader \ pear/Horde_Lock \ From cvs at kolab.org Thu Jan 21 23:24:26 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 23:24:26 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp imp.spec,1.2,1.3 Message-ID: <20100121222426.CB8B6600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp In directory doto:/tmp/cvs-serv9701 Modified Files: imp.spec Log Message: Add configuration file, add imp log table and add missing dependency. Index: imp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- imp.spec 21 Jan 2010 21:23:40 -0000 1.2 +++ imp.spec 21 Jan 2010 22:24:24 -0000 1.3 @@ -1,7 +1,7 @@ # Macros %define V_package imp %define V_version 4.3.6 -%define V_release 20100118 +%define V_release 20100121 # Package Information Name: %{V_package} @@ -28,6 +28,7 @@ Source10: 10-kolab_conf_base.php Source11: 10-kolab_hooks_base.php Source12: 10-kolab_servers_base.php +Source13: conf.php # List of Patches Patch0: package.patch @@ -42,6 +43,7 @@ PreReq: horde >= 3.3.6 PreReq: PEAR-Auth_SASL >= 1.0.2 PreReq: PEAR-Mail +PreReq: Horde_IMAP AutoReq: no AutoReqProv: no @@ -62,6 +64,7 @@ %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates cd %{V_package}-h3-%{V_version} @@ -80,6 +83,8 @@ cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp + sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/imp.db < scripts/sql/imp.sql + cd .. %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/conf.d @@ -98,6 +103,7 @@ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/conf.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/hooks.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/servers.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:13} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/imp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template @@ -111,7 +117,7 @@ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_servers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_spelling.php.template' \ -# '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/imp/config/conf.php + '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/imp/config/conf.php %clean rm -rf $RPM_BUILD_ROOT From cvs at kolab.org Thu Jan 21 23:24:26 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 23:24:26 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/configuration/imp-4.3.6 conf.php, NONE, 1.1 Message-ID: <20100121222426.CF60660056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6 In directory doto:/tmp/cvs-serv9701/configuration/imp-4.3.6 Added Files: conf.php Log Message: Add configuration file, add imp log table and add missing dependency. --- NEW FILE: conf.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 In directory doto:/tmp/cvs-serv9751/configuration/horde-3.3.6 Added Files: conf.php Log Message: Add missing dependency and old configuration file. --- NEW FILE: conf.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv9751 Modified Files: horde.spec Log Message: Add missing dependency and old configuration file. Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- horde.spec 21 Jan 2010 19:57:42 -0000 1.8 +++ horde.spec 21 Jan 2010 22:25:04 -0000 1.9 @@ -1,7 +1,7 @@ # Macros %define V_package horde %define V_version 3.3.6 -%define V_release 20100111 +%define V_release 20100121 # Package Information Name: %{V_package} @@ -26,6 +26,7 @@ Source8: 10-kolab_hooks_base.php Source9: 10-kolab_prefs_base.php Source10: 10-kolab_conf_base.php +Source11: conf.php # List of Patches Patch0: package.patch @@ -50,6 +51,7 @@ PreReq: Horde_Http_Client PreReq: Horde_Image PreReq: Horde_Loader +PreReq: Horde_Kolab PreReq: Horde_Maintenance PreReq: Horde_Mobile PreReq: Horde_Net_SMS @@ -162,6 +164,7 @@ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/hooks.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/prefs.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template @@ -173,6 +176,7 @@ '%config %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \ + '%config(noreplace) %{l_prefix}/var/kolab/webclient_data/storage/horde.db \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/log \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage/horde.db \ From cvs at kolab.org Thu Jan 21 23:34:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 23:34:54 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 10-kolab_conf_base.php, 1.2, 1.3 conf.php, 1.1, 1.2 Message-ID: <20100121223454.76644600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 In directory doto:/tmp/cvs-serv9944/configuration/horde-3.3.6 Modified Files: 10-kolab_conf_base.php conf.php Log Message: Update configuration for 3.3.6. Index: 10-kolab_conf_base.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/10-kolab_conf_base.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- 10-kolab_conf_base.php 21 Jan 2010 19:57:42 -0000 1.2 +++ 10-kolab_conf_base.php 21 Jan 2010 22:34:52 -0000 1.3 @@ -10,12 +10,9 @@ $conf['sql']['phptype'] = 'sqlite'; $conf['auth']['driver'] = 'kolab'; +$conf['auth']['params']['login_block'] = false; -$conf['accounts']['driver'] = 'kolab'; -$conf['accounts']['params']['attr'] = 'mail'; -$conf['accounts']['params']['strip'] = false; - -$conf['log']['priority'] = PEAR_LOG_DEBUG; +$conf['log']['priority'] = PEAR_LOG_WARNING; $conf['log']['ident'] = 'HORDE'; $conf['log']['params'] = array(); $conf['log']['name'] = dirname(__FILE__) . '/../../../../webclient_data/log/horde.log'; @@ -23,8 +20,8 @@ $conf['log']['type'] = 'file'; $conf['log']['enabled'] = true; -$conf['prefs']['driver'] = 'file'; $conf['prefs']['params']['directory'] = dirname(__FILE__) . '/../../../../webclient_data/storage/'; +$conf['prefs']['driver'] = 'file'; $conf['alarms']['params']['driverconfig'] = 'horde'; $conf['alarms']['params']['ttl'] = 300; @@ -36,23 +33,30 @@ $conf['perms']['driverconfig'] = 'horde'; $conf['perms']['driver'] = 'sql'; -$conf['share']['driver'] = 'kolab'; $conf['share']['cache'] = true; +$conf['share']['driver'] = 'kolab'; -$conf['cache']['driver'] = 'file'; +$conf['cache']['default_lifetime'] = 1800; $conf['cache']['params']['dir'] = $conf['tmpdir']; $conf['cache']['params']['sub'] = 0; -$conf['cache']['default_lifetime'] = 1800; +$conf['cache']['driver'] = 'file'; $conf['mailer']['params']['host'] = 'localhost'; $conf['mailer']['params']['port'] = 25; $conf['mailer']['params']['auth'] = true; $conf['mailer']['type'] = 'smtp'; -$conf['vfs']['type'] = 'file'; +$conf['token']['params']['token_dir'] = dirname(__FILE__) . '/../../../../webclient_data/tmp'; +$conf['token']['driver'] = 'file'; + $conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../../../../webclient_data/storage'; +$conf['vfs']['type'] = 'file'; -$conf['kolab']['enabled'] = true; +$conf['accounts']['driver'] = 'kolab'; +$conf['accounts']['params']['attr'] = 'mail'; +$conf['accounts']['params']['strip'] = false; + +$conf['kolab']['ldap']['server'] = 'localhost'; $conf['kolab']['ldap']['port'] = 389; $conf['kolab']['imap']['port'] = 143; $conf['kolab']['imap']['sieveport'] = 2000; @@ -61,4 +65,5 @@ $conf['kolab']['smtp']['port'] = 25; $conf['kolab']['misc']['multidomain'] = false; $conf['kolab']['cache_folders'] = true; +$conf['kolab']['enabled'] = true; $conf['kolab']['freebusy']['server'] = 'https://localhost/freebusy'; Index: conf.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/conf.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- conf.php 21 Jan 2010 22:25:04 -0000 1.1 +++ conf.php 21 Jan 2010 22:34:52 -0000 1.2 @@ -1,13 +1,13 @@ Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde In directory doto:/tmp/cvs-serv10044 Modified Files: horde.spec Log Message: Fix typo. Index: horde.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- horde.spec 21 Jan 2010 22:25:04 -0000 1.9 +++ horde.spec 21 Jan 2010 22:38:40 -0000 1.10 @@ -176,7 +176,7 @@ '%config %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \ - '%config(noreplace) %{l_prefix}/var/kolab/webclient_data/storage/horde.db \ + '%config(noreplace) %{l_prefix}/var/kolab/webclient_data/storage/horde.db' \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/log \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage/horde.db \ From cvs at kolab.org Thu Jan 21 23:51:59 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Jan 2010 23:51:59 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 conf.php, 1.2, 1.3 Message-ID: <20100121225159.16CF0600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 In directory doto:/tmp/cvs-serv10280/configuration/horde-3.3.6 Modified Files: conf.php Log Message: Remove old configuration inclusion. Index: conf.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/conf.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- conf.php 21 Jan 2010 22:34:52 -0000 1.2 +++ conf.php 21 Jan 2010 22:51:57 -0000 1.3 @@ -114,6 +114,3 @@ $conf['kolab']['enabled'] = true; $conf['memcache']['enabled'] = false; /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */ -if (file_exists(dirname(__FILE__) . '/kolab.php')) { - require_once(dirname(__FILE__) . '/kolab.php'); -} From cvs at kolab.org Fri Jan 22 00:09:39 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 00:09:39 +0100 (CET) Subject: gunnar: server TODO,1.13,1.14 Message-ID: <20100121230939.74824600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv10946 Modified Files: TODO Log Message: Creating folders seems to work. Index: TODO =================================================================== RCS file: /kolabrepository/server/TODO,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- TODO 21 Jan 2010 22:23:13 -0000 1.13 +++ TODO 21 Jan 2010 23:09:37 -0000 1.14 @@ -29,8 +29,6 @@ - small effort: - Check that users may create folders in their INBOX. - Fix the Build system for ... apache-php [DONE] @@ -75,6 +73,7 @@ - Blocks: cloud.php - Check the admin section - how to handle the secret key setting ($conf[secret_key]) + - Deletion of horde.db? - larger effort: From cvs at kolab.org Fri Jan 22 00:10:02 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 00:10:02 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB/patches/PEAR-DB-1.7.13 - New directory Message-ID: <20100121231002.2F44B600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB/patches/PEAR-DB-1.7.13 In directory doto:/tmp/cvs-serv10995/PEAR-DB-1.7.13 Log Message: Directory /kolabrepository/server/pear/PEAR-DB/patches/PEAR-DB-1.7.13 added to the repository From cvs at kolab.org Fri Jan 22 00:10:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 00:10:30 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB/patches/DB-1.7.13 t_framework_HK_GW_DB_SqliteErrorChecking.diff, 1.1, NONE Message-ID: <20100121231030.EA4C3600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB/patches/DB-1.7.13 In directory doto:/tmp/cvs-serv11029/DB-1.7.13 Removed Files: t_framework_HK_GW_DB_SqliteErrorChecking.diff Log Message: Fix name of the patch directory. --- t_framework_HK_GW_DB_SqliteErrorChecking.diff DELETED --- From cvs at kolab.org Fri Jan 22 00:10:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 00:10:30 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB/patches/PEAR-DB-1.7.13 t_framework_HK_GW_DB_SqliteErrorChecking.diff, NONE, 1.1 Message-ID: <20100121231030.F02B260056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB/patches/PEAR-DB-1.7.13 In directory doto:/tmp/cvs-serv11029/PEAR-DB-1.7.13 Added Files: t_framework_HK_GW_DB_SqliteErrorChecking.diff Log Message: Fix name of the patch directory. --- NEW FILE: t_framework_HK_GW_DB_SqliteErrorChecking.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/framework/HK/GW/DB/SqliteErrorChecking Fix error checking in the sqlite PEAR implementation. Signed-off-by: Gunnar Wrobel
--- horde-webmail/pear/DB/sqlite.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/horde-webmail/pear/DB/sqlite.php b/horde-webmail/pear/DB/sqlite.php index bf2acec..00e65f4 100644 --- a/horde-webmail/pear/DB/sqlite.php +++ b/horde-webmail/pear/DB/sqlite.php @@ -742,7 +742,7 @@ class DB_sqlite extends DB_common // PHP 5.2+ prepends the function name to $php_errormsg, so we need // this hack to work around it, per bug #9599. - $errormsg = preg_replace('/^sqlite[a-z_]+: /', '', $errormsg); + $errormsg = preg_replace('/^sqlite[a-z_]+ \[[^\]]*\]: /', '', $errormsg); if (!isset($error_regexps)) { $error_regexps = array( -- tg: (018dab9..) t/framework/HK/GW/DB/SqliteErrorChecking (depends on: t/framework/HK/GW/Kolab/XfbFixes) -- TOPGIT patch commit log ======================= commit 1dd36cf01fd707c95af690339799bc5ce73a05c0 Author: Gunnar Wrobel
Date: Sun Feb 1 16:52:24 2009 +0000 Added patch release/HK-GW-DB_sqlite-Incorrect_error_check.patch from the mercurial release queue. From cvs at kolab.org Fri Jan 22 00:11:04 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 00:11:04 +0100 (CET) Subject: gunnar: server/pear/PEAR-DB package.info,1.1,1.2 Message-ID: <20100121231104.4ECE3600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-DB In directory doto:/tmp/cvs-serv11075/pear/PEAR-DB Modified Files: package.info Log Message: Bump release number. Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/PEAR-DB/package.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- package.info 12 Jul 2009 04:39:33 -0000 1.1 +++ package.info 21 Jan 2010 23:11:02 -0000 1.2 @@ -16,7 +16,7 @@ version='1.7.13' # Package release number -release='1' +release='2' # Source URL to download from sourceurl='http://pear.php.net/get' From cvs at kolab.org Fri Jan 22 00:11:33 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 00:11:33 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/configuration/imp-4.3.6 11-kolab_conf_imp.php, NONE, 1.1 Message-ID: <20100121231133.7A49960056A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6 In directory doto:/tmp/cvs-serv11087/configuration/imp-4.3.6 Added Files: 11-kolab_conf_imp.php Log Message: Add configuration for alternate login method. Fix template destinations. --- NEW FILE: 11-kolab_conf_imp.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp In directory doto:/tmp/cvs-serv11087 Modified Files: imp.spec Log Message: Add configuration for alternate login method. Fix template destinations. Index: imp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- imp.spec 21 Jan 2010 22:24:24 -0000 1.3 +++ imp.spec 21 Jan 2010 23:11:31 -0000 1.4 @@ -29,6 +29,7 @@ Source11: 10-kolab_hooks_base.php Source12: 10-kolab_servers_base.php Source13: conf.php +Source14: 11-kolab_conf_imp.php # List of Patches Patch0: package.patch @@ -64,6 +65,7 @@ %install %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates @@ -104,6 +106,7 @@ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/hooks.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/servers.d/ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:13} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:14} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/imp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template @@ -117,6 +120,8 @@ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_servers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-imp_spelling.php.template' \ + '%config(noreplace) %defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/webclient_data/storage/imp.db' \ + %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \ '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/imp/config/conf.php %clean From cvs at kolab.org Fri Jan 22 00:11:33 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 00:11:33 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/templates/imp-4.3.6 webclient-imp_conf.php.template, 1.1, 1.2 webclient-imp_header.php.template, 1.1, 1.2 webclient-imp_hooks.php.template, 1.1, 1.2 webclient-imp_menu.php.template, 1.1, 1.2 webclient-imp_mime_drivers.php.template, 1.1, 1.2 webclient-imp_motd.php.template, 1.1, 1.2 webclient-imp_prefs.php.template, 1.1, 1.2 webclient-imp_servers.php.template, 1.1, 1.2 webclient-imp_spelling.php.template, 1.1, 1.2 Message-ID: <20100121231133.8B2E460056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6 In directory doto:/tmp/cvs-serv11087/templates/imp-4.3.6 Modified Files: webclient-imp_conf.php.template webclient-imp_header.php.template webclient-imp_hooks.php.template webclient-imp_menu.php.template webclient-imp_mime_drivers.php.template webclient-imp_motd.php.template webclient-imp_prefs.php.template webclient-imp_servers.php.template webclient-imp_spelling.php.template Log Message: Add configuration for alternate login method. Fix template destinations. Index: webclient-imp_conf.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_conf.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_conf.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_conf.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/conf.local.php +TARGET=@@@imp_confdir@@@/conf.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_header.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_header.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_header.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_header.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/header.local.php +TARGET=@@@imp_confdir@@@/header.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_hooks.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_hooks.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_hooks.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_hooks.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/hooks.local.php +TARGET=@@@imp_confdir@@@/hooks.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_menu.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_menu.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_menu.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_menu.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/menu.local.php +TARGET=@@@imp_confdir@@@/menu.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_mime_drivers.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_mime_drivers.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_mime_drivers.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_mime_drivers.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/mime_drivers.local.php +TARGET=@@@imp_confdir@@@/mime_drivers.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_motd.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_motd.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_motd.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_motd.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/motd.local.php +TARGET=@@@imp_confdir@@@/motd.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_prefs.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_prefs.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_prefs.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_prefs.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/prefs.local.php +TARGET=@@@imp_confdir@@@/prefs.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_servers.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_servers.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_servers.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_servers.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/servers.local.php +TARGET=@@@imp_confdir@@@/servers.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-imp_spelling.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_spelling.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-imp_spelling.php.template 18 Jan 2010 17:44:22 -0000 1.1 +++ webclient-imp_spelling.php.template 21 Jan 2010 23:11:31 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@imp_confdir@@@/spelling.local.php +TARGET=@@@imp_confdir@@@/spelling.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END From cvs at kolab.org Fri Jan 22 08:13:08 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:13:08 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_imp_H_MS_bug7438.diff, 1.1, NONE Message-ID: <20100122071308.5A4D9600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv28119 Removed Files: t_imp_H_MS_bug7438.diff Log Message: Patch is availavle in imp 4.3.6 --- t_imp_H_MS_bug7438.diff DELETED --- From cvs at kolab.org Fri Jan 22 08:14:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:14:23 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_imp_H_JS_bug7739.diff, 1.1, NONE Message-ID: <20100122071423.F2879600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv28172 Removed Files: t_imp_H_JS_bug7739.diff Log Message: Patch is available in imp 4.3.6 --- t_imp_H_JS_bug7739.diff DELETED --- From cvs at kolab.org Fri Jan 22 08:48:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:48:42 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/patches/imp-4.3.6 - New directory Message-ID: <20100122074842.AFE8B60056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6 In directory doto:/tmp/cvs-serv28986/patches/imp-4.3.6 Log Message: Directory /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6 added to the repository From cvs at kolab.org Fri Jan 22 08:48:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:48:42 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/patches - New directory Message-ID: <20100122074842.AC7D7600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/patches In directory doto:/tmp/cvs-serv28986/patches Log Message: Directory /kolabrepository/server/kolab-webclient/imp/patches added to the repository From cvs at kolab.org Fri Jan 22 08:49:26 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:49:26 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_imp_SC_CH_SecIssues20090128.diff, 1.1, NONE Message-ID: <20100122074926.85379600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv29077/patches/1.2.0/KOLAB Removed Files: t_imp_SC_CH_SecIssues20090128.diff Log Message: Available with imp-4.3.6. --- t_imp_SC_CH_SecIssues20090128.diff DELETED --- From cvs at kolab.org Fri Jan 22 08:50:10 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:50:10 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp imp.spec,1.4,1.5 Message-ID: <20100122075010.2322A600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp In directory doto:/tmp/cvs-serv29106/imp Modified Files: imp.spec Log Message: Extract the part of the patch that has not yet been commited to CVS. Index: imp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- imp.spec 21 Jan 2010 23:11:31 -0000 1.4 +++ imp.spec 22 Jan 2010 07:50:08 -0000 1.5 @@ -1,7 +1,7 @@ # Macros %define V_package imp %define V_version 4.3.6 -%define V_release 20100121 +%define V_release 20100122 # Package Information Name: %{V_package} @@ -26,10 +26,9 @@ Source8: webclient-imp_servers.php.template Source9: webclient-imp_spelling.php.template Source10: 10-kolab_conf_base.php -Source11: 10-kolab_hooks_base.php -Source12: 10-kolab_servers_base.php -Source13: conf.php -Source14: 11-kolab_conf_imp.php +Source11: 10-kolab_servers_base.php +Source12: conf.php +Source13: 11-kolab_conf_imp.php # List of Patches Patch0: package.patch @@ -103,10 +102,9 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/conf.d/ - %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/hooks.d/ - %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/servers.d/ - %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:13} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/ - %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:14} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/servers.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:13} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/imp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template From cvs at kolab.org Fri Jan 22 08:50:10 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:50:10 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_imp_HideGroupwareFolders.diff, 1.1, NONE Message-ID: <20100122075010.29A2A600570@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv29106/patches/1.2.0/KOLAB Removed Files: t_imp_HideGroupwareFolders.diff Log Message: Extract the part of the patch that has not yet been commited to CVS. --- t_imp_HideGroupwareFolders.diff DELETED --- From cvs at kolab.org Fri Jan 22 08:50:10 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:50:10 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/patches/imp-4.3.6 series, NONE, 1.1 t_imp_HideGroupwareFolders.diff, NONE, 1.1 Message-ID: <20100122075010.240B160056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6 In directory doto:/tmp/cvs-serv29106/imp/patches/imp-4.3.6 Added Files: series t_imp_HideGroupwareFolders.diff Log Message: Extract the part of the patch that has not yet been commited to CVS. --- NEW FILE: series --- t_imp_HideGroupwareFolders.diff --- NEW FILE: t_imp_HideGroupwareFolders.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/imp/HideGroupwareFolders Hides special Kolab groupware folders. Signed-off-by: Gunnar Wrobel
--- horde-webmail/imp/config/hooks.php.dist | 11 +++++++- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/horde-webmail/imp/config/hooks.php.dist b/horde-webmail/imp/config/hooks.php.dist index 98e429e..f690ef5 100644 --- a/config/hooks.php.dist +++ b/config/hooks.php.dist @@ -590,7 +590,7 @@ case 'contact': return $GLOBALS['registry']->get('webroot', 'turba'); - case 'prefs': + case 'h-prefs': return $GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=horde'; default: @@ -644,7 +644,7 @@ ); break; - case 'prefs': + case 'h-prefs': $icons[$name] = array( 'icon' => 'prefs.png', 'icondir' => $GLOBALS['registry']->getImageDir('horde'), From cvs at kolab.org Fri Jan 22 08:56:32 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:56:32 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_imp_H_GW_LoginRetries.diff, 1.2, NONE Message-ID: <20100122075632.B7DFC60056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv29232/patches/1.2.0/KOLAB Removed Files: t_imp_H_GW_LoginRetries.diff Log Message: Merged configuration patch. --- t_imp_H_GW_LoginRetries.diff DELETED --- From cvs at kolab.org Fri Jan 22 08:56:32 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 08:56:32 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/configuration/imp-4.3.6 10-kolab_servers_base.php, 1.1, 1.2 Message-ID: <20100122075632.B43D1600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6 In directory doto:/tmp/cvs-serv29232/imp/configuration/imp-4.3.6 Modified Files: 10-kolab_servers_base.php Log Message: Merged configuration patch. Index: 10-kolab_servers_base.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6/10-kolab_servers_base.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- 10-kolab_servers_base.php 18 Jan 2010 17:44:22 -0000 1.1 +++ 10-kolab_servers_base.php 22 Jan 2010 07:56:30 -0000 1.2 @@ -38,7 +38,7 @@ $imapParams = array( 'hostspec' => $server, 'port' => $GLOBALS['conf']['kolab']['imap']['port'], - 'protocol' => $GLOBALS['conf']['auth']['params']['protocol'] + 'protocol' => 'imap/novalidate-cert' ); } @@ -58,4 +58,5 @@ 'acl' => array( 'driver' => 'rfc2086', ), + 'login_tries' => 1, ); From cvs at kolab.org Fri Jan 22 09:03:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 09:03:30 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_imp_H_GW_DefaultLoginView.diff, 1.2, NONE Message-ID: <20100122080330.085DD60056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv29464/patches/1.2.0/KOLAB Removed Files: t_imp_H_GW_DefaultLoginView.diff Log Message: This patch is still needed. --- t_imp_H_GW_DefaultLoginView.diff DELETED --- From cvs at kolab.org Fri Jan 22 09:03:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 09:03:30 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/patches/imp-4.3.6 t_imp_H_GW_DefaultLoginView.diff, NONE, 1.1 series, 1.1, 1.2 Message-ID: <20100122080330.0875060057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6 In directory doto:/tmp/cvs-serv29464/imp/patches/imp-4.3.6 Modified Files: series Added Files: t_imp_H_GW_DefaultLoginView.diff Log Message: This patch is still needed. --- NEW FILE: t_imp_H_GW_DefaultLoginView.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/imp/H/GW/DefaultLoginView Allow to configure the default imp view shown to the user. STATUS: SUBMIT Signed-off-by: Gunnar Wrobel
--- config/conf.xml | 8 ++++++++ login.php | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/config/conf.xml b/config/conf.xml index 517556e..92171b7 100644 --- a/config/conf.xml +++ b/config/conf.xml @@ -103,6 +103,14 @@ + imp + + imp + dimp + mimp + + diff --git a/login.php b/login.php index e6cd3c9..4644e93 100644 --- a/login.php +++ b/login.php @@ -257,7 +257,8 @@ if (!empty($conf['user']['select_view'])) { $apps = $registry->listApps(null, true); $view_cookie = isset($_COOKIE['default_imp_view']) ? $_COOKIE['default_imp_view'] - : ($browser->isMobile() && isset($apps['mimp']) ? 'mimp' : 'imp'); + : ($browser->isMobile() && isset($apps['mimp']) ? 'mimp' + : isset($conf['user']['default_view']) ? $conf['user']['default_view'] : 'imp'); if (isset($apps['dimp']) || isset($apps['mimp'])) { $views[] = array('sel' => $view_cookie == 'imp', 'val' => 'imp', 'name' => _("Traditional")); -- tg: (3a70f58..) t/imp/H/GW/DefaultLoginView (depends on: t/imp/H/JS/bug7739) -- TOPGIT patch commit log ======================= commit 580072bc0b627e05bfe3053efbd31b4215019923 Author: Gunnar Wrobel
Date: Thu Mar 26 19:22:37 2009 +0000 Merge change from http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/horde-webmail/1.2.0/tg/t_imp_H_GW_DefaultLoginView.diff.diff?r1=1.3&r2=1.4 commit e2430d5bafced289bb0b8ac9d073fca9a4e9bb4a Author: Gunnar Wrobel
Date: Sun Mar 8 20:09:33 2009 +0000 Add the conf.xml part of the new configuration variable. commit df4a014051b707ab4bf5ded96264c3b4f3b62ac4 Author: Gunnar Wrobel
Date: Sun Mar 8 08:14:20 2009 +0000 Allow to configure the default view for imp. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6/series,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- series 22 Jan 2010 07:50:08 -0000 1.1 +++ series 22 Jan 2010 08:03:27 -0000 1.2 @@ -1 +1,2 @@ t_imp_HideGroupwareFolders.diff +t_imp_H_GW_DefaultLoginView.diff From cvs at kolab.org Fri Jan 22 09:03:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 09:03:30 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/configuration/imp-4.3.6 conf.php, 1.1, 1.2 Message-ID: <20100122080330.018E9600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6 In directory doto:/tmp/cvs-serv29464/imp/configuration/imp-4.3.6 Modified Files: conf.php Log Message: This patch is still needed. Index: conf.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/configuration/imp-4.3.6/conf.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- conf.php 21 Jan 2010 22:24:24 -0000 1.1 +++ conf.php 22 Jan 2010 08:03:27 -0000 1.2 @@ -14,6 +14,7 @@ $conf['user']['allow_view_source'] = true; $conf['user']['alternate_login'] = false; $conf['user']['redirect_on_logout'] = false; +$conf['user']['default_view'] = 'imp'; $conf['user']['select_view'] = true; $conf['server']['change_server'] = false; $conf['server']['change_port'] = false; From cvs at kolab.org Fri Jan 22 09:41:16 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 09:41:16 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp/configuration - New directory Message-ID: <20100122084116.628A6600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/configuration In directory doto:/tmp/cvs-serv30483/configuration Log Message: Directory /kolabrepository/server/kolab-webclient/mimp/configuration added to the repository From cvs at kolab.org Fri Jan 22 09:41:16 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 09:41:16 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp/configuration/mimp-1.1.3 - New directory Message-ID: <20100122084116.6473A60056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/configuration/mimp-1.1.3 In directory doto:/tmp/cvs-serv30483/configuration/mimp-1.1.3 Log Message: Directory /kolabrepository/server/kolab-webclient/mimp/configuration/mimp-1.1.3 added to the repository From cvs at kolab.org Fri Jan 22 09:41:37 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 09:41:37 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp mimp.spec,1.1,1.2 Message-ID: <20100122084137.5A8EA600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp In directory doto:/tmp/cvs-serv30558 Modified Files: mimp.spec Log Message: Complete the mimp package. Index: mimp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/mimp/mimp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mimp.spec 19 Jan 2010 05:36:24 -0000 1.1 +++ mimp.spec 22 Jan 2010 08:41:35 -0000 1.2 @@ -1,7 +1,7 @@ # Macros %define V_package mimp %define V_version 1.1.3 -%define V_release 20100119 +%define V_release 20100122 # Package Information Name: %{V_package} @@ -20,6 +20,7 @@ Source2: webclient-mimp_menu.php.template Source3: webclient-mimp_mime_drivers.php.template Source4: webclient-mimp_prefs.php.template +Source5: conf.php # List of Patches Patch0: package.patch @@ -31,8 +32,7 @@ #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes -PreReq: horde-3.3.6 -PreReq: imp-4.3.6 +PreReq: imp >= 4.3.6 AutoReq: no AutoReqProv: no @@ -79,6 +79,8 @@ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:5} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/mimp/config/ + sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/mimp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ @@ -86,7 +88,7 @@ '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_menu.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_mime_drivers.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_prefs.php.template' \ -# '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/mimp/config/conf.php + '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/mimp/config/conf.php %clean rm -rf $RPM_BUILD_ROOT From cvs at kolab.org Fri Jan 22 09:41:37 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 09:41:37 +0100 (CET) Subject: gunnar: server/kolab-webclient/mimp/configuration/mimp-1.1.3 conf.php, NONE, 1.1 Message-ID: <20100122084137.5B94760056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/configuration/mimp-1.1.3 In directory doto:/tmp/cvs-serv30558/configuration/mimp-1.1.3 Added Files: conf.php Log Message: Complete the mimp package. --- NEW FILE: conf.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3 In directory doto:/tmp/cvs-serv30558/templates/mimp-1.1.3 Modified Files: webclient-mimp_conf.php.template webclient-mimp_menu.php.template webclient-mimp_mime_drivers.php.template webclient-mimp_prefs.php.template Log Message: Complete the mimp package. Index: webclient-mimp_conf.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3/webclient-mimp_conf.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-mimp_conf.php.template 19 Jan 2010 05:36:24 -0000 1.1 +++ webclient-mimp_conf.php.template 22 Jan 2010 08:41:35 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@mimp_confdir@@@/conf.local.php +TARGET=@@@mimp_confdir@@@/conf.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-mimp_menu.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3/webclient-mimp_menu.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-mimp_menu.php.template 19 Jan 2010 05:36:24 -0000 1.1 +++ webclient-mimp_menu.php.template 22 Jan 2010 08:41:35 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@mimp_confdir@@@/menu.local.php +TARGET=@@@mimp_confdir@@@/menu.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-mimp_mime_drivers.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3/webclient-mimp_mime_drivers.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-mimp_mime_drivers.php.template 19 Jan 2010 05:36:24 -0000 1.1 +++ webclient-mimp_mime_drivers.php.template 22 Jan 2010 08:41:35 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@mimp_confdir@@@/mime_drivers.local.php +TARGET=@@@mimp_confdir@@@/mime_drivers.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-mimp_prefs.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3/webclient-mimp_prefs.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-mimp_prefs.php.template 19 Jan 2010 05:36:24 -0000 1.1 +++ webclient-mimp_prefs.php.template 22 Jan 2010 08:41:35 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@mimp_confdir@@@/prefs.local.php +TARGET=@@@mimp_confdir@@@/prefs.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END From cvs at kolab.org Fri Jan 22 10:00:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:00:13 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd/templates/passwd-3.1.2 webclient-passwd_backends.php.template~, 1.1, NONE webclient-passwd_conf.php.template~, 1.1, NONE Message-ID: <20100122090013.27F6460057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/templates/passwd-3.1.2 In directory doto:/tmp/cvs-serv30958/templates/passwd-3.1.2 Removed Files: webclient-passwd_backends.php.template~ webclient-passwd_conf.php.template~ Log Message: Complete the passwd package. --- webclient-passwd_backends.php.template~ DELETED --- --- webclient-passwd_conf.php.template~ DELETED --- From cvs at kolab.org Fri Jan 22 10:00:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:00:13 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd passwd.spec,1.1,1.2 Message-ID: <20100122090013.20F73600568@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd In directory doto:/tmp/cvs-serv30958 Modified Files: passwd.spec Log Message: Complete the passwd package. Index: passwd.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/passwd/passwd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- passwd.spec 19 Jan 2010 13:20:45 -0000 1.1 +++ passwd.spec 22 Jan 2010 09:00:11 -0000 1.2 @@ -1,7 +1,7 @@ # Macros %define V_package passwd %define V_version 3.1.2 -%define V_release 20100119 +%define V_release 20100122 # Package Information Name: %{V_package} @@ -19,6 +19,7 @@ Source1: webclient-passwd_conf.php.template Source2: webclient-passwd_backends.php.template Source3: 10-kolab_backends_base.php +Source4: conf.php # List of Patches Patch0: package.patch @@ -30,7 +31,7 @@ #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes -PreReq: horde-3.3.6 +PreReq: horde >= 3.3.6 AutoReq: no AutoReqProv: no @@ -79,13 +80,14 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:3} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config/backends.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/passwd/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ '%config %{l_prefix}/etc/kolab/templates/webclient-passwd_conf.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-passwd_backends.php.template' \ -# '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/passwd/config/conf.php + '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/passwd/config/conf.php %clean rm -rf $RPM_BUILD_ROOT From cvs at kolab.org Fri Jan 22 10:00:13 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:00:13 +0100 (CET) Subject: gunnar: server/kolab-webclient/passwd/configuration/passwd-3.1.2 conf.php, NONE, 1.1 Message-ID: <20100122090013.2541A60056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/configuration/passwd-3.1.2 In directory doto:/tmp/cvs-serv30958/configuration/passwd-3.1.2 Added Files: conf.php Log Message: Complete the passwd package. --- NEW FILE: conf.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/passwd/configuration/passwd-3.1.2 In directory doto:/tmp/cvs-serv31048/configuration/passwd-3.1.2 Modified Files: conf.php Log Message: Update the version string of the configuration file. Index: conf.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/passwd/configuration/passwd-3.1.2/conf.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- conf.php 22 Jan 2010 09:00:11 -0000 1.1 +++ conf.php 22 Jan 2010 09:01:13 -0000 1.2 @@ -1,6 +1,6 @@ Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp In directory doto:/tmp/cvs-serv31824 Modified Files: dimp.spec Log Message: Complete the dimp package. The patches still need to be merged. Index: dimp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/dimp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dimp.spec 18 Jan 2010 20:33:56 -0000 1.1 +++ dimp.spec 22 Jan 2010 09:29:15 -0000 1.2 @@ -1,7 +1,7 @@ # Macros %define V_package dimp %define V_version 1.1.4 -%define V_release 20100118 +%define V_release 20100122 # Package Information Name: %{V_package} @@ -23,6 +23,7 @@ Source5: webclient-dimp_prefs.php.template Source6: webclient-dimp_servers.php.template Source7: 10-kolab_servers_base.php +Source8: conf.php # List of Patches Patch0: package.patch @@ -34,8 +35,7 @@ #Pre requisites BuildPreReq: OpenPKG, openpkg >= 20070603 BuildPreReq: php, php::with_pear = yes -PreReq: horde-3.3.6 -PreReq: imp-4.3.6 +PreReq: imp >= 4.3.6 AutoReq: no AutoReqProv: no @@ -85,6 +85,7 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:7} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/servers.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/dimp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template @@ -95,7 +96,7 @@ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_portal.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_prefs.php.template' \ '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_servers.php.template' \ -# '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/dimp/config/conf.php + '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/dimp/config/conf.php %clean rm -rf $RPM_BUILD_ROOT From cvs at kolab.org Fri Jan 22 10:29:18 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:29:18 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/templates/dimp-1.1.4 webclient-dimp_conf.php.template, 1.1, 1.2 webclient-dimp_hooks.php.template, 1.1, 1.2 webclient-dimp_menu.php.template, 1.1, 1.2 webclient-dimp_portal.php.template, 1.1, 1.2 webclient-dimp_prefs.php.template, 1.1, 1.2 webclient-dimp_servers.php.template, 1.1, 1.2 Message-ID: <20100122092918.F41F060057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4 In directory doto:/tmp/cvs-serv31824/templates/dimp-1.1.4 Modified Files: webclient-dimp_conf.php.template webclient-dimp_hooks.php.template webclient-dimp_menu.php.template webclient-dimp_portal.php.template webclient-dimp_prefs.php.template webclient-dimp_servers.php.template Log Message: Complete the dimp package. The patches still need to be merged. Index: webclient-dimp_conf.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4/webclient-dimp_conf.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-dimp_conf.php.template 18 Jan 2010 20:33:56 -0000 1.1 +++ webclient-dimp_conf.php.template 22 Jan 2010 09:29:15 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@dimp_confdir@@@/conf.local.php +TARGET=@@@dimp_confdir@@@/conf.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-dimp_hooks.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4/webclient-dimp_hooks.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-dimp_hooks.php.template 18 Jan 2010 20:33:56 -0000 1.1 +++ webclient-dimp_hooks.php.template 22 Jan 2010 09:29:15 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@dimp_confdir@@@/hooks.local.php +TARGET=@@@dimp_confdir@@@/hooks.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-dimp_menu.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4/webclient-dimp_menu.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-dimp_menu.php.template 18 Jan 2010 20:33:56 -0000 1.1 +++ webclient-dimp_menu.php.template 22 Jan 2010 09:29:15 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@dimp_confdir@@@/menu.local.php +TARGET=@@@dimp_confdir@@@/menu.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-dimp_portal.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4/webclient-dimp_portal.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-dimp_portal.php.template 18 Jan 2010 20:33:56 -0000 1.1 +++ webclient-dimp_portal.php.template 22 Jan 2010 09:29:15 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@dimp_confdir@@@/portal.local.php +TARGET=@@@dimp_confdir@@@/portal.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-dimp_prefs.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4/webclient-dimp_prefs.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-dimp_prefs.php.template 18 Jan 2010 20:33:56 -0000 1.1 +++ webclient-dimp_prefs.php.template 22 Jan 2010 09:29:15 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@dimp_confdir@@@/prefs.local.php +TARGET=@@@dimp_confdir@@@/prefs.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Index: webclient-dimp_servers.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4/webclient-dimp_servers.php.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webclient-dimp_servers.php.template 18 Jan 2010 20:33:56 -0000 1.1 +++ webclient-dimp_servers.php.template 22 Jan 2010 09:29:15 -0000 1.2 @@ -1,5 +1,5 @@ KOLAB_META_START -TARGET=@@@dimp_confdir@@@/servers.local.php +TARGET=@@@dimp_confdir@@@/servers.d/20-kolab_local.php PERMISSIONS=0400 OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END From cvs at kolab.org Fri Jan 22 10:29:17 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:29:17 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/configuration/dimp-1.1.4 conf.php, NONE, 1.1 Message-ID: <20100122092917.E6410600570@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/configuration/dimp-1.1.4 In directory doto:/tmp/cvs-serv31824/configuration/dimp-1.1.4 Added Files: conf.php Log Message: Complete the dimp package. The patches still need to be merged. --- NEW FILE: conf.php --- Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4 In directory doto:/tmp/cvs-serv31899/dimp/patches/dimp-1.1.4 Log Message: Directory /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4 added to the repository From cvs at kolab.org Fri Jan 22 10:29:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:29:46 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/patches - New directory Message-ID: <20100122092946.BA29C60056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/patches In directory doto:/tmp/cvs-serv31899/dimp/patches Log Message: Directory /kolabrepository/server/kolab-webclient/dimp/patches added to the repository From cvs at kolab.org Fri Jan 22 10:30:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:30:47 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_dimp_H_MS_FixBrokenFolderImages.diff, 1.1, NONE Message-ID: <20100122093047.927D4600570@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv31967/patches/1.2.0/KOLAB Removed Files: t_dimp_H_MS_FixBrokenFolderImages.diff Log Message: This patch has been merged to dimp HEAD but not in FRAMEWORK_3 --- t_dimp_H_MS_FixBrokenFolderImages.diff DELETED --- From cvs at kolab.org Fri Jan 22 10:30:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 10:30:47 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/patches/dimp-1.1.4 series, NONE, 1.1 t_dimp_H_MS_FixBrokenFolderImages.diff, NONE, 1.1 Message-ID: <20100122093047.8941E60056B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4 In directory doto:/tmp/cvs-serv31967/dimp/patches/dimp-1.1.4 Added Files: series t_dimp_H_MS_FixBrokenFolderImages.diff Log Message: This patch has been merged to dimp HEAD but not in FRAMEWORK_3 --- NEW FILE: series --- t_dimp_H_MS_FixBrokenFolderImages.diff --- NEW FILE: t_dimp_H_MS_FixBrokenFolderImages.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/dimp/H/MS/FixBrokenFolderImages Fixes broken custom folder images within DIMP. http://bugs.horde.org/ticket/7831 https://www.intevation.de/roundup/kolab/issue3328 STATUS: MERGED in HEAD but not in FRAMEWORK_3 Signed-off-by: Gunnar Wrobel
--- /js/DimpBase.js | 2149 ++++++++++++++++++++++++++++++++- js/src/DimpBase.js | 2 +- lib/DIMP.php | 9 +- themes/screen.css | 2 +- 4 files changed, 2157 insertions(+), 5 deletions(-) [...2197 lines suppressed...] display: inline; float: left; width: 20px; -- tg: (6938161..) t/dimp/H/MS/FixBrokenFolderImages (depends on: master) -- TOPGIT patch commit log ======================= commit 12a42ba2183476ce329b567490ff5013727d8a39 Author: Gunnar Wrobel
Date: Sat Feb 7 23:54:51 2009 +0000 Fix the style name. commit 8588d2b184f6244655c219104b4d8119f0ea4644 Author: Gunnar Wrobel
Date: Sat Feb 7 18:43:00 2009 +0000 kolab/issue3328 ([Webclient] DIMP groupware folder names display bug) From cvs at kolab.org Fri Jan 22 14:01:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 14:01:23 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp dimp.spec,1.2,1.3 Message-ID: <20100122130123.9873760057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp In directory doto:/tmp/cvs-serv5432 Modified Files: dimp.spec Log Message: Additional patch. Added menu entry. Added template warnings. Index: dimp.spec =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/dimp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dimp.spec 22 Jan 2010 09:29:15 -0000 1.2 +++ dimp.spec 22 Jan 2010 13:01:21 -0000 1.3 @@ -22,8 +22,9 @@ Source4: webclient-dimp_portal.php.template Source5: webclient-dimp_prefs.php.template Source6: webclient-dimp_servers.php.template -Source7: 10-kolab_servers_base.php -Source8: conf.php +Source7: 10-kolab_menu_base.php +Source8: 10-kolab_servers_base.php +Source9: conf.php # List of Patches Patch0: package.patch @@ -84,8 +85,9 @@ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates - %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:7} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/servers.d/ - %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:7} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/menu.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/servers.d/ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/ sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/dimp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template From cvs at kolab.org Fri Jan 22 14:01:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 14:01:23 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/configuration/dimp-1.1.4 10-kolab_menu_base.php, NONE, 1.1 Message-ID: <20100122130123.BF65360057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/configuration/dimp-1.1.4 In directory doto:/tmp/cvs-serv5432/configuration/dimp-1.1.4 Added Files: 10-kolab_menu_base.php Log Message: Additional patch. Added menu entry. Added template warnings. --- NEW FILE: 10-kolab_menu_base.php --- array( 'action' => 'DimpCore.DMenu.close(); DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")', 'text' => _('Folder Subscription'), 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'), ); From cvs at kolab.org Fri Jan 22 14:01:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 14:01:23 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/patches/dimp-1.1.4 t_dimp_H_BL_CloseContextMenu.diff, NONE, 1.1 series, 1.1, 1.2 Message-ID: <20100122130123.C9907600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4 In directory doto:/tmp/cvs-serv5432/patches/dimp-1.1.4 Modified Files: series Added Files: t_dimp_H_BL_CloseContextMenu.diff Log Message: Additional patch. Added menu entry. Added template warnings. --- NEW FILE: t_dimp_H_BL_CloseContextMenu.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/dimp/H/BL/CloseContextMenu Close the context menu when clicking into the Dimp menu. Provided by Boris Lorbeer Signed-off-by: Gunnar Wrobel
--- js/DimpBase.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/DimpBase.js b/js/DimpBase.js index c4eb9f4..d90f09b 100644 --- a/js/DimpBase.js +++ b/js/DimpBase.js @@ -1507,6 +1507,7 @@ var DimpBase = { case 'folder': case 'special': + DimpCore.DMenu.close(); e.stop(); return this.go('folder:' + li.readAttribute('mbox')); break; @@ -1903,7 +1904,7 @@ var DimpBase = { tmp = $('applicationfolders'); if (tmp) { tmp.select('ul li.custom a').each(function(s) { - C({ d: s, f: this.go.bind(this, 'app:' + s.readAttribute('app')) }); + C({ d: s, f: function(data){DimpCore.DMenu.close(); this.go('app:' + s.readAttribute('app'), data)}.bind(this) }); }, this); } -- tg: (19ee6e6..) t/dimp/H/BL/CloseContextMenu (depends on: t/kronolith/HK/GW/AnonymousiCalDownload) -- TOPGIT patch commit log ======================= commit b4b3190a4fb88e1843ff86adde4897dea21046db Author: Gunnar Wrobel
Date: Mon Jul 20 09:39:24 2009 +0200 Close the context menu when clicking into the Dimp menu. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/patches/dimp-1.1.4/series,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- series 22 Jan 2010 09:30:45 -0000 1.1 +++ series 22 Jan 2010 13:01:21 -0000 1.2 @@ -1 +1,2 @@ t_dimp_H_MS_FixBrokenFolderImages.diff +t_dimp_H_BL_CloseContextMenu.diff From cvs at kolab.org Fri Jan 22 14:01:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 14:01:23 +0100 (CET) Subject: gunnar: server/kolab-webclient/dimp/templates/dimp-1.1.4 webclient-dimp_conf.php.template, 1.2, 1.3 webclient-dimp_hooks.php.template, 1.2, 1.3 webclient-dimp_menu.php.template, 1.2, 1.3 webclient-dimp_portal.php.template, 1.2, 1.3 webclient-dimp_prefs.php.template, 1.2, 1.3 webclient-dimp_servers.php.template, 1.2, 1.3 Message-ID: <20100122130123.D204460057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4 In directory doto:/tmp/cvs-serv5432/templates/dimp-1.1.4 Modified Files: webclient-dimp_conf.php.template webclient-dimp_hooks.php.template webclient-dimp_menu.php.template webclient-dimp_portal.php.template webclient-dimp_prefs.php.template webclient-dimp_servers.php.template Log Message: Additional patch. Added menu entry. Added template warnings. Index: webclient-dimp_conf.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/dimp/templates/dimp-1.1.4/webclient-dimp_conf.php.template,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webclient-dimp_conf.php.template 22 Jan 2010 09:29:15 -0000 1.2 +++ webclient-dimp_conf.php.template 22 Jan 2010 13:01:21 -0000 1.3 @@ -4,6 +4,10 @@ OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6 In directory doto:/tmp/cvs-serv5562/imp/templates/imp-4.3.6 Modified Files: webclient-imp_conf.php.template webclient-imp_header.php.template webclient-imp_hooks.php.template webclient-imp_menu.php.template webclient-imp_mime_drivers.php.template webclient-imp_motd.php.template webclient-imp_prefs.php.template webclient-imp_servers.php.template webclient-imp_spelling.php.template Log Message: Add template warnings. Index: webclient-imp_conf.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/imp/templates/imp-4.3.6/webclient-imp_conf.php.template,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webclient-imp_conf.php.template 21 Jan 2010 23:11:31 -0000 1.2 +++ webclient-imp_conf.php.template 22 Jan 2010 13:02:55 -0000 1.3 @@ -4,6 +4,10 @@ OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3 In directory doto:/tmp/cvs-serv5562/mimp/templates/mimp-1.1.3 Modified Files: webclient-mimp_conf.php.template webclient-mimp_menu.php.template webclient-mimp_mime_drivers.php.template webclient-mimp_prefs.php.template Log Message: Add template warnings. Index: webclient-mimp_conf.php.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/mimp/templates/mimp-1.1.3/webclient-mimp_conf.php.template,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webclient-mimp_conf.php.template 22 Jan 2010 08:41:35 -0000 1.2 +++ webclient-mimp_conf.php.template 22 Jan 2010 13:02:55 -0000 1.3 @@ -4,6 +4,10 @@ OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ KOLAB_META_END Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6880 Modified Files: release-notes.txt Log Message: Port the AclView fix over to HEAD. Mark some TODOs as merged. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.498 retrieving revision 1.499 diff -u -d -r1.498 -r1.499 --- release-notes.txt 15 Jan 2010 15:38:47 -0000 1.498 +++ release-notes.txt 22 Jan 2010 13:51:09 -0000 1.499 @@ -252,7 +252,7 @@ - kolab-webclient-1.2.0-20091202 -TODO: SECURITY: Fixed image upload form issue. + SECURITY: Fixed image upload form issue. TODO: A proxy user can now be defined in the webclient-kolab-conf.template which allows anonymous read only @@ -508,9 +508,9 @@ - kolab-webclient-1.2.0-20090514 TODO: kolab/issue3329 (Can not accept/deny invitations in Dimp) -TODO: kolab/issue3420 (web client prefs and hooks should be + kolab/issue3420 (web client prefs and hooks should be configurable via templates) -TODO: kolab/issue3455 (There is no convenient/dimp-like way in dimp + kolab/issue3455 (There is no convenient/dimp-like way in dimp to set folder acls) TODO: kolab/issue3456 (There is no view in dimp that allows folder subscription) From cvs at kolab.org Fri Jan 22 14:51:12 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 14:51:12 +0100 (CET) Subject: gunnar: server/kolab-webclient/imp/patches/imp-4.3.6 t_imp_H_GW_AclView.diff, NONE, 1.1 series, 1.2, 1.3 Message-ID: <20100122135112.35AB8600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6 In directory doto:/tmp/cvs-serv6880/kolab-webclient/imp/patches/imp-4.3.6 Modified Files: series Added Files: t_imp_H_GW_AclView.diff Log Message: Port the AclView fix over to HEAD. Mark some TODOs as merged. --- NEW FILE: t_imp_H_GW_AclView.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/dimp/H/GW/AclView Provide a possibility to edit IMAP folder acls within DIMP. kolab/issue3455 (There is no convenient/dimp-like way in dimp to set folder acls) https://www.intevation.de/roundup/kolab/issue3455 [#8060] Additional entry in the folder popup to set IMAP ACLs http://bugs.horde.org/ticket/8060 Signed-off-by: Gunnar Wrobel
--- acl.php | 12 ++++++++++-- templates/acl/acl.html | 13 +++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/acl.php b/acl.php index cfa285f..851d8de 100644 --- a/acl.php +++ b/acl.php @@ -162,14 +162,22 @@ if (is_callable(array('Horde', 'loadConfiguration'))) { } $app = 'imp'; $chunk = Util::nonInputVar('chunk'); -Prefs_UI::generateHeader(null, $chunk); +if ($_SESSION['imp']['default_view'] != 'dimp') { + Prefs_UI::generateHeader(null, $chunk); +} else { + require $registry->get('templates', $app) . '/common-header.inc'; + $GLOBALS['notification']->notify(array('listeners' => 'status')); +} /* Set up template. */ $t = new IMP_Template(); $t->setOption('gettext', true); $t->set('aclurl', Horde::applicationUrl('acl.php')); $t->set('forminput', Util::formInput()); -$t->set('aclnavcell', Util::bufferOutput(array('Prefs_UI', 'generateNavigationCell'), 'acl')); +$t->set('imp_view', $_SESSION['imp']['default_view'] != 'dimp'); +if ($_SESSION['imp']['default_view'] != 'dimp') { + $t->set('aclnavcell', Util::bufferOutput(array('Prefs_UI', 'generateNavigationCell'), 'acl')); +} $t->set('changefolder', Horde::link('#', _("Change Folder"), 'smallheader', '', 'ACLFolderChange(true); return false;')); $t->set('sharedimg', Horde::img('shared.png', _("Change Folder"))); $t->set('options', IMP::flistSelect('', true, array(), $folder)); diff --git a/templates/acl/acl.html b/templates/acl/acl.html index 79580aa..ae85ff4 100644 --- a/templates/acl/acl.html +++ b/templates/acl/acl.html @@ -2,11 +2,14 @@ +
Share mail folders
+ +

@@ -17,6 +20,12 @@
+ +
+ +
+ +
@@ -76,9 +85,13 @@

+ + + +

'; } - if ($_SESSION['imp']['viewmode'] != 'imp') { - return $html; - } - if ($options) { - $html .= '
' . _("Actions") . '
' . - '' . _("Actions") . '' . - ' '; + + if ($_SESSION['imp']['viewmode'] == 'imp') { + + $html .= '
' . _("Actions") . '
' . + '' . _("Actions") . '' . + ' '; + + } else if ($_SESSION['imp']['viewmode'] == 'dimp') { + + $html .= '
'; + + foreach ($options as $key => $description) { + $html .= '
' . _createMEntry($description, 'kronolith.png', 'ctx_itippopdown_' . $key, '', true, 'kronolith') . '
'; + } + + $html .= '
'; + } } return $html; diff --git a/lib/MIME/Viewer/itip.php b/lib/MIME/Viewer/itip.php index 3227519..48769a2 100644 --- a/lib/MIME/Viewer/itip.php +++ b/lib/MIME/Viewer/itip.php @@ -752,8 +752,6 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer { } $script = 'if (DIMP.baseWindow) {var B = DIMP.baseWindow.DimpBase;} else {B = DimpBase;};DimpCore.addMouseEvents({ id: \'button_invitation_cont\', type: \'itippopdown\', offset: \'button_invitation_cont\', left: true});'; - $script .= '[ \'acceptimport\', \'import\', \'accept\', \'tentative\', \'deny\', \'update\', \'send\' ].each(function(a) {var d = $(\'ctx_itippopdown_\' + a); if (d) { DimpCore.clickObserveHandler({ d: d, f: function(a) { B.itip(a, DIMP.conf.msg_index, DIMP.conf.msg_folder, ' . $id . '); window.close(); }.curry(a) })}})'; - $html .= '
' . _createMEntry(_("Invitation"), 'kronolith.png', 'button_invitation', 'hasmenu', true, 'kronolith') . Horde::img('popdown.png', '', array(), $GLOBALS['registry']->getImageDir('dimp')) . '
'; if ($this->_msgs) { @@ -866,14 +864,30 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer { $html .= ' '; } else if ($_SESSION['imp']['viewmode'] == 'dimp') { + // the div of the context menu + $script = "var itipContextMenu = document.createElement('div');\n"; + $script .= "itipContextMenu.setAttribute('class', 'context');\n"; + $script .= "itipContextMenu.setAttribute('id', 'ctx_itippopdown');\n"; + $script .= "itipContextMenu.setAttribute('style', 'display:none');\n"; - $html .= '
'; - + // all the context menu items foreach ($options as $key => $description) { - $html .= '
' . _createMEntry($description, 'kronolith.png', 'ctx_itippopdown_' . $key, '', true, 'kronolith') . '
'; + $script .= "var itipContextMenuItem = document.createElement('a');\n"; + $script .= "itipContextMenuItem.setAttribute('id', 'ctx_itippopdown" . $key . "');\n"; + $script .= "var linkText = document.createTextNode('" . $description . "');\n"; + $script .= "itipContextMenuItem.appendChild(linkText);\n"; + $script .= "itipContextMenu.appendChild(itipContextMenuItem);\n"; + $script .= "var d = $(itipContextMenuItem);\n"; + $script .= "DimpCore.clickObserveHandler({ d: d,\n"; + $script .= " f: function(a) {\n"; + $script .= " B.itip(a, DIMP.conf.msg_index, DIMP.conf.msg_folder, '" . $id . "');\n"; + $script .= " window.close();\n"; + $script .= " }.curry('" . $key . "'),\n"; + $script .= " ns: true,\n"; + $script .= " });\n"; } - - $html .= '
'; + $script .= "document.getElementById('dimpPage').appendChild(itipContextMenu);\n"; + $html .= ''; } } From cvs at kolab.org Fri Jan 22 19:47:26 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 19:47:26 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/patches - New directory Message-ID: <20100122184726.4A3A7600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/patches In directory doto:/tmp/cvs-serv15667/kronolith/patches Log Message: Directory /kolabrepository/server/kolab-webclient/kronolith/patches added to the repository From cvs at kolab.org Fri Jan 22 19:47:26 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 19:47:26 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 - New directory Message-ID: <20100122184726.880B6600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3 In directory doto:/tmp/cvs-serv15667/kronolith/patches/kronolith-2.3.3 Log Message: Directory /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3 added to the repository From cvs at kolab.org Fri Jan 22 19:47:52 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 19:47:52 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_kronolith_HK_GW_AuthenticatedFreeBusy.diff, 1.1, NONE t_kronolith_HK_GW_CalendarRenaming.diff, 1.1, NONE Message-ID: <20100122184752.BF602600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv15717/patches/1.2.0/KOLAB Removed Files: t_kronolith_HK_GW_AuthenticatedFreeBusy.diff t_kronolith_HK_GW_CalendarRenaming.diff Log Message: Merge patches into kronolith. --- t_kronolith_HK_GW_AuthenticatedFreeBusy.diff DELETED --- --- t_kronolith_HK_GW_CalendarRenaming.diff DELETED --- From cvs at kolab.org Fri Jan 22 19:47:52 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 19:47:52 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 series, NONE, 1.1 t_kronolith_HK_GW_AuthenticatedFreeBusy.diff, NONE, 1.1 Message-ID: <20100122184752.B4BF0600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3 In directory doto:/tmp/cvs-serv15717/kronolith/patches/kronolith-2.3.3 Added Files: series t_kronolith_HK_GW_AuthenticatedFreeBusy.diff Log Message: Merge patches into kronolith. --- NEW FILE: series --- t_kronolith_HK_GW_AuthenticatedFreeBusy.diff --- NEW FILE: t_kronolith_HK_GW_AuthenticatedFreeBusy.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/kronolith/HK/GW/AuthenticatedFreeBusy Allow the use of authenticated Free/Busy with Kolab. FIXME: Check if that has been commited/submitted upstream. Signed-off-by: Gunnar Wrobel
--- config/conf.xml | 6 ++++++ lib/FreeBusy.php | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/config/conf.xml b/config/conf.xml index aa72858..0ed2387 100644 --- a/config/conf.xml +++ b/config/conf.xml @@ -49,6 +49,12 @@ + + Use authenticated free/busy + true + + Metadata Settings Date: Sun Feb 1 18:19:43 2009 +0000 Remove stuff from broken patching. commit ebb26e5d1fbfae64d93da8fc83c82589a82812f2 Author: Gunnar Wrobel
Date: Sun Feb 1 18:18:21 2009 +0000 Added patch kronolith/HK-GW-Authenticated_FB.patch from the mercurial release queue. From cvs at kolab.org Fri Jan 22 19:55:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 19:55:29 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_kronolith_HK_GW_FbviewRelevance.diff, 1.2, NONE t_kronolith_HK_GW_XfbAccess.diff, 1.2, NONE Message-ID: <20100122185529.D99F2600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv15922/patches/1.2.0/KOLAB Removed Files: t_kronolith_HK_GW_FbviewRelevance.diff t_kronolith_HK_GW_XfbAccess.diff Log Message: Merge xfbaccess and fbrelevance patches into the kronolith package. --- t_kronolith_HK_GW_FbviewRelevance.diff DELETED --- --- t_kronolith_HK_GW_XfbAccess.diff DELETED --- From cvs at kolab.org Fri Jan 22 19:55:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 19:55:29 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 t_kronolith_HK_GW_FbviewRelevance.diff, NONE, 1.1 t_kronolith_HK_GW_XfbAccess.diff, NONE, 1.1 series, 1.1, 1.2 Message-ID: <20100122185529.A0FBD600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3 In directory doto:/tmp/cvs-serv15922/kronolith/patches/kronolith-2.3.3 Modified Files: series Added Files: t_kronolith_HK_GW_FbviewRelevance.diff t_kronolith_HK_GW_XfbAccess.diff Log Message: Merge xfbaccess and fbrelevance patches into the kronolith package. --- NEW FILE: t_kronolith_HK_GW_FbviewRelevance.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/kronolith/HK/GW/FbviewRelevance Heed the Free/Busy relevance setting. Signed-off-by: Gunnar Wrobel
--- calendars/edit.php | 4 ++++ .../kronolith/lib/Forms/CreateCalendar.php | 4 ++++ lib/Forms/EditCalendar.php | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/calendars/edit.php b/calendars/edit.php index 67137d2..6357a2c 100644 --- a/calendars/edit.php +++ b/calendars/edit.php @@ -53,6 +53,10 @@ if ($form->validate($vars)) { $vars->set('name', $calendar->get('name')); $vars->set('description', $calendar->get('desc')); +$params = @unserialize($calendar->get('params')); +if (isset($params['fbrelevance'])) { + $vars->set('fbrelevance', $params['fbrelevance']); +} $title = $form->getTitle(); require KRONOLITH_TEMPLATES . '/common-header.inc'; require KRONOLITH_TEMPLATES . '/menu.inc'; diff --git a/lib/Forms/CreateCalendar.php b/lib/Forms/CreateCalendar.php index f11ae06..8d1154e 100644 --- a/lib/Forms/CreateCalendar.php +++ b/lib/Forms/CreateCalendar.php @@ -35,6 +35,9 @@ class Kronolith_CreateCalendarForm extends Horde_Form { $this->addVariable(_("Name"), 'name', 'text', true); $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60)); + $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, + array(array('owners/administrators', 'readers', 'no one'), + 'This calendar is only included into the free/busy data for ...')); $this->setButtons(array(_("Create"))); } @@ -48,6 +51,7 @@ class Kronolith_CreateCalendarForm extends Horde_Form { } $calendar->set('name', $this->_vars->get('name')); $calendar->set('desc', $this->_vars->get('description')); + $calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0)))); return $GLOBALS['kronolith_shares']->addShare($calendar); } diff --git a/lib/Forms/EditCalendar.php b/lib/Forms/EditCalendar.php index 0a76c57..e0b4659 100644 --- a/lib/Forms/EditCalendar.php +++ b/lib/Forms/EditCalendar.php @@ -42,6 +42,9 @@ class Kronolith_EditCalendarForm extends Horde_Form { $this->addHidden('', 'c', 'text', true); $this->addVariable(_("Name"), 'name', 'text', true); $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60)); + $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, + array(array('owners/administrators', 'readers', 'no one'), + 'This calendar is only included into the free/busy data for ...')); $this->setButtons(array(_("Save"))); } @@ -51,6 +54,7 @@ class Kronolith_EditCalendarForm extends Horde_Form { $original_name = $this->_calendar->get('name'); $this->_calendar->set('name', $this->_vars->get('name')); $this->_calendar->set('desc', $this->_vars->get('description')); + $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0)))); if ($original_name != $this->_vars->get('name')) { $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name')); -- tg: (2b89751..) t/kronolith/HK/GW/FbviewRelevance (depends on: t/kronolith/HK/SB/ExtraParameters) -- TOPGIT patch commit log ======================= commit 0175a71d1238e9b6907c31b7b97430dd7fc0486e Author: Gunnar Wrobel
Date: Sat Mar 14 01:10:44 2009 +0100 Remove stray .orig file. commit 6aba4a0d6a6d139204db96eeff2569528088b265 Author: Gunnar Wrobel
Date: Sun Feb 1 22:27:55 2009 +0000 Added patch kronolith/HK-GW-Fbview_relevance.patch from the mercurial release queue. --- NEW FILE: t_kronolith_HK_GW_XfbAccess.diff --- From: Gunnar Wrobel
Subject: [PATCH] t/kronolith/HK/GW/XfbAccess Allows to set the extended free/busy view access parameters via the calendar settings. Signed-off-by: Gunnar Wrobel
--- perms.php | 48 ++++++++++++++++++ templates/perms/perms.inc | 55 +++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/perms.php b/perms.php index f9bed71..4966bd4 100644 --- a/perms.php +++ b/perms.php @@ -15,6 +15,34 @@ require_once KRONOLITH_BASE . '/lib/base.php'; require_once 'Horde/Group.php'; +function &getFbperms($share) +{ + $fbperms = array(); + $params = $share->get('params'); + if (!is_a($params, 'PEAR_Error')) { + $params = @unserialize($params); + if (isset($params['xfbaccess'])) { + $xfbusers = $params['xfbaccess']; + foreach ($xfbusers as $user) { + $fbperms[$user] = PERMS_READ; + } + } + } + return $fbperms; +} + +function setFbperms($share, $xfbusers) +{ + $fbperms = array(); + $params = $share->get('params'); + if (!is_a($params, 'PEAR_Error')) { + $params = @unserialize($params); + $params['xfbaccess'] = $xfbusers; + $params = serialize($params); + $share->set('params', $params); + } +} + $shares = &Horde_Share::singleton('kronolith'); $groups = &Group::singleton(); $auth = &Auth::singleton($conf['auth']['driver']); @@ -36,6 +64,8 @@ case 'edit': $notification->push($share, 'horde.error'); } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) { exit('permission denied'); + } else { + $fbperms = getFbperms($share); } break; @@ -226,6 +256,24 @@ case 'editform': } } + // Process free/busy permissions. + $fb_names = Util::getFormData('fb_names'); + $fb_read = Util::getFormData('fb_read'); + + $fbperms = getFbperms($share); + foreach ($fb_names as $key => $user) { + if (empty($user)) { + continue; + } + + if (!empty($fb_read[$key])) { + $fbperms[$user] = PERMS_READ; + } else { + unset($fbperms[$user]); + } + } + setFbperms($share, array_keys($fbperms)); + $result = $share->setPermission($perm, false); if (is_a($result, 'PEAR_Error')) { $notification->push($result, 'horde.error'); diff --git a/templates/perms/perms.inc b/templates/perms/perms.inc index 4ca65a6..2174167 100644 --- a/templates/perms/perms.inc +++ b/templates/perms/perms.inc @@ -330,6 +330,61 @@ foreach ($userList as $user) {

+ getImageDir('horde')) . ' ' . _("Extended free/busy access") ?> +
+ /> + +
+ + + + + + + + +

+ + + + + + + + + + + + + + + + $list): ?> + + ', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, ""; + ?> + ', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, ""; + ?> + + + +
+

Date: Sat Mar 14 01:10:10 2009 +0100 Remove stray .orig file. commit e508e429dcac35ef7ac223c771a9973f823db53f Author: Gunnar Wrobel

Date: Sun Feb 1 22:21:11 2009 +0000 Added patch kronolith/HK-SB-Fbview_save_attendees.patch from the mercurial release queue. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/series,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- series 22 Jan 2010 18:55:27 -0000 1.2 +++ series 22 Jan 2010 19:01:46 -0000 1.3 @@ -1,3 +1,5 @@ +t_kronolith_HK_SB_ExtraParameters.diff +t_kronolith_HK_SB_SaveEventAttendees.diff t_kronolith_HK_GW_AuthenticatedFreeBusy.diff t_kronolith_HK_GW_FbviewRelevance.diff t_kronolith_HK_GW_XfbAccess.diff From cvs at kolab.org Fri Jan 22 20:06:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:06:03 +0100 (CET) Subject: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_kronolith_HK_GW_SyncMLrefresh.diff, 1.1, NONE t_kronolith_HK_GW_getFreebusyServer.diff, 1.1, NONE Message-ID: <20100122190603.DE87F600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB In directory doto:/tmp/cvs-serv16583/patches/1.2.0/KOLAB Removed Files: t_kronolith_HK_GW_SyncMLrefresh.diff t_kronolith_HK_GW_getFreebusyServer.diff Log Message: Merge another kronolith patch, remove an obsolete one. --- t_kronolith_HK_GW_SyncMLrefresh.diff DELETED --- --- t_kronolith_HK_GW_getFreebusyServer.diff DELETED --- From cvs at kolab.org Fri Jan 22 20:06:03 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:06:03 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 t_kronolith_HK_GW_SyncMLrefresh.diff, NONE, 1.1 series, 1.3, 1.4 Message-ID: <20100122190603.DAE9F600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3 In directory doto:/tmp/cvs-serv16583/kronolith/patches/kronolith-2.3.3 Modified Files: series Added Files: t_kronolith_HK_GW_SyncMLrefresh.diff Log Message: Merge another kronolith patch, remove an obsolete one. --- NEW FILE: t_kronolith_HK_GW_SyncMLrefresh.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/SyncMLrefresh Refresh calendars before running a SyncML synchronization. Signed-off-by: Gunnar Wrobel

--- lib/Driver/kolab.php | 10 ++++++++++ lib/api.php | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/lib/Driver/kolab.php b/lib/Driver/kolab.php index 6133d74..de49c81 100644 --- a/lib/Driver/kolab.php +++ b/lib/Driver/kolab.php @@ -62,6 +62,7 @@ class Kronolith_Driver_kolab extends Kronolith_Driver { $this->_calendar = $calendar; $this->_wrapper->reset(); } + $this->_wrapper->open($calendar); return true; } @@ -215,6 +216,10 @@ class Kronolith_Driver_kolab_wrapper { $this->_driver = &$driver; $this->_kolab = &$driver->_kolab; } + + function open($calendar) + { + } } @@ -991,6 +996,11 @@ class Kronolith_Driver_kolab_wrapper_new extends Kronolith_Driver_kolab_wrapper $this->reset(); } + function open($calendar) + { + $this->synchronize(); + } + /** * Reset internal variable on share change */ diff --git a/lib/api.php b/lib/api.php index 68a52d0..202b85e 100644 --- a/lib/api.php +++ b/lib/api.php @@ -694,6 +694,7 @@ function _kronolith_list($calendar = null, $startstamp = 0, $endstamp = 0) function _kronolith_listBy($action, $timestamp, $calendar = null) { require_once dirname(__FILE__) . '/base.php'; + global $kronolith_driver; if (empty($calendar)) { $calendar = Kronolith::getDefaultCalendar(); @@ -704,6 +705,8 @@ function _kronolith_listBy($action, $timestamp, $calendar = null) return PEAR::raiseError(_("Permission Denied")); } + $kronolith_driver->open($calendar); + $history = &Horde_History::singleton(); $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar); if (is_a($histories, 'PEAR_Error')) { -- tg: (6938161..) t/kronolith/HK/GW/SyncMLrefresh (depends on: master) -- TOPGIT patch commit log ======================= commit d66c36f15b0ee0524d4cc2660ea8d092e82df1b2 Author: Gunnar Wrobel

Date: Sun Feb 1 23:54:50 2009 +0000 Added patch kronolith/HK-GW-SyncML_refresh.patch from the mercurial release queue. Index: series =================================================================== RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/series,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- series 22 Jan 2010 19:01:46 -0000 1.3 +++ series 22 Jan 2010 19:06:01 -0000 1.4 @@ -3,3 +3,4 @@ t_kronolith_HK_GW_AuthenticatedFreeBusy.diff t_kronolith_HK_GW_FbviewRelevance.diff t_kronolith_HK_GW_XfbAccess.diff +t_kronolith_HK_GW_SyncMLrefresh.diff From cvs at kolab.org Fri Jan 22 20:59:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:59:51 +0100 (CET) Subject: gunnar: server release-notes.txt,1.501,1.502 Message-ID: <20100122195951.83D29600586@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv17664 Modified Files: release-notes.txt Log Message: Merge patches from the kolab_2_2 branch. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.501 retrieving revision 1.502 diff -u -d -r1.501 -r1.502 --- release-notes.txt 22 Jan 2010 17:20:02 -0000 1.501 +++ release-notes.txt 22 Jan 2010 19:59:49 -0000 1.502 @@ -254,15 +254,15 @@ SECURITY: Fixed image upload form issue. -TODO: A proxy user can now be defined in the + A proxy user can now be defined in the webclient-kolab-conf.template which allows anonymous read only access to all the users calendars. -TODO: The proxy users calender-events can be integrated into third + The proxy users calender-events can be integrated into third party sites using the new client/kronolith/imple_kolab.php feature. -TODO: Calendars accessible for the proxy user can be anonymously + Calendars accessible for the proxy user can be anonymously downloaded as ics files. TODO: kolab/issue3237 (Double Sync with SyncML when using external @@ -279,9 +279,9 @@ status (rt#5801)) TODO: kolab/issue3767 (Kolab server 2.2.0 resmgr creates incorrect event attendee status values) -TODO: kolab/issue3844 (New user preference to specify order of date + kolab/issue3844 (New user preference to specify order of date input fields) -TODO: kolab/issue3846 (fix recurring events that are counted per week + kolab/issue3846 (fix recurring events that are counted per week and not per incident) kolab/issue3856 (IMP/DIMP folder navigator does not allow creating/deleting/... mail folders) From cvs at kolab.org Fri Jan 22 20:59:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:59:51 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/templates/horde-3.3.6 webclient-kolab-conf.template, 1.2, 1.3 Message-ID: <20100122195951.87C30600587@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6 In directory doto:/tmp/cvs-serv17664/kolab-webclient/horde/templates/horde-3.3.6 Modified Files: webclient-kolab-conf.template Log Message: Merge patches from the kolab_2_2 branch. Index: webclient-kolab-conf.template =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-kolab-conf.template,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webclient-kolab-conf.template 12 Jan 2010 22:16:53 -0000 1.2 +++ webclient-kolab-conf.template 22 Jan 2010 19:59:49 -0000 1.3 @@ -23,9 +23,17 @@ @@@endif@@@ $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@'; -/* +/** * Kolab uses file based preferences by default. There is an alternative * IMAP based driver that allows the users to keep their preferences in * the IMAP storage. You can activate it here. */ //$conf['prefs']['driver'] = 'kolab_imap'; + +/** + * Credentials for a proxy user to allow quasi anonymous ICS access + * via kronolith/ics_kolab.php + */ +//$conf['ics']['default_user'] = ''; +//$conf['ics']['default_pass'] = ''; + From cvs at kolab.org Fri Jan 22 20:59:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:59:51 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 t_kronolith_HK_GW_ExportEventList.patch, NONE, 1.1 Message-ID: <20100122195951.8F337600588@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 In directory doto:/tmp/cvs-serv17664/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 Added Files: t_kronolith_HK_GW_ExportEventList.patch Log Message: Merge patches from the kolab_2_2 branch. --- NEW FILE: t_kronolith_HK_GW_ExportEventList.patch --- diff --git a/horde-webmail/lib/Horde/Kolab/Storage/List.php b/horde-webmail/lib/Horde/Kolab/Storage/List.php index a9bff36..a31ef82 100644 --- a/a/a/lib/Horde/Kolab/Storage/List.php +++ b/a/a/lib/Horde/Kolab/Storage/List.php @@ -136,7 +136,7 @@ class Kolab_List { */ function &listFolders() { - if (!isset($this->_list)) { + if (!isset($this->_list) || is_a($this->_list, 'PEAR_Error')) { $session = &Horde_Kolab_Session::singleton(); $imap = &$session->getImap(); if (is_a($imap, 'PEAR_Error')) { From cvs at kolab.org Fri Jan 22 20:59:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:59:51 +0100 (CET) Subject: gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 10-kolab_prefs_base.php, 1.1, 1.2 Message-ID: <20100122195951.809A8600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6 In directory doto:/tmp/cvs-serv17664/kolab-webclient/horde/configuration/horde-3.3.6 Modified Files: 10-kolab_prefs_base.php Log Message: Merge patches from the kolab_2_2 branch. Index: 10-kolab_prefs_base.php =================================================================== RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/10-kolab_prefs_base.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- 10-kolab_prefs_base.php 12 Jan 2010 22:16:11 -0000 1.1 +++ 10-kolab_prefs_base.php 22 Jan 2010 19:59:49 -0000 1.2 @@ -1,5 +1,27 @@ _("Your Information"), + 'label' => _("Locale and Time"), + 'desc' => _("Set your preferred language, timezone and date options."), + 'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'date_input_format', 'first_week_day') +); + +// date input format +$_prefs['date_input_format'] = array( + 'value' => 'year-month-day', + 'locked' => false, + 'shared' => true, + 'type' => 'enum', + 'enum' => array( + 'day-month-year' => strftime('%d %b %Y'), + 'month-day-year' => strftime('%b %d %Y'), + 'year-day-month' => strftime('%Y %d %b'), + 'year-month-day' => strftime('%Y %b %d'), + ), + 'desc' => _("Choose order how to enter dates:"), +); + // user full name for From: line // If you lock this preference, you must specify a value or a hook for it in // horde/config/hooks.php. From cvs at kolab.org Fri Jan 22 20:59:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:59:51 +0100 (CET) Subject: gunnar: server/php-kolab/Kolab_Storage package.info,1.1,1.2 Message-ID: <20100122195951.CE799600585@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Storage In directory doto:/tmp/cvs-serv17664/php-kolab/Kolab_Storage Modified Files: package.info Log Message: Merge patches from the kolab_2_2 branch. Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/package.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- package.info 17 Jan 2010 13:05:01 -0000 1.1 +++ package.info 22 Jan 2010 19:59:49 -0000 1.2 @@ -16,7 +16,7 @@ version='0.4.0' # Package release number -release='20100116' +release='20100122' # Source URL to download from sourceurl='http://pear.horde.org/get' From cvs at kolab.org Fri Jan 22 20:59:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Jan 2010 20:59:51 +0100 (CET) Subject: gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 t_kronolith_HK_GW_AnonymousiCalDownload.diff, NONE, 1.1 t_kronolith_HK_GW_ExportEventList.diff, NONE, 1.1 t_kronolith_HK_GW_HandleEmptyDates.diff, NONE, 1.1 t_kronolith_HK_UV_dateInputFieldOrder.diff, NONE, 1.1 series, 1.4, 1.5 Message-ID: <20100122195951.902B8600589@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3 In directory doto:/tmp/cvs-serv17664/kolab-webclient/kronolith/patches/kronolith-2.3.3 Modified Files: series Added Files: t_kronolith_HK_GW_AnonymousiCalDownload.diff t_kronolith_HK_GW_ExportEventList.diff t_kronolith_HK_GW_HandleEmptyDates.diff t_kronolith_HK_UV_dateInputFieldOrder.diff Log Message: Merge patches from the kolab_2_2 branch. --- NEW FILE: t_kronolith_HK_GW_AnonymousiCalDownload.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/AnonymousiCalDownload This patch allows anonymous access via kronolith/ics_kolab.php by using a proxy user that needs to be given access to user calendars that should be exported anonymously. STATUS: HACK Signed-off-by: Gunnar Wrobel

--- horde-webmail/config/kolab.php | 4 + ics_kolab.php | 110 +++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 0 deletions(-) diff --git a/ics_kolab.php b/ics_kolab.php new file mode 100644 index 0000000..2b81832 --- /dev/null +++ b/ics_kolab.php @@ -0,0 +1,110 @@ + + */ + +function logout() +{ + Auth::clearAuth(); + @session_destroy(); +} + + at define('AUTH_HANDLER', true); + at define('HORDE_BASE', dirname(__FILE__) . '/..'); +require_once HORDE_BASE . '/lib/base.php'; + +// We want to always generate UTF-8 iCalendar data. +NLS::setCharset('UTF-8'); + +// Determine which calendar to export. +$calendar = Util::getFormData('c'); +if (empty($calendar) && !empty($_SERVER['PATH_INFO'])) { + $calendar = basename($_SERVER['PATH_INFO']); +} + +// Authenticate. +$auth = &Auth::singleton($conf['auth']['driver']); +if (!isset($_SERVER['PHP_AUTH_USER'])) { + if (isset($conf['ics']['default_user']) + && isset($conf['ics']['default_pass'])) { + $user = $conf['ics']['default_user']; + $pass = $conf['ics']['default_pass']; + $proxied = true; + } +} else { + $user = $_SERVER['PHP_AUTH_USER']; + $pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : null; +} + +if (!isset($user) || !$auth->authenticate($user, array('password' => $pass))) { + header('WWW-Authenticate: Basic realm="Kronolith iCalendar Interface"'); + header('HTTP/1.0 401 Unauthorized'); + echo '401 Unauthorized'; + exit; +} + + at define('KRONOLITH_BASE', dirname(__FILE__)); +require_once KRONOLITH_BASE . '/lib/base.php'; +require_once 'Horde/Cache.php'; +require_once 'Horde/iCalendar.php'; + +$share = $kronolith_shares->getShare($calendar); +if (is_a($share, 'PEAR_Error')) { + header('HTTP/1.0 400 Bad Request'); + echo '400 Bad Request'; + if ($proxied) { + logout(); + } + exit; +} + +if (!$share->hasPermission(Auth::getAuth(), PERMS_READ)) { + header('WWW-Authenticate: Basic realm="Kronolith iCalendar Interface"'); + header('HTTP/1.0 401 Unauthorized'); + echo '401 Unauthorized'; + exit; +} + +$cache = &Horde_Cache::singleton($conf['cache']['driver'], Horde::getDriverConfig('cache', $conf['cache']['driver'])); +$key = 'kronolith.ics.' . $calendar; + +$ics = $cache->get($key, 360); +if (!$ics) { + $kronolith_driver->open(urlencode($calendar)); + $events = $kronolith_driver->listEvents(); + + $iCal = new Horde_iCalendar(); + $iCal->setAttribute('X-WR-CALNAME', String::convertCharset($share->get('name'), NLS::getCharset(), 'utf-8')); + + foreach ($events as $id) { + $event = &$kronolith_driver->getEvent($id); + if (is_a($event, 'PEAR_Error')) { + continue; + } + $iCalEvent = $event->toiCalendar($iCal); + if (!empty($conf['ics']['hide_organizer'])) { + $iCalEvent->removeAttribute('ORGANIZER'); + } + $iCal->addComponent($iCalEvent); + } + + $ics = $iCal->exportvCalendar(); + $cache->set($key, $ics); +} + +$browser->downloadHeaders($calendar . '.ics', + 'text/calendar; charset=' . NLS::getCharset(), + true, + strlen($ics)); +echo $ics; + +if ($proxied) { + logout(); +} --- NEW FILE: t_kronolith_HK_GW_ExportEventList.diff --- From: Gunnar Wrobel

Subject: [PATCH] t/kronolith/HK/GW/ExportEventList Export a list of events. STATUS: OPEN Signed-off-by: Gunnar Wrobel

--- imple_kolab.php | 96 +++++++++ lib/Block/eventlist.php | 243 +++++++++++++++++++++++ themes/embed.css | 51 +++++- horde-webmail/lib/Horde/Kolab/Storage/List.php | 2 +- 4 files changed, 390 insertions(+), 2 deletions(-) diff --git a/imple_kolab.php b/imple_kolab.php new file mode 100644 index 0000000..65db938 --- /dev/null +++ b/imple_kolab.php @@ -0,0 +1,96 @@ + + */ + +function impleLogout() +{ + Auth::clearAuth(); + @session_destroy(); +} + + at define('AUTH_HANDLER', true); + at define('HORDE_BASE', dirname(__FILE__) . '/..'); +require_once HORDE_BASE . '/lib/base.php'; + +// We want to always generate UTF-8 iCalendar data. +NLS::setCharset('UTF-8'); + +$auth = &Auth::singleton('kolab'); + +if (isset($conf['ics']['default_user']) + && isset($conf['ics']['default_pass'])) { + $user = $conf['ics']['default_user']; + $pass = $conf['ics']['default_pass']; + $_SESSION = array(); + $auth->authenticate($user, + array('password' => + $pass)); + register_shutdown_function('impleLogout'); +} + + at define('KRONOLITH_BASE', dirname(__FILE__)); +require_once KRONOLITH_BASE . '/lib/base.php'; +require_once KRONOLITH_BASE . '/lib/Imple.php'; + + +$path = Util::getFormData('imple'); +if (!$path) { + exit; +} +if ($path[0] == '/') { + $path = substr($path, 1); +} +$path = explode('/', $path); +$impleName = array_shift($path); + +$imple = Imple::factory($impleName); +if (!$imple) { + exit; +} + +$args = array(); +foreach ($path as $pair) { + if (strpos($pair, '=') === false) { + $args[$pair] = true; + } else { + list($name, $val) = explode('=', $pair); + $args[$name] = $val; + } +} + +$result = $imple->handle($args); + +if (!empty($_SERVER['Content-Type'])) { + $ct = $_SERVER['Content-Type']; +} else { + $ct = is_string($result) ? 'plain' : 'json'; +} + +switch ($ct) { +case 'json': + header('Content-Type: text/x-json'); + require_once KRONOLITH_BASE . '/lib/JSON.php'; + echo Kronolith_Serialize_JSON::encode(String::convertCharset($result, NLS::getCharset(), 'utf-8')); + break; + +case 'plain': + header('Content-Type: text/plain'); + echo $result; + break; + +case 'html': + header('Content-Type: text/html'); + echo $result; + break; + +default: + echo $result; +} \ No newline at end of file diff --git a/lib/Block/eventlist.php b/lib/Block/eventlist.php new file mode 100644 index 0000000..420a984 --- /dev/null +++ b/lib/Block/eventlist.php @@ -0,0 +1,243 @@ + array('name' => _("Days"), + 'type' => 'int', + 'default' => 42), + 'maxevents' => array('name' => _("Maximum number of events to display (0 = no limit)"), + 'type' => 'int', + 'default' => 0)); + + return $params; + } + + /** + * The title to go in this block. + * + * @return string The title text. + */ + function _title() + { + global $registry; + return ''; + } + + /** + * The content to go in this block. + * + * @return string The content + */ + function _content() + { + global $kronolith_driver, $registry, $prefs; + require_once dirname(__FILE__) . '/../base.php'; + require_once KRONOLITH_BASE . '/lib/Day.php'; + require_once 'Horde/Prefs/CategoryManager.php'; + require_once 'Horde/Text/Filter.php'; + + if (!empty($this->_params['days'])) { + $span = $this->_params['days']; + } else { + $span = 42; + } + + $now = $_SERVER['REQUEST_TIME']; + $today = date('j'); + + $startDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j'))); + $endDate = new Horde_Date(array('year' => date('Y'), 'month' => date('n'), 'mday' => date('j') + $span)); + $endDate->correct(); + + if (isset($this->_params['calendar']) && + $this->_params['calendar'] != '__all') { + + $calendar = $GLOBALS['kronolith_shares']->getShare($this->_params['calendar']); + if (!is_a($calendar, 'PEAR_Error') && !$calendar->hasPermission(Auth::getAuth(), PERMS_SHOW)) { + return _("Permission Denied"); + } + + $all_events = Kronolith::listEvents($startDate, + $endDate, + array($this->_params['calendar'])); + } else { + $calendars = Kronolith::listCalendars(false, PERMS_SHOW); + $all_events = Kronolith::listEvents($startDate, + $endDate, + array_keys($calendars)); + } + if (is_a($all_events, 'PEAR_Error')) { + return '' . $all_events->getMessage() . ''; + } + + $iMax = $today + $span; + + $html = ''; + $firstday = true; + $olddayname = ''; + $totalevents = 0; + + $displayed = array(); + + for ($i = $today; $i < $iMax; ++$i) { + $day = new Kronolith_Day(date('n'), $i); + + if ($day->isToday()) { + $dayname = _("Today"); + } elseif ($day->isTomorrow()) { + $dayname = _("Tomorrow"); + } elseif ($day->weekOfYear() == $startDate->weekOfYear()) { + $dayname = _("This week"); + } elseif ($day->month == $startDate->month) { + if ($day->weekOfYear() == $startDate->weekOfYear() + 1) { + $dayname = _("Next week"); + } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 2) { + $dayname = _("Two weeks from now"); + } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 3) { + $dayname = _("Three weeks from now"); + } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 4) { + $dayname = _("Four weeks from now"); + } elseif ($day->weekOfYear() == $startDate->weekOfYear() + 5) { + $dayname = _("Five weeks from now"); + } + } elseif ($day->month - 1 == $startDate->month + || ($day->month == 1 && $startDate->month == 12)) { + $dayname = _("Next month"); + } elseif ($day->year == $startDate->year) { + $dayname = $day->format('F'); + } elseif ($day->year - 1 == $startDate->year) { + $dayname = _("Next year"); + } else { + $dayname = _("After the next year"); + } + + if (empty($all_events[$day->getStamp()])) { + continue; + } + + $events = &$all_events[$day->getStamp()]; + + $today12am = mktime(0, 0, 0, + $day->month, + $day->mday, + $day->year); + $tomorrow12am = mktime(0, 0, 0, + $day->month, + $day->mday + 1, + $day->year); + foreach ($events as $event) { + + if (!empty($this->_params['maxevents']) && + $totalevents >= $this->_params['maxevents']) { + break 2; + } + + if ($event->end->timestamp() < $now) { + continue; + } + if ($dayname != $olddayname) { + if (!$firstday) { + $html .= ' '; + } + $html .= ''; + $html .= $dayname . ''; + $olddayname = $dayname; + $firstday = false; + } + + if (in_array($event->getId(), $displayed)) { + continue; + } + + $category = $event->getCategory(); + if (!empty($category)) { + $ctd = ''; + } else { + $ctd = ''; + } + + if ($event->isAllDay()) { + $format = 'D, d M Y'; + } else { + $format = 'G:i T D, d M Y'; + } + + if ($event->start->timestamp() < $now) { + $time = _('until') . date($format, $event->end->timestamp()); + } else { + $time = date($format, $event->start->timestamp()) . _(' to ') . + date($format, $event->end->timestamp()); + } + + $html .= '' . $ctd . '

Date: Fri Oct 9 09:18:48 2009 +0200 Clean logout. commit c471608f1adfa116123b913959498d5b7f8defc6 Author: Gunnar Wrobel

Date: Fri Oct 9 08:45:58 2009 +0200 Cleaner session handling. commit 992834cabdcc4a7aabbf566c7a5a27df639bef98 Author: Gunnar Wrobel

Date: Wed Oct 7 22:22:07 2009 +0200 Comment. commit 787cac7fd3a7dd282ad66596c30fc0eaf67bbe20 Author: Gunnar Wrobel

Date: Wed Oct 7 22:19:43 2009 +0200 Export a list of events. --- NEW FILE: t_kronolith_HK_GW_HandleEmptyDates.diff --- From: root Subject: [PATCH] t/kronolith/HK/GW/HandleEmptyDates Enables the Kolab driver to handle empty start and/or end dates correctly. REF: https://issues.kolab.org/issue3656 Signed-off-by: root --- lib/Driver/kolab.php | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Driver/kolab.php b/lib/Driver/kolab.php index de49c81..e915475 100644 --- a/lib/Driver/kolab.php +++ b/lib/Driver/kolab.php @@ -1134,12 +1134,18 @@ class Kronolith_Driver_kolab_wrapper_new extends Kronolith_Driver_kolab_wrapper return $result; } - if (is_null($startDate)) { + if (empty($startDate)) { $startDate = &new Horde_Date(array('mday' => 1, 'month' => 1, 'year' => 0000)); } - if (is_null($endDate)) { + if (empty($endDate)) { $endDate = &new Horde_Date(array('mday' => 31, 'month' => 12, 'year' => 9999)); } + if (!is_a($startDate, 'Horde_Date')) { + $startDate = &new Horde_Date($startDate); + } + if (!is_a($endDate, 'Horde_Date')) { + $endDate = &new Horde_Date($endDate); + } $ids = array(); -- tg: (e6faeaf..) t/kronolith/HK/GW/HandleEmptyDates (depends on: t/framework/H/JS/Form/FixFormSecurityForImageUploads) -- TOPGIT patch commit log ======================= commit be56600b19e429f4ece1ca685c1e25550b5a02f6 Author: root Date: Tue Nov 24 07:37:58 2009 +0100 Enables the Kolab driver to handle empty start and/or end dates correctly. REF: https://issues.kolab.org/issue3656 --- NEW FILE: t_kronolith_HK_UV_dateInputFieldOrder.diff --- From: Soenke Schwardt-Krummrich Subject: [PATCH] t/kronolith/HK/UV/dateInputFieldOrder Currently in kronolith the order of date input fields is hardcoded to year-month-day. Some parts of the world usually use a different order. The attached patch adds a user preference to specify input field order. REFERENCE_KOLAB: https://issues.kolab.org/issue3844 REFERENCE_HORDE: STATUS_KOLAB_2.2: UNTESTED STATUS_KOLAB_2.3: NONE STATUS_HORDE_KRONOLITH_2.3.3: SUBMIT STATUS_HORDE_KRONOLITH_3.0: SUBMIT Signed-off-by: Gunnar Wrobel

--- horde-webmail/config/prefs.php | 17 ++++++++++- horde-webmail/config/prefs.php.dist | 17 ++++++++++- .../kronolith/templates/edit/edit_timespan.inc | 30 +++++++++++++------ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/templates/edit/edit_timespan.inc b/templates/edit/edit_timespan.inc index 9926617..05f5042 100644 --- a/templates/edit/edit_timespan.inc +++ b/templates/edit/edit_timespan.inc @@ -12,11 +12,16 @@ - html('start[year]') ?> - - - html('start[month]') ?> - - - html('start[day]') ?> + getValue('date_input_format'); + $dateorder = $dateorder != "" ? $dateorder : "year-month-day"; + $dateorder = explode("-", $dateorder ); + $datefields = array(); + foreach ($dateorder as $fld) { + $datefields[] = $event->html('start['.$fld.']'); + } + echo implode("-", $datefields); + ?> hasFeature('dom')): ?>