gunnar: server/imapd Makefile,1.46,1.47 kolab.patch,1.42,1.43
cvs at kolab.org
cvs at kolab.org
Wed Dec 23 21:22:59 CET 2009
- Previous message: gunnar: server/imapd/patches/cyrus-imapd-2.3.16 KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_Folder-names.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_Groups2.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_Logging.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_UID.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch, NONE, 1.1 series, NONE, 1.1
- Next message: gunnar: server kolab.mk,1.1.2.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv32249
Modified Files:
Makefile kolab.patch
Log Message:
Update to cyrus-imapd-2.3.16
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile 9 Dec 2009 23:08:07 -0000 1.46
+++ Makefile 23 Dec 2009 20:22:57 -0000 1.47
@@ -3,14 +3,13 @@
PACKAGE=imapd
DOWNLOAD_VERSION=2.3.13
OPENPKG_RELEASE=20081020
-VERSION=2.3.15
-RELEASE=20081020_kolab5
+VERSION=2.3.16
+RELEASE=20081020_kolab6
SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus
-SOURCE_0=cyrus-imapd-2.3.15.tar.gz
+SOURCE_0=cyrus-imapd-2.3.16.tar.gz
PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annotations.patch \
- patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Folder-names.patch \
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- kolab.patch 4 Dec 2009 10:58:01 -0000 1.42
+++ kolab.patch 23 Dec 2009 20:22:57 -0000 1.43
@@ -5,8 +5,8 @@
License: BSD
-Version: 2.3.13
-Release: 20081020
-+Version: 2.3.15
-+Release: 20081020_kolab5
++Version: 2.3.16
++Release: 20081020_kolab6
# package options
%option with_fsl yes
@@ -18,7 +18,7 @@
# fixing implicit inter-module dependencies and correlations
%if "%{with_kolab}" == "yes"
-@@ -67,12 +68,13 @@
+@@ -67,12 +68,14 @@
Source3: imapd.conf
Source4: fsl.imapd
Patch0: imapd.patch
@@ -29,7 +29,8 @@
-Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch
-Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
+Patch1: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Groups2.patch
-+Patch2: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Annotations2.patch
++#Patch2 is just a duplicated dummy entry to avoid rewriting the whole patch. The patch number 2 is not used anymore.
++Patch2: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Groups2.patch
+Patch3: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Cyradm_Annotations.patch
+Patch4: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Logging.patch
+Patch5: patches/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_UID.patch
@@ -51,12 +52,11 @@
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
-@@ -132,7 +130,7 @@
+@@ -132,7 +130,6 @@
# add optional folder annotation support
%if "%{with_annotate}" == "yes"
- sed <%{PATCH2} -e '5,27d' | %{l_patch} -p1
-+ %patch -p1 -P 2
%patch -p1 -P 3
%endif
- Previous message: gunnar: server/imapd/patches/cyrus-imapd-2.3.16 KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_Folder-names.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_Groups2.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_Logging.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_UID.patch, NONE, 1.1 KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch, NONE, 1.1 series, NONE, 1.1
- Next message: gunnar: server kolab.mk,1.1.2.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list