From feld@feld.me  Tue Oct 30 13:34:42 2012
Return-Path: <feld@feld.me>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 59584F33
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Oct 2012 13:34:42 +0000 (UTC)
	(envelope-from feld@feld.me)
Received: from feld.me (feld.me [66.170.3.2])
	by mx1.freebsd.org (Postfix) with ESMTP id 306BE8FC1E
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Oct 2012 13:34:42 +0000 (UTC)
Received: from feld by feld.me with local (Exim 4.80 (FreeBSD))
	(envelope-from <feld@feld.me>)
	id 1TTBxi-000Nj1-Dq
	for FreeBSD-gnats-submit@freebsd.org; Tue, 30 Oct 2012 08:34:34 -0500
Message-Id: <E1TTBxi-000Nj1-Dq@feld.me>
Date: Tue, 30 Oct 2012 08:34:34 -0500
From: Mark Felder <feld@feld.me>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] mail/vexim: update to 2.2.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         173214
>Category:       ports
>Synopsis:       [PATCH] mail/vexim: update to 2.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 30 13:40:00 UTC 2012
>Closed-Date:    Sat Nov 03 13:13:34 UTC 2012
>Last-Modified:  Sat Nov 03 13:13:34 UTC 2012
>Originator:     feld
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD mwi1.coffeenet.org 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #5 r239731: Mon Aug 27 09:53:18 CDT
>Description:
- Update to 2.2.2

Vexim 2.2.2rc1 was released in May 2010 with some serious security fixes.
It was never listed on their main website for some reason and never finalized even
though they said they would re-roll it into a final release. Vexim development/maintainer
has been dead for years, so this is not surprising.

FreeBSD ports should be have this version which closes these security holes.

I'm posting this patch with the version simply as "2.2.2" not mentioning the rc1 status of this tarball.

https://redports.org/buildarchive/20121030132628-28143/

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- vexim-2.2.2.patch begins here ---
diff -ruN --exclude=CVS ../vexim.orig/Makefile ./Makefile
--- ../vexim.orig/Makefile	2012-10-30 00:00:44.000000000 -0500
+++ ./Makefile	2012-10-30 08:27:03.025535166 -0500
@@ -2,11 +2,10 @@
 # $FreeBSD: ports/mail/vexim/Makefile,v 1.10 2012/10/29 15:57:24 jhale Exp $
 
 PORTNAME=	vexim
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	mail www
-MASTER_SITES=	http://silverwraith.com/vexim/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+MASTER_SITES=	GOOGLE_CODE
+DISTNAME=	${PORTNAME}_${PORTVERSION}_rc1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web interface for managing virtual domains for exim
@@ -17,7 +16,7 @@
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
 VEXIMDIR=	www/${PORTNAME}
-WRKSRC=		${WRKDIR}/vexim2
+WRKSRC=		${WRKDIR}/vexim-release
 
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
@@ -42,27 +41,27 @@
 .endif
 
 post-patch:
-	${FIND} ${WRKSRC} -name CVS -prune -exec ${RM} -r {} \;
+	${RM} -r ${WRKSRC}/.hg ${WRKSRC}/.hgtags ${WRKSRC}/vexim/adminuserchange.phps
 
 do-install:
 	@${ECHO} "Installing in ${VEXIMDIR}"
 	${MKDIR} ${PREFIX}/${VEXIMDIR}
-	cd ${WRKSRC}/vexim && ${FIND} . \! -path '*.svn*' \
+	cd ${WRKSRC}/vexim && ${FIND} . \
 		-type d -exec ${MKDIR} ${PREFIX}/${VEXIMDIR}/{} \;  \
-		-o \! -path '*.svn*' -type f \
+		-o -type f \
 		-exec ${INSTALL_DATA} {} ${PREFIX}/${VEXIMDIR}/{} \;
 	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/setup && ${FIND} . \! -path '*.svn*' \
+	cd ${WRKSRC}/setup && ${FIND} . \
 		-type d -exec ${MKDIR} ${DATADIR}/{} \; \
-		-o \! -path '*.svn*' -type f \
+		-o -type f \
 		-exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-.if ${PORT_OPTIONS:MDOCS}
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${FIND} docs \! -path '*.svn*' \
+	cd ${WRKSRC} && ${FIND} docs \
 		-type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-		-o \! -path '*.svn*' -type f \
+		-o -type f \
 		-exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-.for i in INSTALL README TODO
+.for i in INSTALL LICENSE README TODO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
diff -ruN --exclude=CVS ../vexim.orig/distinfo ./distinfo
--- ../vexim.orig/distinfo	2011-07-03 08:53:48.000000000 -0500
+++ ./distinfo	2012-10-30 08:25:55.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (vexim2.2.1.tar.gz) = 6f057b6c008cacb9d9dbb7c2b69c3c4b4be43f3d2f3d9db811c8ba43ad073a79
-SIZE (vexim2.2.1.tar.gz) = 232441
+SHA256 (vexim_2.2.2_rc1.tar.gz) = cb0d47e3e3e3b53545ad5c959d6acae13f17604550779bc1d01621e65c85a507
+SIZE (vexim_2.2.2_rc1.tar.gz) = 290286
--- vexim-2.2.2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Oct 30 13:40:10 UTC 2012 
Responsible-Changed-Why:  
swills@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173214 

From: Mark Felder <feld@feld.me>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173214: [PATCH] mail/vexim: update to 2.2.2
Date: Tue, 30 Oct 2012 08:53:28 -0500

 --MP_/mwY6WhClyOz.K/==ldE=mBh
 Content-Type: text/plain
 Content-Disposition: inline
 
 Whoops, previous patch broke the OptionsNG DOCS -- see attached
 
 
 --MP_/mwY6WhClyOz.K/==ldE=mBh
 Content-Type: application/octet-stream; name=vexim-2.2.2.patch2
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=vexim-2.2.2.patch2
 
 LS0tIHZleGltLTIuMi4yLnBhdGNoIGJlZ2lucyBoZXJlIC0tLQpkaWZmIC1ydU4gLS1leGNs
 dWRlPUNWUyAuLi92ZXhpbS5vcmlnL01ha2VmaWxlIC4vTWFrZWZpbGUKLS0tIC4uL3ZleGlt
 Lm9yaWcvTWFrZWZpbGUJMjAxMi0xMC0zMCAwMDowMDo0NC4wMDAwMDAwMDAgLTA1MDAKKysr
 IC4vTWFrZWZpbGUJMjAxMi0xMC0zMCAwODozNjo0NC40MzE1NTQwNzYgLTA1MDAKQEAgLTIs
 MTEgKzIsMTAgQEAKICMgJEZyZWVCU0Q6IHBvcnRzL21haWwvdmV4aW0vTWFrZWZpbGUsdiAx
 LjEwIDIwMTIvMTAvMjkgMTU6NTc6MjQgamhhbGUgRXhwICQKIAogUE9SVE5BTUU9CXZleGlt
 Ci1QT1JUVkVSU0lPTj0JMi4yLjEKLVBPUlRSRVZJU0lPTj0JMQorUE9SVFZFUlNJT049CTIu
 Mi4yCiBDQVRFR09SSUVTPQltYWlsIHd3dwotTUFTVEVSX1NJVEVTPQlodHRwOi8vc2lsdmVy
 d3JhaXRoLmNvbS92ZXhpbS8KLURJU1ROQU1FPQkke1BPUlROQU1FfSR7UE9SVFZFUlNJT059
 CitNQVNURVJfU0lURVM9CUdPT0dMRV9DT0RFCitESVNUTkFNRT0JJHtQT1JUTkFNRX1fJHtQ
 T1JUVkVSU0lPTn1fcmMxCiAKIE1BSU5UQUlORVI9CXBvcnRzQEZyZWVCU0Qub3JnCiBDT01N
 RU5UPQlXZWIgaW50ZXJmYWNlIGZvciBtYW5hZ2luZyB2aXJ0dWFsIGRvbWFpbnMgZm9yIGV4
 aW0KQEAgLTE3LDcgKzE2LDcgQEAKIFJVTl9ERVBFTkRTPQkke0xPQ0FMQkFTRX0vc2hhcmUv
 cGVhci9EQi5waHA6JHtQT1JUU0RJUn0vZGF0YWJhc2VzL3BlYXItREIKIAogVkVYSU1ESVI9
 CXd3dy8ke1BPUlROQU1FfQotV1JLU1JDPQkJJHtXUktESVJ9L3ZleGltMgorV1JLU1JDPQkJ
 JHtXUktESVJ9L3ZleGltLXJlbGVhc2UKIAogU1VCX0ZJTEVTPQlwa2ctbWVzc2FnZQogTk9f
 QlVJTEQ9CXllcwpAQCAtNDIsMjcgKzQxLDI3IEBACiAuZW5kaWYKIAogcG9zdC1wYXRjaDoK
 LQkke0ZJTkR9ICR7V1JLU1JDfSAtbmFtZSBDVlMgLXBydW5lIC1leGVjICR7Uk19IC1yIHt9
 IFw7CisJJHtSTX0gLXIgJHtXUktTUkN9Ly5oZyAke1dSS1NSQ30vLmhndGFncyAke1dSS1NS
 Q30vdmV4aW0vYWRtaW51c2VyY2hhbmdlLnBocHMKIAogZG8taW5zdGFsbDoKIAlAJHtFQ0hP
 fSAiSW5zdGFsbGluZyBpbiAke1ZFWElNRElSfSIKIAkke01LRElSfSAke1BSRUZJWH0vJHtW
 RVhJTURJUn0KLQljZCAke1dSS1NSQ30vdmV4aW0gJiYgJHtGSU5EfSAuIFwhIC1wYXRoICcq
 LnN2bionIFwKKwljZCAke1dSS1NSQ30vdmV4aW0gJiYgJHtGSU5EfSAuIFwKIAkJLXR5cGUg
 ZCAtZXhlYyAke01LRElSfSAke1BSRUZJWH0vJHtWRVhJTURJUn0ve30gXDsgIFwKLQkJLW8g
 XCEgLXBhdGggJyouc3ZuKicgLXR5cGUgZiBcCisJCS1vIC10eXBlIGYgXAogCQktZXhlYyAk
 e0lOU1RBTExfREFUQX0ge30gJHtQUkVGSVh9LyR7VkVYSU1ESVJ9L3t9IFw7CiAJJHtNS0RJ
 Un0gJHtEQVRBRElSfQotCWNkICR7V1JLU1JDfS9zZXR1cCAmJiAke0ZJTkR9IC4gXCEgLXBh
 dGggJyouc3ZuKicgXAorCWNkICR7V1JLU1JDfS9zZXR1cCAmJiAke0ZJTkR9IC4gXAogCQkt
 dHlwZSBkIC1leGVjICR7TUtESVJ9ICR7REFUQURJUn0ve30gXDsgXAotCQktbyBcISAtcGF0
 aCAnKi5zdm4qJyAtdHlwZSBmIFwKKwkJLW8gLXR5cGUgZiBcCiAJCS1leGVjICR7SU5TVEFM
 TF9EQVRBfSB7fSAke0RBVEFESVJ9L3t9IFw7CiAuaWYgJHtQT1JUX09QVElPTlM6TURPQ1N9
 CiAJJHtNS0RJUn0gJHtET0NTRElSfQotCWNkICR7V1JLU1JDfSAmJiAke0ZJTkR9IGRvY3Mg
 XCEgLXBhdGggJyouc3ZuKicgXAorCWNkICR7V1JLU1JDfSAmJiAke0ZJTkR9IGRvY3MgXAog
 CQktdHlwZSBkIC1leGVjICR7TUtESVJ9ICR7RE9DU0RJUn0ve30gXDsgXAotCQktbyBcISAt
 cGF0aCAnKi5zdm4qJyAtdHlwZSBmIFwKKwkJLW8gLXR5cGUgZiBcCiAJCS1leGVjICR7SU5T
 VEFMTF9EQVRBfSB7fSAke0RPQ1NESVJ9L3t9IFw7Ci0uZm9yIGkgaW4gSU5TVEFMTCBSRUFE
 TUUgVE9ETworLmZvciBpIGluIElOU1RBTEwgTElDRU5TRSBSRUFETUUgVE9ETwogCSR7SU5T
 VEFMTF9EQVRBfSAke1dSS1NSQ30vJHtpfSAke0RPQ1NESVJ9CiAuZW5kZm9yCiAuZW5kaWYK
 ZGlmZiAtcnVOIC0tZXhjbHVkZT1DVlMgLi4vdmV4aW0ub3JpZy9kaXN0aW5mbyAuL2Rpc3Rp
 bmZvCi0tLSAuLi92ZXhpbS5vcmlnL2Rpc3RpbmZvCTIwMTEtMDctMDMgMDg6NTM6NDguMDAw
 MDAwMDAwIC0wNTAwCisrKyAuL2Rpc3RpbmZvCTIwMTItMTAtMzAgMDg6MjU6NTUuMDAwMDAw
 MDAwIC0wNTAwCkBAIC0xLDIgKzEsMiBAQAotU0hBMjU2ICh2ZXhpbTIuMi4xLnRhci5neikg
 PSA2ZjA1N2I2YzAwOGNhY2I5ZDlkYmI3YzJiNjljM2M0YjRiZTQzZjNkMmYzZDlkYjgxMWM4
 YmE0M2FkMDczYTc5Ci1TSVpFICh2ZXhpbTIuMi4xLnRhci5neikgPSAyMzI0NDEKK1NIQTI1
 NiAodmV4aW1fMi4yLjJfcmMxLnRhci5neikgPSBjYjBkNDdlM2UzZTNiNTM1NDVhZDVjOTU5
 ZDZhY2FlMTNmMTc2MDQ1NTA3NzliYzFkMDE2MjFlNjVjODVhNTA3CitTSVpFICh2ZXhpbV8y
 LjIuMl9yYzEudGFyLmd6KSA9IDI5MDI4NgotLS0gdmV4aW0tMi4yLjIucGF0Y2ggZW5kcyBo
 ZXJlIC0tLQo=
 
 --MP_/mwY6WhClyOz.K/==ldE=mBh--
State-Changed-From-To: open->suspended 
State-Changed-By: crees 
State-Changed-When: Tue Oct 30 14:00:04 UTC 2012 
State-Changed-Why:  
Submitter requested a hold 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173214 

From: Mark Felder <feld@feld.me>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173214: [PATCH] mail/vexim: update to 2.2.2
Date: Tue, 30 Oct 2012 09:24:06 -0500

 --MP_/Kz4nXL=C.TDzZHV7thBqzx0
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 after talking to crees we came up with these changes to make it stay =
 2.2.2_rc1
 
 I also added a change so variables.php (main config file) does not get =
 overwritten with each port update/reinstall.
 
 https://redports.org/buildarchive/20121030141720-46427/
 
 --MP_/Kz4nXL=C.TDzZHV7thBqzx0
 Content-Type: text/x-patch
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=vexim-2.2.2.r1.patch
 
 =2D-- vexim-2.2.2.r1.patch begins here ---
 diff -ruN --exclude=3DCVS ../vexim.orig/Makefile ./Makefile
 =2D-- ../vexim.orig/Makefile	2012-10-30 00:00:44.000000000 -0500
 +++ ./Makefile	2012-10-30 09:16:59.000000000 -0500
 @@ -2,11 +2,10 @@
  # $FreeBSD: ports/mail/vexim/Makefile,v 1.10 2012/10/29 15:57:24 jhale =
 Exp $
 =20
  PORTNAME=3D	vexim
 -PORTVERSION=3D	2.2.1
 -PORTREVISION=3D	1
 +DISTVERSION=3D	2.2.2_rc1
  CATEGORIES=3D	mail www
 -MASTER_SITES=3D	http://silverwraith.com/vexim/
 -DISTNAME=3D	${PORTNAME}${PORTVERSION}
 +MASTER_SITES=3D	GOOGLE_CODE
 +DISTNAME=3D	${PORTNAME}_${DISTVERSION}
 =20
  MAINTAINER=3D	ports@FreeBSD.org
  COMMENT=3D	Web interface for managing virtual domains for exim
 @@ -17,7 +16,7 @@
  RUN_DEPENDS=3D	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear=
 -DB
 =20
  VEXIMDIR=3D	www/${PORTNAME}
 -WRKSRC=3D		${WRKDIR}/vexim2
 +WRKSRC=3D		${WRKDIR}/vexim-release
 =20
  SUB_FILES=3D	pkg-message
  NO_BUILD=3D	yes
 @@ -42,25 +41,26 @@
  .endif
 =20
  post-patch:
 -	${FIND} ${WRKSRC} -name CVS -prune -exec ${RM} -r {} \;
 +	${RM} -r ${WRKSRC}/.hg ${WRKSRC}/.hgtags ${WRKSRC}/vexim/adminuserchang=
 e.phps
 +	${MV} ${WRKSRC}/vexim/config/variables.php ${WRKSRC}/vexim/config/varia=
 bles.php.dist
 =20
  do-install:
  	@${ECHO} "Installing in ${VEXIMDIR}"
  	${MKDIR} ${PREFIX}/${VEXIMDIR}
 -	cd ${WRKSRC}/vexim && ${FIND} . \! -path '*.svn*' \
 +	cd ${WRKSRC}/vexim && ${FIND} . \
  		-type d -exec ${MKDIR} ${PREFIX}/${VEXIMDIR}/{} \;  \
 -		-o \! -path '*.svn*' -type f \
 +		-o -type f \
  		-exec ${INSTALL_DATA} {} ${PREFIX}/${VEXIMDIR}/{} \;
  	${MKDIR} ${DATADIR}
 -	cd ${WRKSRC}/setup && ${FIND} . \! -path '*.svn*' \
 +	cd ${WRKSRC}/setup && ${FIND} . \
  		-type d -exec ${MKDIR} ${DATADIR}/{} \; \
 -		-o \! -path '*.svn*' -type f \
 +		-o -type f \
  		-exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
  .if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
 -	cd ${WRKSRC} && ${FIND} docs \! -path '*.svn*' \
 +	cd ${WRKSRC} && ${FIND} docs \
  		-type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
 -		-o \! -path '*.svn*' -type f \
 +		-o -type f \
  		-exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
  .for i in INSTALL README TODO
  	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 diff -ruN --exclude=3DCVS ../vexim.orig/distinfo ./distinfo
 =2D-- ../vexim.orig/distinfo	2011-07-03 08:53:48.000000000 -0500
 +++ ./distinfo	2012-10-30 08:25:55.000000000 -0500
 @@ -1,2 +1,2 @@
 -SHA256 (vexim2.2.1.tar.gz) =3D 6f057b6c008cacb9d9dbb7c2b69c3c4b4be43f3d2=
 f3d9db811c8ba43ad073a79
 -SIZE (vexim2.2.1.tar.gz) =3D 232441
 +SHA256 (vexim_2.2.2_rc1.tar.gz) =3D cb0d47e3e3e3b53545ad5c959d6acae13f17=
 604550779bc1d01621e65c85a507
 +SIZE (vexim_2.2.2_rc1.tar.gz) =3D 290286
 diff -ruN --exclude=3DCVS ../vexim.orig/pkg-plist ./pkg-plist
 =2D-- ../vexim.orig/pkg-plist	2012-10-30 00:00:44.000000000 -0500
 +++ ./pkg-plist	2012-10-30 09:13:29.000000000 -0500
 @@ -60,7 +60,7 @@
  www/vexim/config/hu.po
  www/vexim/config/i18n.php
  www/vexim/config/template.pot
 -www/vexim/config/variables.php
 +www/vexim/config/variables.php.dist
  www/vexim/images/check.gif
  www/vexim/images/trashcan.gif
  www/vexim/index.php
 =2D-- vexim-2.2.2.r1.patch ends here ---
 
 --MP_/Kz4nXL=C.TDzZHV7thBqzx0--

From: Mark Felder <feld@feld.me>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173214: [PATCH] mail/vexim: update to 2.2.2
Date: Thu, 1 Nov 2012 09:28:08 -0500

 This can be unsuspended and processed. The previous patch I provided is final.
State-Changed-From-To: suspended->open 
State-Changed-By: swills 
State-Changed-When: Sat Nov 3 13:09:44 UTC 2012 
State-Changed-Why:  
Patch is OK 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173214 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Sat Nov 3 13:13:34 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173214 
>Unformatted:
