[packaging] Branch 'feature-el6-kolab-3.0' - 2 commits - cyrus-imapd-2.4.15-903-normalize-authorization-id.patch cyrus-imapd.spec

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Mar 12 11:23:52 CET 2013


 cyrus-imapd-2.4.15-903-normalize-authorization-id.patch |   54 ++++++++++------
 cyrus-imapd.spec                                        |    5 +
 2 files changed, 38 insertions(+), 21 deletions(-)

New commits:
commit d09a07e09c78a76e69afc64fdc6f232fb02b0c33
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Tue Mar 12 10:23:40 2013 +0000

    Bump release for rebuild

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index ad5be83..e4e242b 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -18,7 +18,7 @@
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
 Version:            2.4.17
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
@@ -563,6 +563,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 2.4.17-2
+- Refresh patch for normalization of the UID - actually enable disabling it
+
 * Sat Dec  1 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 2.4.17-1
 - New upstream version
 


commit 8ce28d92293dc3eea6b6469ac8fe193c7bd9b600
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Tue Mar 12 10:20:26 2013 +0000

    Refresh cyrus-imapd-2.4.15-903-normalize-authorization-id.patch making sure the default value can be changed

diff --git a/cyrus-imapd-2.4.15-903-normalize-authorization-id.patch b/cyrus-imapd-2.4.15-903-normalize-authorization-id.patch
index ee77694..e0701bb 100644
--- a/cyrus-imapd-2.4.15-903-normalize-authorization-id.patch
+++ b/cyrus-imapd-2.4.15-903-normalize-authorization-id.patch
@@ -1,7 +1,21 @@
-diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/auth_unix.c cyrus-imapd-2.4.15.git201204161439/lib/auth_unix.c
---- cyrus-imapd-2.4.15.git201204161439.orig/lib/auth_unix.c	2012-04-10 04:05:26.000000000 +0100
-+++ cyrus-imapd-2.4.15.git201204161439/lib/auth_unix.c	2012-04-16 14:57:22.972595330 +0100
-@@ -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];
@@ -14,7 +28,7 @@ diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/auth_unix.c cyrus-imapd-2.4
  
      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;  */
  
@@ -37,10 +51,11 @@ diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/auth_unix.c cyrus-imapd-2.4
      return retbuf;
  }
  
-diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/imapoptions cyrus-imapd-2.4.15.git201204161439/lib/imapoptions
---- cyrus-imapd-2.4.15.git201204161439.orig/lib/imapoptions	2012-04-10 04:05:26.000000000 +0100
-+++ cyrus-imapd-2.4.15.git201204161439/lib/imapoptions	2012-04-16 14:57:22.974595331 +0100
-@@ -1403,6 +1403,11 @@
+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.  */
  
@@ -52,11 +67,11 @@ diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/imapoptions cyrus-imapd-2.4
  /*
  .SH SEE ALSO
  .PP
-Only in cyrus-imapd-2.4.15.git201204161439/lib: imapoptions.orig
-diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/libcyr_cfg.c cyrus-imapd-2.4.15.git201204161439/lib/libcyr_cfg.c
---- cyrus-imapd-2.4.15.git201204161439.orig/lib/libcyr_cfg.c	2012-04-10 04:05:26.000000000 +0100
-+++ cyrus-imapd-2.4.15.git201204161439/lib/libcyr_cfg.c	2012-04-16 14:57:22.975595333 +0100
-@@ -158,6 +158,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 },
  
@@ -67,11 +82,11 @@ diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/libcyr_cfg.c cyrus-imapd-2.
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
-Only in cyrus-imapd-2.4.15.git201204161439/lib: libcyr_cfg.c.orig
-diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/libcyr_cfg.h cyrus-imapd-2.4.15.git201204161439/lib/libcyr_cfg.h
---- cyrus-imapd-2.4.15.git201204161439.orig/lib/libcyr_cfg.h	2012-04-10 04:05:26.000000000 +0100
-+++ cyrus-imapd-2.4.15.git201204161439/lib/libcyr_cfg.h	2012-04-16 14:57:22.976595336 +0100
-@@ -116,6 +116,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,
@@ -80,4 +95,3 @@ diff -ur cyrus-imapd-2.4.15.git201204161439.orig/lib/libcyr_cfg.h cyrus-imapd-2.
  
      CYRUSOPT_LAST
      
-Only in cyrus-imapd-2.4.15.git201204161439/lib: libcyr_cfg.h.orig




More information about the packaging-commits mailing list