Date: Wed, 6 Jun 2018 12:29:15 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471840 - in head/sysutils/aimage: . files Message-ID: <201806061229.w56CTFLv074372@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Jun 6 12:29:15 2018 New Revision: 471840 URL: https://svnweb.freebsd.org/changeset/ports/471840 Log: sysutils/aimage: Unbreak build with Clang 6 - Also fix build with LibreSSL: The configure script checks that libssl has ssl3_new() which LibreSSL doesn't have but aimage itself never uses it, so pretend it's there to pass the check. PR: 228756 Reported by: Chris Hutchinson <portmaster@bsdforge.com> Submitted by: tobik Approved by: Chris Hutchinson <portmaster@bsdforge.com> (maintainer) Added: head/sysutils/aimage/files/patch-src_imager.cpp (contents, props changed) Modified: head/sysutils/aimage/Makefile head/sysutils/aimage/files/patch-src_aimage.cpp Modified: head/sysutils/aimage/Makefile ============================================================================== --- head/sysutils/aimage/Makefile Wed Jun 6 12:23:47 2018 (r471839) +++ head/sysutils/aimage/Makefile Wed Jun 6 12:29:15 2018 (r471840) @@ -11,11 +11,15 @@ MAINTAINER= portmaster@BSDforge.com COMMENT= Advanced Disk Imager LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libafflib.so:sysutils/afflib USES= gmake readline ssl GNU_CONFIGURE= yes +# Pretend ssl3_new exists for LibreSSL. It's never really used but +# configure checks for it. +CONFIGURE_ARGS= ac_cv_lib_ssl_ssl3_new=yes PLIST_FILES= bin/aimage Modified: head/sysutils/aimage/files/patch-src_aimage.cpp ============================================================================== --- head/sysutils/aimage/files/patch-src_aimage.cpp Wed Jun 6 12:23:47 2018 (r471839) +++ head/sysutils/aimage/files/patch-src_aimage.cpp Wed Jun 6 12:29:15 2018 (r471840) @@ -1,6 +1,6 @@ ---- src/aimage.cpp.orig 2018-02-26 16:24:29.829120000 -0800 -+++ src/aimage.cpp 2018-02-26 16:25:21.187218000 -0800 -@@ -344,7 +344,7 @@ +--- src/aimage.cpp.orig 2010-12-17 13:49:50 UTC ++++ src/aimage.cpp +@@ -344,7 +344,7 @@ void segwrite_callback(struct affcallback_info *acbi) /* log if necessary */ if(logfile){ fprintf(logfile, @@ -9,7 +9,7 @@ acbi->pagenum, acbi->bytes_to_write, acbi->bytes_written, -@@ -621,7 +621,7 @@ +@@ -621,7 +621,7 @@ int64 scaled_atoi(const char *arg) int64 ret=0; int multiplier=1; char ch,junk; Added: head/sysutils/aimage/files/patch-src_imager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/aimage/files/patch-src_imager.cpp Wed Jun 6 12:29:15 2018 (r471840) @@ -0,0 +1,15 @@ +imager.cpp:857:8: error: value of type '__bind<int &, sockaddr *, unsigned long>' is not contextually convertible to 'bool' + if(bind(sock,(sockaddr *)&local,sizeof(local))) err(1,"bind"); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/imager.cpp.orig 2018-06-05 06:55:20 UTC ++++ src/imager.cpp +@@ -854,7 +854,7 @@ int imager::socket_listen(int port) + #endif + local.sin_family = AF_INET; + local.sin_port = htons(port); // listen on requested port. +- if(bind(sock,(sockaddr *)&local,sizeof(local))) err(1,"bind"); ++ if(::bind(sock,(sockaddr *)&local,sizeof(local))) err(1,"bind"); + if(listen(sock,0)) err(1,"listen"); // listen, and only accept one + printf("Listening for connection on port %d...\n",port); + in = accept(sock,(sockaddr *)&remote,&rsize);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806061229.w56CTFLv074372>