upgrade and package style cleanups

19 years ago · 97efbeec3a
3 changed files with 46 additions and 90 deletions
--- a/imapd/imapd.patch
+++ b/imapd/imapd.patch
@ -1,6 +1,6 @@
 Index: et/com_err.c
--- et/com_err.c.orig	2004-05-25 03:28:00 +0200
-+++ et/com_err.c	2006-12-17 14:10:03 +0100
+--- et/com_err.c.orig	2004-05-22 05:45:47 +0200
+++ et/com_err.c	2007-02-08 09:24:55 +0100
@@ -51,7 +51,7 @@
 #include <string.h>
 #include "mit-sipb-copyright.h"
@ -12,7 +12,7 @@ Index: et/com_err.c
 #include <varargs.h>
 Index: et/com_err.h
 --- et/com_err.h.orig	2003-02-13 21:15:21 +0100
-+++ et/com_err.h	2006-12-17 14:10:03 +0100
+++ et/com_err.h	2007-02-08 09:24:55 +0100
@@ -99,5 +99,7 @@
 extern void (*reset_com_err_hook ()) ();
 #endif
@ -22,9 +22,9 @@ Index: et/com_err.h
 #define __COM_ERR_H
 #endif /* ! defined(__COM_ERR_H) */
 Index: imap/fud.c
--- imap/fud.c.orig	2005-04-13 17:43:36 +0200
-+++ imap/fud.c	2006-12-17 14:10:03 +0100
-@@ -102,26 +102,26 @@
+--- imap/fud.c.orig	2007-02-05 19:41:46 +0100
+++ imap/fud.c	2007-02-08 09:24:55 +0100
+@@ -104,26 +104,26 @@
 
 char who[16];
 
@ -58,20 +58,9 @@ Index: imap/fud.c
 
 	    if (signals_poll() == SIGHUP) {
 		/* caught a SIGHUP, return */
-Index: imap/idle.c
--- imap/idle.c.orig	2005-12-12 22:23:58 +0100
-+++ imap/idle.c	2006-12-17 14:10:03 +0100
-@@ -53,6 +53,7 @@
- #include <unistd.h>
- #endif
- #include <signal.h>
-+#include <string.h>
- 
- #include "idle.h"
- #include "idled.h"
 Index: imap/idled.c
--- imap/idled.c.orig	2005-12-12 22:23:58 +0100
-+++ imap/idled.c	2006-12-17 14:10:03 +0100
+--- imap/idled.c.orig	2007-02-05 19:41:46 +0100
+++ imap/idled.c	2007-02-08 09:24:55 +0100
@@ -50,6 +50,7 @@
 #include <syslog.h>
 #include <sys/stat.h>
@ -81,8 +70,8 @@ Index: imap/idled.c
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 Index: imap/mboxname.c
--- imap/mboxname.c.orig	2005-02-14 07:43:17 +0100
-+++ imap/mboxname.c	2006-12-17 14:10:03 +0100
+--- imap/mboxname.c.orig	2006-11-30 18:11:19 +0100
+++ imap/mboxname.c	2007-02-08 09:24:55 +0100
@@ -128,7 +128,11 @@
 		sprintf(result, "%s!", cp);
 	    }
@ -96,19 +85,19 @@ Index: imap/mboxname.c
 	    namelen = cp - name;
 
 Index: imap/sync_log.c
--- imap/sync_log.c.orig	2005-05-12 21:56:17 +0200
-+++ imap/sync_log.c	2006-12-17 14:10:03 +0100
+--- imap/sync_log.c.orig	2007-02-05 19:41:48 +0100
+++ imap/sync_log.c	2007-02-08 09:24:55 +0100
@@ -57,6 +57,7 @@
 #include <varargs.h>
 #endif
 #include <stdlib.h>
 +#include <string.h>
 #include <stdio.h>
+ #include <string.h>
 #include <syslog.h>
- #include <errno.h>
 Index: imap/xversion.sh
 --- imap/xversion.sh.orig	2003-10-22 20:03:00 +0200
-+++ imap/xversion.sh	2006-12-17 14:10:03 +0100
+++ imap/xversion.sh	2007-02-08 09:24:55 +0100
@@ -22,4 +22,4 @@
 	match ($0, pattern) {
 	    printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
@ -116,9 +105,9 @@ Index: imap/xversion.sh
 -	sort | tail -1 >> xversion.h
 +	sort | sed -n -e '$p' >> xversion.h
 Index: lib/cyrusdb_berkeley.c
--- lib/cyrusdb_berkeley.c.orig	2006-02-28 13:58:07 +0100
-+++ lib/cyrusdb_berkeley.c	2006-12-17 14:10:03 +0100
-@@ -169,6 +169,7 @@
+--- lib/cyrusdb_berkeley.c.orig	2007-02-05 19:43:26 +0100
+++ lib/cyrusdb_berkeley.c	2007-02-08 09:24:55 +0100
+@@ -172,6 +172,7 @@
 
     dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
 
@ -126,7 +115,7 @@ Index: lib/cyrusdb_berkeley.c
     if ((opt = libcyrus_config_getint(CYRUSOPT_BERKELEY_LOCKS_MAX)) < 0) {
 	syslog(LOG_WARNING,
 	       "DBERROR: invalid berkeley_locks_max value, using internal default");
-@@ -180,6 +181,7 @@
+@@ -183,6 +184,7 @@
 	    abort();
 	}
     }
@ -135,11 +124,11 @@ Index: lib/cyrusdb_berkeley.c
     if ((opt = libcyrus_config_getint(CYRUSOPT_BERKELEY_TXNS_MAX)) < 0) {
 	syslog(LOG_WARNING,
 Index: lib/cyrusdb_skiplist.c
--- lib/cyrusdb_skiplist.c.orig	2006-12-17 14:10:03 +0100
-+++ lib/cyrusdb_skiplist.c	2006-12-17 14:10:03 +0100
-@@ -76,6 +76,13 @@
- #define O_DSYNC 0
- #endif
+--- lib/cyrusdb_skiplist.c.orig	2007-02-05 19:43:26 +0100
+++ lib/cyrusdb_skiplist.c	2007-02-08 09:24:55 +0100
+@@ -74,6 +74,13 @@
+ 
+ #define PROB (0.5)
 
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 +/* #define fdatasync(fd) fsync(fd) */
@ -152,8 +141,8 @@ Index: lib/cyrusdb_skiplist.c
  *
  * disk format; all numbers in network byte order
 Index: lib/prot.h
--- lib/prot.h.orig	2006-02-01 20:25:42 +0100
-+++ lib/prot.h	2006-12-17 14:10:03 +0100
+--- lib/prot.h.orig	2006-11-30 18:11:22 +0100
+++ lib/prot.h	2007-02-08 09:24:55 +0100
@@ -49,6 +49,7 @@
 #include <time.h>
 #include <stdio.h>
@ -162,33 +151,9 @@ Index: lib/prot.h
 
 #include <sasl/sasl.h>
 
-Index: lib/xstrlcat.h
--- lib/xstrlcat.h.orig	2006-03-22 22:38:48 +0100
-+++ lib/xstrlcat.h	2006-12-17 14:10:03 +0100
-@@ -48,6 +48,8 @@
- #include <stdio.h>
- /* for free() */
- #include <stdlib.h>
-+/* for strlen() */
-+#include <string.h>
- 
- #ifndef HAVE_STRLCAT
- extern size_t strlcat(char *dst, const char *src, size_t len);
-Index: lib/xstrlcpy.h
--- lib/xstrlcpy.h.orig	2006-03-22 22:38:49 +0100
-+++ lib/xstrlcpy.h	2006-12-17 14:10:03 +0100
-@@ -48,6 +48,8 @@
- #include <stdio.h>
- /* for free() */
- #include <stdlib.h>
-+/* for strlen() */
-+#include <string.h>
- 
- /* handy string manipulation functions */
- #ifndef HAVE_STRLCPY
 Index: perl/Makefile.in
 --- perl/Makefile.in.orig	2003-10-22 20:50:17 +0200
-+++ perl/Makefile.in	2006-12-17 14:10:03 +0100
+++ perl/Makefile.in	2007-02-08 09:24:55 +0100
@@ -82,7 +82,8 @@
 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
@ -201,7 +166,7 @@ Index: perl/Makefile.in
 	done
 Index: perl/sieve/Makefile.in
 --- perl/sieve/Makefile.in.orig	2003-10-22 20:50:24 +0200
-+++ perl/sieve/Makefile.in	2006-12-17 14:10:03 +0100
+++ perl/sieve/Makefile.in	2007-02-08 09:24:55 +0100
@@ -84,7 +84,8 @@
 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
@ -213,11 +178,11 @@ Index: perl/sieve/Makefile.in
 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
 	done
 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-12-17 14:10:03 +0100
+--- perl/sieve/lib/isieve.c.orig	2006-11-30 18:11:24 +0100
+++ perl/sieve/lib/isieve.c	2007-02-08 09:24:55 +0100
@@ -41,9 +41,7 @@
 
- /* $Id: isieve.c,v 1.27.2.2 2005/04/21 21:04:50 shadow Exp $ */
+ /* $Id: isieve.c,v 1.30 2006/11/30 17:11:24 murch Exp $ */
 
 -#ifdef HAVE_CONFIG_H
 -#include <config.h>
--- a/imapd/imapd.patch.group
+++ b/imapd/imapd.patch.group
@ -1,6 +1,6 @@
 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
+--- 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 @@
 #include <stdlib.h>
 #include <pwd.h>
--- a/imapd/imapd.spec
+++ b/imapd/imapd.spec
@ -32,8 +32,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Mail
 License:      BSD
-Version:      2.3.7
-Release:      20061217
+Version:      2.3.8
+Release:      20070208

 #   package options
 %option       with_fsl           yes
@ -74,11 +74,11 @@ AutoReqProv:  no

 %description
    The Cyrus IMAP server is an IMAP4 and POP3 daemon that differs from
-    other IMAP server implementations in that it is generally intended to
-    be run on sealed servers, where normal users are not permitted to log
-    in. The mailbox database is stored in parts of the filesystem that are
-    private to the Cyrus IMAP system. All user access to mail is through
-    the IMAP, POP3, or KPOP protocols.
+    other IMAP server implementations in that it is generally intended
+    to be run on sealed servers, where normal users are not permitted to
+    log in. The mailbox database is stored in parts of the filesystem
+    that are private to the Cyrus IMAP system. All user access to mail
+    is through the IMAP, POP3, or KPOP protocols.

 %track
    prog imapd = {
@ -107,8 +107,7 @@ AutoReqProv:  no
    %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
    %{l_patch} -p0 <contrib/drac_auth.patch
    sleep 1
-    touch configure
-    touch lib/imapoptions
+    touch configure lib/imapoptions
    rm -f lib/imapopts.[ch]
 %endif

@ -131,15 +130,13 @@ AutoReqProv:  no
        *-sunos* )
            %{l_shtool} subst \
                -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb -lrt\2;' \
-                perl/sieve/managesieve/Makefile.PL \
-                perl/imap/Makefile.PL
-        ;;
+                perl/sieve/managesieve/Makefile.PL perl/imap/Makefile.PL
+            ;;
        * )
            %{l_shtool} subst \
                -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \
-                perl/sieve/managesieve/Makefile.PL \
-                perl/imap/Makefile.PL
-        ;;
+                perl/sieve/managesieve/Makefile.PL perl/imap/Makefile.PL
+            ;;
    esac

    #   ensure invocation of correct Perl
@ -148,18 +145,12 @@ AutoReqProv:  no
        perl/imap/cyradm.sh
    %{l_shtool} subst \
        -e 's;^\(exec\) \(perl .*\)$;\1 %{l_prefix}/bin/\2;' \
-        perl/sieve/scripts/*.pl \
-        snmp/[a-z]* \
-        tools/[a-z]*
+        perl/sieve/scripts/*.pl snmp/[a-z]* tools/[a-z]*

    #   adjust hard-coded location of sieve
    %{l_shtool} subst \
        -e 's;"/usr/sieve";"%{l_prefix}/var/imapd/sieve";g' \
-        lib/imapopts.c \
-        tools/masssievec \
-        tools/rehash \
-        tools/translatesieve \
-        tools/upgradesieve
+        lib/imapopts.c tools/masssievec tools/rehash tools/translatesieve tools/upgradesieve

    #   adjust default config to install environment for use in "mkimap" install helper script
    %{l_shtool} install -c -m 644 \