[pkg-kolab] r505 - in kolab-cyrus-imapd/trunk/debian: . patches
Peter Eisentraut
petere at alioth.debian.org
Thu Nov 2 21:36:46 CET 2006
Author: petere
Date: 2006-11-02 21:36:46 +0100 (Thu, 02 Nov 2006)
New Revision: 505
Removed:
kolab-cyrus-imapd/trunk/debian/patches/110-Admin.pm.dpatch
Modified:
kolab-cyrus-imapd/trunk/debian/changelog
kolab-cyrus-imapd/trunk/debian/copyright
kolab-cyrus-imapd/trunk/debian/patches/00list
kolab-cyrus-imapd/trunk/debian/patches/100-kolab-imapd.dpatch
kolab-cyrus-imapd/trunk/debian/patches/101-fix_Makefile.in.dpatch
kolab-cyrus-imapd/trunk/debian/patches/130-kolab-imapd-goodchars.dpatch
kolab-cyrus-imapd/trunk/debian/patches/140-kolab-ldap.dpatch
kolab-cyrus-imapd/trunk/debian/patches/150-kolab-auth_unix.dpatch
Log:
Adjust Kolab patches
Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/changelog 2006-11-02 20:36:46 UTC (rev 505)
@@ -2,9 +2,11 @@
* Synced against cyrus-imapd package
- New descriptions (closes: #382882)
+ - Obsoletes 110-Admin.pm.dpatch; the changes are now in
+ 45-kolab2-annotations.dpatch
- Obsoletes 120-kolab-Shell.pm.dpatch; equivalent changes are now in
65-sieveshell-enhancements.dpatch
- * Removed -v option from dpatch call because it's broken
+ * Removed -v option from dpatch call because it's broken (see #396738)
-- Peter Eisentraut <petere at debian.org> Wed, 1 Nov 2006 12:48:56 +0100
Modified: kolab-cyrus-imapd/trunk/debian/copyright
===================================================================
--- kolab-cyrus-imapd/trunk/debian/copyright 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/copyright 2006-11-02 20:36:46 UTC (rev 505)
@@ -8,8 +8,6 @@
45-kolab2-annotations.dpatch
100-kolab-imapd.dpatch
105-cyradm.sh.dpatch
-110-Admin.pm.dpatch
-120-kolab-Shell.pm.dpatch
130-kolab-imapd-goodchars.dpatch
140-kolab-ldap.dpatch
150-kolab-auth_unix
Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list 2006-11-02 20:36:46 UTC (rev 505)
@@ -55,9 +55,8 @@
80-kbsd-no-psstrings.dpatch
99-update-autoconf.dpatch
100-kolab-imapd.dpatch
-#101-fix_Makefile.in.dpatch
+101-fix_Makefile.in.dpatch
105-cyradm.sh.dpatch
-#110-Admin.pm.dpatch
-#130-kolab-imapd-goodchars.dpatch
+130-kolab-imapd-goodchars.dpatch
140-kolab-ldap.dpatch
-#150-kolab-auth_unix
+150-kolab-auth_unix
Modified: kolab-cyrus-imapd/trunk/debian/patches/100-kolab-imapd.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/100-kolab-imapd.dpatch 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/patches/100-kolab-imapd.dpatch 2006-11-02 20:36:46 UTC (rev 505)
@@ -1,10 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 100-kolab-imapd.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include imapd.patch from kolab upstream
+## DP: Kolab upstream's imapd.patch adapted
-
@DPATCH@
--- cyrus22-imap-2.2.12.orig/et/com_err.c.orig 2003-06-04 05:27:50.000000000 +0200
+++ cyrus22-imap-2.2.12/et/com_err.c 2004-02-02 19:56:00.000000000 +0100
Modified: kolab-cyrus-imapd/trunk/debian/patches/101-fix_Makefile.in.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/101-fix_Makefile.in.dpatch 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/patches/101-fix_Makefile.in.dpatch 2006-11-02 20:36:46 UTC (rev 505)
@@ -5,8 +5,9 @@
## DP: Fix lib/Makefile.in
@DPATCH@
---- cyrus22-imapd-2.2.12/lib/Makefile.in.orig 2006-01-02 12:05:52.000000000 +0100
-+++ cyrus22-imapd-2.2.12/lib/Makefile.in 2006-01-02 12:07:49.000000000 +0100
+diff -urNad kolab-cyrus-imapd-2.2.13~/lib/Makefile.in kolab-cyrus-imapd-2.2.13/lib/Makefile.in
+--- kolab-cyrus-imapd-2.2.13~/lib/Makefile.in 2006-11-02 20:25:05.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/lib/Makefile.in 2006-11-02 20:25:06.000000000 +0100
@@ -62,7 +62,7 @@
LIBS = @LIBS@
@@ -16,27 +17,9 @@
LDFLAGS = @LDFLAGS@
SHELL = /bin/sh
-@@ -85,7 +85,7 @@
- $(srcdir)/lsort.h $(srcdir)/stristr.h \
- $(srcdir)/util.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
- $(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
-- $(srcdir)/libcyr_cfg.h
-+ $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h
+@@ -155,8 +155,7 @@
+ $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xstrlcpy.o xstrlcat.o xmalloc.o assert.o
- LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
- libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
-@@ -93,7 +93,7 @@
- chartable.o imapurl.o nonblock_ at WITH_NONBLOCK@.o lock_ at WITH_LOCK@.o \
- gmtoff_ at WITH_GMTOFF@.o map_ at WITH_MAP@.o $(ACL) $(AUTH) \
- @LIBOBJS@ @CYRUSDB_OBJS@ \
-- iptostring.o xmalloc.o wildmat.o
-+ iptostring.o xmalloc.o wildmat.o byteorder64.o
-
- LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
- $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
-@@ -153,8 +153,7 @@
- $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
-
clean:
- rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
- $(BUILTSOURCES)
Deleted: kolab-cyrus-imapd/trunk/debian/patches/110-Admin.pm.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/110-Admin.pm.dpatch 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/patches/110-Admin.pm.dpatch 2006-11-02 20:36:46 UTC (rev 505)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 110-Admin.pm.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add lines from Kolab upstream
-
- at DPATCH@
---- cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm.orig 2006-01-02 13:43:38.000000000 +0100
-+++ cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm 2006-01-02 13:46:49.000000000 +0100
-@@ -782,18 +782,20 @@
- my %values = ( "comment" => "/comment",
- "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
- "expire" => "/vendor/cmu/cyrus-imapd/expire",
-- "squat" => "/vendor/cmu/cyrus-imapd/squat" );
-+ "squat" => "/vendor/cmu/cyrus-imapd/squat",
-+ "folder-type" => "/vendor/kolab/folder-type",
-+ "h-share-uid" => "/vendor/kolab/h-share-uid" );
-
- if(!$self->{support_annotatemore}) {
- $self->{error} = "Remote does not support ANNOTATEMORE.";
- return undef;
- }
-
-- if(!exists($values{$entry})) {
-- $self->{error} = "Unknown parameter $entry";
-- }
--
-+ if(exists($values{$entry})) {
- $entry = $values{$entry};
-+ } else {
-+ $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
-+ }
-
- my ($rc, $msg);
-
Modified: kolab-cyrus-imapd/trunk/debian/patches/130-kolab-imapd-goodchars.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/130-kolab-imapd-goodchars.dpatch 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/patches/130-kolab-imapd-goodchars.dpatch 2006-11-02 20:36:46 UTC (rev 505)
@@ -1,28 +1,14 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 140-kolab-mbox.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add imapd-goodchars patch
+## DP: Kolab upstream's imapd-goodchars.patch
+## DP: Some hunks of that patch are in 0009-upstream-remove-redundant-wildcard-check
@DPATCH@
---- kolab-cyrus-imapd-2.2.12/imap/mboxlist.c.orig 2006-01-02 14:09:58.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/imap/mboxlist.c 2006-01-02 14:10:49.000000000 +0100
-@@ -476,10 +476,12 @@
- free(acl);
- return IMAP_PERMISSION_DENIED;
- }
-+ #ifdef notdef
- /* disallow wildcards in userids with inboxes. */
- if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
- return IMAP_MAILBOX_BADNAME;
- }
-+ #endif
-
- /*
- * Users by default have all access to their personal mailbox(es),
---- kolab-cyrus-imapd-2.2.12/imap/mboxname.c.orig 2006-01-02 14:22:32.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/imap/mboxname.c 2006-01-02 14:24:02.000000000 +0100
-@@ -649,8 +649,13 @@
+diff -urNad kolab-cyrus-imapd-2.2.13~/imap/mboxname.c kolab-cyrus-imapd-2.2.13/imap/mboxname.c
+--- kolab-cyrus-imapd-2.2.13~/imap/mboxname.c 2006-11-02 20:57:00.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/imap/mboxname.c 2006-11-02 20:57:00.000000000 +0100
+@@ -653,8 +653,13 @@
/*
* Apply site policy restrictions on mailbox names.
* Restrictions are hardwired for now.
@@ -37,18 +23,3 @@
int mboxname_policycheck(char *name)
{
unsigned i;
---- kolab-cyrus-imapd-2.2.12/imap/imapd.c.orig 2006-01-02 14:00:49.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/imap/imapd.c 2006-01-02 14:01:36.000000000 +0100
-@@ -3923,10 +3923,12 @@
- }
- }
-
-+ #ifdef notdef
- /* verify that the mailbox doesn't have a wildcard in it */
- for (p = oldmailboxname; !r && *p; p++) {
- if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
- }
-+ #endif
-
- /* attempt to rename the base mailbox */
- if (!r) {
Modified: kolab-cyrus-imapd/trunk/debian/patches/140-kolab-ldap.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/140-kolab-ldap.dpatch 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/patches/140-kolab-ldap.dpatch 2006-11-02 20:36:46 UTC (rev 505)
@@ -1,8 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 150-kolab-ldap.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add ldap authentication
+## DP: Kolab upstream's kolab-ldap.patch
@DPATCH@
--- kolab-cyrus-imapd-2.2.12/configure.orig 2006-01-11 21:42:59.000000000 +0100
Modified: kolab-cyrus-imapd/trunk/debian/patches/150-kolab-auth_unix.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/150-kolab-auth_unix.dpatch 2006-11-02 17:10:40 UTC (rev 504)
+++ kolab-cyrus-imapd/trunk/debian/patches/150-kolab-auth_unix.dpatch 2006-11-02 20:36:46 UTC (rev 505)
@@ -1,12 +1,12 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 150-kolab-auth_unix.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include group patch from kolab
+## DP: Kolab upstream's imapd.patch.group plus imapd.group2.patch
@DPATCH@
---- kolab-cyrus-imapd-2.2.12/lib/auth_unix.c.orig 2006-01-18 14:44:29.000000000 +0100
-+++ kolab-cyrus-imapd-2.2.12/lib/auth_unix.c 2006-01-18 14:55:38.000000000 +0100
+diff -urNad kolab-cyrus-imapd-2.2.13~/lib/auth_unix.c kolab-cyrus-imapd-2.2.13/lib/auth_unix.c
+--- kolab-cyrus-imapd-2.2.13~/lib/auth_unix.c 2006-11-02 21:03:54.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/lib/auth_unix.c 2006-11-02 21:04:04.000000000 +0100
@@ -48,6 +48,7 @@
#include <stdlib.h>
#include <pwd.h>
@@ -15,136 +15,7 @@
#include <ctype.h>
#include <string.h>
-@@ -55,6 +56,128 @@
- #include "libcyr_cfg.h"
- #include "xmalloc.h"
-
-+
-+#ifdef __FreeBSD__
-+/*
-+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS,
-+ * Copyright (C) 1995, 1996 Nat Friedman <ndf at linux.mit.edu>.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the Free
-+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+static struct group *__getgrent(int grp_fd, char *line_buff, char **members)
-+{
-+ short line_index;
-+ short buff_size;
-+ static struct group group;
-+ register char *ptr;
-+ char *field_begin;
-+ short member_num;
-+ char *endptr;
-+ int line_len;
-+
-+ /* We use the restart label to handle malformatted lines */
-+ restart:
-+ line_index = 0;
-+ buff_size = 256;
-+
-+ line_buff = realloc(line_buff, buff_size);
-+ while (1) {
-+ if ((line_len = read(grp_fd, line_buff + line_index,
-+ buff_size - line_index)) <= 0) {
-+ return NULL;
-+ }
-+ field_begin = strchr(line_buff, '\n');
-+ if (field_begin != NULL) {
-+ lseek(grp_fd,
-+ (long) (1 + field_begin -
-+ (line_len + line_index + line_buff)), SEEK_CUR);
-+ *field_begin = '\0';
-+ if (*line_buff == '#' || *line_buff == ' '
-+ || *line_buff == '\n' || *line_buff == '\t')
-+ goto restart;
-+ break;
-+ } else {
-+ /* Allocate some more space */
-+ line_index = buff_size;
-+ buff_size += 256;
-+ line_buff = realloc(line_buff, buff_size);
-+ }
-+ }
-+
-+ /* Now parse the line */
-+ group.gr_name = line_buff;
-+ ptr = strchr(line_buff, ':');
-+ if (ptr == NULL)
-+ goto restart;
-+ *ptr++ = '\0';
-+
-+ group.gr_passwd = ptr;
-+ ptr = strchr(ptr, ':');
-+ if (ptr == NULL)
-+ goto restart;
-+ *ptr++ = '\0';
-+
-+ field_begin = ptr;
-+ ptr = strchr(ptr, ':');
-+ if (ptr == NULL)
-+ goto restart;
-+ *ptr++ = '\0';
-+
-+ group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10);
-+ if (*endptr != '\0')
-+ goto restart;
-+
-+ member_num = 0;
-+ field_begin = ptr;
-+
-+ if (members != NULL)
-+ free(members);
-+ members = (char **) malloc((member_num + 1) * sizeof(char *));
-+ for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) {
-+ if ((ptr = strchr(field_begin, ',')) != NULL)
-+ *ptr++ = '\0';
-+ members[member_num++] = field_begin;
-+ members = (char **) realloc(members,
-+ (member_num + 1) * sizeof(char *));
-+ }
-+ members[member_num] = NULL;
-+
-+ group.gr_mem = members;
-+ return &group;
-+}
-+
-+static char *line_buff = NULL;
-+static char **members = NULL;
-+
-+struct group *fgetgrent(FILE *file)
-+{
-+ if (file == NULL) {
-+ errno = EINTR;
-+ return NULL;
-+ }
-+ return __getgrent(fileno(file), line_buff, members);
-+}
-+#endif /* __FreeBSD__ */
-+
-+
- const char *auth_method_desc = "unix";
-
- struct auth_state {
-@@ -144,6 +267,25 @@
+@@ -142,6 +143,25 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
@@ -170,7 +41,7 @@
/*
* Convert 'identifier' into canonical form.
* Returns a pointer to a static buffer containing the canonical form
-@@ -179,7 +321,7 @@
+@@ -177,7 +197,7 @@
*/
if (!strncmp(retbuf, "group:", 6)) {
@@ -179,15 +50,15 @@
if (!grp) return 0;
strcpy(retbuf+6, grp->gr_name);
return retbuf;
-@@ -226,6 +368,7 @@
+@@ -224,6 +244,7 @@
struct passwd *pwd;
struct group *grp;
char **mem;
+ FILE *groupfile;
- identifier = auth_canonifyid(identifier, 0);
+ identifier = mycanonifyid(identifier, 0);
if (!identifier) return 0;
-@@ -242,10 +385,12 @@
+@@ -240,10 +261,12 @@
pwd = getpwnam(identifier);
@@ -203,7 +74,7 @@
}
if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
-@@ -255,7 +400,8 @@
+@@ -253,7 +276,8 @@
newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
}
}
More information about the pkg-kolab-devel
mailing list