summaryrefslogtreecommitdiff
path: root/imapd
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2004-10-08 23:36:19 (GMT)
committerSteffen Hansen <steffen@kdab.com>2004-10-08 23:36:19 (GMT)
commit65f4b69d2f7ca99c52ed6007b86d23cdf56523d7 (patch)
tree04107aac0b6686d91f1c3e29fa6c00af003beefb /imapd
parente572ea02af0c6c71877f9af330bd5203afe11568 (diff)
downloadserver-65f4b69d2f7ca99c52ed6007b86d23cdf56523d7.tar.gz
fix for Issue417
Diffstat (limited to 'imapd')
-rw-r--r--imapd/Makefile1
-rw-r--r--imapd/imapd.group2.patch20
-rw-r--r--imapd/kolab.patch24
3 files changed, 38 insertions, 7 deletions
diff --git a/imapd/Makefile b/imapd/Makefile
index 56e51cb..4dd3247 100644
--- a/imapd/Makefile
+++ b/imapd/Makefile
@@ -18,6 +18,7 @@ all: imapd-$(VERSION)-$(RELEASE).src.rpm
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'
diff --git a/imapd/imapd.group2.patch b/imapd/imapd.group2.patch
new file mode 100644
index 0000000..088ae36
--- /dev/null
+++ b/imapd/imapd.group2.patch
@@ -0,0 +1,20 @@
+--- ../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)) {
diff --git a/imapd/kolab.patch b/imapd/kolab.patch
index fc84773..c138497 100644
--- a/imapd/kolab.patch
+++ b/imapd/kolab.patch
@@ -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@engelschall.com>
## Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
+## Copyright (c) 2004 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
+## Copyright (c) 2004 Martin Konold <martin.konold@erfrakon.de>
++## Copyright (c) 2004 Steffen Hansen <steffen@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