Date: Sat, 30 Jan 2021 09:01:08 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563282 - in head: . ftp ftp/bbftp ftp/bbftp-client ftp/bbftp-client/files ftp/bbftp-server ftp/bbftp-server/files Message-ID: <202101300901.10U918jM058906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Jan 30 09:01:08 2021 New Revision: 563282 URL: https://svnweb.freebsd.org/changeset/ports/563282 Log: - Split into client and server ports: upstream now provides separate distfiles and also this allows to simplify configure and build glue in the Makefiles considerably - Update to version 3.2.1, reword both COMMENTs accordingly - Actualize MASTER_SITES and WWW line in the port description - Unbreak the build against contemporary versions of OpenSSL - Define LICENSE (GPLv2+) and install provided documentation files Added: head/ftp/bbftp-client/ - copied from r563281, head/ftp/bbftp/ head/ftp/bbftp-client/files/patch-connecttoserver.c (contents, props changed) head/ftp/bbftp-client/files/patch-setsignals.c (contents, props changed) head/ftp/bbftp-server/ - copied from r563281, head/ftp/bbftp/ head/ftp/bbftp-server/files/patch-bbftpd.c (contents, props changed) head/ftp/bbftp-server/files/patch-bbftpd__crypt.c (contents, props changed) head/ftp/bbftp-server/files/patch-bbftpd__signals.c (contents, props changed) Deleted: head/ftp/bbftp/ head/ftp/bbftp-client/files/bbftp.patch head/ftp/bbftp-client/files/bbftpd.in head/ftp/bbftp-server/files/bbftp.patch Modified: head/MOVED head/ftp/Makefile head/ftp/bbftp-client/Makefile head/ftp/bbftp-client/distinfo head/ftp/bbftp-client/pkg-descr head/ftp/bbftp-client/pkg-plist head/ftp/bbftp-server/Makefile head/ftp/bbftp-server/distinfo head/ftp/bbftp-server/pkg-descr head/ftp/bbftp-server/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Jan 30 08:12:17 2021 (r563281) +++ head/MOVED Sat Jan 30 09:01:08 2021 (r563282) @@ -16028,3 +16028,4 @@ security/py-rekall|security/py-volatility3|2021-01-28| security/py-rekall-core||2021-01-28|Has expired: Unmaintained upstream www/kurly||2021-01-28|Has expired: Upstream is gone security/regripper||2021-01-28|Has expired: Upstream repo disappeared +ftp/bbftp||2021-01-30|Was split into client and server ports, install as needed Modified: head/ftp/Makefile ============================================================================== --- head/ftp/Makefile Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/Makefile Sat Jan 30 09:01:08 2021 (r563282) @@ -6,7 +6,8 @@ SUBDIR += R-cran-RCurl SUBDIR += R-cran-curl SUBDIR += axel - SUBDIR += bbftp + SUBDIR += bbftp-client + SUBDIR += bbftp-server SUBDIR += bftpd SUBDIR += bsdftpd-ssl SUBDIR += cmdftp Modified: head/ftp/bbftp-client/Makefile ============================================================================== --- head/ftp/bbftp/Makefile Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-client/Makefile Sat Jan 30 09:01:08 2021 (r563282) @@ -1,46 +1,36 @@ # Created by: Petr Holub <hopet@ics.muni.cz> # $FreeBSD$ -PORTNAME= bbftp -PORTVERSION= 3.0.2 +PORTNAME= bbftp-client +PORTVERSION= 3.2.1 CATEGORIES= ftp -MASTER_SITES= http://doc.in2p3.fr/bbftp/dist/ \ - http://ftp.riken.go.jp/pub/net/bbftp/ +MASTER_SITES= http://software.in2p3.fr/bbftp/dist/ \ + ftp://ftp.in2p3.fr/pub/bbftp/ MAINTAINER= ports@FreeBSD.org -COMMENT= Multiple stream file transfer protocol optimized for large files +COMMENT= Secure file transfer suite optimized for large files (client) -USES= gmake ssl:build +LICENSE= GPLv2+ + +USES= gmake ssl GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} +WRKSRC_SUBDIR= bbftpc -EXTRA_PATCHES= ${FILESDIR}/bbftp.patch +OPTIONS_DEFINE= DOCS -USE_RC_SUBR= bbftpd +post-patch: + @${REINPLACE_CMD} -e '/with_ssl\/lib\/libcrypto/s,\.a,.so,' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= error: incomplete definition of type 'struct rsa_st' -BROKEN_FreeBSD_13= error: incomplete definition of type 'struct rsa_st' -BROKEN_FreeBSD_14= error: incomplete definition of type 'struct rsa_st' -.endif - -do-configure: - ${CP} -f ${TEMPLATES}/config.guess ${WRKSRC} - ${CP} -f ${TEMPLATES}/config.sub ${WRKSRC} - (cd ${WRKSRC}/bbftpc && ./configure --prefix=${PREFIX} \ - ${CONFIGURE_ARGS} --with-ssl=${OPENSSLBASE}) - (cd ${WRKSRC}/bbftpd && ./configure --prefix=${PREFIX} \ - ${CONFIGURE_ARGS} --with-ssl=${OPENSSLBASE}) - -do-build: - (cd ${WRKSRC}/bbftpc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) - (cd ${WRKSRC}/bbftpd && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bbftpc/bbftp ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bbftpd/bbftpd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/bbftp.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bbftpd.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/bbftp ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/../doc/bbftp.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../doc/ports ${WRKSRC}/../ChangeLog \ + ${WRKSRC}/../README ${WRKSRC}/../TODO ${STAGEDIR}${DOCSDIR} + +.include <bsd.port.mk> Modified: head/ftp/bbftp-client/distinfo ============================================================================== --- head/ftp/bbftp/distinfo Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-client/distinfo Sat Jan 30 09:01:08 2021 (r563282) @@ -1,2 +1,3 @@ -SHA256 (bbftp-3.0.2.tar.gz) = 539ef20f90778783890f81cf6b4cd434bb6c47c392ec824caf92f6ca1005cc72 -SIZE (bbftp-3.0.2.tar.gz) = 344495 +TIMESTAMP = 1505814511 +SHA256 (bbftp-client-3.2.1.tar.gz) = 4000009804d90926ad3c0e770099874084fb49013e8b0770b82678462304456d +SIZE (bbftp-client-3.2.1.tar.gz) = 245320 Added: head/ftp/bbftp-client/files/patch-connecttoserver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/bbftp-client/files/patch-connecttoserver.c Sat Jan 30 09:01:08 2021 (r563282) @@ -0,0 +1,55 @@ +--- connecttoserver.c.orig 2013-02-07 10:42:46 UTC ++++ connecttoserver.c +@@ -517,6 +517,7 @@ int connectviapassword() + #ifdef WITH_SSL + RSA *hisrsa ; + int lenrsa ; ++ BIGNUM *n, *e; + #endif + /* + ** Get the socket +@@ -629,33 +630,35 @@ int connectviapassword() + /* + ** Getting BIGNUM structures to store the key and exponent + */ +- if ( (hisrsa->n = BN_new()) == NULL) { ++ n = BN_new(); ++ e = BN_new(); ++ if (n == NULL || e == NULL) { + free(readbuffer) ; + close(tmpctrlsock) ; + printmessage(stderr,CASE_ERROR,56,timestamp,"Error reading encrypted message : %s (%s)\n","getting BIGNUM",(char *) ERR_error_string(ERR_get_error(),NULL)) ; + return -1 ; + } +- if ( (hisrsa->e = BN_new()) == NULL) { +- free(readbuffer) ; +- close(tmpctrlsock) ; +- printmessage(stderr,CASE_ERROR,56,timestamp,"Error reading encrypted message : %s (%s)\n","getting BIGNUM",(char *) ERR_error_string(ERR_get_error(),NULL)) ; +- return -1 ; +- } + /* + ** Copy the key and exponent received + */ +- if ( BN_mpi2bn(pubkey,lenkey,hisrsa->n) == NULL ) { ++ if ( BN_mpi2bn(pubkey,lenkey,n) == NULL ) { + free(readbuffer) ; + close(tmpctrlsock) ; + printmessage(stderr,CASE_ERROR,56,timestamp,"Error reading encrypted message : %s (%s)\n","copying pubkey",(char *) ERR_error_string(ERR_get_error(),NULL)) ; + return -1 ; + } +- if ( BN_mpi2bn(pubexponent,lenexpo,hisrsa->e) == NULL ) { ++ if ( BN_mpi2bn(pubexponent,lenexpo,e) == NULL ) { + free(readbuffer) ; + close(tmpctrlsock) ; + printmessage(stderr,CASE_ERROR,56,timestamp,"Error reading encrypted message : %s (%s)\n","copying pubexponent",(char *) ERR_error_string(ERR_get_error(),NULL)) ; + return -1 ; + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ hisrsa->n = n; ++ hisrsa->e = e; ++#else ++ RSA_set0_key(hisrsa, n, e, NULL); ++#endif + lenrsa = RSA_size(hisrsa) ; + + if (strlen(username) > lenrsa - 41 ) { Added: head/ftp/bbftp-client/files/patch-setsignals.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/bbftp-client/files/patch-setsignals.c Sat Jan 30 09:01:08 2021 (r563282) @@ -0,0 +1,11 @@ +--- setsignals.c.orig 2005-03-29 12:48:21 UTC ++++ setsignals.c +@@ -134,7 +134,7 @@ void blockallsignals() + if ( sigaction(SIGTSTP,&sga,0) < 0 ) { + printmessage(stderr,CASE_FATAL_ERROR,32,timestamp,"Error setting signal SIGTSTP : %s \n",strerror(errno)) ; + } +-#ifndef DARWIN ++#ifdef SIGPOLL + if ( sigaction(SIGPOLL,&sga,0) < 0 ) { + printmessage(stderr,CASE_FATAL_ERROR,32,timestamp,"Error setting signal SIGPOLL : %s \n",strerror(errno)) ; + } Modified: head/ftp/bbftp-client/pkg-descr ============================================================================== --- head/ftp/bbftp/pkg-descr Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-client/pkg-descr Sat Jan 30 09:01:08 2021 (r563282) @@ -17,4 +17,4 @@ main features are: bbFTP is open-source software, released under the GNU General Public License. It was written by Gilles Farrache at IN2P3 Computing Center in Lyon, France. -WWW: http://doc.in2p3.fr/bbftp/index.html +WWW: http://software.in2p3.fr/bbftp/ Modified: head/ftp/bbftp-client/pkg-plist ============================================================================== --- head/ftp/bbftp/pkg-plist Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-client/pkg-plist Sat Jan 30 09:01:08 2021 (r563282) @@ -1,4 +1,6 @@ bin/bbftp -bin/bbftpd man/man1/bbftp.1.gz -man/man1/bbftpd.1.gz +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/ports Modified: head/ftp/bbftp-server/Makefile ============================================================================== --- head/ftp/bbftp/Makefile Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-server/Makefile Sat Jan 30 09:01:08 2021 (r563282) @@ -1,46 +1,38 @@ # Created by: Petr Holub <hopet@ics.muni.cz> # $FreeBSD$ -PORTNAME= bbftp -PORTVERSION= 3.0.2 +PORTNAME= bbftp-server +PORTVERSION= 3.2.1 CATEGORIES= ftp -MASTER_SITES= http://doc.in2p3.fr/bbftp/dist/ \ - http://ftp.riken.go.jp/pub/net/bbftp/ +MASTER_SITES= http://software.in2p3.fr/bbftp/dist/ \ + ftp://ftp.in2p3.fr/pub/bbftp/ MAINTAINER= ports@FreeBSD.org -COMMENT= Multiple stream file transfer protocol optimized for large files +COMMENT= Secure file transfer suite optimized for large files (server) -USES= gmake ssl:build -GNU_CONFIGURE= yes +LICENSE= GPLv2+ -EXTRA_PATCHES= ${FILESDIR}/bbftp.patch - +USES= gmake ssl +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} +WRKSRC_SUBDIR= bbftpd USE_RC_SUBR= bbftpd -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DOCS -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= error: incomplete definition of type 'struct rsa_st' -BROKEN_FreeBSD_13= error: incomplete definition of type 'struct rsa_st' -BROKEN_FreeBSD_14= error: incomplete definition of type 'struct rsa_st' -.endif +post-patch: + @${REINPLACE_CMD} -e '/^#include/s,malloc,stdlib,' \ + ${WRKSRC}/bbftpd_cd.c ${WRKSRC}/bbftpd_statfs.c -do-configure: - ${CP} -f ${TEMPLATES}/config.guess ${WRKSRC} - ${CP} -f ${TEMPLATES}/config.sub ${WRKSRC} - (cd ${WRKSRC}/bbftpc && ./configure --prefix=${PREFIX} \ - ${CONFIGURE_ARGS} --with-ssl=${OPENSSLBASE}) - (cd ${WRKSRC}/bbftpd && ./configure --prefix=${PREFIX} \ - ${CONFIGURE_ARGS} --with-ssl=${OPENSSLBASE}) - -do-build: - (cd ${WRKSRC}/bbftpc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) - (cd ${WRKSRC}/bbftpd && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bbftpc/bbftp ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bbftpd/bbftpd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/bbftp.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bbftpd.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/bbftpd ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/../doc/bbftpd.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../doc/ports ${WRKSRC}/../doc/stats \ + ${WRKSRC}/../ChangeLog ${WRKSRC}/../README \ + ${WRKSRC}/../TODO ${STAGEDIR}${DOCSDIR} + +.include <bsd.port.mk> Modified: head/ftp/bbftp-server/distinfo ============================================================================== --- head/ftp/bbftp/distinfo Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-server/distinfo Sat Jan 30 09:01:08 2021 (r563282) @@ -1,2 +1,3 @@ -SHA256 (bbftp-3.0.2.tar.gz) = 539ef20f90778783890f81cf6b4cd434bb6c47c392ec824caf92f6ca1005cc72 -SIZE (bbftp-3.0.2.tar.gz) = 344495 +TIMESTAMP = 1505814511 +SHA256 (bbftp-server-3.2.1.tar.gz) = 818e2de73fbda68b854e0253d13e95f9aae2abe0efb3b4077667a66fe76a5201 +SIZE (bbftp-server-3.2.1.tar.gz) = 234731 Added: head/ftp/bbftp-server/files/patch-bbftpd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/bbftp-server/files/patch-bbftpd.c Sat Jan 30 09:01:08 2021 (r563282) @@ -0,0 +1,15 @@ +--- bbftpd.c.orig 2005-05-03 08:43:34 UTC ++++ bbftpd.c +@@ -842,10 +842,12 @@ main (argc,argv,envp) + char buffrand[NBITSINKEY] ; + struct timeval tp ; + unsigned int seed ; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* + ** Load the error message from the crypto lib + */ + ERR_load_crypto_strings() ; ++#endif + /* + ** Initialize the buffrand buffer which is giong to be used to initialize the + ** random generator Added: head/ftp/bbftp-server/files/patch-bbftpd__crypt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/bbftp-server/files/patch-bbftpd__crypt.c Sat Jan 30 09:01:08 2021 (r563282) @@ -0,0 +1,16 @@ +--- bbftpd_crypt.c.orig 2004-06-30 17:38:50 UTC ++++ bbftpd_crypt.c +@@ -84,8 +84,13 @@ void sendcrypt() + /* + ** Now extract the public key in order to send it + */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + lenkey = BN_bn2mpi(myrsa->n,pubkey) ; + lenexpo = BN_bn2mpi(myrsa->e,pubexponent) ; ++#else ++ lenkey = BN_bn2mpi(RSA_get0_n(myrsa),pubkey) ; ++ lenexpo = BN_bn2mpi(RSA_get0_e(myrsa),pubexponent) ; ++#endif + mess = (struct message *) buf ; + mess->code = MSG_CRYPT ; + #ifndef WORDS_BIGENDIAN Added: head/ftp/bbftp-server/files/patch-bbftpd__signals.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/bbftp-server/files/patch-bbftpd__signals.c Sat Jan 30 09:01:08 2021 (r563282) @@ -0,0 +1,11 @@ +--- bbftpd_signals.c.orig 2013-02-07 10:46:27 UTC ++++ bbftpd_signals.c +@@ -376,7 +376,7 @@ int bbftpd_blockallsignals() { + syslog(BBFTPD_ERR,"Error sigaction SIGTSTP : %s",strerror(errno)) ; + return(-1) ; + } +-#ifndef DARWIN ++#ifdef SIGPOLL + if ( sigaction(SIGPOLL,&sga,0) < 0 ) { + syslog(BBFTPD_ERR,"Error sigaction SIGPOLL : %s",strerror(errno)) ; + return(-1) ; Modified: head/ftp/bbftp-server/pkg-descr ============================================================================== --- head/ftp/bbftp/pkg-descr Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-server/pkg-descr Sat Jan 30 09:01:08 2021 (r563282) @@ -17,4 +17,4 @@ main features are: bbFTP is open-source software, released under the GNU General Public License. It was written by Gilles Farrache at IN2P3 Computing Center in Lyon, France. -WWW: http://doc.in2p3.fr/bbftp/index.html +WWW: http://software.in2p3.fr/bbftp/ Modified: head/ftp/bbftp-server/pkg-plist ============================================================================== --- head/ftp/bbftp/pkg-plist Sat Jan 30 08:12:17 2021 (r563281) +++ head/ftp/bbftp-server/pkg-plist Sat Jan 30 09:01:08 2021 (r563282) @@ -1,4 +1,7 @@ -bin/bbftp bin/bbftpd -man/man1/bbftp.1.gz man/man1/bbftpd.1.gz +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/ports +%%PORTDOCS%%%%DOCSDIR%%/stats
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101300901.10U918jM058906>