OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Nov-2007 11:50:17
Branch: HEAD Handle: 2007113010501500
Modified files:
openpkg-src/imapd fsl.imapd imapd.patch.group imapd.spec
Log:
Fixed the group patch that did not get updated to 2.3.10 in the last
update round. Moved lmtpunix logging into the lmtp.log.
Summary:
Revision Changes Path
1.16 +2 -2 openpkg-src/imapd/fsl.imapd
1.8 +18 -19 openpkg-src/imapd/imapd.patch.group
1.185 +2 -2 openpkg-src/imapd/imapd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/fsl.imapd
============================================================================
$ cvs diff -u -r1.15 -r1.16 fsl.imapd
--- openpkg-src/imapd/fsl.imapd 7 Nov 2007 07:10:21 -0000 1.15
+++ openpkg-src/imapd/fsl.imapd 30 Nov 2007 10:50:15 -0000 1.16
@@ -38,7 +38,7 @@
}
};
-ident (lmtp)/.+ q{
+ident (lmtp|lmtpunix)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ -110,7 +110,7 @@
}
};
-ident (lmtpunix|squatter)/.+ q{
+ident (squatter)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch.group
============================================================================
$ cvs diff -u -r1.7 -r1.8 imapd.patch.group
--- openpkg-src/imapd/imapd.patch.group 8 Feb 2007 08:35:47 -0000
1.7
+++ openpkg-src/imapd/imapd.patch.group 30 Nov 2007 10:50:15 -0000
1.8
@@ -1,7 +1,7 @@
-Index: lib/auth_unix.c
---- lib/auth_unix.c.orig 2006-11-30 18:11:22 +0100
-+++ lib/auth_unix.c 2007-02-08 09:32:47 +0100
-@@ -48,6 +48,7 @@
+diff -r e502c48f9ba9 lib/auth_unix.c
+--- a/lib/auth_unix.c Thu Oct 25 08:10:12 2007 +0200
++++ b/lib/auth_unix.c Fri Nov 30 11:33:23 2007 +0100
+@@ -48,12 +48,133 @@
#include <stdlib.h>
#include <pwd.h>
#include <grp.h>
@@ -9,10 +9,10 @@
#include <ctype.h>
#include <string.h>
-@@ -55,6 +56,126 @@
+ #include "auth.h"
#include "libcyr_cfg.h"
#include "xmalloc.h"
-
++
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+/*
+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS,
@@ -132,11 +132,10 @@
+ return __getgrent(fileno(file), line_buff, members);
+}
+#endif /* __FreeBSD__ */
-+
+
struct auth_state {
char userid[81];
- char **group;
-@@ -142,6 +263,25 @@
+@@ -142,6 +263,25 @@ static char allowedchars[256] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
@@ -162,7 +161,7 @@
/*
* Convert 'identifier' into canonical form.
* Returns a pointer to a static buffer containing the canonical form
-@@ -177,7 +317,7 @@
+@@ -177,7 +317,7 @@ size_t len;
*/
if (!strncmp(retbuf, "group:", 6)) {
@@ -171,18 +170,18 @@
if (!grp) return 0;
strcpy(retbuf+6, grp->gr_name);
return retbuf;
-@@ -224,6 +364,7 @@
- struct passwd *pwd;
- struct group *grp;
+@@ -228,6 +368,7 @@ static struct auth_state *mynewstate(con
+ int ret, ngroups = 0;
+ #else
char **mem;
+ FILE *groupfile;
+ #endif
identifier = mycanonifyid(identifier, 0);
- if (!identifier) return 0;
-@@ -240,20 +381,23 @@
+@@ -286,20 +427,23 @@ err:
+ if (groupids) free(groupids);
- pwd = getpwnam(identifier);
-
+ #else /* !HAVE_GETGROUPLIST */
- setgrent();
- while ((grp = getgrent())) {
- for (mem = grp->gr_mem; *mem; mem++) {
@@ -214,6 +213,6 @@
+ }
+ fclose(groupfile);
+ }
- return newstate;
- }
+ #endif /* HAVE_GETGROUPLIST */
+ return newstate;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.184 -r1.185 imapd.spec
--- openpkg-src/imapd/imapd.spec 7 Nov 2007 07:10:21 -0000 1.184
+++ openpkg-src/imapd/imapd.spec 30 Nov 2007 10:50:15 -0000 1.185
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 2.3.10
-Release: 20071107
+Release: 20071130
# package options
%option with_fsl yes
@@ -125,7 +125,7 @@
%if "%{with_group_igncase}" == "yes"
%{l_shtool} subst -e 's;^\(\+.*\)strcmp;\1strcasecmp;' imapd.patch.group
%endif
- %{l_patch} -p0 <imapd.patch.group
+ %{l_patch} -p1 <imapd.patch.group
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
