ports/55356: Update port: mail/imapfilter

[Lefteris Chatzibarbas]

>Number:         55356
>Category:       ports
>Synopsis:       Update port: mail/imapfilter
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 07 18:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Lefteris Chatzibarbas
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD bsd 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 6 22:11:32 EEST 2003 root at bsd:/usr/obj/usr/src/sys/CUSTOM i386

>Description:
Port mail/imapfilter update to version 0.9.1.

NOTE: The attached patch should be applied against mail/imapfilter 0.8.9.  It
takes into consideration the compilation error in -STABLE described in PR
ports/55320.  The aforementioned PR should be closed:
http://www.freebsd.org/cgi/query-pr.cgi?pr=55320

>How-To-Repeat:

>Fix:

--- patch-0.9.1 begins here ---
diff -ruN imapfilter.old/Makefile imapfilter/Makefile
--- imapfilter.old/Makefile	Fri Aug  8 04:26:03 2003
+++ imapfilter/Makefile	Fri Aug  8 04:17:22 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imapfilter
-PORTVERSION=	0.8.9
+PORTVERSION=	0.9.1
 CATEGORIES=	mail
 MASTER_SITES=	http://imapfilter.hellug.gr/source/
 
@@ -30,6 +30,5 @@
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample.imapfilterrc ${EXAMPLESDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN imapfilter.old/distinfo imapfilter/distinfo
--- imapfilter.old/distinfo	Fri Aug  8 04:26:03 2003
+++ imapfilter/distinfo	Fri Aug  8 04:17:17 2003
@@ -1 +1 @@
-MD5 (imapfilter-0.8.9.tar.bz2) = ab7104e7184725e1df18393d2a4980ea
+MD5 (imapfilter-0.9.1.tar.bz2) = 4d57e0c5162821da07470ecab3f1f450
diff -ruN imapfilter.old/files/patch-aa imapfilter/files/patch-aa
--- imapfilter.old/files/patch-aa	Fri Aug  8 04:26:03 2003
+++ imapfilter/files/patch-aa	Wed Aug  6 22:19:46 2003
@@ -1,31 +1,24 @@
---- Makefile.orig	Sat Oct  5 12:28:37 2002
-+++ Makefile	Sat Oct  5 12:30:57 2002
-@@ -1,9 +1,9 @@
+--- Makefile.orig	Wed Aug  6 22:00:14 2003
++++ Makefile	Wed Aug  6 22:03:56 2003
+@@ -1,10 +1,9 @@
 -CC = cc
 -CFLAGS = -O
-+DESTDIR = $(PREFIX)
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/man
- 
+-LDFLAGS =
+-
 -DESTDIR = /usr/local
 -BINDIR = /usr/local/bin
 -MANDIR = /usr/local/man
++DESTDIR = $(PREFIX)
++BINDIR = $(PREFIX)/bin
++MANDIR = $(PREFIX)/man
++
 +INST_BIN = $(BSD_INSTALL_PROGRAM)
 +INST_DOC = $(BSD_INSTALL_MAN)
  
  MAN_BIN = imapfilter.1
  MAN_RC = imapfilterrc.5
-@@ -14,6 +14,8 @@
- 
- LIBS =  -lssl -lcrypto
- 
-+all: imapfilter
-+
- imapfilter: $(OBJ)
- 	$(CC) $(LIBS) $(CFLAGS) -o $(BIN) $(OBJ)
- 
-@@ -22,12 +24,9 @@
- data.o imapfilter.o imap.o file.o passwd.o request.o socket.o: data.h
+@@ -32,12 +31,9 @@
+ imapfilter.o: version.h
  
  install: imapfilter
 -	if test ! -d $(BINDIR); then mkdir -p $(BINDIR); fi
@@ -38,5 +31,5 @@
 +	$(INST_DOC) $(MAN_BIN) $(MANDIR)/man1
 +	$(INST_DOC) $(MAN_RC) $(MANDIR)/man5
  
- uninstall:
+ deinstall:
  	rm -f $(BINDIR)/$(BIN) $(MANDIR)/man1/$(MAN_BIN) $(MANDIR)/man5/$(MAN_RC)
diff -ruN imapfilter.old/files/patch-ab imapfilter/files/patch-ab
--- imapfilter.old/files/patch-ab	Thu Jan  1 02:00:00 1970
+++ imapfilter/files/patch-ab	Fri Aug  8 04:21:38 2003
@@ -0,0 +1,12 @@
+--- socket.c.orig	Fri Aug  8 04:20:08 2003
++++ socket.c	Fri Aug  8 04:21:28 2003
+@@ -6,6 +6,9 @@
+ #include <netdb.h>
+ #include <sys/socket.h>
+ #include <sys/select.h>
++#if __FreeBSD_version < 500000
++#include <sys/time.h>
++#endif
+ #include <fcntl.h>
+ 
+ #include "config.h"
diff -ruN imapfilter.old/pkg-descr imapfilter/pkg-descr
--- imapfilter.old/pkg-descr	Fri Aug  8 04:26:03 2003
+++ imapfilter/pkg-descr	Wed Aug  6 22:19:46 2003
@@ -3,10 +3,14 @@
 Available searching criteria, which can be combined using logical operators
 (and/or/not), include the matching of a string in the headers or body of
 messages, the size, date or status of them.  Different actions can be applied
-such as deletion, copying or moving of messages to mailboxes in the same
-or different mail server, and changing of their flags.  Other features also
-include daemon mode and encryption and secure storing in the filesystem of the
-user's passwords, using the integrated interactive password editor.
+such as deletion, copying or moving of messages to mailboxes in the same or
+different mail server, and changing of their flags.
+
+IMAPFilter additionally supports connection encryption through either imaps SSL
+wrapped session or the IMAP STARTTLS extension and user authentication using
+the CRAM-MD5 mechanism.  Other features also include encryption and secure
+storing in the filesystem of the user's passwords, running in daemon mode,
+support for the IMAP NAMESPACE extension.
 
 IMAPfilter is purposed as a preconnect utility before a user fetches his/her
 mail, accesses his/her mailboxes with one of the available mail user agents or
diff -ruN imapfilter.old/pkg-message imapfilter/pkg-message
--- imapfilter.old/pkg-message	Fri Aug  8 04:26:03 2003
+++ imapfilter/pkg-message	Thu Jan  1 02:00:00 1970
@@ -1,3 +0,0 @@
-You can install imapfilter suid root, in order to lock memory pages and
-avoid swapping sensitive data.  By default it is not installed suid root,
-so this must be done manually.
--- patch-0.9.1 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: