[packaging] Branch 'debian/wheezy/kolab-3.0' - 2 commits - debian/changelog debian/patches

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Mar 12 13:03:21 CET 2013


 debian/changelog                                                      |    9 +
 debian/patches/cyrus-imapd-2.4.2-903-normalize-authorization-id.patch |   76 ++++------
 2 files changed, 45 insertions(+), 40 deletions(-)

New commits:
commit 87e8cfce7b09cc8545b5222aec709bd3d21882b4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Mar 12 11:31:20 2013 +0100

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 95d7380..303e831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cyrus-imapd (2.4.17-4) unstable; urgency=low
+
+  [ Jeroen van Meeuwen (Kolab Systems) ]
+  * Refresh patch to normalize the uid so that it actually takes the configuration option in to account
+
+  [ Jeroen van Meeuwen ]
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>  Tue, 12 Mar 2013 11:30:13 +0100
+
 cyrus-imapd (2.4.17-3) unstable; urgency=low
 
   [ Jeroen van Meeuwen (Kolab Systems) ]


commit aadb24064a0a84ce7bcc6d2a1c20dc082f1f47e0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Mar 12 11:29:26 2013 +0100

    Refresh patch to normalize the uid so that it actually takes the configuration option in to account

diff --git a/debian/patches/cyrus-imapd-2.4.2-903-normalize-authorization-id.patch b/debian/patches/cyrus-imapd-2.4.2-903-normalize-authorization-id.patch
index 43988a1..e0701bb 100644
--- a/debian/patches/cyrus-imapd-2.4.2-903-normalize-authorization-id.patch
+++ b/debian/patches/cyrus-imapd-2.4.2-903-normalize-authorization-id.patch
@@ -1,25 +1,21 @@
-From 89197dba7887493dbaeaeee0dcb0dd8bed32a321 Mon Sep 17 00:00:00 2001
-From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
-Date: Tue, 3 Aug 2010 10:19:11 +0200
-Subject: [PATCH 09/13] Normalize the authentication ID
-
-By normalize, it is intended that;
-
-    1) Authentication IDs all can be lowercased for more accurate
-       comparison without being volatile to, say, user error, and
-    2) Any leading or trailing blank space can be stripped
----
- lib/auth_unix.c  |   18 ++++++++++++++++++
- lib/imapoptions  |    5 +++++
- lib/libcyr_cfg.c |    4 ++++
- lib/libcyr_cfg.h |    2 ++
- 4 files changed, 29 insertions(+), 0 deletions(-)
-
-Index: cyrus-imapd/lib/auth_unix.c
-===================================================================
---- cyrus-imapd.orig/lib/auth_unix.c	2010-10-20 15:55:37.000000000 +0200
-+++ cyrus-imapd/lib/auth_unix.c	2010-10-20 15:56:10.000000000 +0200
-@@ -156,10 +156,12 @@
+diff --git a/imap/global.c b/imap/global.c
+index d2e5ba7..930d539 100644
+--- a/imap/global.c
++++ b/imap/global.c
+@@ -219,6 +219,8 @@ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
+ 				  config_getswitch(IMAPOPT_UNIX_GROUP_ENABLE));
+ 	libcyrus_config_setswitch(CYRUSOPT_USERNAME_TOLOWER,
+ 				  config_getswitch(IMAPOPT_USERNAME_TOLOWER));
++	libcyrus_config_setswitch(CYRUSOPT_NORMALIZEUID,
++				  config_getswitch(IMAPOPT_NORMALIZEUID));
+ 	libcyrus_config_setswitch(CYRUSOPT_SKIPLIST_UNSAFE,
+ 				  config_getswitch(IMAPOPT_SKIPLIST_UNSAFE));
+ 	libcyrus_config_setstring(CYRUSOPT_TEMP_PATH,
+diff --git a/lib/auth_unix.c b/lib/auth_unix.c
+index c1f0329..d7abf79 100644
+--- a/lib/auth_unix.c
++++ b/lib/auth_unix.c
+@@ -156,10 +156,12 @@ const char *identifier;
  size_t len;
  {
      static char retbuf[81];
@@ -32,7 +28,7 @@ Index: cyrus-imapd/lib/auth_unix.c
  
      if(!len) len = strlen(identifier);
      if(len >= sizeof(retbuf)) return NULL;
-@@ -211,6 +213,22 @@
+@@ -211,6 +213,22 @@ size_t len;
      /* now we don't */
      /* if (!sawalpha) return NULL;  */
  
@@ -55,13 +51,13 @@ Index: cyrus-imapd/lib/auth_unix.c
      return retbuf;
  }
  
-Index: cyrus-imapd/lib/imapoptions
-===================================================================
---- cyrus-imapd.orig/lib/imapoptions	2010-10-20 15:55:38.000000000 +0200
-+++ cyrus-imapd/lib/imapoptions	2010-10-20 15:56:10.000000000 +0200
-@@ -1299,6 +1299,11 @@
-    interface, otherwise the user is assumed to be in the default
-    domain (if set). */
+diff --git a/lib/imapoptions b/lib/imapoptions
+index c049501..4d16fb5 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -1416,6 +1416,11 @@ product version in the capabilities */
+    the special use flag "\Drafts" added.  Later versions of Cyrus
+    have a much more flexible RFC 6154 compatible system.  */
  
 +{ "normalizeuid", 0, SWITCH }
 +/* Lowercase uid and strip leading and trailing blanks. It is recommended
@@ -71,11 +67,11 @@ Index: cyrus-imapd/lib/imapoptions
  /*
  .SH SEE ALSO
  .PP
-Index: cyrus-imapd/lib/libcyr_cfg.c
-===================================================================
---- cyrus-imapd.orig/lib/libcyr_cfg.c	2010-10-20 15:55:38.000000000 +0200
-+++ cyrus-imapd/lib/libcyr_cfg.c	2010-10-20 15:56:10.000000000 +0200
-@@ -154,6 +154,10 @@
+diff --git a/lib/libcyr_cfg.c b/lib/libcyr_cfg.c
+index 688523c..b5c6008 100644
+--- a/lib/libcyr_cfg.c
++++ b/lib/libcyr_cfg.c
+@@ -158,6 +158,10 @@ struct cyrusopt_s cyrus_options[] = {
        CFGVAL(long, 1),
        CYRUS_OPT_SWITCH },
  
@@ -86,11 +82,11 @@ Index: cyrus-imapd/lib/libcyr_cfg.c
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
-Index: cyrus-imapd/lib/libcyr_cfg.h
-===================================================================
---- cyrus-imapd.orig/lib/libcyr_cfg.h	2010-10-20 15:55:38.000000000 +0200
-+++ cyrus-imapd/lib/libcyr_cfg.h	2010-10-20 15:56:10.000000000 +0200
-@@ -114,6 +114,8 @@
+diff --git a/lib/libcyr_cfg.h b/lib/libcyr_cfg.h
+index 7bdca06..1afe95a 100644
+--- a/lib/libcyr_cfg.h
++++ b/lib/libcyr_cfg.h
+@@ -116,6 +116,8 @@ enum cyrus_opt {
      CYRUSOPT_SQL_USESSL,
      /* Checkpoint after every recovery (OFF) */
      CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,




More information about the packaging-commits mailing list