gunnar: server/php/patches Makefile, NONE, 1.1 README_Annotations.patch, NONE, 1.1 README_myrights.patch, NONE, 1.1 hgrc, NONE, 1.1

cvs at kolab.org cvs at kolab.org
Mon May 18 10:43:40 CEST 2009


Author: gunnar

Update of /kolabrepository/server/php/patches
In directory doto:/tmp/cvs-serv20014/patches

Added Files:
	Makefile README_Annotations.patch README_myrights.patch hgrc 
Log Message:
Moved php patches from the server/patches dir into server/php.

--- NEW FILE: Makefile ---
# This is a very rough draft for updating a patch series using
# mercurial queues. The Makefile could see some optimizations but for
# the occasional upstream update it hopefully does fine.
#
# Author: G. Wrobel

OLD_VERSION=5.2.8
NEW_VERSION=5.2.9

PN=php

SOURCE_URL=http://www.php.net/distributions/

.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
	cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.bz2
	cd tmp && tar xfj $(PN)-$(OLD_VERSION).tar.bz2
	cd tmp/$(PN)-$(OLD_VERSION) && hg init && hg commit --addremove -m "$(PN)-$(OLD_VERSION)"
	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-PATCHED
	cp hgrc tmp/$(PN)-PATCHED/.hg/
	cd tmp/$(PN)-PATCHED && hg qinit
	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
	cd $(PN)-$(OLD_VERSION); \
	for FL in KOLAB*; do \
	  cp $$FL ../tmp/$(PN)-PATCHED/.hg/patches/$${FL/$(PN)-$(OLD_VERSION)_/}; \
	done
	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
	cd tmp/$(PN)-PATCHED && hg qpush -a && hg qpop -a
	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-$(NEW_VERSION)
	cd tmp/$(PN)-$(NEW_VERSION) && hg locate -0 | xargs -0 rm
	cd tmp && wget $(SOURCE_URL)/$(PN)-$(NEW_VERSION).tar.bz2
	cd tmp && tar xfj $(PN)-$(NEW_VERSION).tar.bz2
	cd tmp/$(PN)-$(NEW_VERSION) && hg commit --addremove -m "$(PN)-$(NEW_VERSION)"
	cd tmp/$(PN)-PATCHED && hg pull ../$(PN)-$(NEW_VERSION) && hg update
	@echo
	@echo
	@echo "The patch series will be pushed now. If errors occur you will need to fix them"
	@echo "run \"hg qrefresh\" and continue with \"hg qpush\" until the full series applied"
	@echo "successfully. Finally you may move back to the current directory and run \"make patches\""
	@echo
	@echo
	cd tmp/$(PN)-PATCHED && hg qpush -a

.PHONY: patches
patches:
	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
	mkdir $(PN)-$(NEW_VERSION)
	cd tmp/$(PN)-PATCHED/.hg/patches; \
	for FL in KOLAB*; do \
	  cp $$FL ../../../../$(PN)-$(NEW_VERSION)/$${FL/KOLAB_/KOLAB_$(PN)-$(NEW_VERSION)_}; \
	done
	cp tmp/$(PN)-PATCHED/.hg/patches/series $(PN)-$(NEW_VERSION)/ 
	rm -rf tmp


--- NEW FILE: README_Annotations.patch ---
DESCRIPTION:

This provides the imap_getannotation and imap_setannotation functions
within PHP. This is needed for imap caching in the free/busy system of
Kolab-2.1. In addition this patch is required to accelerate Horde.

IMPACT:

The free/busy system won't work without this patch. Horde will run
slower if not using this patch.

REFERENCES:

Kolab bug tracker merge: 

https://intevation.de/roundup/kolab/merge16

Wiki page:

http://wiki.kolab.org/index.php/Template:Patches_php

Mercurial patch repository:

http://hg.pardus.de/cgi-bin/hg.cgi/kolab/patches/php/summary

HISTORY

This patch depends on the imap c-client patch since PHP uses the
c-client library. This can only move forward once the c-client patch
has been integrated.

--- NEW FILE: README_myrights.patch ---
DESCRIPTION:

This provides the imap_myrights function within PHP. This is needed 
for correct share handling within Horde-3.2.

IMPACT:

The Horde share system won't work without this patch. User won't be
able to share folders.

REFERENCES:

Kolab bug tracker merge: 

https://intevation.de/roundup/kolab/merge77

Mercurial patch repository:

http://hg.pardus.de/cgi-bin/hg.cgi/kolab/patches/php/summary

HISTORY

The patch has been submitted upstream:

http://aspn.activestate.com/ASPN/Mail/Message/php-dev/3602193



--- NEW FILE: hgrc ---
[extensions]
hgext.mq =





More information about the commits mailing list