Bug 170101 - [PATCH] ftp/vsftpd: Fix build with clang 3.0
Summary: [PATCH] ftp/vsftpd: Fix build with clang 3.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dirk Meyer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-07-24 07:30 UTC by Hung-te Liang
Modified: 2012-07-26 18:07 UTC (History)
1 user (show)

See Also:


Attachments
vsftpd-3.0.0.patch (3.47 KB, patch)
2012-07-24 07:30 UTC, Hung-te Liang
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Hung-te Liang 2012-07-24 07:30:12 UTC
- Fix build with clang 3.0:
sysstr.c:77:40: error: implicit conversion from enumeration type 'enum EVSFSysStrOpenMode' to different enumeration type 'enum EVSFSysUtilOpenMode' [-Werror,-Wconversion]
  enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown;
                           ~~~~~~~~~   ^~~~~~~~~~~~~~~~~~~~~
- Fix pass -rpath from compiler to linker
- Use OptionsNG
- Update pkg-descr from official website

Added file:
- files/patch-sysstr.c

Modified files:
- Makefile
- pkg-descr

Port maintainer (dinoex@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-07-24 07:30:26 UTC
Responsible Changed
From-To: freebsd-ports-bugs->dinoex

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Dirk Meyer freebsd_committer freebsd_triage 2012-07-26 05:41:28 UTC
State Changed
From-To: open->analyzed


To many changes, in testing now.
Comment 3 dfilter service freebsd_committer freebsd_triage 2012-07-26 16:26:23 UTC
Author: dinoex
Date: Thu Jul 26 15:26:13 2012
New Revision: 301563
URL: http://svn.freebsd.org/changeset/ports/301563

Log:
  - update WWW and email
  PR:		170101
  Submitted by:	Hung-te Liang

Modified:
  head/ftp/vsftpd/pkg-descr

Modified: head/ftp/vsftpd/pkg-descr
==============================================================================
--- head/ftp/vsftpd/pkg-descr	Thu Jul 26 15:02:15 2012	(r301562)
+++ head/ftp/vsftpd/pkg-descr	Thu Jul 26 15:26:13 2012	(r301563)
@@ -3,13 +3,13 @@ A FTP daemon that aims to be "very secur
 From the README file:
 
 	Author: Chris Evans
-	Contact: chris@scary.beasts.org
+	Contact: scarybeasts@gmail.com
 
 	vsftpd is an FTP server, or daemon. The "vs" stands for Very
-	Secure.  Obviously this is not a guarantee, but a reflection
+	Secure. Obviously this is not a guarantee, but a reflection
 	that I have written the entire codebase with security in mind,
 	and carefully designed the program to be resilient to attack.
 
 LICENSE: GPL2 or later with execption to link with OpenSSL
 
-WWW: http://vsftpd.beasts.org/
+WWW: https://security.appspot.com/vsftpd.html
\ No newline at end of file
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 dfilter service freebsd_committer freebsd_triage 2012-07-26 16:30:36 UTC
Author: dinoex
Date: Thu Jul 26 15:30:27 2012
New Revision: 301565
URL: http://svn.freebsd.org/changeset/ports/301565

Log:
  - Fix build with clang 3.0
  PR:		170101
  Submitted by:	Hung-te Liang

Added:
  head/ftp/vsftpd/files/patch-sysstr.c   (contents, props changed)

Added: head/ftp/vsftpd/files/patch-sysstr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/vsftpd/files/patch-sysstr.c	Thu Jul 26 15:30:27 2012	(r301565)
@@ -0,0 +1,11 @@
+--- sysstr.c.orig	2011-12-14 18:26:39.000000000 +0800
++++ sysstr.c	2012-07-24 11:27:18.000000000 +0800
+@@ -74,7 +74,7 @@
+ int
+ str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)
+ {
+-  enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown;
++  enum EVSFSysUtilOpenMode open_mode = (enum EVSFSysUtilOpenMode) kVSFSysStrOpenUnknown;
+   switch (mode)
+   {
+     case kVSFSysStrOpenReadOnly:
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 dfilter service freebsd_committer freebsd_triage 2012-07-26 17:18:18 UTC
Author: dinoex
Date: Thu Jul 26 16:18:08 2012
New Revision: 301566
URL: http://svn.freebsd.org/changeset/ports/301566

Log:
  - Fix pass -rpath from compiler to linker
  PR:		170101
  Submitted by:	Hung-te Liang

Modified:
  head/ftp/vsftpd/Makefile

Modified: head/ftp/vsftpd/Makefile
==============================================================================
--- head/ftp/vsftpd/Makefile	Thu Jul 26 15:30:27 2012	(r301565)
+++ head/ftp/vsftpd/Makefile	Thu Jul 26 16:18:08 2012	(r301566)
@@ -65,7 +65,7 @@ do-configure:
 		-e "s|^CC 	=	gcc|CC	= ${CC}|" \
 		-e "s|^CFLAGS	=|CFLAGS	= ${CFLAGS}|" \
 		-e "s|^INSTALL	=|INSTALL	= ${INSTALL_PROGRAM}|" \
-		-e "s|	-Wl,-s| -Wl,-s ${LDFLAGS}|" \
+		-e "s|	-Wl,-s| -Wl,-s ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
 	@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 dfilter service freebsd_committer freebsd_triage 2012-07-26 17:21:44 UTC
Author: dinoex
Date: Thu Jul 26 16:21:29 2012
New Revision: 301567
URL: http://svn.freebsd.org/changeset/ports/301567

Log:
  - Use OPTIONS_DEFINE
  PR:		170101
  Submitted by:	Hung-te Liang

Modified:
  head/ftp/vsftpd/Makefile

Modified: head/ftp/vsftpd/Makefile
==============================================================================
--- head/ftp/vsftpd/Makefile	Thu Jul 26 16:18:08 2012	(r301566)
+++ head/ftp/vsftpd/Makefile	Thu Jul 26 16:21:29 2012	(r301567)
@@ -26,19 +26,21 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelo
 		README README.security README.ssl REFS REWARD \
 		SIZE SPEED TODO TUNING
 
-OPTIONS=	VSFTPD_SSL	"Include support for SSL" off \
-		PIDFILE		"unofficial support for pidfile" off
+OPTIONS_DEFINE=	VSFTPD_SSL PIDFILE
+
+VSFTPD_SSL_DESC=Include support for SSL
+PIDFILE_DESC=	Unofficial support for pidfile
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_VSFTPD_SSL) && !defined(WITHOUT_SSL)
+.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 SSL_SUFFIX=	-ssl
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .endif
 
-.if defined(WITH_PIDFILE)
+.if ${PORT_OPTIONS:MPIDFILE}
 EXTRA_PATCHES+=	${FILESDIR}/pidfile.patch
 .endif
 
@@ -46,7 +48,7 @@ EXTRA_PATCHES+=	${FILESDIR}/pidfile.patc
 LDFLAGS+=	 -lssp_nonshared
 
 do-configure:
-.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL)
+.if !defined(WITHOUT_SSL) && ${PORT_OPTIONS:MVSFTPD_SSL}
 	${REINPLACE_CMD} -e \
 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
 		-e "s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \
@@ -94,7 +96,7 @@ do-install:
 		${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \
 		done
 	${MKDIR} /var/ftp
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${DOCFILES}
 	${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR}
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Dirk Meyer freebsd_committer freebsd_triage 2012-07-26 18:06:51 UTC
State Changed
From-To: analyzed->closed

committed, thanks.