sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-13 15:51:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ProFTPd to 1.3.4b

Browse source
This commit is contained in:
Martin Matuska 2012-08-04 07:11:32 +00:00
parent 09b600e31e
commit 65112e039d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=302003
5 changed files with 15 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
databases/proftpd-mod_sql_tds/Makefile
View file

@ -19,8 +19,8 @@ LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd MASTERDIR= ${.CURDIR}/../../ftp/proftpd
LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds
_PROFTPD_MODULE_DISTFILES= mod_sql_tds-4.13.tar.bz2:sql_tds _PROFTPD_MODULE_DISTFILES= mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds
_PROFTPD_MODULE_EXTRACT_ONLY= mod_sql_tds-4.13.tar.bz2 _PROFTPD_MODULE_EXTRACT_ONLY= mod_sql_tds-4.13${EXTRACT_SUFX}
INCLUDEDIRS= ${LOCALBASE}/include INCLUDEDIRS= ${LOCALBASE}/include
LIBDIRS= ${LOCALBASE}/lib LIBDIRS= ${LOCALBASE}/lib

14
ftp/proftpd/Makefile
View file

@ -6,15 +6,12 @@
# #
PORTNAME?= proftpd PORTNAME?= proftpd
PORTVERSION?= 1.3.4a PORTVERSION?= 1.3.4b
PORTREVISION?= 3 #PORTREVISION?= 0
CATEGORIES?= ftp CATEGORIES?= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \
ftp://ftp.dataguard.no/ftp/pub/proftpd/distrib/source/ \
ftp://spirit.bentel.sk/mirrors/Proftpd/distrib/source/ \
ftp://proftpd.networkedsystems.co.uk/distrib/source/ \ 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://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \
http://labratsoftware.com/mod_sql_tds/:sql_tds \ http://labratsoftware.com/mod_sql_tds/:sql_tds \
LOCAL/beech:sql_tds LOCAL/beech:sql_tds
@ -56,7 +53,6 @@ PORTDOCS= *
MAKE_JOBS_UNSAFE= yes MAKE_JOBS_UNSAFE= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_BZIP2= yes
USE_AUTOTOOLS= autoconf USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
@ -182,8 +178,8 @@ CONFIGURE_ARGS+= --disable-pcre
.endif .endif
.if make(makesum) || defined(FETCH_ALL) .if make(makesum) || defined(FETCH_ALL)
DISTFILES+= mod_sql_tds-4.13.tar.bz2:sql_tds DISTFILES+= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
EXTRACT_ONLY+= mod_sql_tds-4.13.tar.bz2 mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds
.endif .endif
#.if ${PORT_OPTIONS:MCLAMAV} || make(makesum) || defined(FETCH_ALL) #.if ${PORT_OPTIONS:MCLAMAV} || make(makesum) || defined(FETCH_ALL)

10
ftp/proftpd/distinfo
View file

@ -1,6 +1,4 @@
SHA256 (proftpd-1.3.4a.tar.bz2) = ad92eec86deccc385ac144e3925f9b9cbe085e60f10b33d1de6da91d32f39f3e SHA256 (proftpd-1.3.4b.tar.gz) = 9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb
SIZE (proftpd-1.3.4a.tar.bz2) = 6805631 SIZE (proftpd-1.3.4b.tar.gz) = 7647825
SHA256 (mod_sql_tds-4.13.tar.bz2) = b32b1d4539b1b2e7e4f44161d12ab81a56ddf292ccd125307a9b2900fdd000a8 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
SIZE (mod_sql_tds-4.13.tar.bz2) = 11207 SIZE (mod_sql_tds-4.13.tar.gz) = 11688
SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
SIZE (mod_clamav-0.11rc.tar.gz) = 5115

4
ftp/proftpd/files/patch-sample-configurations_basic.conf
View file

@ -2,8 +2,8 @@
+++ sample-configurations/basic.conf 2009-01-28 11:25:31.000000000 -0900 +++ sample-configurations/basic.conf 2009-01-28 11:25:31.000000000 -0900
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+# +#
+# For more informations about Proftpd configuration +# For more information about Proftpd configuration
+# look at : http://www.proftpd.org/ +# see http://www.proftpd.org/
+# +#
# This is a basic ProFTPD configuration file (rename it to # This is a basic ProFTPD configuration file (rename it to
# 'proftpd.conf' for actual use. It establishes a single server # 'proftpd.conf' for actual use. It establishes a single server

23
ftp/proftpd/files/patch-src-wtmp.c
View file

@ -1,14 +1,5 @@
--- src/wtmp.c.orig 2011-05-23 23:22:24.000000000 +0200 --- src/wtmp.c.orig 2012-08-04 08:45:32.292505678 +0200
+++ src/wtmp.c 2012-07-17 16:19:34.188505949 +0200 +++ src/wtmp.c 2012-08-04 08:45:35.508505108 +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;
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
#else /* SVR4 */ #else /* SVR4 */
utx.ut_syslen = strlen(utx.ut_host)+1; utx.ut_syslen = strlen(utx.ut_host)+1;
@ -18,13 +9,3 @@
time(&t); time(&t);
utx.ut_tv.tv_sec = (time32_t)t; utx.ut_tv.tv_sec = (time32_t)t;
# else # 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 &&