steffen: server/imapd imapd.group2.patch, NONE, 1.1 Makefile, 1.16, 1.17 kolab.patch, 1.12, 1.13

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv19286

Modified Files:
	Makefile kolab.patch 
Added Files:
	imapd.group2.patch 
Log Message:
fix for Issue417

--- NEW FILE: imapd.group2.patch ---
--- ../cyrus-imapd-2.2.6.kolab-orig/lib/auth_unix.c	2004-10-09 00:07:45.000000000 +0200
+++ lib/auth_unix.c	2004-10-09 00:29:58.000000000 +0200
@@ -274,7 +274,7 @@ static struct group* fgetgrnam(const cha
     if (!groupfile) groupfile = fopen("/etc/group", "r");
     if (groupfile) {
        while ((grp = fgetgrent(groupfile))) {
-         if (strcmp(grp->gr_name, name) == 0) {
+         if (strcasecmp(grp->gr_name, name) == 0) {
            fclose(groupfile);
            return grp;
          }
@@ -386,7 +386,7 @@ struct auth_state *auth_newstate(const c
     if (groupfile) {
        while ((grp = fgetgrent(groupfile))) {
          for (mem = grp->gr_mem; *mem; mem++) {
-            if (!strcmp(*mem, identifier)) break;
+            if (!strcasecmp(*mem, identifier)) break;
          }
 
          if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	20 Sep 2004 14:00:54 -0000	1.16
+++ Makefile	8 Oct 2004 23:36:19 -0000	1.17
@@ -18,6 +18,7 @@
 
 	cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/imapd/
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/imapd/           # Patch for imapd.spec
+	cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/imapd/    # Patch for case insensitive group match
 	cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/imapd/      
 
 	cd $(KOLABRPMSRC)/imapd && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba imapd.spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes'

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab.patch	3 Aug 2004 01:25:39 -0000	1.12
+++ kolab.patch	8 Oct 2004 23:36:19 -0000	1.13
@@ -1,15 +1,16 @@
---- imapd.spec.org	2004-07-15 16:30:49.333617635 +0200
-+++ imapd.spec	2004-07-15 16:30:10.962323130 +0200
-@@ -3,6 +3,8 @@
+--- ../imapd.orig/imapd.spec	2004-07-02 17:17:54.000000000 +0200
++++ imapd.spec	2004-10-09 00:34:37.000000000 +0200
+@@ -3,6 +3,9 @@
  ##  Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
  ##  Copyright (c) 2000-2004 Ralf S. Engelschall <rse at engelschall.com>
  ##  Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
 +##  Copyright (c) 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 +##  Copyright (c) 2004 Martin Konold <martin.konold at erfrakon.de>
++##  Copyright (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  ##
  ##  Permission to use, copy, modify, and distribute this software for
  ##  any purpose with or without fee is hereby granted, provided that
-@@ -34,13 +36,15 @@
+@@ -34,13 +37,15 @@ Class:        BASE
  Group:        Mail
  License:      BSD
  Version:      2.2.6
@@ -30,16 +31,17 @@
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +54,8 @@
+@@ -50,6 +55,9 @@ Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
 +Patch2:       imapd.annotate.patch
 +Patch3:	      kolab-ldap.patch
++Patch4:	      imapd.group2.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -62,6 +68,10 @@
+@@ -62,6 +70,10 @@ PreReq:       sasl, db >= 4.1.24, openss
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -50,7 +52,15 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -95,6 +105,13 @@
+@@ -88,6 +100,7 @@ AutoReqProv:  no
+     %{l_shtool} subst \
+         -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
+         lib/auth_unix.c
++    %patch -p0 -P 4
+ %endif
+ %if "%{with_drac}" == "yes"
+     %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
+@@ -95,6 +108,13 @@ AutoReqProv:  no
      sleep 1
      touch configure
  %endif