Attachment 120438 Details for Bug 163246 – file.diff

[patch] file.diff

file.diff (text/plain), 4.97 KB, created by gelraen.ua on 2011-12-13 14:10:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gelraen.ua

Created: 2011-12-13 14:10:10 UTC

Size: 4.97 KB

patch

obsolete

>diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile
>index fe4aa4f..b8f660a 100644
>--- a/ftp/vsftpd-ext/Makefile
>+++ b/ftp/vsftpd-ext/Makefile
>@@ -6,21 +6,21 @@
> #
> 
> PORTNAME=	vsftpd-ext
>-PORTVERSION=	2.1.2
>+UPSTREAMVERSION=	2.3.4
>+EXTVERSION=	2
>+PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
> CATEGORIES=	ftp ipv6
>-MASTER_SITES=	ftp://vsftpd.beasts.org/users/cevans/
>+MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
> PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
>-DISTNAME=	vsftpd-${PORTVERSION}
>-
>-PATCH_SITES=	http://vsftpd.devnet.ru/files/${PORTVERSION}/ext.1/diff/
>-PATCHFILES=	vsftpd-${PORTVERSION}-ext1.diff.gz
>-PATCH_DIST_STRIP=-p2
>+DISTNAME=	vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION}
>+EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	gelraen.ua@gmail.com
> COMMENT=	A FTP daemon that aims to be "very secure". Extended build
> 
> CONFLICTS=	vsftpd-2* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-2*
> 
>+WRKSRC=	${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
> ALL_TARGET=	vsftpd
> MAN5=		vsftpd.conf.5
> MAN8=		vsftpd.8
>@@ -30,15 +30,11 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
> 
> LDFLAGS+=	-lwrap
> 
>-OPTIONS=	RC_NG		"install RC_NG script"		off \
>+OPTIONS=	RC_NG		"install RC_NG script"		on \
> 		VSFTPD_SSL	"Include support for SSL"	off
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 900007
>-BROKEN=		does not build
>-.endif
>-
> .if defined(WITH_RC_NG)
> USE_RC_SUBR=	vsftpd.sh
> .endif
>diff --git a/ftp/vsftpd-ext/distinfo b/ftp/vsftpd-ext/distinfo
>index 5ff44be..73c7c78 100644
>--- a/ftp/vsftpd-ext/distinfo
>+++ b/ftp/vsftpd-ext/distinfo
>@@ -1,4 +1,2 @@
>-SHA256 (vsftpd-2.1.2.tar.gz) = 7964df745247897ed5f57901d4a24ac1ed2f2eafb08f9b5d181028d699b7fbe4
>-SIZE (vsftpd-2.1.2.tar.gz) = 180958
>-SHA256 (vsftpd-2.1.2-ext1.diff.gz) = acc092d100be14bbb4f596c30e7762d5b85681c1cf75f9cc824e4cd575d0dd87
>-SIZE (vsftpd-2.1.2-ext1.diff.gz) = 31494
>+SHA256 (vsFTPd-2.3.4-ext2.tgz) = 530aae6f3f32168fd2cac442483c63923df8e281dd0f351dd81593386b898ca0
>+SIZE (vsFTPd-2.3.4-ext2.tgz) = 218473
>diff --git a/ftp/vsftpd-ext/files/patch-Makefile b/ftp/vsftpd-ext/files/patch-Makefile
>new file mode 100644
>index 0000000..3820ca1
>--- /dev/null
>+++ b/ftp/vsftpd-ext/files/patch-Makefile
>@@ -0,0 +1,14 @@
>+--- ./Makefile.orig	2011-12-13 10:14:07.000000000 +0200
>++++ ./Makefile	2011-12-13 10:15:30.000000000 +0200
>+@@ -3,9 +3,9 @@
>+ INSTALL	=       install
>+ IFLAGS  = -idirafter dummyinc
>+ #CFLAGS = -g
>+-CFLAGS	=       -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
>++CFLAGS	= -O2 -pipe -march=prescott -fno-strict-aliasing       -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
>+ 
>+-LIBS	=       -lcap -ldl -lcrypt    -lpam    -lwrap -lnsl    -lssl -lcrypto
>++LIBS=	-lpam
>+ #                                     |        |               + VSF_BUILD_SSL
>+ #                                     |        + VSF_BUILD_TCPWRAPPERS
>+ #                                     + VSF_BUILD_PAM
>diff --git a/ftp/vsftpd-ext/files/patch-sysdeputil.c b/ftp/vsftpd-ext/files/patch-sysdeputil.c
>new file mode 100644
>index 0000000..becc2bd
>--- /dev/null
>+++ b/ftp/vsftpd-ext/files/patch-sysdeputil.c
>@@ -0,0 +1,31 @@
>+--- 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 */
>diff --git a/ftp/vsftpd-ext/pkg-plist b/ftp/vsftpd-ext/pkg-plist
>index 9460fe2..c0b100f 100644
>--- a/ftp/vsftpd-ext/pkg-plist
>+++ b/ftp/vsftpd-ext/pkg-plist
>@@ -11,6 +11,11 @@ etc/vsftpd.conf.dist
> %%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
> %%PORTDOCS%%%%DOCSDIR%%/BUGS
> %%PORTDOCS%%%%DOCSDIR%%/Changelog
>+%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403.html
>+%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse_line.html
>+%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse.html
>+%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403-serv.html
>+%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/404.html
> %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/README
> %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.conf
> %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.xinetd
>@@ -41,6 +46,7 @@ etc/vsftpd.conf.dist
> %%PORTDOCS%%%%DOCSDIR%%/SPEED
> %%PORTDOCS%%%%DOCSDIR%%/TODO
> %%PORTDOCS%%%%DOCSDIR%%/TUNING
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG

Actions: View | Diff

Attachments on bug 163246: 120438