From nobody Sat Dec 16 10:42:29 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SsjMp2gTfz53kfb; Sat, 16 Dec 2023 10:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SsjMp131yz4HZx; Sat, 16 Dec 2023 10:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702723350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2jeAPy079lv5Puq6lAJbn4rPVOSeweckvK4brrvE/Y=; b=ZX4zmbliBlMTSi/yKXoW/G2Xin+bu6C1a5MA55XcT8v2yuZZTKFSxW3RIJQsGMweojLbGj jYcm6Nv7XLAXwCbPnzI14qkPYCtQxEcjZOHMs7gFMPHNMPLReDHSD22ku/UM53w3qs6rF3 K1ckrHbwMbsR3LN0HtxYVI/fsI67A/vpYKylymv8NyKDgP/9focyBMVjqx4kDlGuZECwza CG/8+iKpx3vQfQzu259iMnRVDVPIKoZgO1Efk6HnFEhjN6o3EPPQ5UTTjh7nee0HMA7ZG/ WnBBCOpKwFIcyXjeTuLon46b/IpV/OoSMxT2HqmtquU6yBmj17lnZ4hbxnlD4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702723350; a=rsa-sha256; cv=none; b=gUYyXJTQEa99GrAzdvYy7Ow8D61otxYIMrnqq4ODrxUOHRcIbBfkTkRKEAxvKuLL6PmvPu q9/uYQM513LWVDuf3MQNi+9Pca9r6eLI9arj+uldppsOianSP8pA8ghz3bUYWXf+bLxRHP A/KZvrU7TyEu74qsxgaVkKnnEA+VneWz4DZRdYJ4WhpxkSrzhoy2HwYZ5XMmPkEqD0dSQk xlIpQWzlNEKJTiSpPPS9dYKh3FjgVovy3LjE2kiXeZEt9Dk47weQbpGhWkcRlS/bKNtBZR qlesPHdt5oDnqEUkhSA2FufmkuJcFITtyMNcNeex/BHEaGPDBYFqoJwbXPEQYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702723350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2jeAPy079lv5Puq6lAJbn4rPVOSeweckvK4brrvE/Y=; b=XNI7QPza9HxPAntdkRKyvsc5L9Tn9aU2kAzVn4q7NF1q1EvftkydhxaVfUytqnSt3degZ1 8lczAy2hhnmtuqGAwq9pvsw4t5KIbRxoYuDSDsZyaIVSY13pAzpslOY7Md5rSOu9VnCF+S eEgxsqlD4xYG7FSk/yqzHKaqFbeqVzHsol8l574Sx5zsSTLvVSMi7OTT75R4/HtAK5IHPL 13hck/uo3XAjSX6kcH3PpygGQDOz3UrzQRhRUtlwHrXpAfrHw4vBrMaO6e0dc9v5JCsBo3 fD1tqCIbYOqfrNLxHoRdlGtxNcLaQK+mMFYuAFwCtJiyrxdGjIMp7gmItBN/ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SsjMn75kjzrC5; Sat, 16 Dec 2023 10:42:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BGAgTQ8009711; Sat, 16 Dec 2023 10:42:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BGAgTe9009708; Sat, 16 Dec 2023 10:42:29 GMT (envelope-from git) Date: Sat, 16 Dec 2023 10:42:29 GMT Message-Id: <202312161042.3BGAgTe9009708@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 5eb01f6981a3 - main - mail/imap-uw: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5eb01f6981a3b8c1cbd08926104fe33506c71c56 Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=5eb01f6981a3b8c1cbd08926104fe33506c71c56 commit 5eb01f6981a3b8c1cbd08926104fe33506c71c56 Author: Rene Ladan AuthorDate: 2023-12-16 10:42:12 +0000 Commit: Rene Ladan CommitDate: 2023-12-16 10:42:12 +0000 mail/imap-uw: Remove expired port 2023-12-16 mail/imap-uw: Last upstream release was in 2007 so use the fork mail/panda-imap --- MOVED | 1 + mail/Makefile | 1 - mail/imap-uw/Makefile | 106 -------------- mail/imap-uw/distinfo | 2 - mail/imap-uw/files/imap-uw.cnf | 34 ----- mail/imap-uw/files/patch-Makefile | 110 --------------- mail/imap-uw/files/patch-src-dmail-Makefile | 26 ---- mail/imap-uw/files/patch-src-mlock-Makefile | 12 -- mail/imap-uw/files/patch-src-osdep-unix-env_unix.c | 19 --- mail/imap-uw/files/patch-src-tmail-Makefile | 26 ---- mail/imap-uw/files/patch-src__imapd__imapd.8 | 11 -- mail/imap-uw/files/patch-src__ipopd__ipopd.8 | 14 -- mail/imap-uw/files/patch-src_imapd_Makefile | 81 ----------- mail/imap-uw/files/patch-src_ipopd_Makefile | 37 ----- mail/imap-uw/files/patch-src_ipopd_ipop3d.c | 11 -- mail/imap-uw/files/patch-src_mailutil_Makefile | 28 ---- mail/imap-uw/files/patch-src_mtest_Makefile | 30 ---- mail/imap-uw/files/patch-src_mtest_mtest.c | 47 ------- mail/imap-uw/files/patch-src_osdep_unix_Makefile | 154 --------------------- mail/imap-uw/files/patch-src_osdep_unix_os_bsi.h | 21 --- mail/imap-uw/files/pkg-message.in | 49 ------- mail/imap-uw/files/pkg-req.rev | 23 --- mail/imap-uw/files/pkg-req.ssl | 27 ---- mail/imap-uw/pkg-descr | 2 - mail/imap-uw/pkg-plist | 79 ----------- 25 files changed, 1 insertion(+), 950 deletions(-) diff --git a/MOVED b/MOVED index 75bbd46a1348..8591e24ae6a1 100644 --- a/MOVED +++ b/MOVED @@ -8179,3 +8179,4 @@ textproc/stardict-quick||2023-12-12|Has expired: unfetchable devel/rubygem-view_component-rails61|devel/rubygem-view_component-rails70|2023-12-14|Obsolete, use devel/rubygem-view_component-rails70 instead devel/rubygem-cucumber-messages23|devel/rubygem-cucumber-messages|2023-12-14|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead devel/py-astroid253|devel/py-astroid|2023-12-14|Remove obsoleted port. Use devel/py-astroid instead +mail/imap-uw|mail/panda-imap|2023-12-16|Has expired: Last upstream release was in 2007 so use the fork mail/panda-imap diff --git a/mail/Makefile b/mail/Makefile index d65e794153da..7133543067f8 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -158,7 +158,6 @@ SUBDIR += heirloom-mailx SUBDIR += ifile SUBDIR += im - SUBDIR += imap-uw SUBDIR += imapdedup SUBDIR += imapfilter SUBDIR += imapsync diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile deleted file mode 100644 index 8e47bb5efe8c..000000000000 --- a/mail/imap-uw/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -PORTNAME= imap -PORTVERSION= 2007f -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= mail -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ - ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ \ - http://atreides.freenix.no/~anders/%SUBDIR%/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/ -MASTER_SITE_SUBDIR= . old -PKGNAMESUFFIX= -uw - -MAINTAINER= ports@FreeBSD.org -COMMENT= University of Washington IMAP4rev1/POP2/POP3 mail servers -WWW= http://www.washington.edu/imap/ - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -DEPRECATED= Last upstream release was in 2007 so use the fork mail/panda-imap -EXPIRATION_DATE= 2023-12-16 - -LIB_DEPENDS= libc-client4.so.9:mail/cclient - -CONFLICTS_INSTALL= panda-imap # bin/dmail - -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -SUB_FILES= pkg-message - -MAKE_JOBS_UNSAFE= yes - -ALL_TARGET= bsf - -# This port must have the same SSL settings as mail/cclient, which it depends on -# To make MBX format the default mailbox format, change the settings of cclient - -OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT NETSCAPE_BRAIN_DAMAGE DOCS -OPTIONS_DEFAULT= SSL -OPTIONS_SUB= yes - -SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL -NETSCAPE_BRAIN_DAMAGE_DESC= See Makefile for documentation - -.include - -.if ! ${PORT_OPTIONS:MSSL} -MAKE_ARGS+= SSLTYPE=none SSLDIR=${OPENSSLBASE} -.else -USES+= ssl -.if ${PORT_OPTIONS:MSSL_AND_PLAINTEXT} -MAKE_ARGS+= SSLTYPE=unix -.else -MAKE_ARGS+= SSLTYPE=unix.nopwd -.endif -.endif - -# Define this to get somewhat better interoperability with Netscape. -.if ${PORT_OPTIONS:MNETSCAPE_BRAIN_DAMAGE} -MAKE_ARGS+= WITH_NETSCAPE_BRAIN_DAMAGE=yes -.endif -# See src/imapd/Makefile for more information about these three options. - -.include -post-patch: - @${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \ - ${WRKSRC}/docs/imaprc.txt - @${RM} ${WRKSRC}/docs/imaprc.txt.bak - -pre-build: - @${SH} ${FILESDIR}/pkg-req.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION} -.if ${PORT_OPTIONS:MSSL} - @${SH} ${FILESDIR}/pkg-req.ssl ${LOCALBASE}/include/c-client/portrevision.h yes -.else - @${SH} ${FILESDIR}/pkg-req.ssl ${LOCALBASE}/include/c-client/portrevision.h no -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${STAGEDIR}${PREFIX}/libexec/ - ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${STAGEDIR}${PREFIX}/libexec/ - ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${STAGEDIR}${PREFIX}/libexec/ - ${INSTALL_PROGRAM} ${WRKSRC}/mlock/mlock ${STAGEDIR}${PREFIX}/libexec/ - ${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${STAGEDIR}${PREFIX}/bin/mboxtest - ${INSTALL_MAN} \ - ${WRKSRC}/src/imapd/imapd.8 ${STAGEDIR}${PREFIX}/man/man8/imapd.8 - ${INSTALL_MAN} \ - ${WRKSRC}/src/ipopd/ipopd.8 ${STAGEDIR}${PREFIX}/man/man8/ipopd.8 - ${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${STAGEDIR}${PREFIX}/man/man1/ - -post-install-DOCS-on: - ${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR} - @${TAR} -C ${WRKSRC}/docs -cf - . | \ - (umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -) - -cert: - @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs - @openssl req -new -x509 -days 365 -nodes -config ${FILESDIR}/imap-uw.cnf -out ${PREFIX}/certs/imapd.pem -keyout ${PREFIX}/certs/imapd.pem - @openssl x509 -subject -dates -fingerprint -noout -in ${PREFIX}/certs/imapd.pem - @${CHMOD} 700 ${PREFIX}/certs/imapd.pem - @${LN} -s ${PREFIX}/certs/imapd.pem ${PREFIX}/certs/ipop3d.pem - -.include diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo deleted file mode 100644 index 2970605d3063..000000000000 --- a/mail/imap-uw/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (imap-2007f.tar.gz) = 53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28 -SIZE (imap-2007f.tar.gz) = 1990304 diff --git a/mail/imap-uw/files/imap-uw.cnf b/mail/imap-uw/files/imap-uw.cnf deleted file mode 100644 index 06610801707b..000000000000 --- a/mail/imap-uw/files/imap-uw.cnf +++ /dev/null @@ -1,34 +0,0 @@ -HOME= . -RANDFILE = $ENV::HOME/.rnd - -[ req ] -default_bits = 1024 -encrypt_key = yes -distinguished_name = req_dn -x509_extensions = cert_type - -[ req_dn ] -countryName = Country Name (2 letter code) -countryName_default = NO -countryName_min = 2 -countryName_max = 2 - -stateOrProvinceName = State or Province Name (full name) -stateOrProvinceName_default = Some-State - -localityName = Locality Name (eg, city) - -0.organizationName = Organization Name (eg, company) -0.organizationName_default = FooBar Inc. - -organizationalUnitName = Organizational Unit Name (eg, section) -#organizationalUnitName_default = - -0.commonName = Common Name (FQDN of your server) - -1.commonName = Common Name (default) -1.commonName_value = localhost - -[ cert_type ] -nsCertType = server - diff --git a/mail/imap-uw/files/patch-Makefile b/mail/imap-uw/files/patch-Makefile deleted file mode 100644 index 1da592cee2a5..000000000000 --- a/mail/imap-uw/files/patch-Makefile +++ /dev/null @@ -1,110 +0,0 @@ -*** Makefile.orig Wed May 9 00:50:45 2007 ---- Makefile Mon Jul 23 17:45:00 2007 -*************** -*** 164,170 **** - # std system standard (typically passwd file), determined by port - # two try alternative (defined by CHECKPWALT), then std - -! PASSWDTYPE=std - - - # SSL type. Defines whether or not SSL support is on this system ---- 164,170 ---- - # std system standard (typically passwd file), determined by port - # two try alternative (defined by CHECKPWALT), then std - -! PASSWDTYPE=pam - - - # SSL type. Defines whether or not SSL support is on this system -*************** -*** 253,264 **** - # British. As of 2005, the Julian calendar and the Gregorian calendar - # diverge by 15 days. - -! EXTRACFLAGS= - - - # Extra linker flags (additional/alternative libraries, etc.) - -! EXTRALDFLAGS= - - - # Special make flags (e.g. to override make environment variables) ---- 253,264 ---- - # British. As of 2005, the Julian calendar and the Gregorian calendar - # diverge by 15 days. - -! EXTRACFLAGS=-I$(PREFIX)/include/c-client - - - # Extra linker flags (additional/alternative libraries, etc.) - -! EXTRALDFLAGS=-L$(PREFIX)/lib -lc-client4 - - - # Special make flags (e.g. to override make environment variables) -*************** -*** 294,306 **** - - # Make the IMAP Toolkit - -! all: c-client SPECIALS rebuild bundled -! -! c-client: -! @echo Not processed yet. In a first-time build, you must specify -! @echo the system type so that the sources are properly processed. -! @false -! - - SPECIALS: - echo $(SPECIALS) > SPECIALS ---- 294,300 ---- - - # Make the IMAP Toolkit - -! all: bundled - - SPECIALS: - echo $(SPECIALS) > SPECIALS -*************** -*** 559,567 **** - @echo + In order to rectify this problem, you MUST build with: - @echo ++ SSLTYPE=$(SSLTYPE).nopwd - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' - - nounenc: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ---- 553,558 ---- -*************** -*** 582,590 **** - @echo ++ SSLTYPE=nopwd - @echo + You must also have OpenSSL or equivalent installed. - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac' - - nonossl: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ---- 573,578 ---- -*************** -*** 659,665 **** - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - -! build: OSTYPE rebuild rebuildclean bundled - - OSTYPE: - @$(MAKE) ip$(IP) ---- 647,653 ---- - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - -! build: bundled - - OSTYPE: - @$(MAKE) ip$(IP) diff --git a/mail/imap-uw/files/patch-src-dmail-Makefile b/mail/imap-uw/files/patch-src-dmail-Makefile deleted file mode 100644 index ec87408b7a51..000000000000 --- a/mail/imap-uw/files/patch-src-dmail-Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/dmail/Makefile.orig 2008-06-04 20:18:34.000000000 +0200 -+++ src/dmail/Makefile 2009-01-16 10:28:52.000000000 +0100 -@@ -31,20 +31,12 @@ - - # Get local definitions from c-client directory - --CC = `cat $C/CCTYPE` --CFLAGS = -I$C `cat $C/CFLAGS` --LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+CFLAGS+= -DNFSKLUDGE -I$(LOCALBASE)/include/c-client -+LDFLAGS+= -L$(LOCALBASE)/lib -lc-client4 - --dmail: $(CCLIENTLIB) dmail.o dquota.o -+dmail: dmail.o dquota.o - $(CC) $(CFLAGS) -o dmail dmail.o dquota.o $(LDFLAGS) - --dmail.o: $C/mail.h $C/misc.h $C/osdep.h dquota.h -- --dquota.o: dquota.h -- --$(CCLIENTLIB): -- cd $C;make -- - clean: - rm -f *.o dmail - diff --git a/mail/imap-uw/files/patch-src-mlock-Makefile b/mail/imap-uw/files/patch-src-mlock-Makefile deleted file mode 100644 index 279633e872b9..000000000000 --- a/mail/imap-uw/files/patch-src-mlock-Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- src/mlock/Makefile.orig Wed Nov 27 04:06:19 2002 -+++ src/mlock/Makefile Wed Nov 27 04:09:37 2002 -@@ -22,8 +22,7 @@ - - # Get local definitions from c-client directory - --CC = `cat $C/CCTYPE` --CFLAGS = `cat $C/CFLAGS` -+CFLAGS+= -DNFSKLUDGE - - all: mlock - diff --git a/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c b/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c deleted file mode 100644 index f67309ed7fea..000000000000 --- a/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c +++ /dev/null @@ -1,19 +0,0 @@ -*** src/osdep/unix/env_unix.c.orig Tue May 29 22:29:52 2007 ---- src/osdep/unix/env_unix.c Mon Jul 23 17:50:43 2007 -*************** -*** 79,85 **** - static short anonymous = NIL; /* is anonymous */ - static short blackBox = NIL; /* is a black box */ - static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ -! static short restrictBox = NIL; /* is a restricted box */ - static short has_no_life = NIL; /* is a cretin with no life */ - static short hideDotFiles = NIL;/* hide files whose names start with . */ - /* advertise filesystem root */ ---- 79,85 ---- - static short anonymous = NIL; /* is anonymous */ - static short blackBox = NIL; /* is a black box */ - static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ -! static short restrictBox = -1; /* is a restricted box */ - static short has_no_life = NIL; /* is a cretin with no life */ - static short hideDotFiles = NIL;/* hide files whose names start with . */ - /* advertise filesystem root */ diff --git a/mail/imap-uw/files/patch-src-tmail-Makefile b/mail/imap-uw/files/patch-src-tmail-Makefile deleted file mode 100644 index f45c29d32d2d..000000000000 --- a/mail/imap-uw/files/patch-src-tmail-Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- src/tmail/Makefile.orig 2008-06-04 20:18:34.000000000 +0200 -+++ src/tmail/Makefile 2009-01-16 10:30:24.000000000 +0100 -@@ -31,20 +31,12 @@ - - # Get local definitions from c-client directory - --CC = `cat $C/CCTYPE` --CFLAGS = -I$C `cat $C/CFLAGS` --LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+CFLAGS+= -DNFSKLUDGE -I$(LOCALBASE)/include/c-client -+LDFLAGS+= -L$(LOCALBASE)/lib -lc-client4 - --tmail: $(CCLIENTLIB) tmail.o tquota.o -+tmail: tmail.o tquota.o - $(CC) $(CFLAGS) -o tmail tmail.o tquota.o $(LDFLAGS) - --tmail.o: $C/mail.h $C/misc.h $C/osdep.h tquota.h -- --tquota.o: tquota.h -- --$(CCLIENTLIB): -- cd $C;make -- - clean: - rm -f *.o tmail - diff --git a/mail/imap-uw/files/patch-src__imapd__imapd.8 b/mail/imap-uw/files/patch-src__imapd__imapd.8 deleted file mode 100644 index dfc14334836e..000000000000 --- a/mail/imap-uw/files/patch-src__imapd__imapd.8 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/imapd/imapd.8.orig Sun Sep 30 16:06:25 2007 -+++ src/imapd/imapd.8 Sun Sep 30 16:06:38 2007 -@@ -16,7 +16,7 @@ - .SH NAME - IMAPd \- Internet Message Access Protocol server - .SH SYNOPSIS --.B /usr/etc/imapd -+.B /usr/local/libexec/imapd - .SH DESCRIPTION - .I imapd - is a server which supports the diff --git a/mail/imap-uw/files/patch-src__ipopd__ipopd.8 b/mail/imap-uw/files/patch-src__ipopd__ipopd.8 deleted file mode 100644 index a712defab505..000000000000 --- a/mail/imap-uw/files/patch-src__ipopd__ipopd.8 +++ /dev/null @@ -1,14 +0,0 @@ ---- src/ipopd/ipopd.8.orig Sun Sep 30 16:08:01 2007 -+++ src/ipopd/ipopd.8 Sun Sep 30 16:08:10 2007 -@@ -16,9 +16,9 @@ - .SH NAME - IPOPd \- Post Office Protocol server - .SH SYNOPSIS --.B /usr/etc/ipop2d -+.B /usr/local/libexec/ipop2d - .PP --.B /usr/etc/ipop3d -+.B /usr/local/libexec/ipop3d - .SH DESCRIPTION - .I ipop2d - and diff --git a/mail/imap-uw/files/patch-src_imapd_Makefile b/mail/imap-uw/files/patch-src_imapd_Makefile deleted file mode 100644 index 830bd8a87a73..000000000000 --- a/mail/imap-uw/files/patch-src_imapd_Makefile +++ /dev/null @@ -1,81 +0,0 @@ -*** src/imapd/Makefile.orig Thu Aug 31 02:10:44 2006 ---- src/imapd/Makefile Mon Jul 23 18:02:12 2007 -*************** -*** 25,35 **** - # Last Edited: 30 August 2006 - - -! ALERT=/etc/imapd.alert - USERALERT=.imapalert -! SHUTDOWN=/etc/nologin -! ANO=/etc/anonymous.newsgroups -! NNTP=/etc/imapd.nntp - SHELL= /bin/sh - - ---- 25,35 ---- - # Last Edited: 30 August 2006 - - -! ALERT=$(PREFIX)/etc/imapd.alert - USERALERT=.imapalert -! SHUTDOWN=$(PREFIX)/etc/nologin -! ANO=$(PREFIX)/etc/anonymous.newsgroups -! NNTP=$(PREFIX)//etc/imapd.nntp - SHELL= /bin/sh - - -*************** -*** 37,64 **** - # causes the "Manage Mail" menu item to open the given URL, e.g. to point to - # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail - # account management page. -! #NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\" - - - # Get local definitions from c-client directory - -! C = ../c-client -! CCLIENTLIB = $C/c-client.a -! CC = `cat $C/CCTYPE` -! CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ - -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" -! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - all: imapd - -! imapd: $(CCLIENTLIB) imapd.o - $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) -- -- imapd.o: $C/mail.h $C/misc.h $C/osdep.h -- -- $(CCLIENTLIB): -- cd $C;make - - clean: - rm -f *.o imapd || true ---- 37,59 ---- - # causes the "Manage Mail" menu item to open the given URL, e.g. to point to - # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail - # account management page. -! .if defined(WITH_NETSCAPE_BRAIN_DAMAGE) -! NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\" -! .endif - - - # Get local definitions from c-client directory - -! CFLAGS = -DNFSKLUDGE -I$(LOCALBASE)/include/c-client $(NSBD) \ -! -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ - -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" -! LDFLAGS+= $(EXTRALDFLAGS) -L$(LOCALBASE)/lib -lc-client4 - - all: imapd - -! imapd: imapd.o - $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) - - clean: - rm -f *.o imapd || true diff --git a/mail/imap-uw/files/patch-src_ipopd_Makefile b/mail/imap-uw/files/patch-src_ipopd_Makefile deleted file mode 100644 index a538cb910b16..000000000000 --- a/mail/imap-uw/files/patch-src_ipopd_Makefile +++ /dev/null @@ -1,37 +0,0 @@ ---- src/ipopd/Makefile.orig Wed Oct 25 01:55:07 2000 -+++ src/ipopd/Makefile Mon Oct 1 03:44:26 2001 -@@ -19,29 +19,21 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a -+#CCLIENTLIB = $C/c-client.a - SHELL = /bin/sh - - # Get local definitions from c-client directory - --CC = `cat $C/CCTYPE` --CFLAGS = -I$C `cat $C/CFLAGS` --LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+CFLAGS+= -DNFSKLUDGE -I$(LOCALBASE)/include/c-client -+LDFLAGS+= -L$(LOCALBASE)/lib -lc-client4 - - ipopd: ipop2d ipop3d - --ipop2d: $(CCLIENTLIB) ipop2d.o -+ipop2d: ipop2d.o - $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS) - --ipop3d: $(CCLIENTLIB) ipop3d.o -+ipop3d: ipop3d.o - $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS) -- --ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h -- --ipop3d.o: $C/mail.h $C/misc.h $C/osdep.h -- --$(CCLIENTLIB): -- cd $C;make - - clean: - rm -f *.o ipop2d ipop3d || true diff --git a/mail/imap-uw/files/patch-src_ipopd_ipop3d.c b/mail/imap-uw/files/patch-src_ipopd_ipop3d.c deleted file mode 100644 index 0b3fb92483ee..000000000000 --- a/mail/imap-uw/files/patch-src_ipopd_ipop3d.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ipopd/ipop3d.c.orig 2008-06-04 20:18:34.000000000 +0200 -+++ src/ipopd/ipop3d.c 2009-01-16 10:19:50.000000000 +0100 -@@ -113,7 +113,7 @@ - (((s = strrchr (argv[0],'/')) || (s = strrchr (argv[0],'\\'))) ? - s+1 : argv[0]) : "ipop3d"; - /* set service name before linkage */ -- mail_parameters (NIL,SET_SERVICENAME,(void *) "pop"); -+ mail_parameters (NIL,SET_SERVICENAME,(void *) "pop3"); - #include "linkage.c" - /* initialize server */ - server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint,NIL); diff --git a/mail/imap-uw/files/patch-src_mailutil_Makefile b/mail/imap-uw/files/patch-src_mailutil_Makefile deleted file mode 100644 index eb7a3dd9f880..000000000000 --- a/mail/imap-uw/files/patch-src_mailutil_Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- src/mailutil/Makefile.orig Tue Nov 19 01:41:46 2002 -+++ src/mailutil/Makefile Wed Nov 27 03:51:27 2002 -@@ -19,22 +19,15 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a - SHELL = /bin/sh - - # Get local definitions from c-client directory - --CC = `cat $C/CCTYPE` --CFLAGS = -I$C `cat $C/CFLAGS` --LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+CFLAGS+= -DNFSKLUDGE -I$(LOCALBASE)/include/c-client -+LDFLAGS+= -L$(LOCALBASE)/lib -lc-client4 - --mailutil: $(CCLIENTLIB) mailutil.o -+mailutil: mailutil.o - $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS) -- --mailutil.o: $C/mail.h $C/misc.h $C/osdep.h -- --$(CCLIENTLIB): -- cd $C;make - - clean: - rm -f *.o mailutil diff --git a/mail/imap-uw/files/patch-src_mtest_Makefile b/mail/imap-uw/files/patch-src_mtest_Makefile deleted file mode 100644 index 041d6a63b98e..000000000000 --- a/mail/imap-uw/files/patch-src_mtest_Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- src/mtest/Makefile.orig Wed Oct 25 01:55:39 2000 -+++ src/mtest/Makefile Mon Oct 1 03:42:11 2001 -@@ -19,24 +19,17 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a - SHELL = /bin/sh - - # Get local definitions from c-client directory - --CC = `cat $C/CCTYPE` --CFLAGS = -I$C `cat $C/CFLAGS` --LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+CFLAGS+= -DNFSKLUDGE -I$(LOCALBASE)/include/c-client -+LDFLAGS+= -L$(LOCALBASE)/lib -lc-client4 - - all: mtest - --mtest: $(CCLIENTLIB) mtest.o -+mtest: mtest.o - $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS) -- --mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h -- --$(CCLIENTLIB): -- cd $C;make - - clean: - rm -f *.o mtest || true diff --git a/mail/imap-uw/files/patch-src_mtest_mtest.c b/mail/imap-uw/files/patch-src_mtest_mtest.c deleted file mode 100644 index a3b490909a09..000000000000 --- a/mail/imap-uw/files/patch-src_mtest_mtest.c +++ /dev/null @@ -1,47 +0,0 @@ ---- src/mtest/mtest.c.orig Sat May 29 08:07:06 1999 -+++ src/mtest/mtest.c Sun Dec 19 15:29:29 1999 -@@ -95,6 +95,7 @@ - void status (MAILSTREAM *stream); - void prompt (char *msg,char *txt); - void smtptest (long debug); -+char *safegets(char *buf); - - /* Main program - initialization */ - -@@ -528,7 +529,7 @@ - void prompt (char *msg,char *txt) - { - printf ("%s",msg); -- gets (txt); -+ safegets (txt); - } - - /* Interfaces to C-client */ -@@ -713,7 +714,7 @@ - puts (" Msg (end with a line with only a '.'):"); - body->type = TYPETEXT; - *text = '\0'; -- while (gets (line)) { -+ while (safegets (line)) { - if (line[0] == '.') { - if (line[1] == '\0') break; - else strcat (text,"."); -@@ -744,4 +745,18 @@ - else puts ("[Can't open connection to any server]"); - mail_free_envelope (&msg); - mail_free_body (&body); -+} -+ -+char *safegets(char *buf) { -+ char *p; -+ -+ if (!fgets(buf, MAILTMPLEN, stdin)) { -+ return NULL; -+ } -+ -+ if ((p = strchr(buf, '\n')) != NULL) { -+ *p = '\0'; -+ } -+ -+ return buf; - } diff --git a/mail/imap-uw/files/patch-src_osdep_unix_Makefile b/mail/imap-uw/files/patch-src_osdep_unix_Makefile deleted file mode 100644 index d81228f915c0..000000000000 --- a/mail/imap-uw/files/patch-src_osdep_unix_Makefile +++ /dev/null @@ -1,154 +0,0 @@ -*** src/osdep/unix/Makefile.orig Sun Jun 17 17:37:44 2007 ---- src/osdep/unix/Makefile Mon Jul 23 17:34:03 2007 -*************** -*** 54,66 **** - - # Extended flags needed for SSL. You may need to modify. - -! SSLDIR=/usr/local/ssl -! SSLCERTS=$(SSLDIR)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead ---- 54,66 ---- - - # Extended flags needed for SSL. You may need to modify. - -! #SSLDIR=/usr/local/ssl -! SSLCERTS=$(PREFIX)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto -lcrypt - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead -*************** -*** 73,79 **** - - SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\ - -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\" -! SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA) - - - # Extended flags needed for non-standard passwd types. You may need to modify. ---- 73,79 ---- - - SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\ - -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\" -! SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA) - - - # Extended flags needed for non-standard passwd types. You may need to modify. -*************** -*** 87,93 **** - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= -lpam -ldl - - - # Build parameters normally set by the individual port ---- 87,93 ---- - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= # -lpam -lcrypt - - - # Build parameters normally set by the individual port -*************** -*** 125,131 **** - # Commands possibly overriden by the individual port - - ARRC=ar rc -! CC=cc - LN=ln -s - RANLIB=ranlib - ---- 125,131 ---- - # Commands possibly overriden by the individual port - - ARRC=ar rc -! CC?=cc - LN=ln -s - RANLIB=ranlib - -*************** -*** 149,155 **** - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS=-g - - CAT=cat - MAKE=make ---- 149,155 ---- - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) - - CAT=cat - MAKE=make -*************** -*** 232,237 **** ---- 232,246 ---- - BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \ - RANLIB=true ARRC="ar -rc" - -+ bfp: # FreeBSD Pluggable Authentication Modules -+ $(BUILD) `cat SPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \ -+ SPOOLDIR=/var \ -+ ACTIVEFILE=/usr/local/news/lib/active \ -+ RSHPATH=/usr/bin/rsh \ -+ LOCKPGM=$(PREFIX)/libexec/mlock \ -+ BASECFLAGS="-DNFSKLUDGE" \ -+ BASELDFLAGS="-lpam -lcrypt" -+ - bs3: # BSD/i386 3.0 or higher - $(BUILD) `$(CAT) SPECIALS` OS=bsi \ - CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \ -*************** -*** 251,258 **** - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="-lcrypt" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ ---- 260,268 ---- - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ -+ LOCKPGM=$(PREFIX)/libexec/mlock \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -*************** -*** 842,848 **** - - build: clean once $(ARCHIVE) - -! all: $(ARCHIVE) - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' ---- 852,858 ---- - - build: clean once $(ARCHIVE) - -! all: onceenv - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' diff --git a/mail/imap-uw/files/patch-src_osdep_unix_os_bsi.h b/mail/imap-uw/files/patch-src_osdep_unix_os_bsi.h deleted file mode 100644 index 4615f235b3fb..000000000000 --- a/mail/imap-uw/files/patch-src_osdep_unix_os_bsi.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/osdep/unix/os_bsi.h.orig Sat Oct 19 20:30:04 1996 -+++ src/osdep/unix/os_bsi.h Sun May 24 10:46:33 1998 -@@ -37,7 +37,18 @@ - #include - #include - #include -+ -+/* -+ * FreeBSD v3.x and onward whines about being obsolete, so switch -+ * to POSIX semantics. -+ */ -+#if __FreeBSD__ >= 3 -+#include -+#define direct dirent -+#else - #include -+#endif -+ - #include - #include - #include diff --git a/mail/imap-uw/files/pkg-message.in b/mail/imap-uw/files/pkg-message.in deleted file mode 100644 index 4bd0e18b1e37..000000000000 --- a/mail/imap-uw/files/pkg-message.in +++ /dev/null @@ -1,49 +0,0 @@ -[ -{ type: install - message: < NB: IMAP-UW now rejects non-encrypted logins by default. To change this -===> behaviour, recompile and reinstall cclient and imap-uw ports with one of -===> the following make variables defined: - -WITHOUT_SSL - build without SSL/encryption support. -WITH_SSL_AND_PLAINTEXT - build with SSL/encryption support, but allow -non-encrypted logins. -%%SSL%%================================================================================ -%%SSL%% -%%SSL%%To create and install a new SSL certificate for imapd and ipop3d, type \"make -%%SSL%%cert\". Or install manually in ${PREFIX}/certs. -%%SSL%% *** 163 LINES SKIPPED ***