<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0deb63d2cc00309f222c2ed99bad15f6b955640a">https://github.com/macports/macports-ports/commit/0deb63d2cc00309f222c2ed99bad15f6b955640a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0deb63d tlswrap: fix build with freebsd patches
</span>0deb63d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0deb63d2cc00309f222c2ed99bad15f6b955640a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 29 12:51:07 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> tlswrap: fix build with freebsd patches
</span>---
net/tlswrap/Portfile | 5 ++
net/tlswrap/files/patch-conf.h.in | 12 +++++
net/tlswrap/files/patch-configure | 99 +++++++++++++++++++++++++++++++++++++++
net/tlswrap/files/patch-tls.c | 54 +++++++++++++++++++++
4 files changed, 170 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tlswrap/Portfile b/net/tlswrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc88355..4bca481 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tlswrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tlswrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,11 @@ checksums md5 68a4d937c1e817fa3056751e8902b691 \
</span>
depends_lib path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# from https://svnweb.freebsd.org/ports/head/security/tlswrap/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-conf.h.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --with-ssl=${prefix}
destroot.destdir prefix=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tlswrap/files/patch-conf.h.in b/net/tlswrap/files/patch-conf.h.in
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0ea13a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tlswrap/files/patch-conf.h.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- conf.h.in.orig 2015-04-19 16:22:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ conf.h.in 2015-04-19 16:22:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the `RAND_status' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_RAND_STATUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to 1 if you have the `RAND_egd' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_RAND_EGD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the `setproctitle' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_SETPROCTITLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tlswrap/files/patch-configure b/net/tlswrap/files/patch-configure
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e2e905d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tlswrap/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,99 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2006-11-26 05:52:04.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-01-29 12:48:25.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1744,7 +1744,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS="-g"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS="$CFLAGS -g"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_ext=c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cpp='$CPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2850,7 +2850,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "$GCC" = "yes" && test "$CC" != "icc"; then CFLAGS="$CFLAGS -O2 -Wall -Wmissing-prototypes"; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "$GCC" = "yes" && test "$CC" != "icc"; then CFLAGS="$CFLAGS -Wall -Wmissing-prototypes"; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if test -n "$GCC"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CFLAGS="$CFLAGS -O2 -Wall -Wmissing-prototypes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4519,6 +4519,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "$as_me:$LINENO: checking for RAND_egd in -lcrypto" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo $ECHO_N "checking for RAND_egd in -lcrypto... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "${ac_cv_lib_crypto_RAND_egd+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS="-lcrypto $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Override any gcc2 internal prototype to avoid an error. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* We use char because int might match the return type of a gcc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ builtin and then its argument prototype would still apply. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char RAND_egd ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++RAND_egd ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.$ac_objext conftest$ac_exeext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval $ac_link) 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { ac_try='test -z "$ac_c_werror_flag"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || test ! -s conftest.err'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval $ac_try) 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); }; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { ac_try='test -s conftest$ac_exeext'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval $ac_try) 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); }; }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_lib_crypto_RAND_egd=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_cv_lib_crypto_RAND_egd=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_RAND_egd" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "${ECHO_T}$ac_cv_lib_crypto_RAND_egd" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test $ac_cv_lib_crypto_RAND_egd = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<\_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_RAND_EGD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_config_files="$ac_config_files Makefile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >confcache <<\_ACEOF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tlswrap/files/patch-tls.c b/net/tlswrap/files/patch-tls.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4decf9d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tlswrap/files/patch-tls.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tls.c.orig 2006-11-25 18:52:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tls.c 2019-03-22 17:37:16.971621000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,10 +73,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("egd_sock is %s\n", egd_sock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_RAND_STATUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (RAND_status() != 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_RAND_EGD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( RAND_egd(egd_sock) == -1 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "egd_sock is %s\n", egd_sock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_err("RAND_egd failed\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (RAND_status() != 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_err("ssl_init: System without /dev/urandom, PRNG seeding must be done manually.\r\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X509 *x509_peer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X509_NAME *x509_subj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X509_EXTENSION *x509_ext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- X509V3_EXT_METHOD *x509_meth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const X509V3_EXT_METHOD *x509_meth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ok, extcount, i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *extstr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL *ssl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -294,15 +296,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extstr = (char*)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(x509_ext)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (debug) printf("extstr = %s\n", extstr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!strcmp(extstr, "subjectAltName")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ASN1_OCTET_STRING *x509_ext_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subjectaltname = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(x509_meth = X509V3_EXT_get(x509_ext)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data1 = x509_ext->value->data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x509_ext_data = X509_EXTENSION_get_data(x509_ext);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data1 = x509_ext_data->data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (OPENSSL_VERSION_NUMBER > 0x00907000L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (x509_meth->it)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ext_str = ASN1_item_d2i(NULL, &data1, x509_ext->value->length, ASN1_ITEM_ptr(x509_meth->it));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext_str = ASN1_item_d2i(NULL, &data1, x509_ext_data->length, ASN1_ITEM_ptr(x509_meth->it));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ext_str = x509_meth->d2i(NULL, &data1, x509_ext->value->length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext_str = x509_meth->d2i(NULL, &data1, x509_ext_data->length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext_str = x509_meth->d2i(NULL, &data1, x509_ext->value->length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -341,7 +345,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tls_auth_cont(struct user_data *ud, int data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int status, sslerr, cert_ok;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_CIPHER *cipher;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const SSL_CIPHER *cipher;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char cipher_info[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL *ssl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>