diff options
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/proftpd/Makefile | 201 | ||||
-rw-r--r-- | ftp/proftpd/distinfo | 6 | ||||
-rw-r--r-- | ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c | 11 | ||||
-rw-r--r-- | ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in | 13 | ||||
-rw-r--r-- | ftp/proftpd/pkg-plist | 14 |
5 files changed, 177 insertions, 68 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 974676bc8988..fd199bd944b8 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= proftpd -PORTVERSION= 1.3.2e +PORTVERSION= 1.3.3 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -28,26 +28,10 @@ COMMENT?= Highly configurable ftp daemon MAN1= ftpcount.1 ftpwho.1 ftptop.1 MAN5= xferlog.5 -MAN8= proftpd.8 ftpshut.8 ftpdctl.8 +MAN8= proftpd.8 ftpscrub.8 ftpshut.8 ftpdctl.8 MAKE_JOBS_UNSAFE= yes -PORTDOCSdoc= Configuration.html faq.html -PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \ - mod_tls.html mod_wrap2.html mod_wrap2_file.html mod_wrap2_sql.html \ - mod_ban.html mod_quotatab_radius.html ftpasswd.html -PORTDOCSreadme= README README.DSO README.FreeBSD README.IPv6 README.LDAP README.PAM \ - README.capabilities README.classes README.facl README.modules \ - README.ports RELEASE_NOTES -PORTDOCS= ${PORTDOCSdoc} ${PORTDOCScontrib} ${PORTDOCSreadme} - -PORTEXAMPLES= ASCII.html CreateHome.html Filters.html SQL.html Umask.html \ - AuthFiles.html DNS.html Globbing.html SSH.html Upgrade.html \ - Authentication.html DSO.html Limit.html Scoreboard.html Vhost.html \ - BCP.html Debugging.html ListOptions.html ServerType.html \ - VirtualUsers.html Chroot.html Directory.html Logging.html Stopping.html \ - index.html Classes.html DisplayFiles.html NAT.html TLS.html ConfigFile.html \ - FTP.html Quotas.html Timestamps.html Controls.html \ - FXP.html Regex.html Tracing.html +PORTDOCS= * USE_GMAKE= yes USE_BZIP2= yes @@ -67,30 +51,43 @@ OPTIONS= BAN "Include mod_ban (Requires CTRLS)" off \ CLAMAV "Include mod_clamav" off \ CTRLS "Include controls" off \ DIGEST "Include mod_digest" off \ + EXEC "Include mod_exec" off \ + HTMLDOCS "Include HTML documentation" off \ IFSESSION "Include mod_ifsession" on \ IPV6 "Use IPv6" on \ LDAP "Use LDAP" off \ - LDAP_TLS "Use LDAP TLS (Requires LDAP, OPENSSL)" off \ - NLS "Use nls (builds mod_lang)" on \ + LDAP_TLS "Use LDAP TLS (Requires LDAP, OPENSSL)" off + +# Set the MYSQL option based upon the setting from the +# slave port (ftp/proftpd-mysql). +.if defined(WITH_MYSQL) +OPTIONS+= MYSQL "MySQL auth" on +.else +OPTIONS+= MYSQL "MySQL auth" off +.endif + +OPTIONS+= NLS "Use nls (builds mod_lang)" on \ + ODBC "ODBC" off \ OPENSSL "Include mod_tls" on \ - PGSQL "Postgres auth (Can be combined with MYSQL)" off \ + PGSQL "Postgres auth" off \ QUOTA "Include mod_quota" off \ QUOTATAB_RADIUS "include mod_quotatab_radius" off \ + SHAPER "Shaper module" off \ + SQLITE "SQLite auth" off \ RADIUS "Include mod_radius" on \ RATIO "Include mod_ratio" on \ README "Include mod_readme" on \ REWRITE "Include mod_rewrite" on \ - TDS "FreeTDS - Sybase & MS-SQL auth (Exclusive)" off \ + TLS_SHMCACHE "TLS SHM session cache (requires OPENSSL)" off \ + TDS "Include mod_sql_tds" off \ + SFTP "Include mod_sftp" off\ + SFTP_SQL "Include mod_sftp_sql" off \ + SFTP_PAM "Include mod_sftp_pam" off \ + SQL_PASSWD "Include mod_sql_passwd" off \ + UNIQUE "Include mod_unique_id" off \ WRAP "Include mod_wrap2" on \ - WRAP_FILE "Include mod_wrap2_file" off \ - WRAP_SQL "Include mod_wrap2_sql" off -# Set the MYSQL option based upon the setting from the -# slave port (ftp/proftpd-mysql). -.if defined(WITH_MYSQL) -OPTIONS+= MYSQL "MySQL auth (Can be combined with PGSQL)" on -.else -OPTIONS+= MYSQL "MySQL auth (Can be combined with PGSQL)" off -.endif + WRAP_FILE "Include mod_wrap2_file (requires WRAP)" off \ + WRAP_SQL "Include mod_wrap2_sql (requires WRAP)" off MODULES?= LIBDIRS?= @@ -119,36 +116,49 @@ PLIST_SUB+= WRAP="" PLIST_SUB+= WRAP="@comment " .endif -.if defined(WITH_WRAP_FILE) -.if defined(WITHOUT_WRAP) -IGNORE= WRAP_FILE and WRAP_FILE_SQL require WRAP. +.if ( defined(WITH_WRAP_FILE) || defined(WITH_WRAP_SQL) ) && defined(WITHOUT_WRAP) +IGNORE= options WRAP_FILE and WRAP_FILE_SQL require WRAP .endif + +.if defined(WITH_WRAP_FILE) INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib MODULES:=${MODULES}:mod_wrap2_file .endif .if defined(WITH_WRAP_SQL) -.if defined(WITHOUT_WRAP) -IGNORE= WRAP_FILE and WRAP_FILE_SQL require WRAP. -.endif INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib MODULES:=${MODULES}:mod_wrap2_sql .endif +.if defined(WITH_EXEC) +MODULES:=${MODULES}:mod_exec +.endif + .if defined(WITH_RADIUS) MODULES:=${MODULES}:mod_radius .endif +.if defined(WITH_SHAPER) +MODULES:=${MODULES}:mod_shaper +.endif + .if defined(WITH_QUOTATAB_RADIUS) MODULES:=${MODULES}:mod_quotatab_radius .endif .if defined(WITH_BAN) +.if !defined(WITH_CTRLS) +IGNORE= option BAN requires CTRLS +.endif MODULES:=${MODULES}:mod_ban .endif +.if defined(WITH_UNIQUE) +MODULES:=${MODULES}:mod_unique_id +.endif + .if defined(WITH_SETPASSENT) CONFIGURE_ARGS+= --enable-force-setpassent .endif @@ -163,7 +173,7 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(WITH_NLS) +.if !defined(WITHOUT_NLS) INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-nls @@ -187,9 +197,15 @@ INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif -# MYSQL, PGSQL and TDS require mod_sql to be built but specifying it -# more than once causes configure script to complain. -.if defined(WITH_MYSQL) || defined(WITH_PGSQL) || defined(WITH_TDS) +# LDAP_TLS and TLS_SHMCACHE require OPENSSL +.if ( defined(WITH_LDAP_TLS) || defined(WITH_TLS_SHMCACHE) ) && !defined(WITH_OPENSSL) +IGNORE= options LDAP_TLS and TLS_SHMCACHE require OPENSSL +.endif + +# MYSQL, PGSQL, SQLITE, ODBC, TDS, SFTP_SQL and SQL_PASSWD require mod_sql +.if defined(WITH_MYSQL) || defined(WITH_PGSQL) || \ +defined(WITH_SQLITE) || defined(WITH_ODBC) || defined(WITH_TDS) \ +|| defined(WITH_SFTP_SQL) || defined (WITH_SQL_PASSWD) MODULES:=${MODULES}:mod_sql .endif @@ -207,17 +223,53 @@ INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib .endif -.if ${MODULES:M*mod_sql_*} +.if defined(WITH_SQLITE) +USE_SQLITE= yes +MODULES:=${MODULES}:mod_sql_sqlite +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +.endif + +.if defined(WITH_ODBC) +LIB_DEPENDS= iodbc.3:${PORTSDIR}/databases/libiodbc +MODULES:=${MODULES}:mod_sql_odbc +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +CONFIGURE_ARGS+=LIBS=-liodbc LD_LIBRARY_PATH=${LOCALBASE}/lib LDFLAGS=-L${LOCALBASE}/lib +.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 +MODULES:=${MODULES}:mod_sql_tds +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds +.endif + +.if defined(WITH_SQL_PASSWD) +MODULES:=${MODULES}:mod_sql_passwd +.endif + +.if ${MODULES:M*mod_sql*} PLIST_SUB+= SQL="" .else PLIST_SUB+= SQL="@comment " .endif +.if defined(WITH_TLS_SHMCACHE) +MODULES:=${MODULES}:mod_tls_shmcache +.endif + .if defined(WITH_OPENSSL) .include <${PORTSDIR}/Mk/bsd.openssl.mk> CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB} MODULES:=${MODULES}:mod_tls +PLIST_SUB+= TLS="" +.else +PLIST_SUB+= TLS="@comment " .endif .if defined(WITH_CTRLS) @@ -264,16 +316,34 @@ DISTFILES+= mod_digest.c:digest MODULES:=${MODULES}:mod_digest .endif -.if defined(WITH_TDS) -DISTFILES+= mod_sql_tds-4.11.tar.bz2:sql_tds -EXTRACT_ONLY+= mod_sql_tds-4.11.tar.bz2 -MODULES:=${MODULES}:mod_sql_tds -PLIST_SUB+= TDS="" +.if defined(WITH_SFTP) +USE_SQLITE= yes +MODULES:=${MODULES}:mod_sftp INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib -LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds +PLIST_SUB+= SFTP="" +.else +PLIST_SUB+= SFTP="@comment " +.endif + +.if defined(WITH_SFTP_SQL) +USE_SQLITE= yes +MODULES:=${MODULES}:mod_sftp_sql +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +PLIST_SUB+= SFTP_SQL="" +.else +PLIST_SUB+= SFTP_SQL="@comment " +.endif + +.if defined(WITH_SFTP_PAM) +USE_SQLITE= yes +MODULES:=${MODULES}:mod_sftp_pam +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +PLIST_SUB+= SFTP_PAM="" .else -PLIST_SUB+= TDS="@comment " +PLIST_SUB+= SFTP_PAM="@comment " .endif # mod_ifsession should be the last item in the modules list @@ -285,7 +355,7 @@ MODULES:=${MODULES}:mod_ifsession CONFIGURE_ENV+= "LIBS=${PROFTPD_LIBS}" .if !empty(MODULES) -CONFIGURE_ARGS+= --with-modules=${MODULES} +CONFIGURE_ARGS+= --with-modules=${MODULES:C/^://g} .endif .if !empty(INCLUDEDIRS) @@ -296,10 +366,6 @@ CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .endif -#Todo: Fix this to not use != if possible. -# Will leave as is for now. -MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,' - post-extract: .if defined(WITH_CLAMAV) (cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mod_clamav-0.11rc.tar.gz ${EXTRACT_AFTER_ARGS}) @@ -323,7 +389,7 @@ post-patch: @${REINPLACE_CMD} -e 's|proftpd\.conf|proftpd.conf.sample|g' ${WRKSRC}/Makefile.in pre-configure: - @${ECHO_MSG} "==> Configuring with ${MODULES}" + @${ECHO_MSG} "==> Configuring with ${MODULES:C/^://g}" post-configure: ${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules @@ -334,15 +400,22 @@ post-configure: post-install: @cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf +.if defined(WITH_SFTP) + @${INSTALL} -d ${PREFIX}/etc/proftpd + @cd ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem + @cd ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat +.endif .if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR}/ - @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCSdoc} ${DOCSDIR}/ - @cd ${WRKSRC}/doc/contrib && ${INSTALL_DATA} ${PORTDOCScontrib} ${DOCSDIR}/ - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCSreadme} ${DOCSDIR}/ -.endif -.if !defined(NOPORTEXAMPLES) - @${INSTALL} -d ${EXAMPLESDIR}/ - @cd ${WRKSRC}/doc/howto/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/ + @${INSTALL} -d ${DOCSDIR} + @cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${DOCSDIR} + @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt ${DOCSDIR} +. if defined(WITH_HTMLDOCS) + @${INSTALL} -d ${DOCSDIR}/html + @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} Configuration.html faq.html ${DOCSDIR}/html + @${CP} -RP ${WRKSRC}/doc/contrib ${DOCSDIR}/html/contrib + @${CP} -RP ${WRKSRC}/doc/modules ${DOCSDIR}/html/modules + @${CP} -RP ${WRKSRC}/doc/howto ${DOCSDIR}/html/howto +. endif .endif .if defined(WITH_CTRLS) @${INSTALL_PROGRAM} ${WRKSRC}/ftpdctl ${PREFIX}/sbin/ diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo index 3c818eaf91f1..f19e5832e338 100644 --- a/ftp/proftpd/distinfo +++ b/ftp/proftpd/distinfo @@ -1,6 +1,6 @@ -MD5 (proftpd-1.3.2e.tar.bz2) = 018e0eb1757d9cea2a0e17f2c9b1ca2d -SHA256 (proftpd-1.3.2e.tar.bz2) = 23fbb10b0f85a6141987dfd52010f7efdd723b84068964cb085cdfb97c0effdf -SIZE (proftpd-1.3.2e.tar.bz2) = 2545499 +MD5 (proftpd-1.3.3.tar.bz2) = 3951244f1940f0a40e8af142a9cf67fe +SHA256 (proftpd-1.3.3.tar.bz2) = 793f2bde2ab5aeb86a68349118d87bb151ba1278987612b7a12872110f9d759c +SIZE (proftpd-1.3.3.tar.bz2) = 4132650 MD5 (mod_clamav-0.11rc.tar.gz) = 42e560ec0bd5964e13fad1b2bb7afe21 SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a SIZE (mod_clamav-0.11rc.tar.gz) = 5115 diff --git a/ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c b/ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c new file mode 100644 index 000000000000..e0339640d096 --- /dev/null +++ b/ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c @@ -0,0 +1,11 @@ +--- contrib/mod_sql_tds.c.orig 2010-03-24 09:52:43.325690672 +0100 ++++ contrib/mod_sql_tds.c 2010-03-24 09:53:04.995963774 +0100 +@@ -567,7 +567,7 @@ + sql_log(DEBUG_WARN, "%s", "No Host Specified! \t Checking Enviroment Variable"); + server = getenv("DSQUERY"); + if(server == NULL){ +- log_pri(PR_LOG_ERR, "%s", "NO Host Specified and DSQUERY Enviroment Variable NOT Found! " ++ pr_log_pri(PR_LOG_ERR, "%s", "NO Host Specified and DSQUERY Enviroment Variable NOT Found! " + "-- Shutting down!."); + sql_log(DEBUG_WARN, "%s", "NO Host Specified and DSQUERY Enviroment Variable NOT Found! " + "-- Shutting down!."); diff --git a/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in b/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in new file mode 100644 index 000000000000..db454ae6ee5d --- /dev/null +++ b/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in @@ -0,0 +1,13 @@ +--- contrib/mod_sftp/Makefile.in.orig 2010-03-24 11:07:25.556408812 +0100 ++++ contrib/mod_sftp/Makefile.in 2010-03-24 11:07:49.115285644 +0100 +@@ -45,8 +45,8 @@ + fi + + install-misc: +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat ++ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/proftpd/dhparams.pem.sample ++ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample + + clean: + $(RM) $(MODULE_NAME).a *.o *.la *.lo diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist index 033ae0f39013..412fbff57e94 100644 --- a/ftp/proftpd/pkg-plist +++ b/ftp/proftpd/pkg-plist @@ -7,11 +7,18 @@ bin/prxs @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 @exec cp -n %D/%F %B/proftpd.conf +%%SFTP%%@unexec if cmp -s %D/etc/proftpd/dhparams.pem %D/etc/proftpd/dhparams.pem.sample; then rm -f %D/etc/proftpd/dhparams.pem; fi +%%SFTP%%etc/proftpd/dhparams.pem.sample +%%SFTP%%@exec cp -n %D/%F %B/dhparams.pem +%%SFTP%%@unexec if cmp -s %D/etc/proftpd/blacklist.dat %D/etc/proftpd/blacklist.dat.sample; then rm -f %D/etc/proftpd/blacklist.dat; fi +%%SFTP%%etc/proftpd/blacklist.dat.sample +%%SFTP%%@exec cp -n %D/%F %B/blacklist.dat include/proftpd/auth.h include/proftpd/bindings.h include/proftpd/buildstamp.h include/proftpd/child.h include/proftpd/class.h +include/proftpd/cmd.h include/proftpd/compat.h include/proftpd/conf.h include/proftpd/config.h @@ -25,6 +32,7 @@ include/proftpd/env.h include/proftpd/event.h include/proftpd/expr.h include/proftpd/feat.h +include/proftpd/filter.h include/proftpd/fsio.h include/proftpd/ftp.h include/proftpd/glibc-glob.h @@ -35,8 +43,9 @@ include/proftpd/log.h include/proftpd/mkhome.h %%CLAMAV%%include/proftpd/mod_clamav.h %%WRAP%%include/proftpd/mod_wrap2.h +%%SFTP%%include/proftpd/mod_sftp.h %%SQL%%include/proftpd/mod_sql.h -%%TDS%%include/proftpd/mod_sql.h +%%TLS%%include/proftpd/mod_tls.h %%QUOTA%%include/proftpd/mod_quotatab.h include/proftpd/mod_ctrls.h include/proftpd/modules.h @@ -54,6 +63,7 @@ include/proftpd/proftpd.h include/proftpd/regexp.h include/proftpd/response.h include/proftpd/scoreboard.h +include/proftpd/session.h include/proftpd/sets.h include/proftpd/str.h include/proftpd/support.h @@ -65,6 +75,7 @@ include/proftpd/var.h include/proftpd/version.h include/proftpd/xferlog.h libdata/pkgconfig/proftpd.pc +sbin/ftpscrub sbin/ftpshut sbin/in.proftpd sbin/proftpd @@ -90,5 +101,6 @@ sbin/proftpd %%NLS%%@dirrmtry share/locale/ru_RU %%NLS%%@dirrmtry share/locale/bg_BG %%NLS%%@dirrmtry share/locale/ko_KR +%%SFTP%%@dirrmtry etc/proftpd @dirrm include/proftpd @dirrmtry lib/proftpd |