Date: Mon, 31 Aug 1998 12:36:10 +0200 (CEST) From: hans@artcom.de To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/7789: [PATCH] cyrus imapd is outdated (and does not build in many situations) Message-ID: <m0zDRJi-000nxAC@mail.artcom.de>
next in thread | raw e-mail | index | archive | help
>Number: 7789 >Category: ports >Synopsis: [PATCH] cyrus imapd is outdated (and does not build in many situations) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Aug 31 03:40:00 PDT 1998 >Last-Modified: >Originator: Hans Huebner >Organization: Art+Com GmbH, Berlin >Release: FreeBSD 2.2.6-RELEASE i386 >Environment: Straightforward 2.2.6-RELEASE installation. >Description: The cyrus imapd port is outdated, and it fails to cleanly build if tcl is not installed. >How-To-Repeat: cd /usr/ports/mail/cyrus; make >Fix: A patch to upgrade the cyrus port (1.5.2) to the current version (1.5.14) is included below. I contacted the original port submitter, but the mail bounced. Seems like a new committer is needed for this port. diff --exclude=CVS -ur mail/cyrus.old/Makefile mail/cyrus/Makefile --- mail/cyrus.old/Makefile Tue May 19 15:55:53 1998 +++ mail/cyrus/Makefile Mon Aug 31 12:23:48 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.14 +PKGNAME= cyrus-1.5.14 CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ @@ -19,9 +19,10 @@ HAS_CONFIGURE= YES CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-group=cyrus \ - --with-tcl=${PREFIX} \ + --with-tclsh=${PREFIX}/bin/tclsh8.1 \ --with-login=unix_pwcheck \ - --with-auth=unix + --with-auth=unix \ + --with-com-err MAN1= cyradm.1 MAN3= imclient.3 diff --exclude=CVS -ur mail/cyrus.old/README.html mail/cyrus/README.html --- mail/cyrus.old/README.html Tue Oct 21 14:23:28 1997 +++ mail/cyrus/README.html Wed Mar 25 00:32:45 1998 @@ -18,9 +18,9 @@ a summary on how to use the ports collection. <p> -This port requires package(s) "makedepend-95.07.05" to build. +This port requires package(s) "makedepend-95.07.05 tcl-8.1.a2" to build. <p> - +This port requires package(s) "tcl-8.1.a2" to run. <p><hr><p> <a href="../README.html"> Go up one level</a> diff --exclude=CVS -ur mail/cyrus.old/files/md5 mail/cyrus/files/md5 --- mail/cyrus.old/files/md5 Fri May 30 21:59:08 1997 +++ mail/cyrus/files/md5 Wed Aug 26 11:17:58 1998 @@ -1 +1 @@ -MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945 +MD5 (cyrus-imapd-v1.5.14.tar.gz) = e90555be60ec3a647f1661e10cc16458 diff --exclude=CVS -ur mail/cyrus.old/patches/patch-ba mail/cyrus/patches/patch-ba --- mail/cyrus.old/patches/patch-ba Sun Feb 15 13:14:14 1998 +++ mail/cyrus/patches/patch-ba Wed Aug 26 11:29:16 1998 @@ -1,46 +1,42 @@ ---- 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> - #include <sys/un.h> - #include <sys/uio.h> -+#include <paths.h> -+#include <unistd.h> -+#include <syslog.h> - - extern int errno; - -+#if !defined(_PATH_PWCHECKPID) -+ #define _PATH_PWCHECKPID _PATH_VARRUN "pwcheck.pid" -+#endif -+ - /* - * Unix pwcheck daemon-authenticated login (shadow password) - */ -@@ -35,6 +42,26 @@ - struct sockaddr_un clientaddr; - int r; - int len; -+ char *pid_file = _PATH_PWCHECKPID; -+ FILE *fp; -+ pid_t pid; -+ -+ /* -+ * Record process ID - shamelessly stolen from inetd (I.V.) -+ */ -+ pid = getpid(); -+ fp = fopen(pid_file, "w"); -+ if (fp) { -+ fprintf(fp, "%ld\n", (long)pid); -+ fclose(fp); -+ } else { -+ syslog(LOG_WARNING, "%s: %m", pid_file); -+ } -+ -+ /* -+ * Make sure socket is rw for everyone (T.S.) -+ */ -+ umask(0); - - s = socket(AF_UNIX, SOCK_STREAM, 0); - if (s == -1) { +*** pwcheck/pwcheck.c.orig Fri May 15 23:55:22 1998 +--- pwcheck/pwcheck.c Wed Aug 26 11:28:01 1998 +*************** +*** 31,36 **** +--- 31,43 ---- + #include <sys/un.h> + #include <sys/uio.h> + #include <sys/stat.h> ++ #include <paths.h> ++ #include <unistd.h> ++ #include <syslog.h> ++ ++ #if !defined(_PATH_PWCHECKPID) ++ # define _PATH_PWCHECKPID _PATH_VARRUN "pwcheck.pid" ++ #endif + + extern int errno; + +*************** +*** 49,54 **** +--- 56,76 ---- + int r; + int len; + mode_t oldumask; ++ char *pid_file = _PATH_PWCHECKPID; ++ FILE *fp; ++ pid_t pid; ++ ++ /* ++ * Record process ID - shamelessly stolen from inetd (I.V.) ++ */ ++ pid = getpid(); ++ fp = fopen(pid_file, "w"); ++ if (fp) { ++ fprintf(fp, "%ld\n", (long)pid); ++ fclose(fp); ++ } else { ++ syslog(LOG_WARNING, "%s: %m", pid_file); ++ } + + s = socket(AF_UNIX, SOCK_STREAM, 0); + if (s == -1) { diff --exclude=CVS -ur mail/cyrus.old/patches/patch-bb mail/cyrus/patches/patch-bb --- mail/cyrus.old/patches/patch-bb Tue Feb 24 22:43:07 1998 +++ mail/cyrus/patches/patch-bb Wed Aug 26 11:37:21 1998 @@ -1,13 +1,22 @@ ---- 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 @@ - 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 - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ - - CFLAGS = @CFLAGS@ +*** cyradm/Makefile.in.orig Tue Jun 9 06:30:40 1998 +--- cyradm/Makefile.in Wed Aug 26 11:35:46 1998 +*************** +*** 33,41 **** + RANLIB = @RANLIB@ + + DEFS = @DEFS@ @TCL_DEFS@ +! CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ +! # lazy approach to linking: just do it a lot +! LIBS = @TCL_LIBS@ @LIBS@ @TCL_LIBS@ @LIBS@ + DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ + + CFLAGS = @CFLAGS@ +--- 33,40 ---- + RANLIB = @RANLIB@ + + DEFS = @DEFS@ @TCL_DEFS@ +! 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 --exclude=CVS -ur mail/cyrus.old/patches/patch-bc mail/cyrus/patches/patch-bc --- mail/cyrus.old/patches/patch-bc Sun Feb 15 13:14:14 1998 +++ mail/cyrus/patches/patch-bc Wed Aug 26 11:42:40 1998 @@ -1,11 +1,19 @@ ---- 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 @@ - 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@ +*** imap/Makefile.in Wed Aug 26 11:40:10 1998 +--- imap/Makefile.in.orig Wed Aug 26 11:37:56 1998 +*************** +*** 47,53 **** + CYRUS_USER=@cyrus_user@ + CYRUS_GROUP=@cyrus_group@ + +! DEFS = @DEFS@ @LOCALDEFS@ + CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ + LIBS = @LIBS@ @COM_ERR_LIBS@ + DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ +--- 47,53 ---- + CYRUS_USER=@cyrus_user@ + CYRUS_GROUP=@cyrus_group@ + +! 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 --exclude=CVS -ur mail/cyrus.old/patches/patch-bd mail/cyrus/patches/patch-bd --- mail/cyrus.old/patches/patch-bd Sun Feb 15 13:14:14 1998 +++ mail/cyrus/patches/patch-bd Wed Aug 26 11:45:05 1998 @@ -1,13 +1,22 @@ ---- 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 @@ - - extern int errno; - --#define CONFIG_FILENAME "/etc/imapd.conf" -+#if !defined(CONFIG_FILENAME) -+ #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif - - struct configlist { - char *key; +*** imap/config.c.orig Fri May 15 23:48:14 1998 +--- imap/config.c Wed Aug 26 11:44:18 1998 +*************** +*** 37,43 **** + + extern int errno; + +! #define CONFIG_FILENAME "/etc/imapd.conf" + /* 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 +--- 37,46 ---- + + extern int errno; + +! #if !defined(CONFIG_FILENAME) +! # define CONFIG_FILENAME "/etc/imapd.conf" +! #endif +! + /* 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 --exclude=CVS -ur devel/makedepend.old/Makefile devel/makedepend/Makefile --- devel/makedepend.old/Makefile Mon Dec 15 11:21:13 1997 +++ devel/makedepend/Makefile Mon Aug 31 11:50:45 1998 @@ -6,7 +6,7 @@ # $Id: Makefile,v 1.2 1997/12/15 05:53:44 max Exp $ # -DISTNAME= cyrus-imapd-v1.5.2 +DISTNAME= cyrus-imapd-v1.5.14 PKGNAME= makedepend-95.07.05 CATEGORIES= devel MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ diff --exclude=CVS -ur devel/makedepend.old/files/md5 devel/makedepend/files/md5 --- devel/makedepend.old/files/md5 Mon Sep 1 17:39:24 1997 +++ devel/makedepend/files/md5 Mon Aug 31 11:51:09 1998 @@ -1 +1 @@ -MD5 (cyrus-imapd-v1.5.2.tar.gz) = d9e1471469320c7bc43837ce1b781945 +MD5 (cyrus-imapd-v1.5.14.tar.gz) = e90555be60ec3a647f1661e10cc16458 diff --exclude=CVS -ur devel/makedepend.old/pkg/PLIST devel/makedepend/pkg/PLIST --- devel/makedepend.old/pkg/PLIST Wed Aug 12 11:22:46 1998 +++ devel/makedepend/pkg/PLIST Mon Sep 1 18:39:25 1997 @@ -1 +1,2 @@ bin/makedepend +man/man1/makedepend.1.gz >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?m0zDRJi-000nxAC>