Bug 211239 - www/hiawatha: Fix build with mbed TLS
Summary: www/hiawatha: Fix build with mbed TLS
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: freebsd-ports-bugs (Nobody)
URL: https://www.hiawatha-webserver.org/we...
Keywords: needs-patch, needs-qa
Depends on:
Blocks:
 
Reported: 2016-07-20 11:08 UTC by Fred
Modified: 2017-04-02 15:43 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (portmaster)
koobs: merge-quarterly?

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Fred 2016-07-20 11:08:41 UTC 
Hi,

Could you please apply the hiawatha patch as described by the developper?
https://www.hiawatha-webserver.org/weblog/114
---
Apply the following patch to Hiawatha v10.3 to make it compile with mbed TLS v2.3.0

--- src/rproxy.h	2015-07-13 15:21:34.000000000 +0200
+++ src/rproxy.h	2016-07-18 17:29:46.813754000 +0200
@@ -19,6 +19,7 @@
 #include 
 #include 
 #ifdef ENABLE_TLS
+#include "mbedtls/platform.h"
 #include "mbedtls/ssl.h"
 #endif
 #include "ip.h"
--- src/tls.h	2016-02-14 14:45:44.000000000 +0100
+++ src/tls.h	2016-07-18 17:29:35.797754000 +0200
@@ -18,6 +18,7 @@
 
 #include 
 #include "liblist.h"
+#include "mbedtls/platform.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/version.h"
--- src/wigwam.c	2016-04-30 12:41:04.000000000 +0200
+++ src/wigwam.c	2016-07-18 17:30:12.677754000 +0200
@@ -33,6 +33,7 @@
 #include "filehashes.h"
 #include "mbedtls/md5.h"
 #ifdef ENABLE_TLS
+#include "mbedtls/platform.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/x509.h"
 #endif
Comment 1 Kubilay Kocak freebsd_committer freebsd_triage 2016-07-20 12:09:10 UTC 
Thank you Fred, can you please include your proposed patch as an attachment
Comment 2 Chris Hutchinson 2016-07-20 15:56:49 UTC 
@Kubilay
Thanks! I was going to request the same. :-)

@Fred
Ahh. If only it were as simple as that. :-)
In order for me to implement your request, I'm going to
need to add an additional OPTION to the port/Makefile.
I'll cobble something up, as soon as you're able to
post your request as an attached diff/patch.

Thanks!

--Chris
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2017-02-18 08:50:25 UTC 
Hi,

Any progress here?
Comment 4 Chris Hutchinson 2017-02-18 21:38:38 UTC 
(In reply to Martin Wilke from comment #3)
> Hi,
> 
> Any progress here?

Yep. I'll post an svn diff, today or tomorrow. :-)

--Chris
Comment 5 Chris Hutchinson 2017-02-23 06:19:11 UTC 
(In reply to Chris Hutchinson from comment #4)
> (In reply to Martin Wilke from comment #3)
> > Hi,
> > 
> > Any progress here?
> 
> Yep. I'll post an svn diff, today or tomorrow. :-)
> 
> --Chris

Yep! There's progress!

Please see PR 215919

As soon as that is committed, this issue will
be moot. :-)

--Chris
Comment 6 Fred 2017-03-01 12:55:55 UTC 
(In reply to Chris Hutchinson from comment #5)
Hiawatha now at version 10.5 maybe quicker to update port tree
Comment 7 Chris Hutchinson 2017-03-01 18:01:32 UTC 
(In reply to Fred from comment #6)
> (In reply to Chris Hutchinson from comment #5)
> Hiawatha now at version 10.5 maybe quicker to update port tree

Uhh.. read the pr(1) I mentioned, closer; as well as
add TLS mbed, it also up(date|grade)s hiawatha to 10.5. :-)

Enjoy!

--Chris
Comment 8 Fred 2017-03-01 19:18:49 UTC 
oops sorry :(
Comment 9 Chris Hutchinson 2017-03-20 14:05:31 UTC 
Please close this pr.
This pr has been resolved -- FIXED.

--Chris
Comment 10 Chris Hutchinson 2017-03-27 00:56:25 UTC 
(In reply to Chris Hutchinson from comment #9)
> Please close this pr.
> This pr has been resolved -- FIXED.
> 
> --Chris

FIXED in 215919

Please CLOSE this pr.

Thanks!

--Chris
Comment 11 Martin Wilke freebsd_committer freebsd_triage 2017-04-02 15:43:56 UTC 
FIXED in 215919