From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 17:10:12 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6F6C16A4CE for ; Tue, 17 May 2005 17:10:12 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9223D43D1F for ; Tue, 17 May 2005 17:10:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4HHA8A7020878 for ; Tue, 17 May 2005 17:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4HHA8KY020877; Tue, 17 May 2005 17:10:08 GMT (envelope-from gnats) Resent-Date: Tue, 17 May 2005 17:10:08 GMT Resent-Message-Id: <200505171710.j4HHA8KY020877@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Vsevolod Stakhov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05BD016A4CE; Tue, 17 May 2005 17:05:32 +0000 (GMT) Received: from mail.icn.bmstu.ru (h133.net37.bmstu.ru [195.19.37.133]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B24D43D6A; Tue, 17 May 2005 17:05:31 +0000 (GMT) (envelope-from vsevolod@highsecure.ru) Received: by mail.icn.bmstu.ru (Postfix, from userid 8) id E81FF93A00; Mon, 23 May 2005 09:07:29 +0400 (MSD) Received: from cebka.icn.bmstu.ru (cebka.icn.bmstu.ru [192.168.5.31]) by mail.icn.bmstu.ru (Postfix) with ESMTP id 61003939F2; Mon, 23 May 2005 09:07:29 +0400 (MSD) Received: (from cebka@localhost) by cebka.icn.bmstu.ru (8.13.1/8.12.10/Submit) id j4HH5eEA057677; Tue, 17 May 2005 21:05:40 +0400 (MSD) (envelope-from cebka) Message-Id: <200505171705.j4HH5eEA057677@cebka.icn.bmstu.ru> Date: Tue, 17 May 2005 21:05:40 +0400 (MSD) From: Vsevolod Stakhov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: mharo@FreeBSD.org Subject: ports/81167: Update port ftp/proftpd to 1.3.0rc1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Vsevolod Stakhov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2005 17:10:13 -0000 >Number: 81167 >Category: ports >Synopsis: Update port ftp/proftpd to 1.3.0rc1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 17 17:10:08 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vsevolod Stakhov >Release: FreeBSD 5.3-RELEASE i386 >Organization: >Environment: System: FreeBSD nemezida.highsecure.ru 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Dec 3 03:56:35 MSK 2004 root@nemezida.highsecure.ru:/usr/obj/usr/src/sys/NK i386 >Description: This release has lot of bugfixes (> 60 bugs are fixed). And there is dso support now, thought dso support is not enabled in this port yet. >How-To-Repeat: >Fix: diff -ruN proftpd.orig/Makefile proftpd/Makefile --- proftpd.orig/Makefile Tue May 17 20:56:55 2005 +++ proftpd/Makefile Tue May 17 20:55:57 2005 @@ -6,8 +6,7 @@ # PORTNAME= proftpd -PORTVERSION= 1.2.10 -PORTREVISION= 1 +PORTVERSION= 1.3.0rc1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -16,7 +15,7 @@ ftp://proftpd.networkedsystems.co.uk/distrib/source/ \ ftp://ftp.ethereal.com/mirrors/ftp.proftpd.org/distrib/source/ \ ftp://mirror.cybercomm.nl/pub/proftpd/distrib/source/ -DISTNAME= ${PORTNAME}-1.2.10 +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER?= mharo@FreeBSD.org COMMENT?= Highly configurable ftp daemon @@ -114,22 +113,22 @@ .if defined(WITH_LDAP) USE_OPENLDAP= yes MODULES:=${MODULES}:mod_ldap -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif .if defined(WITH_MYSQL) USE_MYSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_mysql -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_postgres -INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include -LIBDIRS:=${LIBDIRS}:${PREFIX}/lib +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif .if defined(WITH_OPENSSL) @@ -223,7 +222,7 @@ @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/proftpd .endfor .for f in ${PORTDOCScontrib} - @${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${PREFIX}/share/doc/proftpd + @${INSTALL_DATA} ${WRKSRC}/doc/contrib/${f} ${PREFIX}/share/doc/proftpd .endfor .endif diff -ruN proftpd.orig/distinfo proftpd/distinfo --- proftpd.orig/distinfo Tue May 17 20:56:55 2005 +++ proftpd/distinfo Tue May 17 20:55:57 2005 @@ -1,2 +1,2 @@ -MD5 (proftpd-1.2.10.tar.bz2) = 5feb4a7348e12faefc25e34fd92efdd6 -SIZE (proftpd-1.2.10.tar.bz2) = 920337 +MD5 (proftpd-1.3.0rc1.tar.bz2) = c09df98d2e44b46af4f7a8174c59b294 +SIZE (proftpd-1.3.0rc1.tar.bz2) = 1357048 diff -ruN proftpd.orig/files/patch-contrib::mod_sql.c proftpd/files/patch-contrib::mod_sql.c --- proftpd.orig/files/patch-contrib::mod_sql.c Thu Jan 1 03:00:00 1970 +++ proftpd/files/patch-contrib::mod_sql.c Tue May 17 20:55:57 2005 @@ -0,0 +1,11 @@ +--- contrib/mod_sql.c.orig Tue May 17 20:21:28 2005 ++++ contrib/mod_sql.c Tue May 17 20:21:43 2005 +@@ -28,7 +28,7 @@ + + #include "conf.h" + #include "privs.h" +-#include "mod_sql.h" ++#include "../contrib/mod_sql.h" + + #define MOD_SQL_VERSION "mod_sql/4.2" + diff -ruN proftpd.orig/files/patch-contrib::mod_sql_postgres.c proftpd/files/patch-contrib::mod_sql_postgres.c --- proftpd.orig/files/patch-contrib::mod_sql_postgres.c Thu Jan 1 03:00:00 1970 +++ proftpd/files/patch-contrib::mod_sql_postgres.c Tue May 17 20:55:57 2005 @@ -0,0 +1,10 @@ +--- contrib/mod_sql_postgres.c.orig Tue May 17 19:59:13 2005 ++++ contrib/mod_sql_postgres.c Tue May 17 19:59:57 2005 +@@ -1227,6 +1227,7 @@ + + /* Event handlers + * ++ */ + + static void sql_postgres_mod_load_ev(const void *event_data, + void *user_data) { >Release-Note: >Audit-Trail: >Unformatted: