From owner-svn-ports-head@freebsd.org Tue Jul 3 09:55:27 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D17E10308F9; Tue, 3 Jul 2018 09:55:27 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2207B77C55; Tue, 3 Jul 2018 09:55:27 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04B0B1A8C2; Tue, 3 Jul 2018 09:55:27 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w639tQPI056774; Tue, 3 Jul 2018 09:55:26 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w639tQxh056770; Tue, 3 Jul 2018 09:55:26 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201807030955.w639tQxh056770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Tue, 3 Jul 2018 09:55:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473814 - in head/www/dfileserver: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: in head/www/dfileserver: . files X-SVN-Commit-Revision: 473814 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jul 2018 09:55:27 -0000 Author: rodrigo Date: Tue Jul 3 09:55:25 2018 New Revision: 473814 URL: https://svnweb.freebsd.org/changeset/ports/473814 Log: Fix C++ issues for 12.0 - Unixify the files using dos2unix - Add patches to fix the C++ issues in the code - Dump PORTREVISION Added: head/www/dfileserver/files/ head/www/dfileserver/files/patch-src_CPathResolver.cxx (contents, props changed) head/www/dfileserver/files/patch-src_DashFileServer.cxx (contents, props changed) head/www/dfileserver/files/patch-src_contrib_Base64.cpp (contents, props changed) Modified: head/www/dfileserver/Makefile Modified: head/www/dfileserver/Makefile ============================================================================== --- head/www/dfileserver/Makefile Tue Jul 3 09:37:35 2018 (r473813) +++ head/www/dfileserver/Makefile Tue Jul 3 09:55:25 2018 (r473814) @@ -3,6 +3,7 @@ PORTNAME= DFileServer PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://rodrigo.osorio.free.fr/freebsd/distfiles/ \ http://harpy.soarwitheagles.net/~dashy/ @@ -11,6 +12,8 @@ MAINTAINER= rodrigo@FreeBSD.org COMMENT= Compact webserver designed to make sharing files easy LICENSE= BSD3CLAUSE + +USES= dos2unix PLIST_FILES= bin/dfileserver Added: head/www/dfileserver/files/patch-src_CPathResolver.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dfileserver/files/patch-src_CPathResolver.cxx Tue Jul 3 09:55:25 2018 (r473814) @@ -0,0 +1,11 @@ +--- src/CPathResolver.cxx.orig 2018-07-02 11:45:26 UTC ++++ src/CPathResolver.cxx +@@ -100,7 +100,7 @@ CPathResolver::CPathResolver( string Con + mPaths = new SPathNode(); + + ifstream Config( ConfigFile.c_str(), ios::in ); +- if( Config == NULL ) throw( (exn_t)EXN_IO ); ++ if( ! Config.is_open() ) throw( (exn_t)EXN_IO ); + + while( !Config.eof() ) { + string Fake, Real; Added: head/www/dfileserver/files/patch-src_DashFileServer.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dfileserver/files/patch-src_DashFileServer.cxx Tue Jul 3 09:55:25 2018 (r473814) @@ -0,0 +1,13 @@ +--- src/DashFileServer.cxx.orig 2018-07-02 11:55:29 UTC ++++ src/DashFileServer.cxx +@@ -218,8 +218,8 @@ int InitalizeNetwork ( int ArgPort, int + memset(&(ListenAddr.sin_zero), '\0', 8); + + // Bind the socket to the listening network struct. +- if ( bind( NetworkSocket, (struct sockaddr *)&ListenAddr, +- sizeof( struct sockaddr ) ) == -1 ) ++ if ( ::bind( NetworkSocket, (struct sockaddr *)&ListenAddr, ++ sizeof( struct sockaddr ) ) == -1) + { + perror("InitalizeNetwork -- bind()"); + return -1; Added: head/www/dfileserver/files/patch-src_contrib_Base64.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dfileserver/files/patch-src_contrib_Base64.cpp Tue Jul 3 09:55:25 2018 (r473814) @@ -0,0 +1,36 @@ +--- src/contrib/Base64.cpp.orig 2005-09-30 05:15:19 UTC ++++ src/contrib/Base64.cpp +@@ -27,11 +27,12 @@ static string cvt = "ABCDEFGHIJKLM + + string Base64::encode(string data) + { +- auto string::size_type i; +- auto char c; +- auto string::size_type len = data.length(); +- auto string ret; ++ std::string::size_type i; ++ std::string::size_type len; ++ char c; ++ string ret; + ++ len = data.length(); + for (i = 0; i < len; ++i) + { + c = (data[i] >> 2) & 0x3f; +@@ -71,11 +72,11 @@ string Base64::encode(string data) + + string Base64::decode(string data) + { +- auto string::size_type i; +- auto char c; +- auto char c1; +- auto string::size_type len = data.length(); +- auto string ret; ++ string::size_type i; ++ char c; ++ char c1; ++ string::size_type len = data.length(); ++ string ret; + + for (i = 0; i < len; ++i) + {