From nobody@FreeBSD.org  Thu Nov  4 17:41:09 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B25DF106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  4 Nov 2010 17:41:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 8692E8FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  4 Nov 2010 17:41:09 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id oA4Hf9ar017714
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 4 Nov 2010 17:41:09 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id oA4Hf9ck017701;
	Thu, 4 Nov 2010 17:41:09 GMT
	(envelope-from nobody)
Message-Id: <201011041741.oA4Hf9ck017701@www.freebsd.org>
Date: Thu, 4 Nov 2010 17:41:09 GMT
From: Patrick Muldoon <doon@inoc.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update ftp/proftpd port to include mod_sql_tds-4.12
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         151943
>Category:       ports
>Synopsis:       Update ftp/proftpd port to include mod_sql_tds-4.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 04 17:50:10 UTC 2010
>Closed-Date:    Sun Nov 14 21:44:50 UTC 2010
>Last-Modified:  Sun Nov 14 21:44:50 UTC 2010
>Originator:     Patrick Muldoon
>Release:        FreeBSD 8.1
>Organization:
INOC
>Environment:
FreeBSD orion.localdomain 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Just a quick patch to Update the version of mod_sql_tds that the ftp/proftpd includes to Version 4.12.   Version 4.12 of mod_sql_tds fixes the bug with pr_log_pri, so files/extra-patch-contrib-mod_sql_tds.c  is no longer needed. 
>How-To-Repeat:
N/A
>Fix:
See Attached Patch File. 

Patch attached with submission follows:

diff -ruN proftpd.bak/Makefile proftpd/Makefile
--- proftpd.bak/Makefile	2010-10-29 09:15:42.000000000 -0400
+++ proftpd/Makefile	2010-11-04 13:21:42.000000000 -0400
@@ -246,9 +246,8 @@
 .endif
 
 .if defined(WITH_TDS)
-DISTFILES+=	mod_sql_tds-4.11.tar.bz2:sql_tds
-EXTRACT_ONLY+=	mod_sql_tds-4.11.tar.bz2
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-contrib-mod_sql_tds.c
+DISTFILES+=	mod_sql_tds-4.12.tar.bz2:sql_tds
+EXTRACT_ONLY+=	mod_sql_tds-4.12.tar.bz2
 MODULES:=${MODULES}:mod_sql_tds
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
diff -ruN proftpd.bak/distinfo proftpd/distinfo
--- proftpd.bak/distinfo	2010-10-29 09:15:42.000000000 -0400
+++ proftpd/distinfo	2010-11-04 13:21:25.000000000 -0400
@@ -7,6 +7,6 @@
 MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
 SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
 SIZE (mod_digest.c) = 39073
-MD5 (mod_sql_tds-4.11.tar.bz2) = 217d85806093f71cfe746838a7a9970d
-SHA256 (mod_sql_tds-4.11.tar.bz2) = 0fea4bc2107fb61d7ee45f3913007876f5d95d95dff00a3f355ad50437f1ecff
-SIZE (mod_sql_tds-4.11.tar.bz2) = 11254
+MD5 (mod_sql_tds-4.12.tar.bz2) = 1fc767e122ebbd8b2ae9d3e9c03b32c2
+SHA256 (mod_sql_tds-4.12.tar.bz2) = 81a2cc90df5f5323033f63b9a82eb96c26d9a9f999ffeffd999a0f9d2d22619f
+SIZE (mod_sql_tds-4.12.tar.bz2) = 11255


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 4 17:50:17 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/151943: commit references a PR
Date: Thu,  4 Nov 2010 19:52:24 +0000 (UTC)

 mm          2010-11-04 19:52:19 UTC
 
   FreeBSD ports repository
 
   Modified files:
     ftp/proftpd          Makefile distinfo 
   Removed files:
     ftp/proftpd/files    extra-patch-contrib-mod_sql_tds.c 
   Log:
   - Update to 1.3.3c
   - Update mod_sql_tds to 4.12 [1]
   
   PR:             ports/151943 [1]
   Submitted by:   Patrick Muldoon <doon@inoc.net>
   
   Revision  Changes    Path
   1.184     +3 -4      ports/ftp/proftpd/Makefile
   1.62      +4 -10     ports/ftp/proftpd/distinfo
   1.2       +0 -11     ports/ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: mm 
State-Changed-When: Sun Nov 14 21:44:49 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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