[pkgsrc/pkgsrc-2005Q2]: pkgsrc/net/proftpd Pullup ticket 662 - requested by A...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/net/proftpd Pullup ticket 662 - requested by A...
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:59:06 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4f4018cbb89
branches:  pkgsrc-2005Q2
changeset: 495959:b4f4018cbb89
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Aug 06 22:17:34 2005 +0000

description:
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

diffstat:

 net/proftpd/Makefile         |  62 +++++++------------------------------------
 net/proftpd/PLIST            |   4 +-
 net/proftpd/distinfo         |   6 +++-
 net/proftpd/files/proftpd.sh |   4 +-
 net/proftpd/options.mk       |  45 +++++++++++++++++++++++++++++++
 net/proftpd/patches/patch-ab |  18 ++++++++++++
 net/proftpd/patches/patch-ac |  50 +++++++++++++++++++++++++++++++++++
 net/proftpd/patches/patch-ad |  13 +++++++++
 net/proftpd/patches/patch-ae |  40 ++++++++++++++++++++++++++++
 9 files changed, 186 insertions(+), 56 deletions(-)

diffs (truncated from 333 to 300 lines):

diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/Makefile
--- a/net/proftpd/Makefile      Sat Aug 06 06:09:07 2005 +0000
+++ b/net/proftpd/Makefile      Sat Aug 06 22:17:34 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/05/31 11:24:32 dillo Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2005/08/06 22:17:34 salo Exp $
 
 DISTNAME=      proftpd-1.2.10
-PKGREVISION=   1
+PKGREVISION=   4
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.proftpd.org/distrib/source/ \
                ftp://ftp.servus.at/ProFTPD/distrib/source/ \
@@ -15,12 +15,12 @@
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= yes
+USE_PKGINSTALL=        yes
 USE_TOOLS+=    gmake
-USE_PKGINSTALL=        YES
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE}/run
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --disable-sendfile
 CONFIGURE_ARGS+=       --enable-ctrls
 
@@ -29,54 +29,15 @@
 CONF_FILES=    ${PREFIX}/share/examples/proftpd/basic.conf \
                ${PKG_SYSCONFDIR}/proftpd.conf
 
-PKG_SUPPORTED_OPTIONS = pam wrap quota pgsql
-PKG_OPTIONS_VAR       = PKG_OPTIONS.proftpd
-
-# This (or something like this must be in mk/bsd.options.mk) to allow 
-# to see the supported options
-##BUILD_DEFS+=PKG_SUPPORTED_OPTIONS
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mpam)
-CONFIGURE_ARGS+=       --enable-auth-pam
-.include "../../mk/pam.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mwrap)
-MODULES:=${MODULES}mod_wrap
-.endif
-
-MODULES=#defined
-.if !empty(PKG_OPTIONS:Mquota)
-MODULES:=${MODULES}mod_quota
-.endif
+SUBST_CLASSES+=                man
+SUBST_MESSAGE.man=     "Fixing paths in manual pages."
+SUBST_STAGE.man=       pre-configure
+SUBST_FILES.man=       utils/ftpcount.1.in utils/ftptop.1.in utils/ftpwho.1.in
+SUBST_SED.man=         -e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE}/run,
 
-## .if defined(PROFTPD_USE_LDAP) && ${PROFTPD_USE_LDAP} == "YES"
-## MODULES:=   ${MODULES}:mod_ldap
-## DEPENDS+=   openldap-[0-9]*:../../databases/openldap
-## .endif
-##
-## .if defined(PROFTPD_USE_MYSQL) && ${PROFTPD_USE_MYSQL} == "YES"
-## MODULES:=   ${MODULES}:mod_sql:mod_sql_mysql
-## DEPENDS+=   mysql-client-[0-9]*:../../databases/mysql-client
-## .endif
-##
-## .if defined(PROFTPD_USE_POSTGRES) && ${PROFTPD_USE_POSTGRES} == "YES"
-## MODULES:=   ${MODULES}:mod_sql:mod_sql_postgres
-## DEPENDS+=   postgresql-client-[0-9]*:../../databases/postgresql-client
-## .endif
-##
-## .if defined(PROFTPD_USE_README) && ${PROFTPD_USE_README} == "YES"
-## MODULES:=   ${MODULES}:mod_readme
-## .endif
-
-.if !empty(MODULES)
-CONFIGURE_ARGS+=       --with-modules=${MODULES}
-.endif
+.include "options.mk"
 
 post-install:
-       # documentation
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proftpd
 .for i in NEWS README README.IPv6 README.LDAP README.PAM README.modules
        ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/proftpd
@@ -84,7 +45,6 @@
 .for i in Configuration.html faq.html license.txt
        ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/proftpd
 .endfor
-       # examples
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/proftpd
        ${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \
                ${PREFIX}/share/examples/proftpd
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/PLIST
--- a/net/proftpd/PLIST Sat Aug 06 06:09:07 2005 +0000
+++ b/net/proftpd/PLIST Sat Aug 06 22:17:34 2005 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2005/05/02 20:34:03 reed Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2005/08/06 22:17:34 salo Exp $
 bin/ftpcount
-bin/ftpwho
 bin/ftpdctl
 bin/ftptop
+bin/ftpwho
 man/man1/ftpcount.1
 man/man1/ftptop.1
 man/man1/ftpwho.1
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/distinfo
--- a/net/proftpd/distinfo      Sat Aug 06 06:09:07 2005 +0000
+++ b/net/proftpd/distinfo      Sat Aug 06 22:17:34 2005 +0000
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 12:14:01 agc Exp $
+$NetBSD: distinfo,v 1.9.4.1 2005/08/06 22:17:34 salo Exp $
 
 SHA1 (proftpd-1.2.10.tar.gz) = ea12d139b8b47168cabcd993b137b2360bba1465
 RMD160 (proftpd-1.2.10.tar.gz) = c96cadc6bfef0f77f2d44ed901b55474c6f6a464
 Size (proftpd-1.2.10.tar.gz) = 1182176 bytes
 SHA1 (patch-aa) = 3784f6aed87b327741685d45d453aa2ac98dd98b
+SHA1 (patch-ab) = cc760fc91846a0fc595e2e76d5a1ef582915034d
+SHA1 (patch-ac) = 5c05fb0c21288af6cd718f8792cc829bc348dd47
+SHA1 (patch-ad) = 5afd166f210589a4d985451840d2eec44f96bac9
+SHA1 (patch-ae) = 5bd9ec77732bc9821a0e723d00778fe03f296da1
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/files/proftpd.sh
--- a/net/proftpd/files/proftpd.sh      Sat Aug 06 06:09:07 2005 +0000
+++ b/net/proftpd/files/proftpd.sh      Sat Aug 06 22:17:34 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: proftpd.sh,v 1.1 2003/03/22 10:15:27 jmmv Exp $
+# $NetBSD: proftpd.sh,v 1.1.14.1 2005/08/06 22:17:34 salo Exp $
 #
 
 # PROVIDE: proftpd
@@ -12,7 +12,7 @@
 name="proftpd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}.pid"
 required_files="@PKG_SYSCONFDIR@/proftpd.conf"
 
 load_rc_config $name
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/options.mk    Sat Aug 06 22:17:34 2005 +0000
@@ -0,0 +1,45 @@
+# $NetBSD: options.mk,v 1.1.2.2 2005/08/06 22:17:34 salo Exp $
+#
+
+PKG_OPTIONS_VAR       = PKG_OPTIONS.proftpd
+PKG_SUPPORTED_OPTIONS = pam wrap quota
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpam)
+CONFIGURE_ARGS+=       --enable-auth-pam
+.include "../../mk/pam.buildlink3.mk"
+.endif
+
+MODULES=#defined
+
+.if !empty(PKG_OPTIONS:Mwrap)
+MODULES:=${MODULES}mod_wrap
+.endif
+
+.if !empty(PKG_OPTIONS:Mquota)
+MODULES:=${MODULES}mod_quota
+.endif
+
+## .if defined(PROFTPD_USE_LDAP) && ${PROFTPD_USE_LDAP} == "YES"
+## MODULES:=   ${MODULES}:mod_ldap
+## DEPENDS+=   openldap-[0-9]*:../../databases/openldap
+## .endif
+##
+## .if defined(PROFTPD_USE_MYSQL) && ${PROFTPD_USE_MYSQL} == "YES"
+## MODULES:=   ${MODULES}:mod_sql:mod_sql_mysql
+## DEPENDS+=   mysql-client-[0-9]*:../../databases/mysql-client
+## .endif
+##
+## .if defined(PROFTPD_USE_POSTGRES) && ${PROFTPD_USE_POSTGRES} == "YES"
+## MODULES:=   ${MODULES}:mod_sql:mod_sql_postgres
+## DEPENDS+=   postgresql-client-[0-9]*:../../databases/postgresql-client
+## .endif
+##
+## .if defined(PROFTPD_USE_README) && ${PROFTPD_USE_README} == "YES"
+## MODULES:=   ${MODULES}:mod_readme
+## .endif
+
+.if !empty(MODULES)
+CONFIGURE_ARGS+=       --with-modules=${MODULES}
+.endif
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/patches/patch-ab      Sat Aug 06 22:17:34 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.2.2 2005/08/06 22:17:34 salo Exp $
+
+--- configure.orig     2004-05-26 04:17:24.000000000 +0200
++++ configure  2005-06-23 00:25:54.000000000 +0200
+@@ -16809,11 +16809,11 @@
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
++#define PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`"
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define RUN_DIR "`eval echo "${localstatedir}/proftpd"`"
++#define RUN_DIR "`eval echo "${localstatedir}/run"`"
+ _ACEOF
+ 
+ 
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/patches/patch-ac      Sat Aug 06 22:17:34 2005 +0000
@@ -0,0 +1,50 @@
+$NetBSD: patch-ac,v 1.2.2.2 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
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/patches/patch-ad      Sat Aug 06 22:17:34 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/08/06 22:17:34 salo Exp $
+
+--- src/response.c.orig        2005-08-06 12:20:27.000000000 +0100
++++ src/response.c
+@@ -169,7 +169,7 @@ void pr_response_send_async(const char *
+   buf[sizeof(buf) - 1] = '\0';
+   sstrcat(buf, "\r\n", sizeof(buf));
+ 
+-  RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, buf, strlen(buf))
++  RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, "%s", buf)
+ }
+ 
+ void pr_response_send(const char *resp_numeric, const char *fmt, ...) {
diff -r bd2837b0c666 -r b4f4018cbb89 net/proftpd/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/proftpd/patches/patch-ae      Sat Aug 06 22:17:34 2005 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1.2.2 2005/08/06 22:17:34 salo Exp $
+
+--- contrib/mod_sql.c.orig     2004-08-03 01:44:31.000000000 +0100
++++ contrib/mod_sql.c
+@@ -2036,7 +2036,7 @@ MODRET info_master(cmd_rec *cmd) {
+       *outsp++ = 0;
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/php4-xslt Don't include bsd.builtin.mk... jus...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/w3m Utilize brand new PKG_OPTIONS_GROUP to select ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/php4-xslt Don't include bsd.builtin.mk... jus...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/w3m Utilize brand new PKG_OPTIONS_GROUP to select ...
Indexes:
Home | Main Index | Thread Index | Old Index