[Midnightbsd-cvs] mports [20660] trunk/ftp/proftpd/pkg-plist: proftpd 1.3.5a
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Nov 6 19:28:23 EST 2015
Revision: 20660
http://svnweb.midnightbsd.org/mports/?rev=20660
Author: laffer1
Date: 2015-11-06 19:28:22 -0500 (Fri, 06 Nov 2015)
Log Message:
-----------
proftpd 1.3.5a
Modified Paths:
--------------
trunk/ftp/proftpd/Makefile
trunk/ftp/proftpd/distinfo
trunk/ftp/proftpd/files/proftpd.in
trunk/ftp/proftpd/pkg-descr
trunk/ftp/proftpd/pkg-plist
Added Paths:
-----------
trunk/ftp/proftpd/files/patch-8-src-fsio.c
trunk/ftp/proftpd/files/patch-doc__Configuration.html
Removed Paths:
-------------
trunk/ftp/proftpd/files/extra-patch-7-src-fsio.c
trunk/ftp/proftpd/files/extra-patch-8-src-fsio.c
trunk/ftp/proftpd/files/patch-src_proftpd.8.in
Property Changed:
----------------
trunk/ftp/proftpd/files/extra-patch-modules_mod_xfer.c
trunk/ftp/proftpd/files/patch-sample-configurations_basic.conf
trunk/ftp/proftpd/pkg-descr
Modified: trunk/ftp/proftpd/Makefile
===================================================================
--- trunk/ftp/proftpd/Makefile 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/Makefile 2015-11-07 00:28:22 UTC (rev 20660)
@@ -4,11 +4,11 @@
.if !defined(DISTVERSION)
PORTVERSION?= ${PROFTPD_VERSION}
.endif
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES?= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
https://github.com/downloads/proftpd/proftpd.github.com/ \
- ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
+ ftp://ftpmirror.uk/ftp.proftpd.org/distrib/source/ \
http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/
.if defined(_BUILDING_PROFTPD_MODULE)
DISTNAME= proftpd-${PROFTPD_VERSION}
@@ -25,7 +25,7 @@
RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
.endif
-PROFTPD_VERSION= 1.3.5
+PROFTPD_VERSION= 1.3.5a
.if defined(_BUILDING_PROFTPD_MODULE)
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
@@ -47,7 +47,7 @@
.endif
MAKE_JOBS_UNSAFE= yes
-USES= gmake libtool
+USES+= cpe gmake libtool
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
@@ -84,7 +84,6 @@
PLIST_FILES+= libexec/proftpd/${m}.a \
libexec/proftpd/${m}.so
.endfor
-PLIST_DIRSTRY+= libexec/proftpd
.else
OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE
OPTIONS_DEFAULT= IPV6 NLS PCRE
@@ -101,6 +100,7 @@
.if !defined(_BUILDING_PROFTPD_MODULE)
CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC}
LIBS+= -lssl -lcrypto -L${OPENSSLLIB}
+LDFLAGS+= -lpthread
.endif
.if !defined(_BUILDING_PROFTPD_MODULE)
@@ -141,18 +141,6 @@
mod_wrap2_file \
mod_wrap2_sql
-# FreeBSD-SA-11:07.chroot
-.if ${OSVERSION} < 4000
-CHROOT_TEST != ${GREP} __FreeBSD_libc_enter_restricted_mode \
- /usr/include/unistd.h > /dev/null || ${ECHO_CMD} error
-. if ${CHROOT_TEST} == "error"
-BROKEN=__FreeBSD_libc_enter_restricted_mode is not supported
-. endif
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-7-src-fsio.c
-.else
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-src-fsio.c
-.endif
-
.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --enable-ipv6
.else
Modified: trunk/ftp/proftpd/distinfo
===================================================================
--- trunk/ftp/proftpd/distinfo 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/distinfo 2015-11-07 00:28:22 UTC (rev 20660)
@@ -1,6 +1,7 @@
-SHA256 (proftpd-1.3.5.tar.gz) = c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715
-SIZE (proftpd-1.3.5.tar.gz) = 7594509
+SHA256 (proftpd-1.3.5a.tar.gz) = a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696
+SIZE (proftpd-1.3.5a.tar.gz) = 29988477
SHA256 (mod_clamav-v0.13.tar.gz) = 7f60bebbb58836319bf249be77540efc6667a55caca8aaba164e6a61cd0c3db7
SIZE (mod_clamav-v0.13.tar.gz) = 11683
SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
SIZE (mod_sql_tds-4.13.tar.gz) = 11688
+
Deleted: trunk/ftp/proftpd/files/extra-patch-7-src-fsio.c
===================================================================
--- trunk/ftp/proftpd/files/extra-patch-7-src-fsio.c 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/files/extra-patch-7-src-fsio.c 2015-11-07 00:28:22 UTC (rev 20660)
@@ -1,19 +0,0 @@
---- src/fsio.c.orig 2010-04-12 12:00:00.000000000 -0700
-+++ src/fsio.c 2011-12-16 15:12:07.799166185 -0800
-@@ -50,6 +50,8 @@
- # include <acl/libacl.h>
- #endif
-
-+#include <unistd.h>
-+
- typedef struct fsopendir fsopendir_t;
-
- struct fsopendir {
-@@ -287,6 +289,7 @@
- static int sys_chroot(pr_fs_t *fs, const char *path) {
- if (chroot(path) < 0)
- return -1;
-+ __FreeBSD_libc_enter_restricted_mode();
-
- session.chroot_path = (char *) path;
- return 0;
Deleted: trunk/ftp/proftpd/files/extra-patch-8-src-fsio.c
===================================================================
--- trunk/ftp/proftpd/files/extra-patch-8-src-fsio.c 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/files/extra-patch-8-src-fsio.c 2015-11-07 00:28:22 UTC (rev 20660)
@@ -1,44 +0,0 @@
---- src/fsio.c.orig 2010-04-12 21:00:00.000000000 +0200
-+++ src/fsio.c 2011-12-29 21:51:33.844925577 +0100
-@@ -50,6 +50,10 @@
- # include <acl/libacl.h>
- #endif
-
-+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+#endif
-+
- typedef struct fsopendir fsopendir_t;
-
- struct fsopendir {
-@@ -284,7 +288,30 @@
- #endif
- }
-
-+#if defined(__FreeBSD__)
-+static int
-+enter_freebsd_restricted_mode()
-+{
-+ typedef void frmode_t();
-+ frmode_t *frmode;
-+
-+ frmode = (frmode_t *)dlfunc(
-+ RTLD_NEXT, "__FreeBSD_libc_enter_restricted_mode");
-+ if (frmode == NULL) {
-+ pr_log_pri(PR_LOG_ERR,
-+ "error: FreeBSD with vulnerable chroot (FreeBSD-SA-11:07.chroot)");
-+ return 1;
-+ }
-+ frmode();
-+ return 0;
-+}
-+#endif
-+
- static int sys_chroot(pr_fs_t *fs, const char *path) {
-+#if defined(__FreeBSD__)
-+ if (enter_freebsd_restricted_mode() != 0)
-+ return -1;
-+#endif
- if (chroot(path) < 0)
- return -1;
-
Index: trunk/ftp/proftpd/files/extra-patch-modules_mod_xfer.c
===================================================================
--- trunk/ftp/proftpd/files/extra-patch-modules_mod_xfer.c 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/files/extra-patch-modules_mod_xfer.c 2015-11-07 00:28:22 UTC (rev 20660)
Property changes on: trunk/ftp/proftpd/files/extra-patch-modules_mod_xfer.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/ftp/proftpd/files/patch-8-src-fsio.c
===================================================================
--- trunk/ftp/proftpd/files/patch-8-src-fsio.c (rev 0)
+++ trunk/ftp/proftpd/files/patch-8-src-fsio.c 2015-11-07 00:28:22 UTC (rev 20660)
@@ -0,0 +1,44 @@
+--- src/fsio.c.orig 2010-04-12 21:00:00.000000000 +0200
++++ src/fsio.c 2011-12-29 21:51:33.844925577 +0100
+@@ -50,6 +50,10 @@
+ # include <acl/libacl.h>
+ #endif
+
++#if defined(__FreeBSD__)
++#include <dlfcn.h>
++#endif
++
+ typedef struct fsopendir fsopendir_t;
+
+ struct fsopendir {
+@@ -284,7 +288,30 @@
+ #endif
+ }
+
++#if defined(__FreeBSD__)
++static int
++enter_freebsd_restricted_mode()
++{
++ typedef void frmode_t();
++ frmode_t *frmode;
++
++ frmode = (frmode_t *)dlfunc(
++ RTLD_NEXT, "__FreeBSD_libc_enter_restricted_mode");
++ if (frmode == NULL) {
++ pr_log_pri(PR_LOG_ERR,
++ "error: FreeBSD with vulnerable chroot (FreeBSD-SA-11:07.chroot)");
++ return 1;
++ }
++ frmode();
++ return 0;
++}
++#endif
++
+ static int sys_chroot(pr_fs_t *fs, const char *path) {
++#if defined(__FreeBSD__)
++ if (enter_freebsd_restricted_mode() != 0)
++ return -1;
++#endif
+ if (chroot(path) < 0)
+ return -1;
+
Property changes on: trunk/ftp/proftpd/files/patch-8-src-fsio.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/ftp/proftpd/files/patch-doc__Configuration.html
===================================================================
--- trunk/ftp/proftpd/files/patch-doc__Configuration.html (rev 0)
+++ trunk/ftp/proftpd/files/patch-doc__Configuration.html 2015-11-07 00:28:22 UTC (rev 20660)
@@ -0,0 +1,18 @@
+--- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003
++++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003
+@@ -4226,7 +4226,7 @@
+ ></DT
+ ><DD
+ ><P
+->ftp</P
++>ftpd</P
+ ></DD
+ ><DT
+ ><PRE
+@@ -32252,4 +32252,4 @@
+ ></DIV
+ ></BODY
+ ></HTML
+->
+\ No newline at end of file
++>
Property changes on: trunk/ftp/proftpd/files/patch-doc__Configuration.html
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/ftp/proftpd/files/patch-sample-configurations_basic.conf
===================================================================
--- trunk/ftp/proftpd/files/patch-sample-configurations_basic.conf 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/files/patch-sample-configurations_basic.conf 2015-11-07 00:28:22 UTC (rev 20660)
Property changes on: trunk/ftp/proftpd/files/patch-sample-configurations_basic.conf
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Deleted: trunk/ftp/proftpd/files/patch-src_proftpd.8.in
===================================================================
--- trunk/ftp/proftpd/files/patch-src_proftpd.8.in 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/files/patch-src_proftpd.8.in 2015-11-07 00:28:22 UTC (rev 20660)
@@ -1,15 +0,0 @@
---- src/proftpd.8.in.orig Sat Sep 18 07:40:30 2004
-+++ src/proftpd.8.in Thu Nov 3 15:35:56 2005
-@@ -22,6 +22,12 @@
- connection to the FTP service is made, or alternatively it can be run as a
- standalone daemon.
- .PP
-+.br
-+Each successful and failed ftp(1) session is logged using syslog with a
-+facility of LOG_FTP. Note: LOG_FTP messages are not displayed
-+by syslogd(8) by default, and may have to be enabled in syslogd(8)'s
-+configuration file.
-+.PP
- When
- .B proftpd
- is run in standalone mode and it receives a SIGHUP then it will reread its
Modified: trunk/ftp/proftpd/files/proftpd.in
===================================================================
--- trunk/ftp/proftpd/files/proftpd.in 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/files/proftpd.in 2015-11-07 00:28:22 UTC (rev 20660)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: head/ftp/proftpd/files/proftpd.in 349374 2014-03-27 23:31:52Z mm $
+# $FreeBSD: head/ftp/proftpd/files/proftpd.in 378282 2015-02-01 22:25:50Z mm $
#
# PROVIDE: proftpd
@@ -22,9 +22,11 @@
name=proftpd
rcvar=proftpd_enable
-proftpd_enable=${proftpd_enable:="NO"}
-proftpd_config=${proftpd_config:="%%PREFIX%%/etc/proftpd.conf"}
+load_rc_config $name
+: ${proftpd_enable:="NO"}
+: ${proftpd_config:="%%PREFIX%%/etc/proftpd.conf"}
+
command=%%PREFIX%%/sbin/proftpd
command_args="-c ${proftpd_config}"
pidfile=$(grep PidFile ${proftpd_config} | awk '{print($2)}')
@@ -37,5 +39,4 @@
rm -f $pidfile
}
-load_rc_config $name
run_rc_command "$1"
Modified: trunk/ftp/proftpd/pkg-descr
===================================================================
--- trunk/ftp/proftpd/pkg-descr 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/pkg-descr 2015-11-07 00:28:22 UTC (rev 20660)
@@ -1,5 +1,5 @@
-ProFTPD is a highly configurable ftp daemon for unix
-and unix-like operating systems. ProFTPD is designed
+ProFTPD is a highly configurable ftp daemon for Unix
+and Unix-like operating systems. ProFTPD is designed
to be somewhat of a "drop-in" replacement for wu-ftpd
with a configuration format like Apache.
Property changes on: trunk/ftp/proftpd/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/ftp/proftpd/pkg-plist
===================================================================
--- trunk/ftp/proftpd/pkg-plist 2015-11-07 00:23:31 UTC (rev 20659)
+++ trunk/ftp/proftpd/pkg-plist 2015-11-07 00:28:22 UTC (rev 20660)
@@ -7,16 +7,9 @@
bin/ftpwho
bin/prxs
etc/PROFTPD-MIB.txt
- at unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi
-etc/proftpd.conf.sample
- at exec cp -n %D/%F %B/proftpd.conf
- at unexec if cmp -s %D/etc/proftpd/dhparams.pem %D/etc/proftpd/dhparams.pem.sample; then rm -f %D/etc/proftpd/dhparams.pem; fi
-etc/proftpd/dhparams.pem.sample
- at exec cp -n %D/%F %B/dhparams.pem
- at unexec if cmp -s %D/etc/proftpd/blacklist.dat %D/etc/proftpd/blacklist.dat.sample; then rm -f %D/etc/proftpd/blacklist.dat; fi
-etc/proftpd/blacklist.dat.sample
- at exec cp -n %D/%F %B/blacklist.dat
- at exec mkdir -p %%LOCALSTATEDIR%%/proftpd
+ at sample etc/proftpd.conf.sample
+ at sample etc/proftpd/dhparams.pem.sample
+ at sample etc/proftpd/blacklist.dat.sample
include/proftpd/ascii.h
include/proftpd/auth.h
include/proftpd/bindings.h
@@ -42,7 +35,9 @@
include/proftpd/ftp.h
include/proftpd/glibc-glob.h
include/proftpd/help.h
+include/proftpd/ident.h
include/proftpd/inet.h
+include/proftpd/lastlog.h
include/proftpd/libsupp.h
include/proftpd/log.h
include/proftpd/memcache.h
@@ -82,6 +77,7 @@
include/proftpd/timers.h
include/proftpd/tpl.h
include/proftpd/trace.h
+include/proftpd/utf8.h
include/proftpd/var.h
include/proftpd/version.h
include/proftpd/xferlog.h
@@ -180,20 +176,5 @@
%%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo
%%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo
%%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo
-%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bg_BG/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_US
-%%NLS%%@dirrmtry share/locale/ja_JP
-%%NLS%%@dirrmtry share/locale/it_IT
-%%NLS%%@dirrmtry share/locale/ru_RU
-%%NLS%%@dirrmtry share/locale/bg_BG
-%%NLS%%@dirrmtry share/locale/ko_KR
- at dirrmtry etc/proftpd
- at dirrm include/proftpd
- at dirrmtry lib/proftpd
- at dirrmtry libexec/proftpd
- at unexec rmdir %%LOCALSTATEDIR%%/proftpd 2>/dev/null || true
+ at dir lib/proftpd
+ at dir %%LOCALSTATEDIR%%/proftpd
More information about the Midnightbsd-cvs
mailing list