From owner-svn-ports-all@FreeBSD.ORG Sat Aug 4 07:11:32 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E0DA7106564A; Sat, 4 Aug 2012 07:11:32 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BE27E8FC0A; Sat, 4 Aug 2012 07:11:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q747BWH3023017; Sat, 4 Aug 2012 07:11:32 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q747BW7C023010; Sat, 4 Aug 2012 07:11:32 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201208040711.q747BW7C023010@svn.freebsd.org> From: Martin Matuska Date: Sat, 4 Aug 2012 07:11:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302003 - in head: databases/proftpd-mod_sql_tds ftp/proftpd ftp/proftpd/files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2012 07:11:33 -0000 Author: mm Date: Sat Aug 4 07:11:32 2012 New Revision: 302003 URL: http://svn.freebsd.org/changeset/ports/302003 Log: Update ProFTPd to 1.3.4b Modified: head/databases/proftpd-mod_sql_tds/Makefile head/ftp/proftpd/Makefile head/ftp/proftpd/distinfo head/ftp/proftpd/files/patch-sample-configurations_basic.conf head/ftp/proftpd/files/patch-src-wtmp.c Modified: head/databases/proftpd-mod_sql_tds/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_tds/Makefile Sat Aug 4 06:41:24 2012 (r302002) +++ head/databases/proftpd-mod_sql_tds/Makefile Sat Aug 4 07:11:32 2012 (r302003) @@ -19,8 +19,8 @@ LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME MASTERDIR= ${.CURDIR}/../../ftp/proftpd LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds -_PROFTPD_MODULE_DISTFILES= mod_sql_tds-4.13.tar.bz2:sql_tds -_PROFTPD_MODULE_EXTRACT_ONLY= mod_sql_tds-4.13.tar.bz2 +_PROFTPD_MODULE_DISTFILES= mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds +_PROFTPD_MODULE_EXTRACT_ONLY= mod_sql_tds-4.13${EXTRACT_SUFX} INCLUDEDIRS= ${LOCALBASE}/include LIBDIRS= ${LOCALBASE}/lib Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Sat Aug 4 06:41:24 2012 (r302002) +++ head/ftp/proftpd/Makefile Sat Aug 4 07:11:32 2012 (r302003) @@ -6,15 +6,12 @@ # PORTNAME?= proftpd -PORTVERSION?= 1.3.4a -PORTREVISION?= 3 +PORTVERSION?= 1.3.4b +#PORTREVISION?= 0 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ - ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ - ftp://ftp.dataguard.no/ftp/pub/proftpd/distrib/source/ \ - ftp://spirit.bentel.sk/mirrors/Proftpd/distrib/source/ \ + https://github.com/downloads/proftpd/proftpd.github.com/ \ ftp://proftpd.networkedsystems.co.uk/distrib/source/ \ - http://mirrors.ibiblio.org/pub/mirrors/proftpd/distrib/source/ \ http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \ http://labratsoftware.com/mod_sql_tds/:sql_tds \ LOCAL/beech:sql_tds @@ -56,7 +53,6 @@ PORTDOCS= * MAKE_JOBS_UNSAFE= yes USE_GMAKE= yes -USE_BZIP2= yes USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes @@ -182,8 +178,8 @@ CONFIGURE_ARGS+= --disable-pcre .endif .if make(makesum) || defined(FETCH_ALL) -DISTFILES+= mod_sql_tds-4.13.tar.bz2:sql_tds -EXTRACT_ONLY+= mod_sql_tds-4.13.tar.bz2 +DISTFILES+= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ + mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds .endif #.if ${PORT_OPTIONS:MCLAMAV} || make(makesum) || defined(FETCH_ALL) Modified: head/ftp/proftpd/distinfo ============================================================================== --- head/ftp/proftpd/distinfo Sat Aug 4 06:41:24 2012 (r302002) +++ head/ftp/proftpd/distinfo Sat Aug 4 07:11:32 2012 (r302003) @@ -1,6 +1,4 @@ -SHA256 (proftpd-1.3.4a.tar.bz2) = ad92eec86deccc385ac144e3925f9b9cbe085e60f10b33d1de6da91d32f39f3e -SIZE (proftpd-1.3.4a.tar.bz2) = 6805631 -SHA256 (mod_sql_tds-4.13.tar.bz2) = b32b1d4539b1b2e7e4f44161d12ab81a56ddf292ccd125307a9b2900fdd000a8 -SIZE (mod_sql_tds-4.13.tar.bz2) = 11207 -SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a -SIZE (mod_clamav-0.11rc.tar.gz) = 5115 +SHA256 (proftpd-1.3.4b.tar.gz) = 9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb +SIZE (proftpd-1.3.4b.tar.gz) = 7647825 +SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08 +SIZE (mod_sql_tds-4.13.tar.gz) = 11688 Modified: head/ftp/proftpd/files/patch-sample-configurations_basic.conf ============================================================================== --- head/ftp/proftpd/files/patch-sample-configurations_basic.conf Sat Aug 4 06:41:24 2012 (r302002) +++ head/ftp/proftpd/files/patch-sample-configurations_basic.conf Sat Aug 4 07:11:32 2012 (r302003) @@ -2,8 +2,8 @@ +++ sample-configurations/basic.conf 2009-01-28 11:25:31.000000000 -0900 @@ -1,3 +1,7 @@ +# -+# For more informations about Proftpd configuration -+# look at : http://www.proftpd.org/ ++# For more information about Proftpd configuration ++# see http://www.proftpd.org/ +# # This is a basic ProFTPD configuration file (rename it to # 'proftpd.conf' for actual use. It establishes a single server Modified: head/ftp/proftpd/files/patch-src-wtmp.c ============================================================================== --- head/ftp/proftpd/files/patch-src-wtmp.c Sat Aug 4 06:41:24 2012 (r302002) +++ head/ftp/proftpd/files/patch-src-wtmp.c Sat Aug 4 07:11:32 2012 (r302003) @@ -1,14 +1,5 @@ ---- src/wtmp.c.orig 2011-05-23 23:22:24.000000000 +0200 -+++ src/wtmp.c 2012-07-17 16:19:34.188505949 +0200 -@@ -42,7 +42,7 @@ - !(defined(LINUX) || defined(__hpux) || defined (_AIX)) - /* This "auxilliary" utmp doesn't exist under linux. */ - --#if defined(__sparcv9) && !defined(__NetBSD__) -+#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__) - struct futmpx utx; - time_t t; - +--- src/wtmp.c.orig 2012-08-04 08:45:32.292505678 +0200 ++++ src/wtmp.c 2012-08-04 08:45:35.508505108 +0200 @@ -97,7 +97,7 @@ #else /* SVR4 */ utx.ut_syslen = strlen(utx.ut_host)+1; @@ -18,13 +9,3 @@ time(&t); utx.ut_tv.tv_sec = (time32_t)t; # else -@@ -126,7 +126,9 @@ - } - - #else /* Non-SVR4 systems */ -+#if !defined(__FreeBSD_version) || __FreeBSD_version < 900007 || !defined(HAVE_UTMPX_H) - struct utmp ut; -+#endif - static int fd = -1; - - if (fd < 0 &&