- Update to 1.0.18

- Makefile and plist cleanup

- Release: Prayer 1.0.18
- Important Security fix:
- os_connect_unix() had a strcpy() which should have been strncpy() to
  prevent buffer overrun. Prayer 1.0.17 was mostly safe.

- Release: Prayer 1.0.17
- Fix small foulup wuth gethostbyname() calculations when binding  
  Prayer to specific interfaces.
- Cleanups to stop char vs unsigned char warnings with latest    
  c-client.
- Make sure that all internal draft messages consistently use CRLF.
- Security audit for Prayer frontend following attack:
- Optional Chroot environment (See chroot options in config file).
- Stripped out debugging code.

PR:		ports/119496
Submitted by:	Mike Bristow <mike@urgle.com>
Approved by:	linimon (mentor)

5 files changed, 39 insertions, 38 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index dea9d26e1bbc..1ea098427a93 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	prayer
-PORTVERSION=	1.0.16
-PORTREVISION=	2
+PORTVERSION=	1.0.18
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -27,8 +26,8 @@ MAKE_ENV+=	PORTCFLAGS="${CFLAGS}"
 BERKELEYDB_PORT?=	databases/db42
 BERKELEYDB_LIB?=		db-4.2
 
-DOCS=	ACCOUNTD CMD_LINE DESIGN DONE DONE-OLD FEATURES ICONLIST \
-	INSTALL LOGS NOTICE README ROADMAP SECURITY TODO URL_OPTIONS
+PORTDOCS=	ACCOUNTD CMD_LINE DESIGN DONE DONE-OLD FEATURES ICONLIST \
+		INSTALL LOGS NOTICE README ROADMAP SECURITY TODO URL_OPTIONS
 
 pre-patch:
 	${CP} ${WRKSRC}/defaults/Config ${WRKSRC}/Config
@@ -50,11 +49,11 @@ pre-install:
 	${MKDIR} ${PREFIX}/prayer
 	${INSTALL_SCRIPT} ${WRKSRC}/prayer.sh \
 		${LOCALBASE}/etc/rc.d/prayer.sh.sample
+
+post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}/
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index 1d343b54d945..6272c2278630 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,3 +1,3 @@
-MD5 (prayer-1.0.16.tar.gz) = bede9f6cb3502d6180581bc4ff1f1961
-SHA256 (prayer-1.0.16.tar.gz) = 227fc7130b1ca2cc07cfe32aabc1b47ea5edfe9c8960dd46502f748a92cfd69b
-SIZE (prayer-1.0.16.tar.gz) = 575980
+MD5 (prayer-1.0.18.tar.gz) = 405177f14ced9ef11969f4db2dd96c13
+SHA256 (prayer-1.0.18.tar.gz) = 0c0f6a8d388ab95669566cc1bbe271992917f01d55e1caf695103e1f098d5f4a
+SIZE (prayer-1.0.18.tar.gz) = 566168
diff --git a/mail/prayer/files/patch-Config b/mail/prayer/files/patch-Config
index b36650de1d98..9ff704f9ce10 100644
--- a/mail/prayer/files/patch-Config
+++ b/mail/prayer/files/patch-Config
@@ -1,5 +1,5 @@
---- Config.orig	Tue Feb  7 12:38:13 2006
-+++ Config	Tue Feb  7 12:38:46 2006
+--- Config.orig	2006-04-05 13:35:35.000000000 +0100
++++ Config	2008-01-09 16:25:14.000000000 +0000
 @@ -28,7 +28,7 @@
  
  ############################################################################
@@ -25,10 +25,10 @@
  #
 -CCLIENT_DIR=./c-client
 -CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
--CCLIENT_LIB=./$(CCLIENT_DIR)/c-client.a
+-CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
 +#CCLIENT_DIR=./c-client
 +#CCLIENT_INCLUDE=-I $(CCLIENT_DIR)
-+#CCLIENT_LIB=./$(CCLIENT_DIR)/c-client.a
++#CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a
  CCLIENT_SSL_ENABLE  = true
  
  #
@@ -37,8 +37,8 @@
  #
  #CCLIENT_INCLUDE = -I/usr/local/include/c-client
 +CCLIENT_INCLUDE = -I${LOCALBASE}/include/c-client
- #CCLIENT_LIB     = -L/usr/local/lib -lc-client4
-+CCLIENT_LIB     = -L${LOCALBASE}/lib -lc-client4
+ #CCLIENT_LIBS    = -L/usr/local/lib -lc-client4
++CCLIENT_LIBS     = -L${LOCALBASE}/lib -lc-client4
  #
  # Complication:
  #   The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.
@@ -49,12 +49,12 @@
  
  ############################################################################
 @@ -99,7 +102,7 @@
- Z_LIB     = -lz
+ Z_LIBS    = -lz
  
  # LDAP (required if LDAP_ENABLE set)
 -LDAP_INCLUDE =
 +LDAP_INCLUDE = -I${LOCALBASE}/include
- LDAP_LIB     = -lldap
+ LDAP_LIBS    = -lldap
  
  # Pam (required if CCLIENT_PAM_ENABLE set)
 @@ -128,12 +131,12 @@
diff --git a/mail/prayer/files/patch-prayer_chroot.c b/mail/prayer/files/patch-prayer_chroot.c
new file mode 100644
index 000000000000..0a71df3435af
--- /dev/null
+++ b/mail/prayer/files/patch-prayer_chroot.c
@@ -0,0 +1,19 @@
+--- prayer/prayer_chroot.c.orig	2006-04-11 15:29:26.000000000 +0100
++++ prayer/prayer_chroot.c	2008-01-09 16:26:45.000000000 +0000
+@@ -10,8 +10,6 @@
+ #include "prayer.h"
+ #include "prayer_server.h"
+ 
+-#include <sys/prctl.h>
+-
+ BOOL prayer_main_use_existing(struct prayer *prayer, char *ports)
+ {
+     char *use_ssl, *fd, *next;
+@@ -305,7 +303,6 @@
+         if (getuid() == 0)
+             log_fatal("Failed to lose root priveledges");       /* Stop impossible loop */
+ 
+-        prctl(PR_SET_DUMPABLE, 1);
+     }
+ 
+     if (getuid() == 0)
diff --git a/mail/prayer/pkg-plist b/mail/prayer/pkg-plist
index c44b7633fa1d..24161ec62d20 100644
--- a/mail/prayer/pkg-plist
+++ b/mail/prayer/pkg-plist
@@ -4,6 +4,7 @@ etc/rc.d/prayer.sh.sample
 prayer/help/CVS/Root
 prayer/help/CVS/Repository
 prayer/help/CVS/Entries
+prayer/help/CVS/Entries.Log
 prayer/help/compose/CVS/Root
 prayer/help/compose/CVS/Repository
 prayer/help/compose/CVS/Entries
@@ -52,12 +53,9 @@ prayer/help/prefs/CVS/Repository
 prayer/help/prefs/CVS/Entries
 prayer/help/prefs/compose1.html
 prayer/help/prefs/compose2.html
-prayer/help/prefs/compose2.html.~1.2.~
 prayer/help/prefs/display1.html
-prayer/help/prefs/display1.html.~1.2.~
 prayer/help/prefs/folder.html
 prayer/help/prefs/general.html
-prayer/help/prefs/general.html.~1.2.~
 prayer/icons/CVS/Root
 prayer/icons/CVS/Repository
 prayer/icons/CVS/Entries
@@ -106,6 +104,7 @@ prayer/sbin/prayer-session
 prayer/sbin/prayer-ssl-prune
 prayer/sbin/prayer-sem-prune
 prayer/sbin/prayer-cyclog
+prayer/sbin/prayer-chroot
 @dirrm prayer/help/CVS
 @dirrm prayer/help/compose/CVS
 @dirrm prayer/help/compose
@@ -118,22 +117,6 @@ prayer/sbin/prayer-cyclog
 @dirrm prayer/certs
 @dirrm prayer/sbin
 @dirrm prayer
-%%PORTDOCS%%%%DOCSDIR%%/ACCOUNTD
-%%PORTDOCS%%%%DOCSDIR%%/CMD_LINE
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN
-%%PORTDOCS%%%%DOCSDIR%%/DONE
-%%PORTDOCS%%%%DOCSDIR%%/DONE-OLD
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/ICONLIST
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LOGS
-%%PORTDOCS%%%%DOCSDIR%%/NOTICE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ROADMAP
-%%PORTDOCS%%%%DOCSDIR%%/SECURITY
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/URL_OPTIONS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p /var/spool/prayer
 @exec chown -R prayer:prayer /var/spool/prayer
 @dirrmtry /var/spool/prayer