Date: Mon, 9 Jan 2012 03:27:57 GMT From: Svyatoslav Lempert <svyatoslav.lempert@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/163940: [update] ftp/vsftpd-ext 2.3.5 Message-ID: <201201090327.q093RvPY039522@red.freebsd.org> Resent-Message-ID: <201201090330.q093U9nn086468@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163940
>Category: ports
>Synopsis: [update] ftp/vsftpd-ext 2.3.5
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 09 03:30:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Svyatoslav Lempert
>Release: 8.2-STABLE
>Organization:
>Environment:
>Description:
- Update to 2.3.5-ext1
- Fix path to vsftpd.conf in defs.h and builddefs.h (in old version path /usr/local/etc/vsftpd.conf is not defined correctly)
- patch-sysdeputil.c removed (FreeBSD already detected in sources)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nru vsftpd-ext.old/Makefile vsftpd-ext/Makefile
--- vsftpd-ext.old/Makefile 2012-01-09 11:06:40.000000000 +0900
+++ vsftpd-ext/Makefile 2012-01-09 12:17:19.000000000 +0900
@@ -6,10 +6,9 @@
#
PORTNAME= vsftpd-ext
-UPSTREAMVERSION= 2.3.4
-EXTVERSION= 2
+UPSTREAMVERSION= 2.3.5
+EXTVERSION= 1
PORTVERSION= ${UPSTREAMVERSION}.${EXTVERSION}
-PORTREVISION= 1
CATEGORIES= ftp ipv6
MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}
@@ -49,8 +48,10 @@
.endif
do-configure:
- ${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
+ ${REINPLACE_CMD} -e "s|vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
+ ${REINPLACE_CMD} -e "s|/etc/vsftpd|${PREFIX}/etc/vsftpd|" \
+ ${WRKSRC}/builddefs.h
${REINPLACE_CMD} \
-e '/^CC/s/=/?=/' \
-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
diff -Nru vsftpd-ext.old/distinfo vsftpd-ext/distinfo
--- vsftpd-ext.old/distinfo 2012-01-09 11:06:40.000000000 +0900
+++ vsftpd-ext/distinfo 2012-01-09 11:06:24.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (vsFTPd-2.3.4-ext2.tgz) = 530aae6f3f32168fd2cac442483c63923df8e281dd0f351dd81593386b898ca0
-SIZE (vsFTPd-2.3.4-ext2.tgz) = 218473
+SHA256 (vsFTPd-2.3.5-ext1.tgz) = 2eeee4955565e6d6f9b21ab9a199689488d6d62c0024f6415dbd4510f85d43fe
+SIZE (vsFTPd-2.3.5-ext1.tgz) = 222249
diff -Nru vsftpd-ext.old/files/patch-sysdeputil.c vsftpd-ext/files/patch-sysdeputil.c
--- vsftpd-ext.old/files/patch-sysdeputil.c 2012-01-09 11:06:40.000000000 +0900
+++ vsftpd-ext/files/patch-sysdeputil.c 1970-01-01 08:00:00.000000000 +0800
@@ -1,31 +0,0 @@
---- sysdeputil.c.orig 2010-03-26 06:25:33.000000000 +0300
-+++ sysdeputil.c 2011-05-17 20:51:35.350022421 +0400
-@@ -57,7 +57,7 @@
- #endif
- #define VSF_SYSDEP_HAVE_SHADOW
- #define VSF_SYSDEP_HAVE_USERSHELL
--#define VSF_SYSDEP_HAVE_LIBCAP
-+#undef VSF_SYSDEP_HAVE_LIBCAP
- #define VSF_SYSDEP_HAVE_UTMPX
-
- #define __USE_GNU
-@@ -1213,7 +1213,9 @@ vsf_insert_uwtmp(const struct mystr* p_u
- setutxent();
- (void) pututxline(&s_utent);
- endutxent();
-+#if !defined(__FreeBSD__)
- updwtmpx(WTMPX_FILE, &s_utent);
-+#endif
- }
-
- void
-@@ -1232,7 +1234,9 @@ vsf_remove_uwtmp(void)
- (void) pututxline(&s_utent);
- endutxent();
- s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();
-+#if !defined(__FreeBSD__)
- updwtmpx(WTMPX_FILE, &s_utent);
-+#endif
- }
-
- #endif /* !VSF_SYSDEP_HAVE_UTMPX */
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201090327.q093RvPY039522>