Date: Thu, 4 Jun 1998 18:03:45 -0500 (CDT) From: "Scot W. Hetzel <hetzels@westbend.net>"@mail.westbend.net To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/6862: Cyrus upgraded to 1.5.10 Message-ID: <199806042303.SAA05711@mail.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 6862 >Category: ports >Synopsis: Cyrus upgraded to 1.5.10 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 4 16:10:01 PDT 1998 >Last-Modified: >Originator: Scot W. Hetzel >Organization: West Bend Internet >Release: FreeBSD 2.2.6-STABLE i386 >Environment: >Description: The Cyrus Imap Server, has been upgraded to v1.5.10. I have applied the patches from the v1.5.2, but am unable to finish compiling, due to deliver.c being compiled with the wrong code in the checkdelivered function: cc -c -I. -I. -I./../lib -I/usr/local/include -DSTATEDIR=\"/var\" -DHAVE_LONG_FILE_NAMES=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_MEMMOVE=1 -DHAVE_STRCASECMP=1 -DHAVE_FTRUNCATE=1 -DHAVE_STRERROR=1 -DHAVE_DIRENT_H=1 -DHAVE_VPRINTF=1 -DHAS_STRERROR=1 -DSPT_TYPE=SPT_BUILTIN -DHAVE_LIBCRYPT=1 -DHAVE_SASL_KRB=1 -DHAVE_GETDTABLESIZE=1 -DCONFIG_FILENAME=\"/usr/local/etc/imapd.conf\" -O2 -pipe -I/usr/include/kerberosIV deliver.c deliver.c: In function `checkdelivered': deliver.c:1065: invalid operands to binary == *** Error code 1 Stop The reason this error occurs is because configure is not detecting any database libraries, which doesn't add -DHAVE_LIBDB to the DEF line in the status.config file and cause checkdelivered to be compiled with the default code, instead of the code using the appropriate database library. NOTE: When I add -DHAVE_LIBDB=1 to the DEF line in config.status and run config.status. The imap server will then build. So, can somebody take these patches to the cyrus port, and figure out why configure is not detecting the database libary. Scot >How-To-Repeat: Apply the attached patches to the cyrus port, and then build the port, it will stop at deliver.c due to -DHAVE_LIBDB is undefined. >Fix: The attached port diff will bring port to v1.5.10, but is not the complete fix. diff -ruN cyrus.orig/Makefile cyrus/Makefile --- cyrus.orig/Makefile Wed Feb 25 03:41:30 1998 +++ cyrus/Makefile Wed Jun 3 15:21:06 1998 @@ -6,8 +6,8 @@ # $Id: Makefile,v 1.7 1998/02/25 09:41:30 asami Exp $ # -DISTNAME= cyrus-imapd-v1.5.2 -PKGNAME= cyrus-1.5.2 +DISTNAME= cyrus-imapd-v1.5.10 +PKGNAME= cyrus-1.5.10 CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ diff -ruN cyrus.orig/files/md5 cyrus/files/md5 --- cyrus.orig/files/md5 Fri May 30 14:59:08 1997 +++ cyrus/files/md5 Wed Jun 3 15:18:06 1998 @@ -1 +1 @@ -MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945 +MD5 (cyrus-imapd-v1.5.10.tar.gz) = d4d6c70ede1ec7b315e65c0b928afe66 diff -ruN cyrus.orig/patches/patch-ab cyrus/patches/patch-ab --- cyrus.orig/patches/patch-ab Fri May 30 14:59:08 1997 +++ cyrus/patches/patch-ab Wed Jun 3 17:09:12 1998 @@ -1,8 +1,8 @@ ---- man/quota.8.orig Sun May 4 22:26:33 1997 -+++ man/quota.8 Sun May 4 22:27:24 1997 -@@ -11,9 +11,9 @@ - .\" use of the code for commercial purposes or benefits by anyone - .\" without specific, additional permission by the owner of the code. +--- man/quota.8.orig Fri May 15 16:55:05 1998 ++++ man/quota.8 Wed Jun 3 16:49:49 1998 +@@ -24,9 +24,9 @@ + .\" (412) 268-4387, fax: (412) 268-7395 + .\" tech-transfer@andrew.cmu.edu .SH NAME -quota \- report and optionally fix quota usage +cyrquota \- report and optionally fix quota usage @@ -12,7 +12,7 @@ [ .B \-f ] -@@ -21,12 +21,12 @@ +@@ -34,12 +34,12 @@ .IR mailbox-prefix ... ] .SH DESCRIPTION @@ -27,7 +27,7 @@ first fixes any inconsistencies in the quota subsystem, such as mailboxes with the wrong quota root or quota roots with the wrong quota usage reported. -@@ -37,7 +37,7 @@ +@@ -50,7 +50,7 @@ prefixes. .PP Running diff -ruN cyrus.orig/patches/patch-ba cyrus/patches/patch-ba --- cyrus.orig/patches/patch-ba Sun Feb 15 06:14:14 1998 +++ cyrus/patches/patch-ba Wed Jun 3 17:07:07 1998 @@ -1,9 +1,9 @@ ---- pwcheck/pwcheck.c.orig Sat Dec 21 02:09:01 1996 -+++ pwcheck/pwcheck.c Wed Oct 8 15:00:36 1997 -@@ -18,9 +18,16 @@ - #include <sys/socket.h> +--- pwcheck/pwcheck.c.orig Fri May 15 16:55:22 1998 ++++ pwcheck/pwcheck.c Wed Jun 3 16:49:49 1998 +@@ -31,9 +31,16 @@ #include <sys/un.h> #include <sys/uio.h> + #include <sys/stat.h> +#include <paths.h> +#include <unistd.h> +#include <syslog.h> @@ -11,16 +11,16 @@ extern int errno; +#if !defined(_PATH_PWCHECKPID) -+ #define _PATH_PWCHECKPID _PATH_VARRUN "pwcheck.pid" ++ #define _PATH_PWCHECKPID _PATH_VARRUN "pwcheck.pid" +#endif + /* * Unix pwcheck daemon-authenticated login (shadow password) */ -@@ -35,6 +42,26 @@ - struct sockaddr_un clientaddr; +@@ -49,6 +56,26 @@ int r; int len; + mode_t oldumask; + char *pid_file = _PATH_PWCHECKPID; + FILE *fp; + pid_t pid; diff -ruN cyrus.orig/patches/patch-bb cyrus/patches/patch-bb --- cyrus.orig/patches/patch-bb Tue Feb 24 15:43:07 1998 +++ cyrus/patches/patch-bb Wed Jun 3 17:03:26 1998 @@ -1,13 +1,13 @@ ---- cyradm/Makefile.in.orig Sat Dec 21 02:07:57 1996 -+++ cyradm/Makefile.in Wed Oct 8 13:56:57 1997 -@@ -21,8 +21,8 @@ +--- cyradm/Makefile.in.orig Fri May 15 16:47:29 1998 ++++ cyradm/Makefile.in Wed Jun 3 16:55:46 1998 +@@ -33,8 +33,8 @@ RANLIB = @RANLIB@ DEFS = @DEFS@ --CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ --LIBS = @LIBS@ @TCLLIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ -+LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm +-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ +-LIBS = @TCL_LIBS@ @LIBS@ @TCL_LIBS@ @LIBS@ ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ ++LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff -ruN cyrus.orig/patches/patch-bc cyrus/patches/patch-bc --- cyrus.orig/patches/patch-bc Sun Feb 15 06:14:14 1998 +++ cyrus/patches/patch-bc Wed Jun 3 17:13:15 1998 @@ -1,11 +1,11 @@ ---- imap/Makefile.in.orig Thu Mar 13 10:23:01 1997 -+++ imap/Makefile.in Wed Oct 8 13:56:57 1997 -@@ -34,7 +34,7 @@ +--- imap/Makefile.in.orig Fri May 15 16:47:56 1998 ++++ imap/Makefile.in Wed Jun 3 17:12:25 1998 +@@ -47,7 +47,7 @@ CYRUS_USER=@cyrus_user@ CYRUS_GROUP=@cyrus_group@ --DEFS = @DEFS@ -+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ - LIBS = @LIBS@ - DEPLIBS = ../et/libcom_err.a ../lib/libcyrus.a @DEPLIBS@ +-DEFS = @DEFS@ @LOCALDEFS@ ++DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ + LIBS = @LIBS@ @COM_ERR_LIBS@ + DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ diff -ruN cyrus.orig/patches/patch-bd cyrus/patches/patch-bd --- cyrus.orig/patches/patch-bd Sun Feb 15 06:14:14 1998 +++ cyrus/patches/patch-bd Wed Jun 3 17:17:31 1998 @@ -1,6 +1,6 @@ ---- imap/config.c.orig Sat Dec 21 02:08:11 1996 -+++ imap/config.c Wed Oct 8 13:56:58 1997 -@@ -23,7 +23,9 @@ +--- imap/config.c.orig Fri May 15 16:48:14 1998 ++++ imap/config.c Wed Jun 3 17:16:41 1998 +@@ -37,7 +37,10 @@ extern int errno; @@ -8,6 +8,7 @@ +#if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/imapd.conf" +#endif - - struct configlist { - char *key; ++ + /* You'd think this'd be EX_CONFIG, but you'd be wrong. + If it's EX_CONFIG then sendmail's result is to fatally reject the + message; this isn't desireable, we just want to fail the message in a diff -ruN cyrus.orig/patches/patch-be cyrus/patches/patch-be --- cyrus.orig/patches/patch-be Sun Feb 15 06:14:14 1998 +++ cyrus/patches/patch-be Wed Jun 3 17:19:38 1998 @@ -1,6 +1,6 @@ ---- imap/krbck.c.orig Sat Dec 21 02:08:21 1996 -+++ imap/krbck.c Wed Oct 8 13:56:58 1997 -@@ -29,7 +29,9 @@ +--- imap/krbck.c.orig Fri May 15 16:48:47 1998 ++++ imap/krbck.c Wed Jun 3 17:18:08 1998 +@@ -44,7 +44,9 @@ #define EXIT_CHOKE (int) 10 >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199806042303.SAA05711>