head 1.15; access; symbols pkgsrc-2013Q2:1.15.0.2 pkgsrc-2013Q2-base:1.15 pkgsrc-2012Q4:1.14.0.10 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.14.0.8 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.6 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.14.0.4 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.14.0.2 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q3:1.13.0.8 pkgsrc-2011Q3-base:1.13 pkgsrc-2011Q2:1.13.0.6 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.13.0.4 pkgsrc-2011Q1-base:1.13 pkgsrc-2010Q4:1.13.0.2 pkgsrc-2010Q4-base:1.13 pkgsrc-2010Q3:1.12.0.6 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.4 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.2 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.11.0.10 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.8 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.6 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.4 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.2 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.10.0.2 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.9.0.12 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.10 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.8 pkgsrc-2008Q1:1.9.0.6 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.4 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.2 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.8.0.4 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.2 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.7.0.2 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2; locks; strict; comment @# @; 1.15 date 2013.03.15.13.34.32; author kim; state dead; branches; next 1.14; 1.14 date 2011.10.03.11.23.31; author adam; state Exp; branches 1.14.10.1; next 1.13; 1.13 date 2010.11.07.12.21.10; author obache; state Exp; branches 1.13.8.1; next 1.12; 1.12 date 2010.03.21.21.24.25; author kim; state Exp; branches 1.12.6.1; next 1.11; 1.11 date 2008.11.21.08.00.36; author martti; state Exp; branches; next 1.10; 1.10 date 2008.10.03.06.52.03; author martti; state Exp; branches; next 1.9; 1.9 date 2007.07.06.11.04.40; author martti; state Exp; branches; next 1.8; 1.8 date 2007.01.13.09.47.38; author martti; state Exp; branches 1.8.4.1; next 1.7; 1.7 date 2006.12.14.11.19.46; author martti; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2006.11.23.11.57.07; author adrianp; state Exp; branches; next 1.5; 1.5 date 2006.11.18.14.32.58; author adrianp; state Exp; branches; next 1.4; 1.4 date 2006.03.02.10.46.20; author martti; state dead; branches 1.4.6.1; next 1.3; 1.3 date 2005.11.04.12.36.16; author martti; state Exp; branches; next 1.2; 1.2 date 2005.07.10.19.57.07; author christos; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2005.06.23.04.49.26; author christos; state Exp; branches; next ; 1.14.10.1 date 2013.03.17.11.45.25; author tron; state dead; branches; next ; 1.13.8.1 date 2011.11.16.21.06.50; author sbd; state Exp; branches; next ; 1.12.6.1 date 2010.11.09.20.58.59; author spz; state Exp; branches; next ; 1.8.4.1 date 2007.07.10.12.16.05; author ghen; state Exp; branches; next ; 1.7.2.1 date 2007.01.28.16.43.57; author ghen; state Exp; branches; next ; 1.4.6.1 date 2006.11.19.12.15.43; author ghen; state Exp; branches; next 1.4.6.2; 1.4.6.2 date 2006.11.23.12.30.27; author ghen; state Exp; branches; next 1.4.6.3; 1.4.6.3 date 2006.12.18.14.28.32; author ghen; state Exp; branches; next ; 1.2.2.1 date 2005.07.10.19.57.07; author salo; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2005.08.06.22.17.34; author salo; state Exp; branches; next ; desc @@ 1.15 log @Updated net/proftpd to 1.3.4c: - addresses CVE-2012-6095 @ text @$NetBSD: patch-ac,v 1.14 2011/10/03 11:23:31 adam Exp $ portability fix. --- configure.in.orig 2010-04-13 21:57:34.000000000 +0000 +++ configure.in @@@@ -348,7 +348,7 @@@@ AC_ARG_WITH(modules, if test x"$withval" != xno; then modules_list=`echo "$withval" | sed -e 's/:/ /g'`; for amodule in $modules_list; do - if test x"$amodule" == xmod_dso ; then + if test x"$amodule" = xmod_dso ; then AC_MSG_ERROR([use --enable-dso instead of --with-modules=mod_dso for DSO support]) fi done @ 1.14 log @Changes 1.3.3f: * Fixes segfault if mod_sql_mysql and "SQLAuthenticate groupsetfast" configuration used. * Fixes mod_wrap syslog level (regression from Bug 3317). * Fixes mod_ifsession segfault if regular expression patterns used in a section. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.13 2010/11/07 12:21:10 obache Exp $ @ 1.14.10.1 log @Pullup ticket #4099 - requested by kim net/proftpd: security update Revisions pulled up: - net/proftpd/Makefile 1.72 - net/proftpd/PLIST 1.24 - net/proftpd/distinfo 1.40 - net/proftpd/patches/patch-ab deleted - net/proftpd/patches/patch-ac deleted --- Module Name: pkgsrc Committed By: kim Date: Fri Mar 15 13:34:32 UTC 2013 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo Removed Files: pkgsrc/net/proftpd/patches: patch-ab patch-ac Log Message: Updated net/proftpd to 1.3.4c: - addresses CVE-2012-6095 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.14 2011/10/03 11:23:31 adam Exp $ @ 1.13 log @Update proftpd to 1.3.3c. pksrc changes: * Instead of patch&subst to change layout of statedir, pass it to configure instead (and subst for manpages are fixed). * Convert custom mod_wrap library modification to SUBST. * Need to buildlink with security/tcp_wappers for mod_wrap. NEWS: 1.3.3c - Released 29-Oct-2010 -------------------------------- - Bug 3511 - SQLAuthType Backend not properly rejected by mod_sql_sqlite. - Bug 3513 - EPERM error logged unnecessarily for SFTP logins on Linux. - Bug 3517 - mod_quotatab decrements file tally improperly for failed DELE commands. - Bug 3518 - Support SiteMiscEngine directive, for disabling mod_site_misc functionality via proftpd.conf. - Bug 3519 - Inappropriate directory traversal allowed by mod_site_misc. - Bug 3521 - Telnet IAC processing stack overflow. 1.3.3b - Released 09-Sep-2010 -------------------------------- - Bug 3481 - Problem with SFTP directory listings. - Bug 3483 - NULL pointer dereference handling SITE command in mod_quotatab. - Bug 3485 - Disabling IPv6 via -4 or --ipv4 command-line options does not work. - Bug 3487 - Null pointer dereference with EPRT/EPSV/PASV/PORT command during data transfer. - Bug 3482 - ProFTPD corrupts utmpx log files on FreeBSD 9.0/HEAD. - Bug 3491 - Directory pattern not matching as expected. - Bug 3492 - Null pointer dereference during data transfer due to RNFR/RNTO. - Bug 3494 - Null pointer dereference for IPv6-enabled proftpd when no DefaultServer configured. - Bug 3501 - logins with "AuthAliasOnly on" still handled as anonymous logins. 1.3.3a - Released 01-Jul-2010 -------------------------------- - Bug 3400 - Add Japanese translation. - Bug 3401 - mod_sftp does not compile with pre-0.9.7 OpenSSL. - Bug 3402 - mod_tls does not compile with pre-0.9.7 OpenSSL due to Bug#3349. - Bug 3403 - File upload followed by MLSD leads to wrong file size entries in TransferLog. - Bug 3405 - Multiple SFTPAuthorizedUserKeys stores causes segfault on 64-bit platforms. - Bug 3354 - Renaming a file across mount points to a full disk does not fail as expected. - Bug 3408 - Use instead of where possible. - Bug 3412 - Include files not included after restart due to permissions. - Bug 3409 - Build failure on newer FreeBSD due to utmp/utmpx system changes. - Bug 3417 - Unsafe use of pointer when scanning config for ScoreboardFile. - Bug 3418 - %U sometimes showing up as "(none)" in ExtendedLog. - Bug 3421 - RewriteHome does not work properly for SFTP connections. - Bug 3419 - SSL_shutdown() errors with openssl-0.9.8m. - Bug 3423 - Last line of multiline DisplayLogin file improperly handled. - Bug 3426 - mod_sftp does not log to TransferLog by default. - Bug 3425 - Improperly constructed destination paths for SCP uploads. - Bug 3427 - mod_sftp does not handle recursive SCP uploads properly. - Bug 3432 - ExecBeforeCommand does not interpolate the %F/%f variables properly. - Bug 3434 - TraceLog contains messages even with "Trace DEFAULT:0" configured. - Bug 3435 - Encoding/decoding conversion can cause CPU spike. - Bug 3436 - Support build-time option to disable use of nonblocking open of log files. Use --disable-nonblocking-log-open to get the pre-1.3.3 behavior of opening log files. - Bug 3437 - UseImplicitSSL TLSOption causes PBSZ/PROT commands to fail. - Bug 3439 - Encoding fails if an NLS-enabled proftpd starts in a UTF8 locale. - Bug 3446 - .ftpaccess ignored in some cases. - Bug 3447 - mod_sftp can become confused during large recursive SCP uploads. - Bug 3448 - Ensure that STAT/LSTAT/FSTAT SFTP requests do not use cached/stale data. - Bug 3449 - mod_sftp does not properly handle the O_TRUNC flag in a SFTP OPEN request. - Bug 3450 - mod_sftp does not properly handle the O_APPEND flag in a SFTP OPEN request. - Bug 3451 - WinSCP can't upload files using protocol version 5 with mod_sftp. - Bug 3452 - mod_sftp does not advertise its supported SFTP extensions for protocol version 5. - Bug 3454 - msgfmt(1) options used for generating NLS files are not compatible with Solaris' msgfmt. - Bug 3456 - Problem attempting to recursively download a directory via SCP. - Bug 3458 - mod_sftp incorrectly performs OpenSSL cleanup. - Bug 3459 - mod_radius segfaults during incorrect login due to stale data. - Bug 3460 - REALPATH SFTP request can cause improperly cached directory configuration. - Bug 3462 - ftpasswd script's --delete-user option does not work. - Bug 3463 - ftpasswd script's --delete-group option does not work. - Bug 3465 - SIGSEGV at LIST after CCC. - Bug 3470 - Deferred resolution paths not handled properly by mod_sftp. - Bug 3469 - ExtendedLog's %f variable not properly expanded for DELE if path begins with tilde ('~'). - Bug 3467 - mod_ifsession does not merge blocks properly. - Bug 3471 - Null values in allow/deny rules causes mod_wrap2 to segfault. - Bug 3472 - mod_sftp publickey authentication fails for large keys. - Bug 3424 - Bad LDAP lookup can cause mod_ldap segfault under some conditions. - Bug 3476 - LIST/NLST of path starting with "-" fails. - Bug 3475 - Add new 'noGetgrouplist' AuthUnixOption to work around buggy libc code. - Bug 3474 - Using SQLite database and SQLLog directive can lead to problems under load. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.12 2010/03/21 21:24:25 kim Exp $ d7 9 a15 9 @@@@ -331,7 +331,7 @@@@ AC_ARG_WITH(modules, if test x"$withval" != x; then modules_list=`echo "$withval" | sed -e 's/:/ /g'`; for amodule in $modules_list; do - if test x"$amodule" == xmod_dso ; then + if test x"$amodule" = xmod_dso ; then AC_MSG_ERROR([use --enable-dso instead of --with-modules=mod_dso for DSO support]) fi done @ 1.13.8.1 log @Pullup ticket #3603 - requested by obache net/proftpd security update Revisions pulled up: - net/proftpd/Makefile 1.64-1.65 - net/proftpd/distinfo 1.38-1.39 - net/proftpd/patches/patch-ab 1.13 - net/proftpd/patches/patch-ac 1.14 - net/proftpd/patches/patch-contrib_mod_tls.c 1.2 --- Module Name: pkgsrc Committed By: adam Date: Mon Oct 3 11:23:31 UTC 2011 Modified Files: pkgsrc/net/proftpd: Makefile distinfo pkgsrc/net/proftpd/patches: patch-ab patch-ac patch-contrib_mod_tls.c Log Message: Changes 1.3.3f: * Fixes segfault if mod_sql_mysql and "SQLAuthenticate groupsetfast" configuration used. * Fixes mod_wrap syslog level (regression from Bug 3317). * Fixes mod_ifsession segfault if regular expression patterns used in a section. --- Module Name: pkgsrc Committed By: obache Date: Wed Nov 16 09:05:04 UTC 2011 Modified Files: pkgsrc/net/proftpd: Makefile distinfo Log Message: Update proftpd to 1.3.3g. 1.3.3g - Released 09-Nov-2011 -------------------------------- - Bug 3702 - ProFTPD with mod_sql_mysql dies of "Alarm clock" on FreeBSD. - Bug 3704 - Enable OpenSSL countermeasure against SSLv3/TLSv1 BEAST attacks. To disable this countermeasure, which may cause interoperability issues with some clients, use the NoEmptyFragments TLSOption. - Bug 3711 - Response pool use-after-free memory corruption error. @ text @d1 1 a1 1 $NetBSD$ d7 9 a15 9 @@@@ -348,7 +348,7 @@@@ AC_ARG_WITH(modules, if test x"$withval" != xno; then modules_list=`echo "$withval" | sed -e 's/:/ /g'`; for amodule in $modules_list; do - if test x"$amodule" == xmod_dso ; then + if test x"$amodule" = xmod_dso ; then AC_MSG_ERROR([use --enable-dso instead of --with-modules=mod_dso for DSO support]) fi done @ 1.12 log @Upgrade proftpd to 1.3.3 (bug fixes, see the NEWS file for a full list). @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.11 2008/11/21 08:00:36 martti Exp $ d3 1 a3 1 Make this pkgsrc friendly. d5 11 a15 14 --- configure.in.orig 2010-02-15 14:22:26.000000000 -0500 +++ configure.in 2010-03-21 16:38:07.000000000 -0400 @@@@ -2266,9 +2266,9 @@@@ locale_dir="`eval echo ${locale_dir}`" AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/run"`") AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") prefix="$pr_saved_prefix" exec_prefix="$pr_saved_exec_prefix" @ 1.12.6.1 log @Pullup ticket 3269 - requested by obache security update Revisions pulled up: - pkgsrc/net/proftpd/Makefile 1.59 - pkgsrc/net/proftpd/PLIST 1.22 - pkgsrc/net/proftpd/distinfo 1.34 - pkgsrc/net/proftpd/options.mk 1.9 - pkgsrc/net/proftpd/patches/patch-aa 1.13 - pkgsrc/net/proftpd/patches/patch-ac 1.13 - pkgsrc/net/proftpd/patches/patch-ab 1.12 Files deleted: pkgsrc/net/proftpd/patches/patch-ae ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: obache Date: Sun Nov 7 12:21:10 UTC 2010 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo options.mk pkgsrc/net/proftpd/patches: patch-aa patch-ab patch-ac Removed Files: pkgsrc/net/proftpd/patches: patch-ae Log Message: Update proftpd to 1.3.3c. pksrc changes: * Instead of patch&subst to change layout of statedir, pass it to configure instead (and subst for manpages are fixed). * Convert custom mod_wrap library modification to SUBST. * Need to buildlink with security/tcp_wappers for mod_wrap. NEWS: 1.3.3c - Released 29-Oct-2010 -------------------------------- - Bug 3511 - SQLAuthType Backend not properly rejected by mod_sql_sqlite. - Bug 3513 - EPERM error logged unnecessarily for SFTP logins on Linux. - Bug 3517 - mod_quotatab decrements file tally improperly for failed DELE commands. - Bug 3518 - Support SiteMiscEngine directive, for disabling mod_site_misc functionality via proftpd.conf. - Bug 3519 - Inappropriate directory traversal allowed by mod_site_misc. - Bug 3521 - Telnet IAC processing stack overflow. 1.3.3b - Released 09-Sep-2010 -------------------------------- - Bug 3481 - Problem with SFTP directory listings. - Bug 3483 - NULL pointer dereference handling SITE command in mod_quotatab. - Bug 3485 - Disabling IPv6 via -4 or --ipv4 command-line options does not work. - Bug 3487 - Null pointer dereference with EPRT/EPSV/PASV/PORT command during data transfer. - Bug 3482 - ProFTPD corrupts utmpx log files on FreeBSD 9.0/HEAD. - Bug 3491 - Directory pattern not matching as expected. - Bug 3492 - Null pointer dereference during data transfer due to RNFR/RNTO. - Bug 3494 - Null pointer dereference for IPv6-enabled proftpd when no DefaultServer configured. - Bug 3501 - logins with "AuthAliasOnly on" still handled as anonymous logins. 1.3.3a - Released 01-Jul-2010 -------------------------------- - Bug 3400 - Add Japanese translation. - Bug 3401 - mod_sftp does not compile with pre-0.9.7 OpenSSL. - Bug 3402 - mod_tls does not compile with pre-0.9.7 OpenSSL due to Bug#3349. - Bug 3403 - File upload followed by MLSD leads to wrong file size entries in TransferLog. - Bug 3405 - Multiple SFTPAuthorizedUserKeys stores causes segfault on 64-bit platforms. - Bug 3354 - Renaming a file across mount points to a full disk does not fail as expected. - Bug 3408 - Use instead of where possible. - Bug 3412 - Include files not included after restart due to permissions. - Bug 3409 - Build failure on newer FreeBSD due to utmp/utmpx system changes. - Bug 3417 - Unsafe use of pointer when scanning config for ScoreboardFile. - Bug 3418 - %U sometimes showing up as "(none)" in ExtendedLog. - Bug 3421 - RewriteHome does not work properly for SFTP connections. - Bug 3419 - SSL_shutdown() errors with openssl-0.9.8m. - Bug 3423 - Last line of multiline DisplayLogin file improperly handled. - Bug 3426 - mod_sftp does not log to TransferLog by default. - Bug 3425 - Improperly constructed destination paths for SCP uploads. - Bug 3427 - mod_sftp does not handle recursive SCP uploads properly. - Bug 3432 - ExecBeforeCommand does not interpolate the %F/%f variables properly. - Bug 3434 - TraceLog contains messages even with "Trace DEFAULT:0" configured. - Bug 3435 - Encoding/decoding conversion can cause CPU spike. - Bug 3436 - Support build-time option to disable use of nonblocking open of log files. Use --disable-nonblocking-log-open to get the pre-1.3.3 behavior of opening log files. - Bug 3437 - UseImplicitSSL TLSOption causes PBSZ/PROT commands to fail. - Bug 3439 - Encoding fails if an NLS-enabled proftpd starts in a UTF8 locale. - Bug 3446 - .ftpaccess ignored in some cases. - Bug 3447 - mod_sftp can become confused during large recursive SCP uploads. - Bug 3448 - Ensure that STAT/LSTAT/FSTAT SFTP requests do not use cached/stale data. - Bug 3449 - mod_sftp does not properly handle the O_TRUNC flag in a SFTP OPEN request. - Bug 3450 - mod_sftp does not properly handle the O_APPEND flag in a SFTP OPEN request. - Bug 3451 - WinSCP can't upload files using protocol version 5 with mod_sftp. - Bug 3452 - mod_sftp does not advertise its supported SFTP extensions for protocol version 5. - Bug 3454 - msgfmt(1) options used for generating NLS files are not compatible with Solaris' msgfmt. - Bug 3456 - Problem attempting to recursively download a directory via SCP. - Bug 3458 - mod_sftp incorrectly performs OpenSSL cleanup. - Bug 3459 - mod_radius segfaults during incorrect login due to stale data. - Bug 3460 - REALPATH SFTP request can cause improperly cached directory configuration. - Bug 3462 - ftpasswd script's --delete-user option does not work. - Bug 3463 - ftpasswd script's --delete-group option does not work. - Bug 3465 - SIGSEGV at LIST after CCC. - Bug 3470 - Deferred resolution paths not handled properly by mod_sftp. - Bug 3469 - ExtendedLog's %f variable not properly expanded for DELE if path begins with tilde ('~'). - Bug 3467 - mod_ifsession does not merge blocks properly. - Bug 3471 - Null values in allow/deny rules causes mod_wrap2 to segfault. - Bug 3472 - mod_sftp publickey authentication fails for large keys. - Bug 3424 - Bad LDAP lookup can cause mod_ldap segfault under some conditions. - Bug 3476 - LIST/NLST of path starting with "-" fails. - Bug 3475 - Add new 'noGetgrouplist' AuthUnixOption to work around buggy libc code. - Bug 3474 - Using SQLite database and SQLLog directive can lead to problems under load. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 pkgsrc/net/proftpd/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/proftpd/PLIST cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/proftpd/distinfo cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/proftpd/options.mk cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/proftpd/patches/patch-aa \ pkgsrc/net/proftpd/patches/patch-ac cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/proftpd/patches/patch-ab cvs rdiff -u -r1.7 -r0 pkgsrc/net/proftpd/patches/patch-ae @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.13 2010/11/07 12:21:10 obache Exp $ d3 1 a3 1 portability fix. d5 14 a18 11 --- configure.in.orig 2010-04-13 21:57:34.000000000 +0000 +++ configure.in @@@@ -331,7 +331,7 @@@@ AC_ARG_WITH(modules, if test x"$withval" != x; then modules_list=`echo "$withval" | sed -e 's/:/ /g'`; for amodule in $modules_list; do - if test x"$amodule" == xmod_dso ; then + if test x"$amodule" = xmod_dso ; then AC_MSG_ERROR([use --enable-dso instead of --with-modules=mod_dso for DSO support]) fi done @ 1.11 log @Updated net/proftpd to 1.3.2rc3 * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2008/10/03 06:52:03 martti Exp $ d5 3 a7 3 --- configure.in.orig 2008-11-19 05:51:38.000000000 +0200 +++ configure.in 2008-11-21 09:55:26.000000000 +0200 @@@@ -2111,9 +2111,9 @@@@ d11 1 a11 1 -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`") @ 1.10 log @Updated net/proftpd to 1.3.2rc2 Fix for http://bugs.proftpd.org/show_bug.cgi?id=3115 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.9 2007/07/06 11:04:40 martti Exp $ d5 3 a7 3 --- configure.in.orig 2008-09-02 18:54:49.000000000 +0300 +++ configure.in 2008-10-03 09:36:41.000000000 +0300 @@@@ -2067,9 +2067,9 @@@@ d9 1 a9 1 AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}/locale"`") @ 1.9 log @Updated net/proftpd to 1.3.1rc3 Hello, ProFTPD community. The ProFTPD Project team is pleased to announce that the third release candidate for ProFTPD 1.3.1 is now available for public consumption. The 1.3.1rc3 release includes a number of minor bugfixes, including segfaults when handling the NLST command, dealing assigning IPv6 addresses for the EPSV command, and better handling of Display files in chrooted sessions. Please read the included NEWS and ChangeLog files for the full details. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2007/01/13 09:47:38 martti Exp $ d3 8 a10 6 --- configure.in.orig 2007-05-22 23:54:09.000000000 +0300 +++ configure.in 2007-07-06 13:53:22.000000000 +0300 @@@@ -2019,9 +2019,9 @@@@ AC_DEFINE_UNQUOTED(PR_CONFIG_DIR, "`eval echo "${sysconfdir}"`") AC_DEFINE_UNQUOTED(PR_LIBEXEC_DIR, "`eval echo "${libexecdir}"`") AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${datadir}/locale"`") @ 1.8 log @Updated net/proftpd to 1.3.1rc2 + Fixed mod_sql's handling of WHERE clauses + Fixed segfaults ocurring after SIGHUP when shared modules are used + Fixed copying of symlinks in skeleton directory for CreateHome @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2006/12/14 11:19:46 martti Exp $ d3 3 a5 3 --- configure.in.orig 2007-01-10 03:45:08.000000000 +0000 +++ configure.in 2007-01-13 11:43:20.000000000 +0000 @@@@ -2009,9 +2009,9 @@@@ @ 1.8.4.1 log @Pullup ticket 2139 - requested by martti bugfix update for proftpd - pkgsrc/net/proftpd/Makefile 1.42 - pkgsrc/net/proftpd/PLIST 1.13 - pkgsrc/net/proftpd/distinfo 1.24 - pkgsrc/net/proftpd/patches/patch-ab 1.7 - pkgsrc/net/proftpd/patches/patch-ac 1.9 - pkgsrc/net/proftpd/patches/patch-ad removed - pkgsrc/net/proftpd/patches/patch-ae removed - pkgsrc/net/proftpd/patches/patch-af removed Module Name: pkgsrc Committed By: martti Date: Fri Jul 6 11:04:41 UTC 2007 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo pkgsrc/net/proftpd/patches: patch-ab patch-ac Removed Files: pkgsrc/net/proftpd/patches: patch-ad patch-ae patch-af Log Message: Updated net/proftpd to 1.3.1rc3 Hello, ProFTPD community. The ProFTPD Project team is pleased to announce that the third release candidate for ProFTPD 1.3.1 is now available for public consumption. The 1.3.1rc3 release includes a number of minor bugfixes, including segfaults when handling the NLST command, dealing assigning IPv6 addresses for the EPSV command, and better handling of Display files in chrooted sessions. Please read the included NEWS and ChangeLog files for the full details. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2007/01/13 09:47:38 martti Exp $ d3 3 a5 3 --- configure.in.orig 2007-05-22 23:54:09.000000000 +0300 +++ configure.in 2007-07-06 13:53:22.000000000 +0300 @@@@ -2019,9 +2019,9 @@@@ @ 1.7 log @Updated net/proftpd to 1.3.1rc1 The 1.3.1rc1 release includes major new features and numerous bugfixes, including: + Support for UTF8 and translated response messages (NLS support) + New configuration directives: DisplayChdir DisplayFileTransfer UseIPv6 UseUTF8 + Deprecated configuration directives: DisplayFirstChdir The DisplayFirstChdir directive is deprecated; sites should use the new DisplayChdir directive (which allows for files to be displayed on every directory change, rather than just the first time for a directory change). HiddenStor The HiddenStor directive is deprecated; simply use HiddenStores instead. SQLHomedirOnDemand The SQLHomedirOnDemand directive will be removed in future releases; use the CreateHome directive instead. + New modules: mod_ban, a module handling dynamic client "black lists" See doc/contrib/mod_ban.html + Enhanced modules: The mod_tls module can now make use of cryptographic accelerator cards with the new TLSCryptoDevice directive. It can also use a program for obtaining certificate passphrases via the new TLSPassPhraseProvider directive. + Documentation @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 36 --- configure.in.orig 2006-12-06 18:55:14.000000000 +0000 +++ configure.in 2006-12-14 10:28:37.000000000 +0000 @@@@ -486,19 +486,22 @@@@ [ if test x"$enableval" = x"yes" ; then dnl The libintl library is only needed on non-GNU systems. If it - dnl is not installed, and the admin enables NLS support, the linker - dnl will complain. + dnl is not installed, and the admin enables NLS support, then we + dnl should abort. AC_CHECK_LIB(intl, bindtextdomain, - ac_build_addl_libs="-lintl $ac_build_addl_libs" - AC_DEFINE(HAVE_LIBINTL, 1, [Define if libintl is present.]) - - dnl Will it be problem that LIBS is not automatically updated - dnl to include -lintl here, since we are defining our own actions? + [ac_build_addl_libs="-lintl $ac_build_addl_libs" + AC_DEFINE(HAVE_LIBINTL, 1, [Define if libintl is present.]) + AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) + ENABLE_NLS="1" + ], + [AC_CHECK_LIB(c, bindtextdomain, + [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) + ENABLE_NLS="1" + ], + [AC_MSG_ERROR([libintl support, required for NLS, not present -- aborting])] + ]) ) - - AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) - ENABLE_NLS="1" fi ]) @@@@ -1927,9 +1930,9 @@@@ @ 1.7.2.1 log @Pullup ticket 1991 - requested by martti bugfix update for proftpd - pkgsrc/net/proftpd/Makefile 1.39 - pkgsrc/net/proftpd/PLIST 1.12 - pkgsrc/net/proftpd/distinfo 1.22 - pkgsrc/net/proftpd/patches/patch-aa 1.9 - pkgsrc/net/proftpd/patches/patch-ab 1.6 - pkgsrc/net/proftpd/patches/patch-ac 1.8 Module Name: pkgsrc Committed By: martti Date: Sat Jan 13 09:47:38 UTC 2007 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo pkgsrc/net/proftpd/patches: patch-aa patch-ab patch-ac Log Message: Updated net/proftpd to 1.3.1rc2 + Fixed mod_sql's handling of WHERE clauses + Fixed segfaults ocurring after SIGHUP when shared modules are used + Fixed copying of symlinks in skeleton directory for CreateHome @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2007/01/13 09:47:38 martti Exp $ d3 36 a38 3 --- configure.in.orig 2007-01-10 03:45:08.000000000 +0000 +++ configure.in 2007-01-13 11:43:20.000000000 +0000 @@@@ -2009,9 +2009,9 @@@@ @ 1.6 log @Updated patch-ac via Debian to fix PR #35092 @ text @d3 4 a6 3 --- src/main.c.orig 2006-03-15 19:41:01.000000000 +0000 +++ src/main.c @@@@ -116,6 +116,8 @@@@ static unsigned char have_dead_child = F d8 5 a12 1 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'}; d14 3 a16 11 +#define PR_DEFAULT_CMD_BUFSZ 512 + static char **Argv = NULL; static char *LastArgv = NULL; static const char *PidPath = PR_PID_FILE_PATH; @@@@ -820,17 +822,24 @@@@ static void cmd_loop(server_rec *server, pr_timer_reset(TIMER_IDLE, NULL); if (cmd_buf_size == -1) { - long *buf_size = get_param_ptr(main_server->conf, - "CommandBufferSize", FALSE); d18 14 a31 2 - if (buf_size == NULL || *buf_size <= 0) - cmd_buf_size = 512; d33 14 a46 24 - else if (*buf_size + 1 > sizeof(buf)) { - pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. " - "Resetting to 512."); - cmd_buf_size = 512; - } + int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE); + if (bufsz == NULL) { + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; + } + else if ( bufsz <= 0 ) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, resetting to default buffer size (%u)", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; + } else if (*bufsz + 1 > sizeof(buf)) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, using default buffer size (%u) instead", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; + } else { + pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); + cmd_buf_size = (long) *bufsz; + } } d48 2 a49 1 buf[cmd_buf_size - 1] = '\0'; @ 1.5 log @Add patch-ac for CVE-2006-5815 Patch from ProFTPD CVS: http://proftp.cvs.sourceforge.net/proftp/proftpd/src/main.c?r1=1.292&r2=1.293&view=patch&sortby=date @ text @d3 1 a3 1 --- src/main.c.orig 2006-11-18 14:24:35.000000000 +0000 d9 1 a9 1 +#define PR_DEFAULT_CMD_BUFSZ 512 d14 1 a14 1 @@@@ -820,16 +822,25 @@@@ static void cmd_loop(server_rec *server, d20 1 a20 3 + int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", + FALSE); d23 1 a23 13 + if (bufsz == NULL || + *bufsz <= 0) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, resetting to default buffer size (%u)", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; + + } else if (*bufsz + 1 > sizeof(buf)) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, resetting to default buffer size (%u)", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; d28 19 a46 4 + } else { + pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); + cmd_buf_size = (long) *bufsz; } d49 1 @ 1.4 log @Updated net/proftpd to 1.3.0rc4 The 1.3.0rc4 release includes a number of minor bugfixes, including fixed run-time detection of Unix domain sockets, portability tweaks for Mac OSX 10.4, and logging fixes for NetBSD and Solaris. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2005/11/04 12:36:16 martti Exp $ d3 7 a9 19 --- src/log.c 19 Sep 2005 21:35:38 -0000 1.74 +++ src/log.c 3 Nov 2005 19:13:17 -0000 @@@@ -59,7 +59,8 @@@@ int res = 0; static int fd = -1; -#if (defined(SVR4) || defined(__SVR4)) && \ +#if ((defined(SVR4) || defined(__SVR4)) || \ + (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \ !(defined(LINUX) || defined(__hpux) || defined (_AIX)) /* This "auxilliary" utmp doesn't exist under linux. */ #ifdef __sparcv9 @@@@ -70,6 +71,10 @@@@ #endif static int fdx = -1; +#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX) +# define WTMPX_FILE _PATH_WTMPX +#endif d11 20 a30 24 if (fdx < 0 && (fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) { pr_log_pri(PR_LOG_WARNING, "wtmpx %s: %s", WTMPX_FILE, strerror(errno)); @@@@ -89,14 +94,20 @@@@ sstrncpy(utx.ut_id, "ftp", sizeof(utx.ut_user)); sstrncpy(utx.ut_line, line, sizeof(utx.ut_line)); sstrncpy(utx.ut_host, host, sizeof(utx.ut_host)); - utx.ut_syslen = strlen(utx.ut_host)+1; utx.ut_pid = getpid(); -#ifdef __sparcv9 +#if defined(__NetBSD__) && defined(HAVE_UTMPX_H) + memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss)); + gettimeofday(&utx.ut_tv, NULL); +#else /* SVR4 */ + utx.ut_syslen = strlen(utx.ut_host)+1; +# ifdef __sparcv9 time(&t); utx.ut_tv.tv_sec = (time32_t)t; -#else +# else time(&utx.ut_tv.tv_sec); -#endif +# endif +#endif /* SVR4 */ d32 16 a47 3 if (*name) utx.ut_type = USER_PROCESS; else @ 1.4.6.1 log @Pullup ticket 1913 - requested by adrianp security fix for proftpd - pkgsrc/net/proftpd/Makefile 1.36 - pkgsrc/net/proftpd/distinfo 1.19 - pkgsrc/net/proftpd/patches/patch-ac 1.5 Module Name: pkgsrc Committed By: adrianp Date: Sat Nov 18 14:32:58 UTC 2006 Modified Files: pkgsrc/net/proftpd: Makefile distinfo Added Files: pkgsrc/net/proftpd/patches: patch-ac Log Message: Add patch-ac for CVE-2006-5815 Patch from ProFTPD CVS: http://proftp.cvs.sourceforge.net/proftp/proftpd/src/main.c?r1=1.292&r2=1.293&view=patch&sortby=date @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2006/11/18 14:32:58 adrianp Exp $ d3 19 a21 7 --- src/main.c.orig 2006-11-18 14:24:35.000000000 +0000 +++ src/main.c @@@@ -116,6 +116,8 @@@@ static unsigned char have_dead_child = F static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'}; +#define PR_DEFAULT_CMD_BUFSZ 512 d23 24 a46 20 static char **Argv = NULL; static char *LastArgv = NULL; static const char *PidPath = PR_PID_FILE_PATH; @@@@ -820,16 +822,25 @@@@ static void cmd_loop(server_rec *server, pr_timer_reset(TIMER_IDLE, NULL); if (cmd_buf_size == -1) { - long *buf_size = get_param_ptr(main_server->conf, - "CommandBufferSize", FALSE); + int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", + FALSE); - if (buf_size == NULL || *buf_size <= 0) - cmd_buf_size = 512; + if (bufsz == NULL || + *bufsz <= 0) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, resetting to default buffer size (%u)", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; d48 3 a50 16 + } else if (*bufsz + 1 > sizeof(buf)) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, resetting to default buffer size (%u)", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; - else if (*buf_size + 1 > sizeof(buf)) { - pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. " - "Resetting to 512."); - cmd_buf_size = 512; + } else { + pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); + cmd_buf_size = (long) *bufsz; } } @ 1.4.6.2 log @Pullup ticket 1920 - requested by adrianp fix security fix for proftpd - pkgsrc/net/proftpd/Makefile 1.37 - pkgsrc/net/proftpd/distinfo 1.20 - pkgsrc/net/proftpd/patches/patch-ac 1.6 Module Name: pkgsrc Committed By: adrianp Date: Thu Nov 23 11:57:07 UTC 2006 Modified Files: pkgsrc/net/proftpd: Makefile distinfo pkgsrc/net/proftpd/patches: patch-ac Log Message: Updated patch-ac via Debian to fix PR #35092 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4.6.1 2006/11/19 12:15:43 ghen Exp $ d3 1 a3 1 --- src/main.c.orig 2006-03-15 19:41:01.000000000 +0000 d9 1 a9 1 +#define PR_DEFAULT_CMD_BUFSZ 512 d14 1 a14 1 @@@@ -820,17 +822,24 @@@@ static void cmd_loop(server_rec *server, d20 3 a22 1 - d25 13 a37 1 - d42 4 a45 19 - } + int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE); + if (bufsz == NULL) { + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; + } + else if ( bufsz <= 0 ) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, resetting to default buffer size (%u)", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; + } else if (*bufsz + 1 > sizeof(buf)) { + pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " + "given, using default buffer size (%u) instead", + *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); + cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; + } else { + pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); + cmd_buf_size = (long) *bufsz; + } a47 1 buf[cmd_buf_size - 1] = '\0'; @ 1.4.6.3 log @Pullup ticket 1960 - requested by salo security update for proftpd - pkgsrc/net/proftpd/Makefile 1.38 - pkgsrc/net/proftpd/PLIST 1.11 - pkgsrc/net/proftpd/distinfo 1.21 - pkgsrc/net/proftpd/patches/patch-aa 1.8 - pkgsrc/net/proftpd/patches/patch-ab 1.5 - pkgsrc/net/proftpd/patches/patch-ac 1.7 Module Name: pkgsrc Committed By: martti Date: Thu Dec 14 11:19:46 UTC 2006 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo pkgsrc/net/proftpd/patches: patch-aa patch-ab patch-ac Log Message: Updated net/proftpd to 1.3.1rc1 The 1.3.1rc1 release includes major new features and numerous bugfixes, including: + Support for UTF8 and translated response messages (NLS support) + New configuration directives: DisplayChdir DisplayFileTransfer UseIPv6 UseUTF8 + Deprecated configuration directives: DisplayFirstChdir The DisplayFirstChdir directive is deprecated; sites should use the new DisplayChdir directive (which allows for files to be displayed on every directory change, rather than just the first time for a directory change). HiddenStor The HiddenStor directive is deprecated; simply use HiddenStores instead. SQLHomedirOnDemand The SQLHomedirOnDemand directive will be removed in future releases; use the CreateHome directive instead. + New modules: mod_ban, a module handling dynamic client "black lists" See doc/contrib/mod_ban.html + Enhanced modules: The mod_tls module can now make use of cryptographic accelerator cards with the new TLSCryptoDevice directive. It can also use a program for obtaining certificate passphrases via the new TLSPassPhraseProvider directive. + Documentation @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4.6.2 2006/11/23 12:30:27 ghen Exp $ d3 3 a5 4 --- configure.in.orig 2006-12-06 18:55:14.000000000 +0000 +++ configure.in 2006-12-14 10:28:37.000000000 +0000 @@@@ -486,19 +486,22 @@@@ [ if test x"$enableval" = x"yes" ; then d7 1 a7 5 dnl The libintl library is only needed on non-GNU systems. If it - dnl is not installed, and the admin enables NLS support, the linker - dnl will complain. + dnl is not installed, and the admin enables NLS support, then we + dnl should abort. d9 11 a19 3 AC_CHECK_LIB(intl, bindtextdomain, - ac_build_addl_libs="-lintl $ac_build_addl_libs" - AC_DEFINE(HAVE_LIBINTL, 1, [Define if libintl is present.]) d21 2 a22 14 - dnl Will it be problem that LIBS is not automatically updated - dnl to include -lintl here, since we are defining our own actions? + [ac_build_addl_libs="-lintl $ac_build_addl_libs" + AC_DEFINE(HAVE_LIBINTL, 1, [Define if libintl is present.]) + AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) + ENABLE_NLS="1" + ], + [AC_CHECK_LIB(c, bindtextdomain, + [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) + ENABLE_NLS="1" + ], + [AC_MSG_ERROR([libintl support, required for NLS, not present -- aborting])] + ]) ) d24 24 a47 14 - AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) - ENABLE_NLS="1" fi ]) @@@@ -1927,9 +1930,9 @@@@ AC_DEFINE_UNQUOTED(PR_CONFIG_DIR, "`eval echo "${sysconfdir}"`") AC_DEFINE_UNQUOTED(PR_LIBEXEC_DIR, "`eval echo "${libexecdir}"`") AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${datadir}/locale"`") -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`") +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/run"`") AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") d49 1 a49 2 prefix="$pr_saved_prefix" exec_prefix="$pr_saved_exec_prefix" @ 1.3 log @Use the official utmpx patch. No functional change. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2005/07/10 19:57:07 christos Exp $ @ 1.2 log @Simplify (and correct) the previous ut_ss filling code. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2005/06/23 04:49:26 christos Exp $ d3 2 a4 2 --- src/log.c.orig 2004-08-07 18:22:42.000000000 -0400 +++ src/log.c 2005-07-10 15:50:13.000000000 -0400 d34 1 a34 1 + memcpy(&utx.ut_ss, &ip->na_addr, sizeof(ip->na_addr)); @ 1.2.2.1 log @file patch-ac was added on branch pkgsrc-2005Q2 on 2005-07-10 19:57:07 +0000 @ text @d1 50 @ 1.2.2.2 log @Pullup ticket 662 - requested by Adrian Portelli update and security fixes for proftpd Revisions pulled up: - pkgsrc/net/proftpd/Makefile 1.22, 1.23, 1.24 - pkgsrc/net/proftpd/PLIST 1.9 - pkgsrc/net/proftpd/distinfo 1.10, 1.11, 1.12, 1.13 - pkgsrc/net/proftpd/options.mk 1.1 - pkgsrc/net/proftpd/files/proftpd.sh 1.2 - pkgsrc/net/proftpd/patches/patch-ab 1.1 - pkgsrc/net/proftpd/patches/patch-ac 1.1, 1.2 - pkgsrc/net/proftpd/patches/patch-ad 1.1 - pkgsrc/net/proftpd/patches/patch-ae 1.1 Module Name: pkgsrc Committed By: salo Date: Wed Jun 22 22:43:37 UTC 2005 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo pkgsrc/net/proftpd/files: proftpd.sh Added Files: pkgsrc/net/proftpd: options.mk pkgsrc/net/proftpd/patches: patch-ab Log Message: PKGREVISION++ - split PKG_OPTIONS to options.mk file - fix issue with state directory in (typically) /var/run, noted by Justin Newcomer on tech-pkg@@ - delint --- Module Name: pkgsrc Committed By: christos Date: Thu Jun 23 04:49:27 UTC 2005 Modified Files: pkgsrc/net/proftpd: Makefile distinfo Added Files: pkgsrc/net/proftpd/patches: patch-ac Log Message: Make it log in wtmpx properly. XXX: someone should fix the array has type char issues. --- Module Name: pkgsrc Committed By: christos Date: Sun Jul 10 19:57:07 UTC 2005 Modified Files: pkgsrc/net/proftpd: distinfo pkgsrc/net/proftpd/patches: patch-ac Log Message: Simplify (and correct) the previous ut_ss filling code. --- Module Name: pkgsrc Committed By: adrianp Date: Sat Aug 6 11:51:18 UTC 2005 Modified Files: pkgsrc/net/proftpd: Makefile Added Files: pkgsrc/net/proftpd/patches: patch-ad patch-ae Log Message: Patches to address recent security issue via Gentoo: http://secunia.com/advisories/16181/ --- Module Name: pkgsrc Committed By: adrianp Date: Sat Aug 6 12:29:25 UTC 2005 Modified Files: pkgsrc/net/proftpd: distinfo Log Message: Add missing patch from last update - ride the previous bump @ text @a0 50 $NetBSD: patch-ac,v 1.2.2.1 2005/08/06 22:17:34 salo Exp $ --- src/log.c.orig 2004-08-07 18:22:42.000000000 -0400 +++ src/log.c 2005-07-10 15:50:13.000000000 -0400 @@@@ -59,7 +59,8 @@@@ int res = 0; static int fd = -1; -#if (defined(SVR4) || defined(__SVR4)) && \ +#if ((defined(SVR4) || defined(__SVR4)) || \ + (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \ !(defined(LINUX) || defined(__hpux) || defined (_AIX)) /* This "auxilliary" utmp doesn't exist under linux. */ #ifdef __sparcv9 @@@@ -70,6 +71,10 @@@@ #endif static int fdx = -1; +#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX) +# define WTMPX_FILE _PATH_WTMPX +#endif + if (fdx < 0 && (fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) { pr_log_pri(PR_LOG_WARNING, "wtmpx %s: %s", WTMPX_FILE, strerror(errno)); @@@@ -89,14 +94,20 @@@@ sstrncpy(utx.ut_id, "ftp", sizeof(utx.ut_user)); sstrncpy(utx.ut_line, line, sizeof(utx.ut_line)); sstrncpy(utx.ut_host, host, sizeof(utx.ut_host)); - utx.ut_syslen = strlen(utx.ut_host)+1; utx.ut_pid = getpid(); -#ifdef __sparcv9 +#if defined(__NetBSD__) && defined(HAVE_UTMPX_H) + memcpy(&utx.ut_ss, &ip->na_addr, sizeof(ip->na_addr)); + gettimeofday(&utx.ut_tv, NULL); +#else /* SVR4 */ + utx.ut_syslen = strlen(utx.ut_host)+1; +# ifdef __sparcv9 time(&t); utx.ut_tv.tv_sec = (time32_t)t; -#else +# else time(&utx.ut_tv.tv_sec); -#endif +# endif +#endif /* SVR4 */ + if (*name) utx.ut_type = USER_PROCESS; else @ 1.1 log @Make it log in wtmpx properly. XXX: someone should fix the array has type char issues. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ src/log.c 2005-06-23 00:42:29.000000000 -0400 d26 1 a26 1 @@@@ -89,14 +94,30 @@@@ d34 1 a34 11 + { + /* XXX: may return (size_t) -1 */ + size_t len = pr_netaddr_get_inaddr_len(ip); + if (len > sizeof(utx.ut_ss)) + len = sizeof(utx.ut_ss); +# ifndef USE_IPV6 + memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), len); +# else + memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), len); +# endif /* !USE_IPV6 */ + } @