OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Feb-2006 19:43:48
Branch: HEAD Handle: 2006022218434700
Modified files:
openpkg-src/imapd imapd.conf imapd.patch imapd.patch.group
imapd.spec
Log:
cleanup and improve packaging
Summary:
Revision Changes Path
1.14 +1 -1 openpkg-src/imapd/imapd.conf
1.16 +48 -40 openpkg-src/imapd/imapd.patch
1.5 +10 -9 openpkg-src/imapd/imapd.patch.group
1.153 +4 -2 openpkg-src/imapd/imapd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.conf
============================================================================
$ cvs diff -u -r1.13 -r1.14 imapd.conf
--- openpkg-src/imapd/imapd.conf 22 Mar 2005 15:18:32 -0000 1.13
+++ openpkg-src/imapd/imapd.conf 22 Feb 2006 18:43:47 -0000 1.14
@@ -1,6 +1,5 @@
##
## imapd.conf -- IMAP daemon configuration
-## Copyright (c) 2002-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
# Warning: Do not use a trailing slash in paths!
@@ -13,6 +12,7 @@
sendmail: @l_prefix@/sbin/sendmail
lmtpsocket: @l_prefix@/var/imapd/socket/lmtp
temp_path: @l_prefix@/var/imapd/tmp
+sievedir: @l_prefix@/var/imapd/sieve
unixhierarchysep: yes
#altnamespace: yes
allowanonymouslogin: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 imapd.patch
--- openpkg-src/imapd/imapd.patch 10 Jan 2006 12:48:37 -0000 1.15
+++ openpkg-src/imapd/imapd.patch 22 Feb 2006 18:43:47 -0000 1.16
@@ -1,7 +1,7 @@
Index: et/com_err.c
---- et/com_err.c.orig 2003-06-04 05:27:50.000000000 +0200
-+++ et/com_err.c 2004-02-02 19:56:00.000000000 +0100
-@@ -50,7 +50,7 @@
+--- et/com_err.c.orig 2004-05-25 03:28:00 +0200
++++ et/com_err.c 2006-02-22 19:10:03 +0100
+@@ -51,7 +51,7 @@
#include <string.h>
#include "mit-sipb-copyright.h"
@@ -10,9 +10,33 @@
#include <stdarg.h>
#else
#include <varargs.h>
+Index: imap/mboxname.c
+--- imap/mboxname.c.orig 2005-02-14 07:43:17 +0100
++++ imap/mboxname.c 2006-02-22 19:10:03 +0100
+@@ -128,7 +128,11 @@
+ sprintf(result, "%s!", cp);
+ }
+ }
++#ifdef ATVDOM /* allow '@' being a regular character in mboxname even when
using virtual domains */
++ else if ((cp = strrchr(name, '@'))) {
++#else
+ if ((cp = strrchr(name, '@'))) {
++#endif /* ATVDOM */
+ /* mailbox specified as [EMAIL PROTECTED] */
+ namelen = cp - name;
+
+Index: imap/xversion.sh
+--- imap/xversion.sh.orig 2003-10-22 20:03:00 +0200
++++ imap/xversion.sh 2006-02-22 19:10:35 +0100
+@@ -22,4 +22,4 @@
+ match ($0, pattern) {
+ printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
+ }' pattern="$DATEPAT $TIMEPAT" | \
+- sort | tail -1 >> xversion.h
++ sort | tail -n 1 >> xversion.h
Index: lib/cyrusdb_skiplist.c
---- lib/cyrusdb_skiplist.c.orig 2003-12-15 17:04:35.000000000 +0100
-+++ lib/cyrusdb_skiplist.c 2004-02-02 19:56:00.000000000 +0100
+--- lib/cyrusdb_skiplist.c.orig 2004-06-09 21:42:47 +0200
++++ lib/cyrusdb_skiplist.c 2006-02-22 19:10:03 +0100
@@ -71,6 +71,11 @@
#define PROB (0.5)
@@ -26,8 +50,8 @@
*
* disk format; all numbers in network byte order
Index: lib/prot.h
---- lib/prot.h.orig 2003-10-22 20:50:12.000000000 +0200
-+++ lib/prot.h 2004-02-02 19:58:47.000000000 +0100
+--- lib/prot.h.orig 2005-05-04 21:25:44 +0200
++++ lib/prot.h 2006-02-22 19:10:03 +0100
@@ -49,6 +49,7 @@
#include <time.h>
#include <stdio.h>
@@ -36,23 +60,9 @@
#include <sasl/sasl.h>
-Index: perl/sieve/lib/isieve.c
---- perl/sieve/lib/isieve.c.orig 2003-10-22 20:50:25.000000000 +0200
-+++ perl/sieve/lib/isieve.c 2004-02-02 20:01:21.000000000 +0100
-@@ -41,9 +41,7 @@
-
- /* $Id: imapd.patch,v 1.12 2004/11/13 14:53:34 rse Exp $ */
-
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
-+#include "../../../config.h"
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
Index: perl/Makefile.in
---- perl/Makefile.in.orig 2003-10-22 20:50:17.000000000 +0200
-+++ perl/Makefile.in 2004-02-02 21:23:32.000000000 +0100
+--- perl/Makefile.in.orig 2003-10-22 20:50:17 +0200
++++ perl/Makefile.in 2006-02-22 19:10:03 +0100
@@ -82,7 +82,8 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)"
OPENSSL_INC="$(OPENSSL_INC)" \
@@ -64,8 +74,8 @@
$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
Index: perl/sieve/Makefile.in
---- perl/sieve/Makefile.in.orig 2003-10-22 20:50:24.000000000 +0200
-+++ perl/sieve/Makefile.in 2004-02-02 21:41:22.000000000 +0100
+--- perl/sieve/Makefile.in.orig 2003-10-22 20:50:24 +0200
++++ perl/sieve/Makefile.in 2006-02-22 19:10:03 +0100
@@ -84,7 +84,8 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)"
OPENSSL_INC="$(OPENSSL_INC)" \
@@ -76,19 +86,17 @@
fi; \
$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
-Index: imap/mboxname.c
---- imap/mboxname.c.orig 2004-03-17 10:03:40.000000000 +0200
-+++ imap/mboxname.c 2004-03-17 10:03:40.000000000 +0200
-@@ -129,7 +129,11 @@
- domainlen = strlen(result);
- }
- }
-+#ifdef ATVDOM /* allow '@' being a regular character in mboxname even when
using virtual domains */
-+ else if ((cp = strrchr(name, '@'))) {
-+#else
- if ((cp = strrchr(name, '@'))) {
-+#endif /* ATVDOM */
- /* mailbox specified as [EMAIL PROTECTED] */
- namelen = cp - name;
+Index: perl/sieve/lib/isieve.c
+--- perl/sieve/lib/isieve.c.orig 2005-04-21 23:04:50 +0200
++++ perl/sieve/lib/isieve.c 2006-02-22 19:10:03 +0100
+@@ -41,9 +41,7 @@
+
+ /* $Id: isieve.c,v 1.27.2.2 2005/04/21 21:04:50 shadow Exp $ */
+
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
++#include "../../../config.h"
-
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch.group
============================================================================
$ cvs diff -u -r1.4 -r1.5 imapd.patch.group
--- openpkg-src/imapd/imapd.patch.group 29 Jan 2004 15:09:57 -0000
1.4
+++ openpkg-src/imapd/imapd.patch.group 22 Feb 2006 18:43:47 -0000
1.5
@@ -1,5 +1,6 @@
---- lib/auth_unix.c.orig Wed Oct 22 20:50:12 2003
-+++ lib/auth_unix.c Fri Jan 16 15:24:05 2004
+Index: lib/auth_unix.c
+--- lib/auth_unix.c.orig 2005-02-16 22:06:50 +0100
++++ lib/auth_unix.c 2005-12-12 09:56:53 +0100
@@ -48,6 +48,7 @@
#include <stdlib.h>
#include <pwd.h>
@@ -16,7 +17,7 @@
+/*
+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS,
+ * Copyright (C) 1995, 1996 Nat Friedman <[EMAIL PROTECTED]>.
-+ *
++ *
+ * 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
@@ -118,7 +119,7 @@
+ group.gr_mem = members;
+ return &group;
+}
-+
++
+static char *line_buff = NULL;
+static char **members = NULL;
+
@@ -132,10 +133,10 @@
+}
+#endif /* __FreeBSD__ */
+
- const char *auth_method_desc = "unix";
-
struct auth_state {
-@@ -144,6 +265,25 @@
+ char userid[81];
+ char **group;
+@@ -142,6 +263,25 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
@@ -161,7 +162,7 @@
/*
* Convert 'identifier' into canonical form.
* Returns a pointer to a static buffer containing the canonical form
-@@ -179,7 +319,7 @@
+@@ -177,7 +317,7 @@
*/
if (!strncmp(retbuf, "group:", 6)) {
@@ -176,7 +177,7 @@
char **mem;
+ FILE *groupfile;
- identifier = auth_canonifyid(identifier, 0);
+ identifier = mycanonifyid(identifier, 0);
if (!identifier) return 0;
@@ -240,20 +381,23 @@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.152 -r1.153 imapd.spec
--- openpkg-src/imapd/imapd.spec 10 Jan 2006 12:48:38 -0000 1.152
+++ openpkg-src/imapd/imapd.spec 22 Feb 2006 18:43:47 -0000 1.153
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 2.3.1
-Release: 20060110
+Release: 20060222
# package options
%option with_fsl yes
@@ -202,7 +202,8 @@
--with-cyrus-prefix=%{l_prefix} \
--with-cyrus-user=%{l_rusr} \
--with-cyrus-group=%{l_rgrp} \
- --with-pidfile=%{l_prefix}/var/imapd/cyrus-master.pid
+ --with-pidfile=%{l_prefix}/var/imapd/cyrus-master.pid \
+ --without-krb
# redirect the hard coded file paths
%{l_shtool} subst \
@@ -223,6 +224,7 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/var/imapd/log \
$RPM_BUILD_ROOT%{l_prefix}/var/imapd/tmp \
+ $RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve \
$RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \
$RPM_BUILD_ROOT%{l_prefix}/bin
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
