Re: wkhtmltopdf update

[Frank Groeneveld]

> Op 26 apr 2024, om 16:01 heeft Stuart Henderson  het 
> volgende geschreven:
> 
> I noticed this was behind the latest version, ok to update?
> I simplified the distfile fetching as this is a good place to use
> DIST_TUPLE.
> 
> Upstream has now archived the repository - and it has weak CSS support
> as it's an ld qtwebkit, and breaks totally with more complex pages,
> but chromium/iridium broke headless mode somewhere between 117 and 120,
> likely in 120 where I think they changed to new headless mode, and
> wkhtmltopdf does at least work for getting image/pdf dumps in some
> cases, so it still seems slightly useful to have for now.
> 
> ok?

Fine by me, I’m not using it anymore. Maybe unlist me as maintainer as well?

Thanks!

Re: textproc/wkhtmltopdf crash

[Frank Groeneveld]

Hello Denis,

Unfortunately I'm of no help here. I don't have much experience solving 
problems like this. I am able to reliably reproduce the crash for wkhtmltopdf 
https://www.google.com out.pdf indeed. It seems the upstream bugtracker 
contains similair cases on FreeBSD, Ubuntu and CentOS, although none contain 
the stacktraces.

I use wkhtmltopdf only for reports generated from our own custom HTML and CSS. 
These seem to work fine as long as we don't point to any https:// sources. For 
us that's not a problem, because we prefer having everything local anyways when 
generating these PDF's. When we include https:// sources we get crashes as 
well, although I'm not sure whether the stacktraces are the same.

Does your report contain any external sources, or is it all local relative to 
the file?
--
Frank

Op zo apr 26 2020, om 14:02 schreef Denis Fondras:
> Hi Frank,
> 
> I am using wkhtmltopdf from Odoo and I noticed it crashes when 
> generating
> reports. This command crashes :
> /usr/local/bin/wkhtmltopdf --header-html 
> /tmp/report.header.tmp.l1ae35ik.html 
> /tmp/report.body.tmp.0.s0vmsl3y.html report.pdf
> 
> Thread 1 received signal SIGTRAP, Trace/breakpoint trap.
> 0x0186bec30acb in cti_op_call_NotJSFunction ()
> (gdb) bt
> #0  0x0186bec30acb in cti_op_call_NotJSFunction ()
> #1  0x0186bec2bd98 in ctiTrampoline ()
> #2  0x0186beb51e1b in 
> JSC::Interpreter::executeCall(JSC::ExecState*, JSC::JSObject*, 
> JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) 
> ()
> #3  0x0186beb5b7fb in JSC::call(JSC::ExecState*, JSC::JSValue, 
> JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) 
> ()
> #4  0x0186bf33ba68 in 
> WebCore::JSEventListener::handleEvent(WebCore::ScriptExecutionContext*, 
> WebCore::Event*) ()
> #5  0x0186bed779ce in 
> WebCore::EventTarget::fireEventListeners(WebCore::Event*, 
> WebCore::EventTargetData*, 
> WTF::Vector&) ()
> #6  0x0186bed773b6 in 
> WebCore::EventTarget::fireEventListeners(WebCore::Event*) ()
> #7  0x0186bed7372b in 
> WebCore::EventDispatcher::dispatchEvent(WTF::PassRefPtr) ()
> #8  0x0186bed725a5 in 
> WebCore::EventDispatchMediator::dispatchEvent(WebCore::EventDispatcher*) 
> const ()
> #9  0x0186bed7268c in 
> WebCore::EventDispatcher::dispatchEvent(WebCore::Node*, 
> WebCore::EventDispatchMediator const&) ()
> #10 0x0186bef66eb2 in 
> WebCore::Node::dispatchEvent(WTF::PassRefPtr) ()
> #11 0x0186bed8fe39 in WebCore::Document::finishedParsing() ()
> #12 0x0186bf514b7f in 
> WebCore::HTMLDocumentParser::prepareToStopParsing() ()
> #13 0x0186bf5160dd in 
> WebCore::HTMLDocumentParser::executeScriptsWaitingForStylesheets() ()
> #14 0x0186bed8a539 in WebCore::Document::removePendingSheet() ()
> #15 0x0186bf538692 in WebCore::HTMLLinkElement::sheetLoaded() ()
> #16 0x0186beef5261 in WebCore::CSSStyleSheet::checkLoaded() ()
> #17 0x0186bf53825f in 
> WebCore::HTMLLinkElement::setCSSStyleSheet(WTF::String const&, 
> WebCore::KURL const&, WTF::String const&, WebCore::CachedCSSStyleSheet 
> const*) ()
> #18 0x0186bf539a01 in WebCore::CachedCSSStyleSheet::checkNotify() ()
> #19 0x0186bf5397da in 
> WebCore::CachedCSSStyleSheet::data(WTF::PassRefPtr, 
> bool) ()
> #20 0x0186bf9eb551 in 
> WebCore::CachedResourceRequest::didFinishLoading(WebCore::SubresourceLoader*, 
> double) ()
> #21 0x0186bfa9048f in 
> WebCore::SubresourceLoader::didFinishLoading(double) ()
> #22 0x0186bef8cf00 in WebCore::QNetworkReplyHandler::finish() ()
> #23 0x0186bef8b11f in 
> WebCore::QNetworkReplyHandlerCallQueue::flush() ()
> #24 0x0186bef8da80 in 
> WebCore::QNetworkReplyWrapper::didReceiveFinished() ()
> #25 0x0186c05ad148 in QMetaObject::activate(QObject*, QMetaObject 
> const*, int, void**) ()
> #26 0x0186c03db9db in QNetworkReplyImplPrivate::finished() ()
> #27 0x0186c05a8643 in QObject::event(QEvent*) ()
> #28 0x0186bfd4b1b6 in QApplicationPrivate::notify_helper(QObject*, 
> QEvent*) ()
> #29 0x0186bfd4c8f3 in QApplication::notify(QObject*, QEvent*) ()
> #30 0x0186c0591eb8 in QCoreApplication::notifyInternal(QObject*, 
> QEvent*) ()
> #31 0x0186c0592cd6 in 
> QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) 
> ()
> #32 0x0186c05bf8f7 in 
> QEventDispatcherUNIX::processEvents(QFlags) ()
> #33 0x0186c05923e5 in 
> QCoreApplication::processEvents(QFlags) 
> ()
> #34 0x0186bea9a19f in wkhtmltopdf::Converter::convert() ()
> #35 0x0186beabeb2c in main ()
> 
> 
> If I remove the --header-html (or --footer-html), it works :
> /usr/local/bin/wkhtmltopdf /tmp/report.header.tmp.l1ae35ik.html 
> /tmp/report.body.tmp.0.s0vmsl3y.html z.pdf
> 
> I also noticed that "/usr/local/bin/wkhtmltopdf https://www.google.com; 
> crashes
> when "/usr/local/bin/wkhtmltopdf --disable-javascript https://www.google.com;
> does not. Not the same trace though :
> 
> Thread 1 received signal SIGTRAP, 

Re: SSL errors on 6.4 after apache-httpd with mpm_event_module was updated to 2.4.39

[Frank Groeneveld]

On Fri, Apr 12, 2019, at 01:00, Stuart Henderson wrote:
> On 2019/04/11 23:22, Stuart Henderson wrote:
> > On 2019/04/11 20:25, Stuart Henderson wrote:
> > > On 2019/04/10 05:12, Frank Groeneveld wrote:
> > > > Last week an update to apache-httpd was released which fixes an 
> > > > important security issue. I updated a number of servers right away, but 
> > > > after receiving some traffic they started to produce SSL errors. I've 
> > > > tried to debug this as far as I could and have come to the conclusion 
> > > > that it only happens when using mpm_event_module. My configs are 
> > > > default, but I enable SSL and switch to the evented MPM. For 
> > > > certificates I use Let's Encrypt (using acme-client). ab prints the 
> > > > following errors. 
> > > > 
> > > > SSL handshake failed (1).
> > > > 140321585887104:error:0407008A:rsa 
> > > > routines:RSA_padding_check_PKCS1_type_1:invalid 
> > > > padding:crypto/rsa/rsa_pk1.c:66:
> > > > 140321585887104:error:04067072:rsa 
> > > > routines:rsa_ossl_public_decrypt:padding check 
> > > > failed:crypto/rsa/rsa_ossl.c:655:
> > > > 140321585887104:error:1416D07B:SSL 
> > > > routines:tls_process_key_exchange:bad 
> > > > signature:ssl/statem/statem_clnt.c:2414:
> > > > 
> > > > Web browsers show an error also, but some refreshing sometimes fixes 
> > > > the problem. Is anybody else able to reproduce this? Can I do anything 
> > > > to help resolve it?
> > > > 
> > > > Thanks in advance.
> > > > 
> > > > Frank
> > > > 
> > > 
> > > I can replicate this on 6.4 but not -current, I'll see if I can figure
> > > out what's up.
> > > 
> > 
> > Seems it was introduced between 2.4.35 and 2.4.37. I don't see
> > anything particularly suspicious in the main code diff between those
> > two versions, but one of the subtler changes is that it switches off
> > MODSSL_USE_OPENSSL_PRE_1_1_API for libressl 2.7+.
> > 
> > So probably one of the ifdef blocks is taking a code path that fails
> > with the libressl code in 6.4 but has been changed post-6.4-release.
> > 
> > Builds are taking ages on the machine I'm testing on and the wifi
> > connection I'm on at the moment is stalling every few minutes and
> > I'm losing patience now but if anyone wants to pick it up I'd suggest
> > looking through the various #if MODSSL_USE_OPENSSL_PRE_1_1_API blocks
> > and see if adding "&& !defined(LIBRESSL_VERSION_NUMBER)" to any of
> > them fixes things (the usual libressl-porting whack-a-mole..).
> > 
> 
> ...oh I have something that works now :)

Works great, thank you very much!

Frank

SSL errors on 6.4 after apache-httpd with mpm_event_module was updated to 2.4.39

[Frank Groeneveld]

Last week an update to apache-httpd was released which fixes an important 
security issue. I updated a number of servers right away, but after receiving 
some traffic they started to produce SSL errors. I've tried to debug this as 
far as I could and have come to the conclusion that it only happens when using 
mpm_event_module. My configs are default, but I enable SSL and switch to the 
evented MPM. For certificates I use Let's Encrypt (using acme-client). ab 
prints the following errors. 

SSL handshake failed (1).
140321585887104:error:0407008A:rsa 
routines:RSA_padding_check_PKCS1_type_1:invalid padding:crypto/rsa/rsa_pk1.c:66:
140321585887104:error:04067072:rsa routines:rsa_ossl_public_decrypt:padding 
check failed:crypto/rsa/rsa_ossl.c:655:
140321585887104:error:1416D07B:SSL routines:tls_process_key_exchange:bad 
signature:ssl/statem/statem_clnt.c:2414:

Web browsers show an error also, but some refreshing sometimes fixes the 
problem. Is anybody else able to reproduce this? Can I do anything to help 
resolve it?

Thanks in advance.

Frank

Re: Update textproc/wkhtmltopdf-0.12.5

[Frank Groeneveld]

Great, thank you very much!

--
Frank

On Tue, Jul 24, 2018, at 12:07, Stuart Henderson wrote:
> On 2018/07/24 08:40, Frank Groeneveld wrote:
> > Ping
> 
> >  GH_ACCOUNT =   wkhtmltopdf
> > +GH_TAGNAME =   0.12.5
> 
> Testing now, I'll take care of this.
> 

Re: Update textproc/wkhtmltopdf-0.12.5

[Frank Groeneveld]

On Tue, Jul 17, 2018, at 08:28, Frank Groeneveld wrote:
> On Mon, Jul 16, 2018, at 16:10, Brian Callahan wrote:
> > 
> > It looks like you may have forgotten to cvs add a number of patches.
> > 
> > ~Brian
> > 
> 
> Thanks, I hadn't noticed. Attached a complete and working patch, tested 
> with a clean checkout.
> 
> Frank
> Email had 1 attachment:
> + wkhtmltopdf-0.12.5.patch
>   39k (text/x-patch)

Ping

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile	10 Jul 2018 12:24:24 -	1.19
+++ Makefile	17 Jul 2018 06:14:35 -
@@ -9,8 +9,8 @@ COMMENT =		convert HTML to PDF using Web
 
 GH_ACCOUNT =		wkhtmltopdf
 GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.4
-QT_COMMIT =		c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME =		0.12.5
+QT_COMMIT =		5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	10 Jul 2018 12:24:24 -	1.5
+++ distinfo	17 Jul 2018 06:14:35 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+SHA256 (wkhtmltopdf-0.12.5.tar.gz) = hh1uYeL1vrLY2qreLNWoW4QGXun6wNbYUADYp3EqRiE=
+SHA256 (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = tD6GRyvKy0seNzXfnJr9CQ+gEWl0oD8BqScf8CkRU2w=
+SIZE (wkhtmltopdf-0.12.5.tar.gz) = 511181
+SIZE (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = 173051127
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure	2 Mar 2017 10:12:02 -	1.1
+++ patches/patch-qt_configure	17 Jul 2018 06:14:35 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
 qt/configure.orig	Wed Mar  1 20:53:04 2017
-+++ qt/configure	Wed Mar  1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
 qt/configure
+@@ -3427,7 +3427,7 @@ else
  CFG_FRAMEWORK=no
  fi
  
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	10 Jul 2018 12:24:25 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
===
RCS file: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
diff -N patches/patch-qt_src_network_ssl_qsslcertificate_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-qt_src_network_ssl_qsslcertificate_cpp	17 Jul 2018 06:14:35 -
@@ -0,0 +1,78 @@
+$OpenBSD$
+
+Index: qt/src/network/ssl/qsslcertificate.cpp
+--- qt/src/network/ssl/qsslcertificate.cpp.orig
 qt/src/network/ssl/qsslcertificate.cpp
+@@ -259,10 +259,10 @@ void QSslCertificate::clear()
+ QByteArray QSslCertificate::version() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+-if (d->versionString.isEmpty() && d->x509) {
++if (d->versionString.isEmpty() && d->x509)
+ d->versionString =
+-	QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
+-}
++QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x5

Re: Update textproc/wkhtmltopdf-0.12.4

[Frank Groeneveld]

On Mon, Jul 16, 2018, at 16:10, Brian Callahan wrote:
> 
> It looks like you may have forgotten to cvs add a number of patches.
> 
> ~Brian
> 

Thanks, I hadn't noticed. Attached a complete and working patch, tested with a 
clean checkout.

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile	10 Jul 2018 12:24:24 -	1.19
+++ Makefile	17 Jul 2018 06:14:35 -
@@ -9,8 +9,8 @@ COMMENT =		convert HTML to PDF using Web
 
 GH_ACCOUNT =		wkhtmltopdf
 GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.4
-QT_COMMIT =		c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME =		0.12.5
+QT_COMMIT =		5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	10 Jul 2018 12:24:24 -	1.5
+++ distinfo	17 Jul 2018 06:14:35 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+SHA256 (wkhtmltopdf-0.12.5.tar.gz) = hh1uYeL1vrLY2qreLNWoW4QGXun6wNbYUADYp3EqRiE=
+SHA256 (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = tD6GRyvKy0seNzXfnJr9CQ+gEWl0oD8BqScf8CkRU2w=
+SIZE (wkhtmltopdf-0.12.5.tar.gz) = 511181
+SIZE (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = 173051127
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure	2 Mar 2017 10:12:02 -	1.1
+++ patches/patch-qt_configure	17 Jul 2018 06:14:35 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
 qt/configure.orig	Wed Mar  1 20:53:04 2017
-+++ qt/configure	Wed Mar  1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
 qt/configure
+@@ -3427,7 +3427,7 @@ else
  CFG_FRAMEWORK=no
  fi
  
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	10 Jul 2018 12:24:25 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
===
RCS file: patches/patch-qt_src_network_ssl_qsslcertificate_cpp
diff -N patches/patch-qt_src_network_ssl_qsslcertificate_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-qt_src_network_ssl_qsslcertificate_cpp	17 Jul 2018 06:14:35 -
@@ -0,0 +1,78 @@
+$OpenBSD$
+
+Index: qt/src/network/ssl/qsslcertificate.cpp
+--- qt/src/network/ssl/qsslcertificate.cpp.orig
 qt/src/network/ssl/qsslcertificate.cpp
+@@ -259,10 +259,10 @@ void QSslCertificate::clear()
+ QByteArray QSslCertificate::version() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+-if (d->versionString.isEmpty() && d->x509) {
++if (d->versionString.isEmpty() && d->x509)
+ d->versionString =
+-	QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
+-}
++QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
++
+ return d->versionString;
+ }
+ 
+@@ -276,7 +276,7 @@ QByteArray QSslCertificate::serialNumber() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+ if (d->serialNumberString.isEmpty() && d->x509) {
+-

Re: Update textproc/wkhtmltopdf-0.12.4

[Frank Groeneveld]

On Tue, Jul 10, 2018, at 18:44, Frank Groeneveld wrote:
> Thanks for committing the update and thanks for the hints Stuart!
> I got version 0.12.5 to compile and run correctly by undoing two patches 
> of upstream:
> https://github.com/wkhtmltopdf/qt/commit/4d3f24547b2e6d43f6af766411a810343b8e3c31
> https://github.com/wkhtmltopdf/qt/commit/b612c88a5f214bf35e0748c330aa855a1b90ce81
> 
> Attached a diff to update to 0.12.5, the latest release!
> 
> --
> Frank

Ping

Frank
? patches/patch-qt_src_network_ssl_qsslcertificate_cpp
? patches/patch-qt_src_network_ssl_qsslkey_cpp
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_p_h
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile	10 Jul 2018 12:24:24 -	1.19
+++ Makefile	10 Jul 2018 16:40:53 -
@@ -9,8 +9,8 @@ COMMENT =		convert HTML to PDF using Web
 
 GH_ACCOUNT =		wkhtmltopdf
 GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.4
-QT_COMMIT =		c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME =		0.12.5
+QT_COMMIT =		5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	10 Jul 2018 12:24:24 -	1.5
+++ distinfo	10 Jul 2018 16:40:53 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+SHA256 (wkhtmltopdf-0.12.5.tar.gz) = hh1uYeL1vrLY2qreLNWoW4QGXun6wNbYUADYp3EqRiE=
+SHA256 (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = tD6GRyvKy0seNzXfnJr9CQ+gEWl0oD8BqScf8CkRU2w=
+SIZE (wkhtmltopdf-0.12.5.tar.gz) = 511181
+SIZE (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = 173051127
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure	2 Mar 2017 10:12:02 -	1.1
+++ patches/patch-qt_configure	10 Jul 2018 16:40:53 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
 qt/configure.orig	Wed Mar  1 20:53:04 2017
-+++ qt/configure	Wed Mar  1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
 qt/configure
+@@ -3427,7 +3427,7 @@ else
  CFG_FRAMEWORK=no
  fi
  
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	10 Jul 2018 12:24:25 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qt_src_network_ssl_qsslsocket_openssl_cpp
--- patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp	6 Jan 2016 17:13:48 -	1.2
+++ patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp	10 Jul 2018 16:40:53 -
@@ -1,15 +1,105 @@
-$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_cpp,v 1.2 2016/01/06 17:13:48 sthen Exp $
 qt/src/network/ssl/qsslsocket_openssl.cpp.orig	Thu Jul  2 12:46:37 2015
-+++ qt/src/network/ssl/qsslsocket_openssl.cpp	Wed Jan  6 17:06:15 2016
-@@ -

Re: Update textproc/wkhtmltopdf-0.12.4

[Frank Groeneveld]

Thanks for committing the update and thanks for the hints Stuart!
I got version 0.12.5 to compile and run correctly by undoing two patches of 
upstream:
https://github.com/wkhtmltopdf/qt/commit/4d3f24547b2e6d43f6af766411a810343b8e3c31
https://github.com/wkhtmltopdf/qt/commit/b612c88a5f214bf35e0748c330aa855a1b90ce81

Attached a diff to update to 0.12.5, the latest release!

--
Frank

On Tue, Jul 10, 2018, at 14:25, Jeremie Courreges-Anglas wrote:
> On Tue, Jul 10 2018, Frank Groeneveld  wrote:
> > Attached a patch to update textproc/wkhtmltopdf to version 0.12.4. This 
> > release fixes some small bugs, a full release log can be found at: 
> > https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.4
> 
> Committed, thanks, worked fine in my limited testing.
> 
> > Unfortunately this is not the latest version yet, I'm still trying to
> > get 0.12.5 to work with HTTPS sites (errors about not being able to
> > resolve some OpenSSL symbols during runtime). As soon as I fix that I'll
> > send an update for it.
> 
> Same question as Stuart, which symbols?  Have fun... :)
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 
? patches/patch-qt_src_network_ssl_qsslcertificate_cpp
? patches/patch-qt_src_network_ssl_qsslkey_cpp
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_p_h
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile	10 Jul 2018 12:24:24 -	1.19
+++ Makefile	10 Jul 2018 16:40:53 -
@@ -9,8 +9,8 @@ COMMENT =		convert HTML to PDF using Web
 
 GH_ACCOUNT =		wkhtmltopdf
 GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.4
-QT_COMMIT =		c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME =		0.12.5
+QT_COMMIT =		5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	10 Jul 2018 12:24:24 -	1.5
+++ distinfo	10 Jul 2018 16:40:53 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+SHA256 (wkhtmltopdf-0.12.5.tar.gz) = hh1uYeL1vrLY2qreLNWoW4QGXun6wNbYUADYp3EqRiE=
+SHA256 (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = tD6GRyvKy0seNzXfnJr9CQ+gEWl0oD8BqScf8CkRU2w=
+SIZE (wkhtmltopdf-0.12.5.tar.gz) = 511181
+SIZE (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = 173051127
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure	2 Mar 2017 10:12:02 -	1.1
+++ patches/patch-qt_configure	10 Jul 2018 16:40:53 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
 qt/configure.orig	Wed Mar  1 20:53:04 2017
-+++ qt/configure	Wed Mar  1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
 qt/configure
+@@ -3427,7 +3427,7 @@ else
  CFG_FRAMEWORK=no
  fi
  
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	10 Jul 2018 12:24:25 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return im

Update textproc/wkhtmltopdf-0.12.4

[Frank Groeneveld]

Attached a patch to update textproc/wkhtmltopdf to version 0.12.4. This release 
fixes some small bugs, a full release log can be found at: 
https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.4

Unfortunately this is not the latest version yet, I'm still trying to get 
0.12.5 to work with HTTPS sites (errors about not being able to resolve some 
OpenSSL symbols during runtime). As soon as I fix that I'll send an update for 
it.

--
Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile	16 Apr 2018 12:00:40 -	1.18
+++ Makefile	10 Jul 2018 09:11:30 -
@@ -9,9 +9,8 @@ COMMENT =		convert HTML to PDF using Web
 
 GH_ACCOUNT =		wkhtmltopdf
 GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.3.2
-REVISION =		3
-QT_COMMIT =		8dae19a82231e87366d81c683bafcb025aea9c1d
+GH_TAGNAME =		0.12.4
+QT_COMMIT =		c0cfa03a072789550d8ff5724b2e5e58436e02d1
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo	16 Apr 2018 12:00:40 -	1.4
+++ distinfo	10 Jul 2018 09:11:30 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.3.2.tar.gz) = chUj74fMuTe/NxSt4ZsRL0y4os2EDjSzDybuJixB/hY=
-SHA256 (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d_1.tar.gz) = SxuN/mRu2mum6lTDfBmcTYbt9f2D6w5Hmk3nD1MQaiU=
-SIZE (wkhtmltopdf-0.12.3.2.tar.gz) = 128050
-SIZE (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d_1.tar.gz) = 173053203
+SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
+SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
+SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
+SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	27 Apr 2017 16:23:14 -	1.1
+++ patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	10 Jul 2018 09:11:30 -
@@ -1,6 +1,8 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.1 2017/04/27 16:23:14 espie Exp $
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig	Thu Apr 27 17:13:35 2017
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp	Thu Apr 27 17:13:49 2017
+$OpenBSD$
+
+Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
+--- qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
 @@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
  RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
  if (optionalWidth)
Index: patches/patch-src_image_image_pro
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-src_image_image_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_image_image_pro
--- patches/patch-src_image_image_pro	6 Jan 2016 16:50:35 -	1.2
+++ patches/patch-src_image_image_pro	10 Jul 2018 09:11:30 -
@@ -1,14 +1,15 @@
 $OpenBSD: patch-src_image_image_pro,v 1.2 2016/01/06 16:50:35 sthen Exp $
 src/image/image.pro.orig	Sun Jul 12 07:34:52 2015
-+++ src/image/image.pro	Sun Dec 27 11:11:46 2015
+Index: src/image/image.pro
+--- src/image/image.pro.orig
 src/image/image.pro
 @@ -24,8 +24,8 @@ DEPENDPATH += . ../shared
  INCLUDEPATH += . ../shared
  
  unix {
 -man.path=$$INSTALLBASE/share/man/man1
--man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz
+-man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)$$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz
 +man.path=$$INSTALLBASE/man/man1
-+man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage > $(INSTALL_ROOT)/man/man1/wkhtmltoimage.1
++man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage > $(INSTALL_ROOT)$$INSTALLBASE/man/man1/wkhtmltoimage.1
  
  QMAKE_EXTRA_TARGETS += man
  INSTALLS += man
Index: patches/patch-src_pdf_pdf_pro
===
RCS file: 

Re: [update] lang/node 6.12.3 -> 8.9.4 - now with 100% more arm64!

[Frank Groeneveld]

On Thu, Feb 8, 2018, at 15:49, Aaron Bieber wrote:
> On Thu, Feb 08, 2018 at 07:46:01AM -0700, Aaron Bieber wrote:
> > On Fri, Feb 02, 2018 at 07:09:00AM -0700, Aaron Bieber wrote:
> > > Hola!
> > >
> > > Here is a fairly big jump for the node port that brings us to the current
> > > LTS.
> > >
> > > I would like to get as much testing on this one as possible before
> > > getting it in.
> > >
> > > "make test" should result in 100% success:
> > >   [--] Global test environment tear-down
> > >   [==] 62 tests from 7 test cases ran. (200 ms total)
> > >   [  PASSED  ] 62 tests.
> > >   /usr/local/bin/python2.7 tools/test.py --mode=release -J \
> > >   async-hooks \
> > >   default \
> > >   addons addons-napi \
> > >   doctool \
> > >   known_issues
> > >   [04:53|% 100|+ 2047|-   0]: Done
> > >   qbit@slip[0]:nodeλ
> > >
> > > I also plan on adding a port for 9.x, but I haven't worked out the
> > > details on that yet.
> > >
> > > https://deftly.net/patches/node-v8.9.4.diff
> >
> > Here is a new version that:
> >
> > - Adds support for arm64 (not well tested).
> > - Includes a few missing test patches I had clobbered.
> 
> Actual link to the patch: https://deftly.net/patches/node-v8.9.4.diff
> 
> >
> > --
> > PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE
> >
> 
> --
> PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE
> 

(Sorry, replied off-list before).

Works great on amd64 with yarn and heroku-cli, thanks! This makes the Heroku 
CLI available again on OpenBSD as it started to depend on some node > 6.x 
features.

Frank

Backport munin memory plugin for swap usage

[Frank Groeneveld]

Attached patch backports an upstream feature to add swap usage to the
memory plugin of munin. The original upstream patch can be found at:
https://github.com/munin-monitoring/munin/commit/0ceb8560ad5967862a4dfa0f6695f2763ef00599

Hopefully this can be added after the ports tree is unlocked again.

Thanks,

Frank
Index: Makefile
===
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile	27 May 2017 19:57:06 -	1.62
+++ Makefile	6 Oct 2017 13:59:14 -
@@ -11,7 +11,7 @@ PKGNAME-main =	munin-node-$V
 PKGNAME-server =munin-server-$V
 CATEGORIES =	net
 
-REVISION-main =	3
+REVISION-main =	4
 REVISION-server =	3
 
 HOMEPAGE =	http://munin-monitoring.org/
Index: patches/patch-plugins_node_d_openbsd_memory_in
===
RCS file: patches/patch-plugins_node_d_openbsd_memory_in
diff -N patches/patch-plugins_node_d_openbsd_memory_in
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-plugins_node_d_openbsd_memory_in	6 Oct 2017 13:59:14 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: plugins/node.d.openbsd/memory.in
+--- plugins/node.d.openbsd/memory.in.orig
 plugins/node.d.openbsd/memory.in
+@@ -76,6 +76,10 @@ if [ "$1" = "config" ]; then
+ 	echo 'free.info pages without data content'
+ 	echo 'free.draw STACK'
+ 
++	echo 'swap.label swap'
++	echo 'swap.info total used swap'
++	echo 'swap.draw STACK'
++
+ 	exit 0
+ fi
+ 
+@@ -85,5 +89,6 @@ vmstat -s | awk -v bpp=$PAGESIZE '
+ /pages active$/   { active = $1;   print "active.value "   $1 * bpp; }
+ /pages inactive$/ { inactive = $1; print "inactive.value " $1 * bpp; }
+ /pages wired$/{ wired = $1;print "wired.value "$1 * bpp; }
++/swap pages in use$/{ swap = $1;print "swap.value "$1 * bpp; }
+ END { kernel = managed - wired - inactive - active - free;
+ print "kernel.value " kernel * bpp; }'

Re: ffmpeg hang on 6.1-stable and -current with certain video files

[Frank Groeneveld]

On Sat, Sep 2, 2017, at 00:42, Juan Francisco Cantero Hurtado wrote:
> Can you both try to reproduce the bug using something else instead of
> aac?

I tried Big Buck Bunny in mp4 format, which has AC3 audio
(http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi).
Using the same command it doesn't hang a single time, so maybe the input
aac is the problem? Although Marcus' test seems to suggest the other way
around.

Frank

Re: ffmpeg hang on 6.1-stable and -current with certain video files

[Frank Groeneveld]

On Mon, Aug 28, 2017, at 14:33, Frank Groeneveld wrote:
> ...

Apparently my ports tree was outdated and ffmpeg was updated 3 days
before my email. Using that version I am still able to reproduce the
bug, which lead me to believe that it was somewhere in an OpenBSD port
specific patch. Some more builds later I now think it is not possible to
reproduce the problem after building a version without the following
patches:
patches/patch-libavcodec*
patches/patch-libavutil_internal_h

Meaning, the bug is probably in one of those files. Hopefully this is a
hint for somebody with more knowledge of those patches.

Thanks!
--
Frank

ffmpeg hang on 6.1-stable and -current with certain video files

[Frank Groeneveld]

When I try to convert certain video files using ffmpeg from ports on
6.1-stable or -current it randomly hangs about one in three or four
tries. I've uploaded a sample movie at:
https://ivaldi.nl/wp-content/uploads/sample.mp4

The following command reproduces the problem:
ffmpeg -i sample.mp4 -acodec aac -strict experimental -vf
scale=1280:720,setdar=2:1 -y output.mp4

This is the output when it hangs: https://pastebin.com/mb0X3hU3
The process uses 100% cpu and doesn't seem to do anything else, the
output file doesn't grow either.

One of my colleagues uses a Mac with ffmpeg 3.3.3 installed using
Homebrew and he doesn't have this problem. I modified the OpenBSD port
to build 3.3.3 and removed all local patches (had to disable some stuff
that is not useful for me anyway). After compiling this hacked port I
can convert the video with this new version without any problems.

I'm not sure whether removing the local patches has fixed this or
something in the newer ffmpeg release, but would it be possible to
update the OpenBSD port? I could probably  create a patch for it, but I
can't get some of the local patches to apply. Were they integrated by
upstream?

Thanks!
Frank

Re: Chromecast usage on OpenBSD?

[Frank Groeneveld]

Aaron Bieber  schreef op 5 juli 2017 20:33:45 CEST:
>
>What cast app / extension are you using? I can't seem to find the
>chrome extension that existed at one point.

It has been integrated in Chrome itself. There is a cast menu-item in the main 
menu.

Frank

Re: Chromecast usage on OpenBSD?

[Frank Groeneveld]

On Wed, Jul 5, 2017, at 10:35, Stuart Henderson wrote:
> Just a quick guess, but do you have multicast=YES in rc.conf.local?
> If not, either try setting that + rebooting, or 'route delete 224/4'
> 

Thanks for the hint. I didn't have it on and it is probably needed
indeed. Unfortunately enabling wasn't enough. I'm not sure how it works,
but I've also tried starting both avahi daemons after start message_bus
and that doesn't fix it either.

Frank

Chromecast usage on OpenBSD?

[Frank Groeneveld]

Is anybody using Chrome to cast a tab or the complete desktop to a
Chromecast? I have never been able to do this on OpenBSD, while it works
on the same network and machine with Linux. On OpenBSD I see some
network packages going back and forth using tcpdump, but I can't find
out why Chrome decides not to show the Chromecast as a valid casting
device.

Thanks,

Frank

Re: Ports with hardcoded "gcc", "g++"

[Frank Groeneveld]

On Wed, Mar 1, 2017, at 17:47, Amit Kulkarni wrote:
> I meant to say the .a file is missing for libQtWebkit
> 
> Thanks
> 

Found the cause and fixed it. Attached patch makes it build correctly
without g++/gcc.

Thanks again Stuart and Amit for the hints.

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile	13 Sep 2016 18:52:06 -	1.12
+++ Makefile	1 Mar 2017 20:06:14 -
@@ -39,7 +39,9 @@ LIB_DEPENDS =		converters/libiconv \
 
 USE_GMAKE =		Yes
 MAKE_FLAGS =		LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
-MAKE_ENV +=		WRKBUILD=${WRKBUILD}
+MAKE_ENV +=		WRKBUILD=${WRKBUILD} \
+			PORTS_CC="${CC}" PORTS_CXX="${CXX}"
+CONFIGURE_ENV =	PORTS_CC="${CC}" PORTS_CXX="${CXX}"
 FAKE_FLAGS =		INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
 
 SEPARATE_BUILD =	Yes
@@ -51,7 +53,7 @@ pre-patch:
 	cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
 
 do-configure:
-	mkdir ${WRKBUILD}/qt
+	mkdir -p ${WRKBUILD}/qt
 	# qt config options taken from scripts/build.py
 	cd ${WRKBUILD}/qt && \
 		env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \
Index: patches/patch-qt_configure
===
RCS file: patches/patch-qt_configure
diff -N patches/patch-qt_configure
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-qt_configure	1 Mar 2017 20:06:14 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qt/configure.orig	Wed Mar  1 20:53:04 2017
 qt/configure	Wed Mar  1 20:53:19 2017
+@@ -3411,7 +3411,7 @@ else
+ CFG_FRAMEWORK=no
+ fi
+ 
+-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
++QMAKE_CONF_COMPILER="${PORTS_CXX}"
+ TEST_COMPILER="$CXX"
+ 
+ [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
Index: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf
===
RCS file: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf
diff -N patches/patch-qt_mkspecs_openbsd-g++_qmake_conf
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-qt_mkspecs_openbsd-g++_qmake_conf	1 Mar 2017 20:06:14 -
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- qt/mkspecs/openbsd-g++/qmake.conf.orig	Tue May 10 09:19:52 2016
 qt/mkspecs/openbsd-g++/qmake.conf	Wed Mar  1 12:07:44 2017
+@@ -8,7 +8,7 @@ TEMPLATE		= app
+ CONFIG			+= qt warn_on release link_prl gdb_dwarf_index
+ QT			+= core gui
+ 
+-QMAKE_CC		= gcc
++QMAKE_CC		= ${PORTS_CC}
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		=
+ QMAKE_YACC		= yacc
+@@ -24,7 +24,7 @@ QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -pthread
+ 
+-QMAKE_CXX		= g++
++QMAKE_CXX		= ${PORTS_CXX}
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+@@ -45,10 +45,10 @@ QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+ QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+ 
+-QMAKE_LINK		= g++
+-QMAKE_LINK_SHLIB	= g++
+-QMAKE_LINK_C		= gcc
+-QMAKE_LINK_C_SHLIB	= gcc
++QMAKE_LINK		= $$QMAKE_CXX
++QMAKE_LINK_SHLIB	= $$QMAKE_CXX
++QMAKE_LINK_C		= $$QMAKE_CC
++QMAKE_LINK_C_SHLIB	= $$QMAKE_CC
+ QMAKE_LINK_SHLIB_CMD	= $$QMAKE_LINK_SHLIB $(LFLAGS) \
+ 	$$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \
+ 	-o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)

Re: Ports with hardcoded "gcc", "g++"

[Frank Groeneveld]

On Wed, Mar 1, 2017, at 15:14, Stuart Henderson wrote:
> Oops, I forgot to re-run update-patches and had an old one. However
> unfortunately
> not enough as linking fails.
> 

Thanks, that gets us a lot further indeed. The complete QT build
finished and now only the final linking step fails indeed.
For the interested, this is the command:

c++ -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib -pthread
-shared -Wl,-soname,libwkhtmltox.so.0 -fPIC -o libwkhtmltox.so.0.0
loadsettings.o multipageloader.o tempfile.o converter.o websettings.o
reflect.o utilities.o pdfsettings.o pdfconverter.o outline.o
tocstylesheet.o imagesettings.o imageconverter.o pdf_c_bindings.o
image_c_bindings.o moc_multipageloader_p.o moc_converter_p.o
moc_pdfconverter_p.o moc_imageconverter_p.o moc_pdf_c_bindings_p.o
moc_image_c_bindings_p.o moc_converter.o moc_multipageloader.o
moc_utilities.o moc_pdfconverter.o moc_imageconverter.o
qrc_wkhtmltopdf.o-L/usr/local/lib
-L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib
-L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/plugins/codecs
-lqcncodecs -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib
-L/usr/local/lib -lqjpcodecs -lqkrcodecs -lqtwcodecs -lQtWebKit
-L/usr/X11R6/lib -lQtSvg -lQtXmlPatterns -lQtGui -ljpeg -lpng -lXrender
-lfontconfig -lfreetype -lXext -lX11 -lQtNetwork -lQtCore -lz -lm
-liconv 
/usr/bin/ld: cannot find -lQtWebKit

Which seems weird to me, because:

$ ls /usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib 
libQAxContainer.prllibQtNetwork.a libQtSvg.prl
libQAxServer.prl   libQtNetwork.lalibQtTest.a
libQt3Support.la   libQtNetwork.prl   libQtTest.la
libQt3Support.prl  libQtOpenGL.la libQtTest.prl
libQtCore.alibQtOpenGL.prllibQtWebKit.la
libQtCore.la   libQtOpenVG.la libQtWebKit.prl
libQtCore.prl  libQtOpenVG.prllibQtXml.a
libQtDBus.la   libQtScript.la libQtXml.la
libQtDBus.prl  libQtScript.prllibQtXml.prl
libQtDeclarative.lalibQtScriptTools.lalibQtXmlPatterns.a
libQtDeclarative.prl   libQtScriptTools.prl  
libQtXmlPatterns.la
libQtGui.a libQtSql.a
libQtXmlPatterns.prl
libQtGui.lalibQtSql.lalibpvrQWSWSEGL.prl
libQtGui.prl   libQtSql.prl   pkgconfig
libQtMultimedia.la libQtSvg.a
libQtMultimedia.prllibQtSvg.la

libQtWebkit seems to be there, right?

Frank

Re: Ports with hardcoded "gcc", "g++"

[Frank Groeneveld]

On Tue, Feb 28, 2017, at 14:03, Christian Weisgerber wrote:
> textproc/wkhtmltopdf Frank Groeneveld <fr...@frankgroeneveld.nl>

I've been trying to fix textporc/wkhtmltopdf in the last few days, but
can't seem to make qmake use the correct compiler. The do-configure step
of this port configures the patched QT that is part of the port. I've
tried adding CXX="${CXX}" and/or SYS_CXX="${CXX}" to the env of that
step, but it seems to be unused. Anybody got some hints on how to fix
this one?

Thanks!
Frank

Re: UPDATE security/lastpass-cli

[Frank Groeneveld]

On Sun, Feb 12, 2017 at 01:18:36PM +0100, Bj??rn Ketelaars wrote:
> With lastpass-cli 1.1.2 on current I'm unable to reproduce your error. Same is
> true for 1.1.1 on current.

You're right, I can now only reproduce this on 6.0. Sorry for the noise.

Frank

Re: UPDATE security/lastpass-cli

[Frank Groeneveld]

On Wed, Feb 08, 2017 at 11:33:41AM +0100, Bj??rn Ketelaars wrote:
> Please find enclosed a diff for bringing security/lastpass-cli to the latest
> version (bug fix release). Changelog can be found at:
> 
> https://github.com/lastpass/lastpass-cli/releases/tag/v1.1.2
> 
> OK?

Hello Bj??rn,

It seems to compile fine, however I always get this error:
Error: Peer certificate cannot be authenticated with given CA
certificates.

I get the error on older versions of the port as well and on three
different boxes (two running current, one running -stable).

I've traced this back to curl connecting to the Lastpass using https. Is
there any manual intervention needed to let it trust the certificate?

Thanks,
Frank

Update composer to 1.3.2

[Frank Groeneveld]

Attached patch updates composer from 1.0.0 to 1.3.2.
This update fixes an issue where OpenSSL detection wouldn't work
for LibreSSL.

Thanks,

Frank
Index: Makefile
===
RCS file: /cvs/ports/www/composer/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile5 Apr 2016 22:51:29 -   1.2
+++ Makefile30 Jan 2017 09:17:02 -
@@ -4,7 +4,7 @@ COMMENT=dependency manager for PHP
 
 CATEGORIES=www devel
 
-V= 1.0.0
+V= 1.3.2
 EPOCH= 0
 MASTER_SITES=  https://getcomposer.org/download/$V/
 DISTNAME=  composer-$V
Index: distinfo
===
RCS file: /cvs/ports/www/composer/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 Apr 2016 22:51:29 -   1.2
+++ distinfo30 Jan 2017 09:17:02 -
@@ -1,2 +1,2 @@
-SHA256 (composer-1.0.0.phar) = GswADPI72dGeFZDC7etE+5FfiNhfF5iSXsmJxgHbC9Y=
-SIZE (composer-1.0.0.phar) = 1592980
+SHA256 (composer-1.3.2.phar) = ak92GqNLtp/KhrxBGl6YNsqCRvD80p84BLF0/un7BWk=
+SIZE (composer-1.3.2.phar) = 1816271

Update ruby-bunlder to 1.13.6

[Frank Groeneveld]

Attached patch updates ruby-bundler to 1.13.6.

Frank
Index: Makefile
===
RCS file: /cvs/ports/devel/ruby-bundler/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile15 Nov 2015 17:14:29 -  1.10
+++ Makefile12 Dec 2016 19:23:11 -
@@ -2,7 +2,7 @@
 
 COMMENT=   ruby application dependency manager
 
-DISTNAME=  bundler-1.10.6
+DISTNAME=  bundler-1.13.6
 CATEGORIES=devel
 
 HOMEPAGE=  http://gembundler.com/
Index: distinfo
===
RCS file: /cvs/ports/devel/ruby-bundler/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo15 Nov 2015 17:14:29 -  1.4
+++ distinfo12 Dec 2016 19:23:11 -
@@ -1,2 +1,2 @@
-SHA256 (bundler-1.10.6.gem) = +ykz0SMEzsddrHW5OhywRdoCaykebGWwl0TOuQB2n+4=
-SIZE (bundler-1.10.6.gem) = 251392
+SHA256 (bundler-1.13.6.gem) = +v0i3+1ljKBgPzIb3RaO1wnXxoLmEnO1VjdxZFny0Pc=
+SIZE (bundler-1.13.6.gem) = 307200
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ruby-bundler/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   15 Nov 2015 17:14:29 -  1.4
+++ pkg/PLIST   12 Dec 2016 19:23:11 -
@@ -3,8 +3,11 @@ ${GEM_BIN}/bundle${GEM_BIN_SUFFIX}
 ${GEM_BIN}/bundler${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
+${GEM_LIB}/gems/${DISTNAME}/.codeclimate.yml
 ${GEM_LIB}/gems/${DISTNAME}/.gitignore
 ${GEM_LIB}/gems/${DISTNAME}/.rspec
+${GEM_LIB}/gems/${DISTNAME}/.rubocop.yml
+${GEM_LIB}/gems/${DISTNAME}/.rubocop_todo.yml
 ${GEM_LIB}/gems/${DISTNAME}/.travis.yml
 ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
 ${GEM_LIB}/gems/${DISTNAME}/CODE_OF_CONDUCT.md
@@ -15,10 +18,15 @@ ${GEM_LIB}/gems/${DISTNAME}/LICENSE.md
 ${GEM_LIB}/gems/${DISTNAME}/README.md
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/bin/
-${GEM_LIB}/gems/${DISTNAME}/bin/bundle
-${GEM_LIB}/gems/${DISTNAME}/bin/bundle_ruby
-${GEM_LIB}/gems/${DISTNAME}/bin/bundler
+${GEM_LIB}/gems/${DISTNAME}/bin/rake
+${GEM_LIB}/gems/${DISTNAME}/bin/rspec
+${GEM_LIB}/gems/${DISTNAME}/bin/rubocop
+${GEM_LIB}/gems/${DISTNAME}/bin/with_rubygems
 ${GEM_LIB}/gems/${DISTNAME}/bundler.gemspec
+${GEM_LIB}/gems/${DISTNAME}/exe/
+${GEM_LIB}/gems/${DISTNAME}/exe/bundle
+${GEM_LIB}/gems/${DISTNAME}/exe/bundle_ruby
+${GEM_LIB}/gems/${DISTNAME}/exe/bundler
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler.rb
@@ -32,6 +40,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/common.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/config.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/console.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/doctor.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/exec.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/gem.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/init.rb
@@ -42,6 +51,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/outdated.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/package.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/platform.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/plugin.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/show.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/update.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/viz.rb
@@ -55,36 +65,46 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/dsl.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/endpoint_specification.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/env.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/bundler/environment.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/environment_preserver.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/errors.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/base.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/compact_index.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/dependency.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/downloader.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/index.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/friendly_errors.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_helper.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_helpers.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_installer.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_path_manipulation.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_remote_fetcher.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_tasks.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_version_promoter.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/graph.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/index.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/injector.rb
 

Re: igmpproxy double free (was: Re: Kernel panic on 6.0-stable)

[Frank Groeneveld]

Hello Jeremie,

On Mon, Dec 12, 2016 at 02:10:33AM +0100, Jeremie Courreges-Anglas wrote:
> It is not clear to me whether this update doesn't have any drawback.
> Also, the issue at hand may be fixed only because the patches have been
> removed.  Markus is the maintainer and should decide here (I added him
> to the Cc list).
> 
> Frank, does the following diff help?

Thanks for looking into this as well. Unfortunately your patch doesn't
help. Below the new backtrace.

Frank

 
igmpproxy(31308) in free(): error: use after free 0x1ed1b2687600

Program received signal SIGABRT, Aborted.
0x1ed13291387a in thrkill () at :2
2   : No such file or directory.
in 
Current language:  auto; currently asm
(gdb) bt
#0  0x1ed13291387a in thrkill () at :2
#1  0x1ed13290ef39 in *_libc_abort ()
at /usr/src/lib/libc/stdlib/abort.c:52
#2  0x1ed1328f1279 in wrterror (msg=0x1ed132a1a378 "use after free", 
p=0x1ed1b2687600) at /usr/src/lib/libc/stdlib/malloc.c:283
#3  0x1ed1328f284c in ofree (p=0x1ed1b2687600)
at /usr/src/lib/libc/stdlib/malloc.c:1235
#4  0x1ed1328f28ee in free (ptr=0x1ed121093600)
at /usr/src/lib/libc/stdlib/malloc.c:1340
#5  0x1ecf19f05888 in age_callout_queue (elapsed_time=2) at
callout.c:92
#6  0x1ecf19f01e06 in igmpProxyRun () at igmpproxy.c:378
#7  0x1ecf19f02321 in main (ArgCn=2, ArgVc=0x7f7bd448)
at igmpproxy.c:181

Re: Kernel panic on 6.0-stable

[Frank Groeneveld]

On Fri, Dec 09, 2016 at 12:30:47AM +0100, Rafael Sadowski wrote:
> 
> Just for fun, diff below updates igmpproxy from beta2 (2005-09-13) to final
> (2009-10-05). I deleted all undocumented patches. Maybe this is a
> mistake, maybe not.
> 
> Frank, maybe it helps you.
> 
> Rafael
> 

Great, that fixes it, thank you!

Your patch needs some modifications before import though:

- the daemon now requires the config file as first argument, so the rc
  file needs that added.
- the version number you created (0.1p9) is not recognized as being
  higher thatn 0.1b2p8. I would opt for renaming this new one 0.1 and
  adding a quirk so that it would upgrade the 0.1 beta 2's to 0.1.

Thanks again!

Frank

Re: Kernel panic on 6.0-stable

[Frank Groeneveld]

On Thu, Dec 08, 2016 at 11:11:33PM +0100, Frank Groeneveld wrote:
> On Sun, Dec 04, 2016 at 07:17:44PM +0100, Jeremie Courreges-Anglas wrote:
> > 
> > Hi,
> > 
> > Frank Groeneveld <frank+openbsd-m...@frankgroeneveld.nl> writes:
> > 
> > > On Sun, Nov 20, 2016 at 03:21:32PM +0100, Martin Pieuchot wrote:
> > >> On 20/11/16(Sun) 13:58, Frank Groeneveld wrote:
> > >> > A few week back there was an outage at my ISP. Afterwards, I kept
> > >> > getting crashed on igmpproxy after changing channels on the tv a few
> > >> > times:
> > >> 
> > >> This has been fixed in -current.
> > >
> > > Thanks for the pointer. Does it fix both the igmpproxy crash and the
> > > kernel crash? Or just the igmpproxy crash?
> > 
> > This igmpproxy crash would probably be trivial to solve, if we had
> > a backtrace.  If you're on -current,
> > 
> >   make clean repackage reinstall DEBUG=-g
> > 
> > would install an igmpproxy package with debug symbols.  Then running
> > igmpproxy under gdb and typing 'bt' once you hit the crash would give us
> > a helpful backtrace, which you could then send (to ports@ or to me).
> > 
> > -- 
> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 
> That would be great! I've not upgraded to -current yet, but I captured
> the backtrace on 5.9. I've also included some debugging output from
> before the crash.
> 
> Let me know how I can help resolve this.
> 
> Frank
> 

Forgot the attachment...
Current routing table (Remove route);
-

Debu: #0: Dst: 224.3.2.6, Age:2, St: A, OutVifs: 0x0002
Debu: #0: Origin: 213.75.167.58 floodIf -1 pktcnt 224
Debu: #1: Dst: 224.0.251.124, Age:2, St: A, OutVifs: 0x0002
Debu: #1: Origin: 213.75.167.6 floodIf -1 pktcnt 12686
Debu: #2: Dst: 224.0.251.126, Age:2, St: A, OutVifs: 0x0002
Debu: #2: Origin: 213.75.167.6 floodIf -1 pktcnt 6384
Debu: #3: Dst: 239.255.255.250, Age:2, St: A, OutVifs: 0x0002
Debu: #3: Origin: 192.168.1.2 floodIf 2 pktcnt 368
Debu: #3: Origin: 192.168.2.10 floodIf 1 pktcnt 26
Debu: 
-

Debu: About to call timeout 15 (#1)
Debu: Aging Origin 213.75.167.6 Dst 224.0.251.124 PktCnt 12686 -> 12686
Debu: Origin 213.75.167.6 Vif bits : 0x0002
Debu: Setting TTL for Vif 1 to 1
Debu: Identified VIF #2 as upstream.
Note: Removing MFC: 213.75.167.6 -> 224.0.251.124, InpVIf: 2
igmpproxy(26355) in free(): error: use after free 0xee1e9c3adc0

Program received signal SIGABRT, Aborted.
0x0ee1e7a5487a in thrkill () at :2
2   : No such file or directory.
in 
Current language:  auto; currently asm
(gdb) bt
#0  0x0ee1e7a5487a in thrkill () at :2
#1  0x0ee1e7a4ff39 in *_libc_abort ()
at /usr/src/lib/libc/stdlib/abort.c:52
#2  0x0ee1e7a32279 in wrterror (msg=0xee1e7b5b378 "use after free", 
p=0xee1e9c3adc0) at /usr/src/lib/libc/stdlib/malloc.c:283
#3  0x0ee1e7a3384c in ofree (p=0xee1e9c3adc0)
at /usr/src/lib/libc/stdlib/malloc.c:1235
#4  0x0ee1e7a338ee in free (ptr=0xee19f72fac0)
at /usr/src/lib/libc/stdlib/malloc.c:1340
#5  0x0edeecb03f4e in internAgeRoute (croute=0xee16d3c9cc0)
at rttable.c:614
#6  0x0edeecb04118 in lastMemberGroupAge (group=Variable "group" is not 
available.
) at rttable.c:483
#7  0x0edeecb03070 in sendGroupSpecificMemberQuery (argument=0xee1e9c3c500)
at request.c:156
#8  0x0edeecb05880 in age_callout_queue (elapsed_time=0) at callout.c:91
#9  0x0edeecb01e06 in igmpProxyRun () at igmpproxy.c:378
#10 0x0edeecb02321 in main (ArgCn=2, ArgVc=0x7f7e32c8)
at igmpproxy.c:181

Re: Kernel panic on 6.0-stable

[Frank Groeneveld]

On Sun, Dec 04, 2016 at 07:17:44PM +0100, Jeremie Courreges-Anglas wrote:
> 
> Hi,
> 
> Frank Groeneveld <frank+openbsd-m...@frankgroeneveld.nl> writes:
> 
> > On Sun, Nov 20, 2016 at 03:21:32PM +0100, Martin Pieuchot wrote:
> >> On 20/11/16(Sun) 13:58, Frank Groeneveld wrote:
> >> > A few week back there was an outage at my ISP. Afterwards, I kept
> >> > getting crashed on igmpproxy after changing channels on the tv a few
> >> > times:
> >> 
> >> This has been fixed in -current.
> >
> > Thanks for the pointer. Does it fix both the igmpproxy crash and the
> > kernel crash? Or just the igmpproxy crash?
> 
> This igmpproxy crash would probably be trivial to solve, if we had
> a backtrace.  If you're on -current,
> 
>   make clean repackage reinstall DEBUG=-g
> 
> would install an igmpproxy package with debug symbols.  Then running
> igmpproxy under gdb and typing 'bt' once you hit the crash would give us
> a helpful backtrace, which you could then send (to ports@ or to me).
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

That would be great! I've not upgraded to -current yet, but I captured
the backtrace on 5.9. I've also included some debugging output from
before the crash.

Let me know how I can help resolve this.

Frank

wxneeded for textproc/wkhtmltopdf

[Frank Groeneveld]

Because of the bundled webkit, attached patch needs to be applied to
textproc/wkhtmltopdf to be usable again. Could somebody commit this for
me?

Cheers.

Frank
? wkhtmltopdf-0.12.3.2p0.patch
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile10 Aug 2016 20:53:27 -  1.9
+++ Makefile20 Aug 2016 14:56:48 -
@@ -8,6 +8,7 @@ COMMENT =   convert HTML to PDF using Web
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.3.2
+REVISION = 0
 QT_COMMIT =8dae19a82231e87366d81c683bafcb025aea9c1d
 MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =${DISTNAME}.tar.gz \
@@ -35,6 +36,7 @@ LIB_DEPENDS = graphics/png \
textproc/icu4c
 
 USE_GMAKE =Yes
+USE_WXNEEDED = Yes
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
 MAKE_ENV +=WRKBUILD=${WRKBUILD}
 FAKE_FLAGS =   INSTALL_ROOT=${WRKINST}${TRUEPREFIX}

Re: simple wxneeded setting from port Makefiles

[Frank Groeneveld]

On Sat, Aug 20, 2016 at 03:25:25PM +0200, Jeremie Courreges-Anglas wrote:
> Pretty much any time you see this, you can assume that the kernel
> returned ENOEXEC.  This can happen with an invalid executable,
> a partition mounted "noexec", or... a program annotated with wxneeded
> but placed on a partition that isn't mounted with "wxallowed".  Check
> the partition that holds WRKOBJDIR (probably /home here).

Great tip, thank you very much. The diff is now just a USE_WXNEEDED
addition :-)

Frank

UPDATE: sysutils/ansible-2.1.1.0

[Frank Groeneveld]

Attached patch updates Ansible to 2.1.1.0 to fix an important bug: using
the cron modules user argument might result in the root users crontab
being cleared, see the following bugreport.
https://github.com/ansible/ansible-modules-core/issues/3344

Thanks.

Frank
Index: Makefile
===
RCS file: /cvs/ports/sysutils/ansible/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile27 May 2016 13:54:49 -  1.51
+++ Makefile19 Aug 2016 09:50:04 -
@@ -2,7 +2,7 @@
 
 COMMENT =  ssh based config management framework
 
-MODPY_EGG_VERSION =2.1.0.0
+MODPY_EGG_VERSION =2.1.1.0
 DISTNAME = ansible-${MODPY_EGG_VERSION}
 
 CATEGORIES =   sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ansible/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo27 May 2016 13:54:49 -  1.39
+++ distinfo19 Aug 2016 09:50:04 -
@@ -1,2 +1,2 @@
-SHA256 (ansible-2.1.0.0.tar.gz) = QDRDtV9lIs+G+bQVRKm2uB99J/CIRG6FM01demMXzK0=
-SIZE (ansible-2.1.0.0.tar.gz) = 1877209
+SHA256 (ansible-2.1.1.0.tar.gz) = Yec5wSOSO6kBafQsVOX1HfdZ7UC04zKnFg19uWPVZ4s=
+SIZE (ansible-2.1.1.0.tar.gz) = 1844349
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/ansible/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST   27 May 2016 13:54:49 -  1.19
+++ pkg/PLIST   19 Aug 2016 09:50:04 -
@@ -1669,6 +1669,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/ansible/playbook/conditional.pyc
 lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler.py
 lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler.pyc
+lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler_task_include.py
+lib/python${MODPY_VERSION}/site-packages/ansible/playbook/handler_task_include.pyc
 lib/python${MODPY_VERSION}/site-packages/ansible/playbook/helpers.py
 lib/python${MODPY_VERSION}/site-packages/ansible/playbook/helpers.pyc
 lib/python${MODPY_VERSION}/site-packages/ansible/playbook/included_file.py

Re: NEW: devel/gitlab-ci-multi-runner

[Frank Groeneveld]

On Tue, Aug 16, 2016 at 09:04:00AM +0200, Frank Groeneveld wrote:
> Got some feedback off-list. I've incorporated these fixes (missing >,
> added homepage, license on seperate line). Any other comments?

Ping?

Thanks.

Frank


gitlab-ci-multi-runner-1.4.1.tar.gz
Description: application/tar-gz

Re: NEW: devel/gitlab-ci-multi-runner

[Frank Groeneveld]

On Wed, Aug 10, 2016 at 12:37:33PM +0200, Frank Groeneveld wrote:
> Attached a port for gitlab-ci-multi-runner:
> 
> ---
> A runner for Gitlab CI. It runs tests and sends the results to GitLab.
> GitLab CI is the open-source continuous integration service included
> with GitLab that coordinates the testing.
> ---
> 
> My previous attempt stranded because I needed some upstream patches and
> a prebuilt docker image. I've solved this problem by just simply
> disabling the docker parts, we won't be able to use that on OpenBSD
> anyway.
> 
> What do you think, can this be imported?
> 
> Thanks
> 
> Frank

Got some feedback off-list. I've incorporated these fixes (missing >,
added homepage, license on seperate line). Any other comments?

Thanks.

Frank


gitlab-ci-multi-runner-1.4.1.tar.gz
Description: application/tar-gz

Re: Security update textproc/wkhtmltopdf-0.12.3.2

[Frank Groeneveld]

On Thu, Aug 11, 2016 at 03:48:59PM +0800, Tinker wrote:
> On 2016-08-11 15:38, Tinker wrote:
> >On 2016-07-28 22:54, Frank Groeneveld wrote:
> >>On Thu, Jul 28, 2016 at 12:54:52PM +0100, Stuart Henderson wrote:
> >>>On 2016/07/28 01:02, Tinker wrote:
> >>>> On 2016-07-27 16:36, Frank Groeneveld wrote:
> >>>> > Attached patch updates wkhtmltopdf to the latest release. Some 
> >>>> > important
> >>>> > security fixes (OpenSSL updates) were added ..
> >>>>
> >>>> Can't it use the system's LibreSSL version??
> >>>>
> >>>
> >>>I'm pretty sure it is, otherwise we wouldn't have needed the
> >>>OPENSSL_NO_SSL3
> >>>patches.
> >>
> >>Yes, it doesn't use the bundled OpenSSl version, sorry for the
> >>confusion. It seems [..]
> 
> (Wait, by "does not use the bundled OpenSSL version", you mean that the
> Wkhtmltopdf OpenBSD port not uses the *OS-*bundled *LibreSSL* library
> right?)
> 

With bundled I mean the library that comes in the wkhtmltopdf "bundle".
As you can see we need patches to let the build know that the base
LibreSSL doesn't support SSLv3, which leads me and Stuart to think that
it uses the LibreSSL from base.

I see Stuart has committed this update already. Thanks Stuart!

Frank

NEW: devel/gitlab-ci-multi-runner

[Frank Groeneveld]

Attached a port for gitlab-ci-multi-runner:

---
A runner for Gitlab CI. It runs tests and sends the results to GitLab.
GitLab CI is the open-source continuous integration service included
with GitLab that coordinates the testing.
---

My previous attempt stranded because I needed some upstream patches and
a prebuilt docker image. I've solved this problem by just simply
disabling the docker parts, we won't be able to use that on OpenBSD
anyway.

What do you think, can this be imported?

Thanks

Frank


gitlab-ci-multi-runner-1.4.1.tar.gz
Description: application/tar-gz

Re: Security update textproc/wkhtmltopdf-0.12.3.2

[Frank Groeneveld]

On Thu, Jul 28, 2016 at 04:54:18PM +0200, Frank Groeneveld wrote:
> 
> I'll bring this patch up again after the lock is removed, because
> without security issues there is no rush this port update.
> 

Bringing this up again now that the lock is gone. Could somebody commit
this if there are no objections?

Thanks!

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile3 Apr 2016 14:20:03 -   1.8
+++ Makefile27 Jul 2016 08:26:08 -
@@ -7,9 +7,8 @@ COMMENT =   convert HTML to PDF using Web
 
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
-GH_TAGNAME =   0.12.2.4
-REVISION = 3
-QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+GH_TAGNAME =   0.12.3.2
+QT_COMMIT =8dae19a82231e87366d81c683bafcb025aea9c1d
 MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo6 Jan 2016 16:50:35 -   1.2
+++ distinfo27 Jul 2016 08:26:08 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.2.4.tar.gz) = 
27AWbpzhkeeH6QlgHkzbrnEGnylpM2Lt9c19TUREcog=
-SHA256 (wkhtmltopdf-qt-7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 
0uxGcEwKVGE7Wlhv/0bSRZLFCiYYJJTxqkmKy0aLwlQ=
-SIZE (wkhtmltopdf-0.12.2.4.tar.gz) = 127595
-SIZE (wkhtmltopdf-qt-7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 
173043701
+SHA256 (wkhtmltopdf-0.12.3.2.tar.gz) = 
chUj74fMuTe/NxSt4ZsRL0y4os2EDjSzDybuJixB/hY=
+SHA256 (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d.tar.gz) = 
w7Fa4y044TfRu3BSWGNK+CFzbANS6VIVCk01NrjISl4=
+SIZE (wkhtmltopdf-0.12.3.2.tar.gz) = 128050
+SIZE (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d.tar.gz) = 
173040690

Re: Security update textproc/wkhtmltopdf-0.12.3.2

[Frank Groeneveld]

On Thu, Jul 28, 2016 at 12:54:52PM +0100, Stuart Henderson wrote:
> On 2016/07/28 01:02, Tinker wrote:
> > On 2016-07-27 16:36, Frank Groeneveld wrote:
> > > Attached patch updates wkhtmltopdf to the latest release. Some important
> > > security fixes (OpenSSL updates) were added ..
> > 
> > Can't it use the system's LibreSSL version??
> > 
> 
> I'm pretty sure it is, otherwise we wouldn't have needed the OPENSSL_NO_SSL3
> patches.

Yes, it doesn't use the bundled OpenSSl version, sorry for the
confusion. It seems the 0.12.3.1 and 0.12.3.2 releases are mostly done
for Windows users which do use the bundled OpenSSL:

https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.3.2
https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.3.1

Other platforms only need the fixes that were done in 0.12.3, which
according to the changelog, don't include security fixes:

https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.3

I'll bring this patch up again after the lock is removed, because
without security issues there is no rush this port update.

Frank

Re: Security update textproc/wkhtmltopdf-0.12.3.2

[Frank Groeneveld]

On Wed, Jul 27, 2016 at 10:59:45AM +0200, Rafael Sadowski wrote:
> > ? wkhtmltopdf-0.12.3.2.patch
> 
> Remove it and create new diff.

Attached.

> > -GH_TAGNAME =   0.12.2.4
> > -REVISION = 3
> > -QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
> > +GH_TAGNAME =   0.12.3.2
> > +QT_COMMIT =8dae19a82231e87366d81c683bafcb025aea9c1d
> 
> QT_COMMIT is wrong but it works because GH_TAGNAME is set. You can
> remove QT_COMMIT.

Have a look at the full file, we're actually gathering two seperate
projects on Github and merging those in one build. The patched QT
doesn't have git tags, so that's why we have a ref there.

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile3 Apr 2016 14:20:03 -   1.8
+++ Makefile27 Jul 2016 08:26:08 -
@@ -7,9 +7,8 @@ COMMENT =   convert HTML to PDF using Web
 
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
-GH_TAGNAME =   0.12.2.4
-REVISION = 3
-QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+GH_TAGNAME =   0.12.3.2
+QT_COMMIT =8dae19a82231e87366d81c683bafcb025aea9c1d
 MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo6 Jan 2016 16:50:35 -   1.2
+++ distinfo27 Jul 2016 08:26:08 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.2.4.tar.gz) = 
27AWbpzhkeeH6QlgHkzbrnEGnylpM2Lt9c19TUREcog=
-SHA256 (wkhtmltopdf-qt-7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 
0uxGcEwKVGE7Wlhv/0bSRZLFCiYYJJTxqkmKy0aLwlQ=
-SIZE (wkhtmltopdf-0.12.2.4.tar.gz) = 127595
-SIZE (wkhtmltopdf-qt-7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 
173043701
+SHA256 (wkhtmltopdf-0.12.3.2.tar.gz) = 
chUj74fMuTe/NxSt4ZsRL0y4os2EDjSzDybuJixB/hY=
+SHA256 (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d.tar.gz) = 
w7Fa4y044TfRu3BSWGNK+CFzbANS6VIVCk01NrjISl4=
+SIZE (wkhtmltopdf-0.12.3.2.tar.gz) = 128050
+SIZE (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d.tar.gz) = 
173040690

Security update textproc/wkhtmltopdf-0.12.3.2

[Frank Groeneveld]

Attached patch updates wkhtmltopdf to the latest release. Some important
security fixes (OpenSSL updates) were added and some minor bugfixes are
included as well. I've tested this in production on our servers and the
produced PDF files seem to be visually identical.

Can this be included in 6.0 or should it wait?

Frank
? wkhtmltopdf-0.12.3.2.patch
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile3 Apr 2016 14:20:03 -   1.8
+++ Makefile27 Jul 2016 08:26:08 -
@@ -7,9 +7,8 @@ COMMENT =   convert HTML to PDF using Web
 
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
-GH_TAGNAME =   0.12.2.4
-REVISION = 3
-QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+GH_TAGNAME =   0.12.3.2
+QT_COMMIT =8dae19a82231e87366d81c683bafcb025aea9c1d
 MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo6 Jan 2016 16:50:35 -   1.2
+++ distinfo27 Jul 2016 08:26:08 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.2.4.tar.gz) = 
27AWbpzhkeeH6QlgHkzbrnEGnylpM2Lt9c19TUREcog=
-SHA256 (wkhtmltopdf-qt-7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 
0uxGcEwKVGE7Wlhv/0bSRZLFCiYYJJTxqkmKy0aLwlQ=
-SIZE (wkhtmltopdf-0.12.2.4.tar.gz) = 127595
-SIZE (wkhtmltopdf-qt-7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 
173043701
+SHA256 (wkhtmltopdf-0.12.3.2.tar.gz) = 
chUj74fMuTe/NxSt4ZsRL0y4os2EDjSzDybuJixB/hY=
+SHA256 (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d.tar.gz) = 
w7Fa4y044TfRu3BSWGNK+CFzbANS6VIVCk01NrjISl4=
+SIZE (wkhtmltopdf-0.12.3.2.tar.gz) = 128050
+SIZE (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d.tar.gz) = 
173040690

Re: NEW: devel/gitlab-ci-multi-runner

[Frank Groeneveld]

On Mon, Jul 11, 2016 at 06:00:50PM -0500, Amit Kulkarni wrote:
> I think you missed ports lock, you will have to wait a month or so before
> port imports can start again.

Thanks for the reply, but my first concern is cleaning up this port and
resolving the two problems. Do you have any suggestions for that?

Thanks!

Frank

Re: NEW: devel/gitlab-ci-multi-runner

[Frank Groeneveld]

On Mon, Apr 18, 2016 at 09:51:08PM +0200, Frank Groeneveld wrote:
> Attached a port for gitlab-ci-multi-runner:
> 
> ---
> A runner for Gitlab CI. It runs tests and sends the results to GitLab.
> GitLab CI is the open-source continuous integration service included
> with GitLab that coordinates the testing.
> ---
> 
> My upstream patches have not all been accepted yet. I'm still waiting
> on one update of a vendored package:
> https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/139
> 
> For now, I've included that patch in its most simple form in the port.
> This results in a very long filename though, so the port is attached as
> zip file (tar could not store this long name). What's the best way to
> shorten this patch name?
> 
> The final problem is the referenced prebuilt.tar.gz. I believe this is
> a very simple Docker container image that can be used by
> gitlab-ci-multi-runner to start a docker container on a docker host.
> This file is however not versioned and I'm not sure whether the contents
> will change in the future. If so, it will of course result in checksum
> errors. Should we/I cache this file somewhere and version it with the
> date?

Anybody care to help me with these questions? I would really like to get
this imported.

Thanks!

Frank

Re: NEW: devel/gox

[Frank Groeneveld]

On Mon, Apr 18, 2016 at 08:18:51PM +0200, Frank Groeneveld wrote:
> Attached another build dependency for gitlab-ci-multi-runner: gox.
> 
> Gox is a simple, no-frills tool for Go cross compilation that behaves a
> lot like standard go build. Gox will parallelize builds for multiple 
> platforms.  Gox will also build the cross-compilation toolchain for you.
> 
> Any comments or OK's?
> 
> Thanks!
> 
> Frank

You can discard this port, we don't need it, because we can not build
the needed docker container for gitlab-ci-multi-runner on OpenBSD.
We'll have to download a binary BLOB for the container, which means we
don't need this port.

Sorry for the noise.

Frank

Re: NEW: devel/go-bindata

[Frank Groeneveld]

On Fri, Apr 08, 2016 at 04:32:36PM +0200, Frank Groeneveld wrote:
> Thanks to Dmitrij D. Czarkof, I hereby sent you a port for go-bindata.
> 
> A tool that can be used to embed binary data in a Go program. It is a
> build requirement for gitlab-ci-multi-runner,for which I'm planning to
> create a port.
> 
> Please let me know if this port works everywhere and whether it needs
> any changes before being committed.

Ping?

Frank


go-bindata-3.0.5.tar.gz
Description: application/tar-gz

NEW: devel/gox

[Frank Groeneveld]

Attached another build dependency for gitlab-ci-multi-runner: gox.

Gox is a simple, no-frills tool for Go cross compilation that behaves a
lot like standard go build. Gox will parallelize builds for multiple 
platforms.  Gox will also build the cross-compilation toolchain for you.

Any comments or OK's?

Thanks!

Frank


gox-0.3.0.tar.gz
Description: application/tar-gz

Re: PHP 7 build dependency missing

[Frank Groeneveld]

On Thu, Apr 14, 2016 at 11:29:50AM +0100, Stuart Henderson wrote:
> untested (no time right now) but this should work:

It does indeed work, seems like a much nicer solution to me. Thanks!

Could somebody commit this to -current and possibly -stable?

Frank

Re: PHP 7 build dependency missing

[Frank Groeneveld]

On Wed, Apr 13, 2016 at 12:32:03PM +0200, Frank Groeneveld wrote:
> ...
> 
> One other small bug: files/php.conf contains "php5" in some places, it
> should be dynamic, depending on the php major version. I'm not sure how
> to capture only the first char from the $PV variable, otherwise I could
> make a diff for you.

I've made a diff that defines a new variable MV (major version) that is
used to fix this bug. My diff is against 5.9-stable, but I think it will
apply to -current without problems.

Would be great to get this committed into -stable as well.

Frank
? major_version.diff
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile.inc
--- Makefile.inc1 Feb 2016 21:53:06 -   1.72
+++ Makefile.inc14 Apr 2016 09:35:31 -
@@ -429,7 +429,7 @@ post-install:
 
${INSTALL_DATA} ${.CURDIR}/../files/php.conf \
${PREFIX}/share/examples/php-${PV}/php.conf
-   @perl -pi -e "s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g" \
+   @perl -pi -e 
"s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g;s,!!MV!!,${MV},g" \
${PREFIX}/share/examples/php-${PV}/php.conf
 
 .for m in ${MULTI_PACKAGES:N-main:N-fastcgi:N-fpm:S/-//g}
Index: 5.4/Makefile
===
RCS file: /cvs/ports/lang/php/5.4/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- 5.4/Makefile1 Feb 2016 21:53:06 -   1.52
+++ 5.4/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
 # $OpenBSD: Makefile,v 1.52 2016/02/01 21:53:06 sthen Exp $
 
-PV=5.4
+MV=5
+PV=${MV}.4
 V= ${PV}.45
 REVISION=  2
 
Index: 5.5/Makefile
===
RCS file: /cvs/ports/lang/php/5.5/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- 5.5/Makefile6 Feb 2016 23:31:20 -   1.49
+++ 5.5/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
 # $OpenBSD: Makefile,v 1.49 2016/02/06 23:31:20 sthen Exp $
 
-PV=5.5
+MV=5
+PV=${MV}.5
 V= ${PV}.32
 
 .include 
Index: 5.6/Makefile
===
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- 5.6/Makefile6 Feb 2016 23:30:25 -   1.25
+++ 5.6/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
 # $OpenBSD: Makefile,v 1.25 2016/02/06 23:30:25 sthen Exp $
 
-PV=5.6
+MV=5
+PV=${MV}.6
 V= ${PV}.18
 
 WANTLIB-main+= stdc++ ncurses readline
Index: 7.0/Makefile
===
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- 7.0/Makefile1 Feb 2016 21:53:06 -   1.5
+++ 7.0/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
 # $OpenBSD: Makefile,v 1.5 2016/02/01 21:53:06 sthen Exp $
 
-PV=7.0
+MV=7
+PV=${MV}.0
 V= ${PV}.2
 REVISION=  0
 
Index: files/php.conf
===
RCS file: /cvs/ports/lang/php/files/php.conf,v
retrieving revision 1.2
diff -u -p -r1.2 php.conf
--- files/php.conf  5 Jan 2011 09:31:23 -   1.2
+++ files/php.conf  14 Apr 2016 09:35:31 -
@@ -1,6 +1,6 @@
-LoadModule php5_module !!PREFIX!!/lib/php-!!PV!!/libphp5.so
+LoadModule php!!MV!!_module !!PREFIX!!/lib/php-!!PV!!/libphp!!MV!!.so
 
-
+
AddType application/x-httpd-php .php .phtml .php3
AddType application/x-httpd-php-source .phps
 # Most php configs require this

Re: PHP 7 build dependency missing

[Frank Groeneveld]

On Wed, Apr 13, 2016 at 09:40:49AM +0100, Stuart Henderson wrote:
> it's already there:
> 
> $ cd /usr/ports/lang/php/7.0
> $ make show=BUILD_DEPENDS
> devel/bison www/apache-httpd STEM->=0.10.38:devel/gettext devel/gettext-tools 
> devel/metaauto devel/autoconf/2.69 devel/ccache archivers/bzip2
> 

You're right. Thats weird, dpb didn't install it for me, I had to
manually install it on my build machine. Would you know the reason?

One other small bug: files/php.conf contains "php5" in some places, it
should be dynamic, depending on the php major version. I'm not sure how
to capture only the first char from the $PV variable, otherwise I could
make a diff for you.

Thanks, and keep up the great work!

Frank

PHP 7 build dependency missing

[Frank Groeneveld]

Great work on getting php 7.0  in for 5.9 release!
Apparently you need to have apache-httpd installed before you can build
the php 7.0 port, though. Could somebody add it to the port?

Thanks!

Frank

Re: Fix wkhtmltopdf runtime dependency

[Frank Groeneveld]

On Sat, Apr 02, 2016 at 07:42:06PM +0100, Stuart Henderson wrote:
> Thanks, done (I did it as LIB_DEPENDS and added a comment as well).
> I don't see much point in pushing this to -stable, it's easier to just
> pkg_add icu4c if you don't already have it pulled in from something
> else (though most desktop-like systems will already have it).

Great, thank you! Somebody reported icu4c was missing on his server,
so it is not always pulled in by other dependencies. On my servers it
was not missing though.

It's fine by me if this is just in -current. He now knows he needs to
install icu4c manually.

Regards,
Frank

Re: Fix wkhtmltopdf runtime dependency

[Frank Groeneveld]

On Tue, Mar 22, 2016 at 07:43:57PM +0100, Frank Groeneveld wrote:
> Apparently wkhtmltopdf has a runtime dependency on icu4c. Attached
> patch adds it to the port. It would be great if this patch could
> also be added to 5.9-stable.
> 
> Thanks.
> 
> Frank

Ping?

Fix wkhtmltopdf runtime dependency

[Frank Groeneveld]

Apparently wkhtmltopdf has a runtime dependency on icu4c. Attached
patch adds it to the port. It would be great if this patch could
also be added to 5.9-stable.

Thanks.

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile13 Jan 2016 22:31:38 -  1.6
+++ Makefile21 Mar 2016 19:07:41 -
@@ -8,7 +8,7 @@ COMMENT =   convert HTML to PDF using Web
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
-REVISION = 2
+REVISION = 3
 QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
 MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =${DISTNAME}.tar.gz \
@@ -25,11 +25,13 @@ MAINTAINER =Frank Groeneveld <frank@fr
 # LGPLv3
 PERMIT_PACKAGE_CDROM = Yes

-WANTLIB += X11 Xext Xrender c fontconfig freetype jpeg m png pthread stdc++ z
+WANTLIB += X11 Xext Xrender c fontconfig freetype icui18n jpeg m png pthread \
+   stdc++ z

 MODULES =  converters/libiconv
 LIB_DEPENDS =  graphics/png \
graphics/jpeg
+RUN_DEPENDS =  textproc/icu4c

 USE_GMAKE =Yes
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}

Re: Update ansible to 2.0.0.1

[Frank Groeneveld]

On Thu, Jan 14, 2016 at 11:45:17AM +, Stuart Henderson wrote:
> Thank you - works for me (and fixes an annoying bug I was bumping into
> with the rsync module where it tries to use sudo when it doesn't need to :)
> 
> Update is OK sthen@.

Great! Could somebody commit this for me? Thanks.

Frank

Re: Update ansible to 2.0.0.1

[Frank Groeneveld]

On Wed, Jan 13, 2016 at 09:41:56PM +0100, Daniel Jakots wrote:
> >  share/examples/ansible/
> > -@sample ${SYSCONFDIR}/ansible/
> >  share/examples/ansible/ansible.cfg
> > -@sample ${SYSCONFDIR}/ansible/ansible.cfg
> >  share/examples/ansible/hosts
> > -@sample ${SYSCONFDIR}/ansible/hosts
>
> I don't think that should change.

Thanks for pointing that out, I fixed it in the attached patch.

On Wed, Jan 13, 2016 at 09:17:21PM +, Stuart Henderson wrote:
> Please CC rpe@ (maintainer) :)

Sorry, didn't know that. I'll do so from now on.

> 
> And since this just moved from the following patch, please copy across the 
> comment:
> 
> > -$OpenBSD: patch-lib_ansible_runner_action_plugins_copy_py,v 1.1 2014/09/10 
> > 20:21:43 rpe Exp $
> > -
> > -https://github.com/adamchainz/ansible/commit/842a1b976d650b2c3117a6e0ed1329e5d0d62873
> > -
> > -'copy' write new line at end of file if 'content' passed without newline
> ^^

Had overlooked the comment. I re-added it in the attached patch.

Thanks!

Frank
? ansible-2.0.0.1.diff
Index: Makefile
===
RCS file: /cvs/ports/sysutils/ansible/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile25 Oct 2015 15:23:03 -  1.46
+++ Makefile14 Jan 2016 11:05:00 -
@@ -2,7 +2,7 @@
 
 COMMENT =  ssh based config management framework
 
-MODPY_EGG_VERSION =1.9.4
+MODPY_EGG_VERSION =2.0.0.1
 DISTNAME = ansible-${MODPY_EGG_VERSION}
 
 CATEGORIES =   sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ansible/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo25 Oct 2015 15:23:03 -  1.34
+++ distinfo14 Jan 2016 11:05:00 -
@@ -1,2 +1,2 @@
-SHA256 (ansible-1.9.4.tar.gz) = lywvrOSfFXe9D/eYlEC/4oIOZvsQ11eZFcxTa8z6b+M=
-SIZE (ansible-1.9.4.tar.gz) = 937120
+SHA256 (ansible-2.0.0.1.tar.gz) = EIXB+uO1n45VpkuUlInx3c2BGgwy2d+KwYq/RKQw87U=
+SIZE (ansible-2.0.0.1.tar.gz) = 1524249
Index: patches/patch-lib_ansible_plugins_action_copy_py
===
RCS file: patches/patch-lib_ansible_plugins_action_copy_py
diff -N patches/patch-lib_ansible_plugins_action_copy_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-lib_ansible_plugins_action_copy_py14 Jan 2016 11:05:00 
-
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+https://github.com/adamchainz/ansible/commit/842a1b976d650b2c3117a6e0ed1329e5d0d62873
+
+'copy' write new line at end of file if 'content' passed without newline
+
+--- lib/ansible/plugins/action/copy.py.origWed Jan 13 21:13:56 2016
 lib/ansible/plugins/action/copy.py Wed Jan 13 21:14:39 2016
+@@ -299,6 +299,8 @@ class ActionModule(ActionBase):
+ content = to_bytes(content)
+ try:
+ f.write(content)
++if not content.endswith('\n'):
++  f.write('\n')
+ except Exception as err:
+ os.remove(content_tempfile)
+ raise Exception(err)
Index: patches/patch-lib_ansible_runner_action_plugins_copy_py
===
RCS file: patches/patch-lib_ansible_runner_action_plugins_copy_py
diff -N patches/patch-lib_ansible_runner_action_plugins_copy_py
--- patches/patch-lib_ansible_runner_action_plugins_copy_py 10 Sep 2014 
20:21:43 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-lib_ansible_runner_action_plugins_copy_py,v 1.1 2014/09/10 
20:21:43 rpe Exp $
-
-https://github.com/adamchainz/ansible/commit/842a1b976d650b2c3117a6e0ed1329e5d0d62873
-
-'copy' write new line at end of file if 'content' passed without newline
-
 lib/ansible/runner/action_plugins/copy.py.orig Wed Sep 10 21:24:52 2014
-+++ lib/ansible/runner/action_plugins/copy.py  Wed Sep 10 21:25:00 2014
-@@ -315,6 +315,8 @@ class ActionModule(object):
- f = os.fdopen(fd, 'w')
- try:
- f.write(content)
-+if not content.endswith('\n'):
-+f.write('\n')
- except Exception, err:
- os.remove(content_tempfile)
- raise Exception(err)
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/ansible/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST   1 Jul 2015 21:26:38 -   1.16
+++ pkg/PLIST   14 Jan 2016 11:05:00 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2015/07/01 21:26:38 rpe Exp $
+@comment $OpenBSD$
 bin/ansible
 bin/ansible-doc
 bin/ansible-galaxy
@@ -20,32 +20,86 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/ansible.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ansible/__init__.py
 lib/python${MODPY_VERSION}/site-packages/ansible/__init__.pyc

Re: UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

On 01/06/16 17:25, Stuart Henderson wrote:

It seems the library does still get linked to system qt4 if present
(make port-lib-depends-check) - this doesn't seem quite correct but now
that the runtime warnings are gone and things seem to be working I'd
like to get this in, so I'm going to commit what I have (I've added
the various LIB_DEPENDS/WANTLIB needed), I'm happy to look at any more
diffs on top of this:)


I've fixed this problem in the attached diff. This also means qt4 is no 
longer a depedency of the port, so I removed that from the Makefile as 
well. Could you verify and commit this?


Thanks!

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile6 Jan 2016 17:13:48 -   1.5
+++ Makefile13 Jan 2016 18:54:32 -
@@ -8,7 +8,7 @@ COMMENT =   convert HTML to PDF using Web
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
-REVISION = 1
+REVISION = 2
 QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
 MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =${DISTNAME}.tar.gz \
@@ -26,11 +26,8 @@ MAINTAINER = Frank Groeneveld <frank@fr
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += X11 Xext Xrender c fontconfig freetype jpeg m png pthread stdc++ z
-WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtWebKit
-WANTLIB += lib/qt4/QtXmlPatterns
 
-MODULES =  converters/libiconv \
-   x11/qt4
+MODULES =  converters/libiconv
 LIB_DEPENDS =  graphics/png \
graphics/jpeg
 
Index: patches/patch-src_lib_lib_pro
===
RCS file: patches/patch-src_lib_lib_pro
diff -N patches/patch-src_lib_lib_pro
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_lib_lib_pro   13 Jan 2016 18:54:32 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/lib/lib.pro.orig   Wed Jan 13 20:36:58 2016
 src/lib/lib.proWed Jan 13 20:37:15 2016
+@@ -41,5 +41,7 @@ TARGET=wkhtmltox
+ INSTALLS += target
+ wkhtmltox.path=$$INSTALLBASE/lib
+ 
++QMAKE_LFLAGS = -L${WRKBUILD}/qt/lib
++
+ DESTDIR = ../../bin
+ target.path=$$INSTALLBASE/lib

Re: UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

After more testing and polishing I've come up with the attached patch.
It's a full diff to -current that incorporates the fixes from Stuart
as well as the ONLY_FOR_ARCH=amd64 proposed by Landry.

I believe that only the icui18n problem is left:

> On Sun, Jan 03, 2016 at 06:01:33PM +, Stuart Henderson wrote:
> - dlopen handling needs adjusting for OpenBSD, otherwise you get
> Unable to load library icui18n "Cannot load library icui18n: (File not found)"
> as it tries to open libicui18n.so.56

Anybody know how to reproduce this? Is it only on specific urls?

Frank
? test.pdf
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile29 Dec 2015 19:49:41 -  1.3
+++ Makefile6 Jan 2016 15:06:49 -
@@ -1,11 +1,17 @@
 # $OpenBSD: Makefile,v 1.3 2015/12/29 19:49:41 jasper Exp $
 
+ONLY_FOR_ARCHS =   amd64 
+DPB_PROPERTIES =   parallel nojunk
+
 COMMENT =  convert HTML to PDF using Webkit
 
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
-
+QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
+DISTFILES =${DISTNAME}.tar.gz 
wkhtmltopdf-qt-${QT_COMMIT}{${QT_COMMIT}}.tar.gz:0
+REVISION = 0
 
 SHARED_LIBS =  wkhtmltox 0.0 # 0.12
 
@@ -19,19 +25,104 @@ MAINTAINER =   Frank Groeneveld <frank@fr
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread stdc++ QtCore QtGui QtNetwork
-WANTLIB += QtSvg QtWebKit QtXmlPatterns
-
-MODULES =  x11/qt4
+WANTLIB += freetype m pthread stdc++
+BUILD_DEPENDS = converters/libiconv devel/gmake graphics/png 
graphics/jpeg
 
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
+MAKE_ENV +=WRKBUILD=${WRKBUILD}
 FAKE_FLAGS =   INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
 
 SEPARATE_BUILD =   Yes
 
 NO_TEST =  Yes
 
+pre-patch:
+   cd ${WRKDIR}/${DISTNAME} && rmdir qt
+   cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
+
 do-configure:
-   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake4 
${WRKSRC}/wkhtmltopdf.pro
+   mkdir ${WRKBUILD}/qt
+   # qt config options taken from scripts/build.py
+   cd ${WRKBUILD}/qt && \
+   env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \
+   --prefix=${WRKBUILD}/qt \
+   -opensource \
+   -confirm-license \
+   -fast \
+   -release \
+   -static \
+   -graphicssystem raster \
+   -webkit \
+   -exceptions \
+   -xmlpatterns \
+   -system-zlib \
+   -system-libpng \
+   -system-libjpeg \
+   -no-libmng \
+   -no-libtiff \
+   -no-accessibility \
+   -no-stl \
+   -no-qt3support \
+   -no-phonon \
+   -no-phonon-backend \
+   -no-opengl \
+   -no-declarative \
+   -no-script \
+   -no-scripttools \
+   -no-sql-ibase \
+   -no-sql-mysql \
+   -no-sql-odbc \
+   -no-sql-psql \
+   -no-sql-sqlite \
+   -no-sql-sqlite2 \
+   -no-mmx \
+   -no-3dnow \
+   -no-sse \
+   -no-sse2 \
+   -no-multimedia \
+   -nomake demos \
+   -nomake docs \
+   -nomake examples \
+   -nomake tools \
+   -nomake tests \
+   -nomake translations \
+   -silent \
+   -xrender \
+   -largefile \
+   -iconv \
+   -openssl \
+   -no-rpath \
+   -no-dbus \
+   -no-nis \
+   -no-cups \
+   -no-pch \
+   -no-gtkstyle \
+   -no-nas-sound \
+   -no-sm \
+   -no-xshape \
+   -no-xinerama \
+   -no-xcursor \
+   -no-xfixes \
+   -no-xrandr \
+   -no-mitshm \
+   -no-xinput \
+   -no-xkb \
+   -no-glib \
+   -no-gstreamer \
+   -D ENABLE_VIDEO=0 \
+   -no-openvg \
+   -no-xsync \
+   -no-audio-backend \
+   -no-sse3 \
+   -no-ssse3 \
+   -no-sse4.1 \
+   -no-sse4.2 \
+   -no-avx \
+   -no-neon
+   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qt/bin/qmake \
+   ${WRKSRC}/

Re: UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

On Sun, Jan 03, 2016 at 06:01:33PM +, Stuart Henderson wrote:
> On 2016/01/03 17:40, Stuart Henderson wrote:
> > Here's a diff that's updated for -current. It also provides a meaningful
> > distfile name for the patched Qt, and adds DPB markers to build on multiple
> > CPUs and avoid junking during the build which is also likely to be needed
> > (at least it's needed for the other Qt builds in tree).

Thanks for testing and improving the patch!

> hmm. now it's finished building I see it needs further patching with
> things from x11/qt4/patches and/or www/phantomjs..
> 
> - SSLv3_* functions need to be made conditional

Does this give problems when running against https urls? Or how did you find
out? I'm using this with a local file (generated by Ruby on Rails), so didn't
notice this.

> - dlopen handling needs adjusting for OpenBSD, otherwise you get
> Unable to load library icui18n "Cannot load library icui18n: (File not found)"
> as it tries to open libicui18n.so.56

I saw this once, but not with my current build. Do you have any idea why I don't
see the message anymore?

Frank

Re: UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

On 12/27/15 14:21, Frank Groeneveld wrote:

I fixed the final problem, attached a complete diff to -current. The
build takes quite a while (due to the custom qt4). On my system 125
minutes. If nobody has any objections, could somebody then commit it for
me?


Would somebody be able to test this? It would be great to have it 
applied in time for the next release.


Thanks!

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Nov 2015 21:11:16 -   1.1.1.1
+++ Makefile27 Dec 2015 19:59:30 -
@@ -5,8 +5,13 @@ COMMENT =  convert HTML to PDF using Web
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
+REVISION = 0
 
+QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+
+MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTNAME = wkhtmltopdf-${GH_TAGNAME}
+DISTFILES +=   ${DISTNAME}.tar.gz ${QT_COMMIT}.tar.gz:0
 
 SHARED_LIBS =  wkhtmltox 0.0 # 0.12
 
@@ -20,19 +25,103 @@ MAINTAINER =   Frank Groeneveld <frank@fr
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread stdc++ QtCore QtGui QtNetwork
-WANTLIB += QtSvg QtWebKit QtXmlPatterns
-
-MODULES =  x11/qt4
+WANTLIB += freetype m pthread stdc++
 
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
+MAKE_ENV +=WRKBUILD=${WRKBUILD}
 FAKE_FLAGS =   INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
 
 SEPARATE_BUILD =   Yes
 
 NO_TEST =  Yes
 
+pre-patch:
+   cd ${WRKDIR}/${DISTNAME} && rmdir qt
+   cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
+
 do-configure:
-   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake4 
${WRKSRC}/wkhtmltopdf.pro
+   mkdir ${WRKBUILD}/qt
+   # qt config options taken from scripts/build.py
+   cd ${WRKBUILD}/qt && \
+   env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \
+   --prefix=${WRKBUILD}/qt \
+   -opensource \
+   -confirm-license \
+   -fast \
+   -release \
+   -static \
+   -graphicssystem raster \
+   -webkit \
+   -exceptions \
+   -xmlpatterns \
+   -system-zlib \
+   -system-libpng \
+   -system-libjpeg \
+   -no-libmng \
+   -no-libtiff \
+   -no-accessibility \
+   -no-stl \
+   -no-qt3support \
+   -no-phonon \
+   -no-phonon-backend \
+   -no-opengl \
+   -no-declarative \
+   -no-script \
+   -no-scripttools \
+   -no-sql-ibase \
+   -no-sql-mysql \
+   -no-sql-odbc \
+   -no-sql-psql \
+   -no-sql-sqlite \
+   -no-sql-sqlite2 \
+   -no-mmx \
+   -no-3dnow \
+   -no-sse \
+   -no-sse2 \
+   -no-multimedia \
+   -nomake demos \
+   -nomake docs \
+   -nomake examples \
+   -nomake tools \
+   -nomake tests \
+   -nomake translations \
+   -silent \
+   -xrender \
+   -largefile \
+   -iconv \
+   -openssl \
+   -no-rpath \
+   -no-dbus \
+   -no-nis \
+   -no-cups \
+   -no-pch \
+   -no-gtkstyle \
+   -no-nas-sound \
+   -no-sm \
+   -no-xshape \
+   -no-xinerama \
+   -no-xcursor \
+   -no-xfixes \
+   -no-xrandr \
+   -no-mitshm \
+   -no-xinput \
+   -no-xkb \
+   -no-glib \
+   -no-gstreamer \
+   -D ENABLE_VIDEO=0 \
+   -no-openvg \
+   -no-xsync \
+   -no-audio-backend \
+   -no-sse3 \
+   -no-ssse3 \
+   -no-sse4.1 \
+   -no-sse4.2 \
+   -no-avx \
+   -no-neon
+   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qt/bin/qmake \
+   ${WRKSRC}/wkhtmltopdf.pro
+
+pre-build:
+   cd ${WRKBUILD}/qt && env -i ${MAKE_ENV} gmake ${MAKE_FLAGS}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Nov 2015 21:11:16 -   1.1.1.1
+++ distinfo   

Re: UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

On 12/27/15 18:24, Landry Breuil wrote:

I think you forgot to cvs add those...

Landry


Indeed, sorry. Attached the full diff with those files added.

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Nov 2015 21:11:16 -   1.1.1.1
+++ Makefile27 Dec 2015 19:59:30 -
@@ -5,8 +5,13 @@ COMMENT =  convert HTML to PDF using Web
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
+REVISION = 0
 
+QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+
+MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTNAME = wkhtmltopdf-${GH_TAGNAME}
+DISTFILES +=   ${DISTNAME}.tar.gz ${QT_COMMIT}.tar.gz:0
 
 SHARED_LIBS =  wkhtmltox 0.0 # 0.12
 
@@ -20,19 +25,103 @@ MAINTAINER =   Frank Groeneveld <frank@fr
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread stdc++ QtCore QtGui QtNetwork
-WANTLIB += QtSvg QtWebKit QtXmlPatterns
-
-MODULES =  x11/qt4
+WANTLIB += freetype m pthread stdc++
 
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
+MAKE_ENV +=WRKBUILD=${WRKBUILD}
 FAKE_FLAGS =   INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
 
 SEPARATE_BUILD =   Yes
 
 NO_TEST =  Yes
 
+pre-patch:
+   cd ${WRKDIR}/${DISTNAME} && rmdir qt
+   cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
+
 do-configure:
-   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake4 
${WRKSRC}/wkhtmltopdf.pro
+   mkdir ${WRKBUILD}/qt
+   # qt config options taken from scripts/build.py
+   cd ${WRKBUILD}/qt && \
+   env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \
+   --prefix=${WRKBUILD}/qt \
+   -opensource \
+   -confirm-license \
+   -fast \
+   -release \
+   -static \
+   -graphicssystem raster \
+   -webkit \
+   -exceptions \
+   -xmlpatterns \
+   -system-zlib \
+   -system-libpng \
+   -system-libjpeg \
+   -no-libmng \
+   -no-libtiff \
+   -no-accessibility \
+   -no-stl \
+   -no-qt3support \
+   -no-phonon \
+   -no-phonon-backend \
+   -no-opengl \
+   -no-declarative \
+   -no-script \
+   -no-scripttools \
+   -no-sql-ibase \
+   -no-sql-mysql \
+   -no-sql-odbc \
+   -no-sql-psql \
+   -no-sql-sqlite \
+   -no-sql-sqlite2 \
+   -no-mmx \
+   -no-3dnow \
+   -no-sse \
+   -no-sse2 \
+   -no-multimedia \
+   -nomake demos \
+   -nomake docs \
+   -nomake examples \
+   -nomake tools \
+   -nomake tests \
+   -nomake translations \
+   -silent \
+   -xrender \
+   -largefile \
+   -iconv \
+   -openssl \
+   -no-rpath \
+   -no-dbus \
+   -no-nis \
+   -no-cups \
+   -no-pch \
+   -no-gtkstyle \
+   -no-nas-sound \
+   -no-sm \
+   -no-xshape \
+   -no-xinerama \
+   -no-xcursor \
+   -no-xfixes \
+   -no-xrandr \
+   -no-mitshm \
+   -no-xinput \
+   -no-xkb \
+   -no-glib \
+   -no-gstreamer \
+   -D ENABLE_VIDEO=0 \
+   -no-openvg \
+   -no-xsync \
+   -no-audio-backend \
+   -no-sse3 \
+   -no-ssse3 \
+   -no-sse4.1 \
+   -no-sse4.2 \
+   -no-avx \
+   -no-neon
+   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qt/bin/qmake \
+   ${WRKSRC}/wkhtmltopdf.pro
+
+pre-build:
+   cd ${WRKBUILD}/qt && env -i ${MAKE_ENV} gmake ${MAKE_FLAGS}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Nov 2015 21:11:16 -   1.1.1.1
+++ distinfo27 Dec 2015 19:59:30 -
@@ -1,2 +1,4 @@
+SHA256 (7e48a1fac7e0f9aefccd01e9871f987da3a62fda.tar.gz) = 
0uxGcEwKVGE7Wlhv/0bSRZLFCiYYJJTxqkmKy0aLwlQ=
 SHA256 (wkhtmltopdf-0.12.2.4.tar.gz) = 
27AWbpzhkeeH6QlgHkzbrnEGnylpM2Lt9c19TUREcog=
+SIZE (7e48a1fac7e0f9a

Re: UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

On 12/17/15 01:07, Stuart Henderson wrote:

Check the -L flags - the path to the build directory containing the newly
built Qt library will need to be listed before -L/usr/local/lib. I'm not
sure how you'd go about passing this in through qmake though.


I fixed the final problem, attached a complete diff to -current. The 
build takes quite a while (due to the custom qt4). On my system 125 
minutes. If nobody has any objections, could somebody then commit it for me?


Thanks!

Frank
? patches/patch-qt_config_tests_unix_gnu-libiconv_gnu-libiconv_cpp
? patches/patch-qt_qmake_generators_unix_unixmake2_cpp
? patches/patch-qt_qmake_generators_unix_unixmake_cpp
? 
patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker_cpp
? patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs_cpp
? patches/patch-qt_src_corelib_codecs_qiconvcodec_cpp
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Nov 2015 21:11:16 -   1.1.1.1
+++ Makefile27 Dec 2015 12:20:36 -
@@ -5,8 +5,13 @@ COMMENT =  convert HTML to PDF using Web
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
+REVISION = 0
 
+QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+
+MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTNAME = wkhtmltopdf-${GH_TAGNAME}
+DISTFILES +=   ${DISTNAME}.tar.gz ${QT_COMMIT}.tar.gz:0
 
 SHARED_LIBS =  wkhtmltox 0.0 # 0.12
 
@@ -20,19 +25,103 @@ MAINTAINER =   Frank Groeneveld <frank@fr
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread stdc++ QtCore QtGui QtNetwork
-WANTLIB += QtSvg QtWebKit QtXmlPatterns
-
-MODULES =  x11/qt4
+WANTLIB += freetype m pthread stdc++
 
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
+MAKE_ENV +=WRKBUILD=${WRKBUILD}
 FAKE_FLAGS =   INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
 
 SEPARATE_BUILD =   Yes
 
 NO_TEST =  Yes
 
+pre-patch:
+   cd ${WRKDIR}/${DISTNAME} && rmdir qt
+   cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
+
 do-configure:
-   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake4 
${WRKSRC}/wkhtmltopdf.pro
+   mkdir ${WRKBUILD}/qt
+   # qt config options taken from scripts/build.py
+   cd ${WRKBUILD}/qt && \
+   env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \
+   --prefix=${WRKBUILD}/qt \
+   -opensource \
+   -confirm-license \
+   -fast \
+   -release \
+   -static \
+   -graphicssystem raster \
+   -webkit \
+   -exceptions \
+   -xmlpatterns \
+   -system-zlib \
+   -system-libpng \
+   -system-libjpeg \
+   -no-libmng \
+   -no-libtiff \
+   -no-accessibility \
+   -no-stl \
+   -no-qt3support \
+   -no-phonon \
+   -no-phonon-backend \
+   -no-opengl \
+   -no-declarative \
+   -no-script \
+   -no-scripttools \
+   -no-sql-ibase \
+   -no-sql-mysql \
+   -no-sql-odbc \
+   -no-sql-psql \
+   -no-sql-sqlite \
+   -no-sql-sqlite2 \
+   -no-mmx \
+   -no-3dnow \
+   -no-sse \
+   -no-sse2 \
+   -no-multimedia \
+   -nomake demos \
+   -nomake docs \
+   -nomake examples \
+   -nomake tools \
+   -nomake tests \
+   -nomake translations \
+   -silent \
+   -xrender \
+   -largefile \
+   -iconv \
+   -openssl \
+   -no-rpath \
+   -no-dbus \
+   -no-nis \
+   -no-cups \
+   -no-pch \
+   -no-gtkstyle \
+   -no-nas-sound \
+   -no-sm \
+   -no-xshape \
+   -no-xinerama \
+   -no-xcursor \
+   -no-xfixes \
+   -no-xrandr \
+   -no-mitshm \
+   -no-xinput \
+   -no-xkb \
+   -no-glib \
+   -no-gstreamer \
+   -D ENABLE_VIDEO=0 \
+   -no-openvg \
+   -no-xsync \
+   -no-audio-backend \
+   -no-sse3 \
+   -no-ssse3 \
+   -no-sse4.1 \
+   -no-sse4.2 \
+   -no-avx \
+   -no-neon
+   cd ${

Re: UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

On 12/17/15 01:07, Stuart Henderson wrote:

Check the -L flags - the path to the build directory containing the newly
built Qt library will need to be listed before -L/usr/local/lib. I'm not
sure how you'd go about passing this in through qmake though.


Thanks for your hint. I should have phrased my question differently: is 
there anybody who knows how to get qmake to insert the -L flag with the 
patched qt path before /usr/local/lib?


Frank

UPDATE: wkhtmltopdf with patched QT

[Frank Groeneveld]

Attached to this email you'll find a diff that modifies the wkhtmltopdf 
port so that it is statically built against their patched qt. This will 
will enable the following extra features:


 * Printing more then one HTML document into a PDF file.
 * Running without an X11 server.
 * Adding a document outline to the PDF file.
 * Adding headers and footers to the PDF file.
 * Generating a table of contents.
 * Adding links in the generated PDF file.
 * Printing using the screen media-type.
 * Disabling the smart shrink feature of webkit.

Note that the patches I needed in this diff are copied from the 
phantomjs port and the qt4 port.


As far as I can see, the current diff has only one problem left: it can 
only be built when qt4 is not already installed on the system, because 
the linking phase will fail otherwise. How would I be able to solve this 
problem?


Thanks,
Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Nov 2015 21:11:16 -   1.1.1.1
+++ Makefile16 Dec 2015 20:46:42 -
@@ -5,8 +5,13 @@ COMMENT =  convert HTML to PDF using Web
 GH_ACCOUNT =   wkhtmltopdf
 GH_PROJECT =   wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
+REVISION = 0
 
+QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
+
+MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
 DISTNAME = wkhtmltopdf-${GH_TAGNAME}
+DISTFILES +=   ${DISTNAME}.tar.gz ${QT_COMMIT}.tar.gz:0
 
 SHARED_LIBS =  wkhtmltox 0.0 # 0.12
 
@@ -20,10 +25,7 @@ MAINTAINER = Frank Groeneveld <frank@fr
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread stdc++ QtCore QtGui QtNetwork
-WANTLIB += QtSvg QtWebKit QtXmlPatterns
-
-MODULES =  x11/qt4
+WANTLIB += freetype m pthread stdc++
 
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
 FAKE_FLAGS =   INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
@@ -32,7 +34,93 @@ SEPARATE_BUILD = Yes
 
 NO_TEST =  Yes
 
+pre-patch:
+   cd ${WRKDIR}/${DISTNAME} && rmdir qt
+   cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
+
 do-configure:
-   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake4 
${WRKSRC}/wkhtmltopdf.pro
+   mkdir ${WRKBUILD}/qt
+   # qt config options taken from scripts/build.py
+   cd ${WRKBUILD}/qt && \
+   env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \
+   --prefix=${WRKBUILD}/qt \
+   -opensource \
+   -confirm-license \
+   -fast \
+   -release \
+   -static \
+   -graphicssystem raster \
+   -webkit \
+   -exceptions \
+   -xmlpatterns \
+   -system-zlib \
+   -system-libpng \
+   -system-libjpeg \
+   -no-libmng \
+   -no-libtiff \
+   -no-accessibility \
+   -no-stl \
+   -no-qt3support \
+   -no-phonon \
+   -no-phonon-backend \
+   -no-opengl \
+   -no-declarative \
+   -no-script \
+   -no-scripttools \
+   -no-sql-ibase \
+   -no-sql-mysql \
+   -no-sql-odbc \
+   -no-sql-psql \
+   -no-sql-sqlite \
+   -no-sql-sqlite2 \
+   -no-mmx \
+   -no-3dnow \
+   -no-sse \
+   -no-sse2 \
+   -no-multimedia \
+   -nomake demos \
+   -nomake docs \
+   -nomake examples \
+   -nomake tools \
+   -nomake tests \
+   -nomake translations \
+   -silent \
+   -xrender \
+   -largefile \
+   -iconv \
+   -openssl \
+   -no-rpath \
+   -no-dbus \
+   -no-nis \
+   -no-cups \
+   -no-pch \
+   -no-gtkstyle \
+   -no-nas-sound \
+   -no-sm \
+   -no-xshape \
+   -no-xinerama \
+   -no-xcursor \
+   -no-xfixes \
+   -no-xrandr \
+   -no-mitshm \
+   -no-xinput \
+   -no-xkb \
+   -no-glib \
+   -no-gstreamer \
+   -D ENABLE_VIDEO=0 \
+   -no-openvg \
+   -no-xsync \
+   -no-audio-backend \
+   -no-sse3 \
+   -no-ssse3 \
+   -no-sse4.1 \
+   -no-sse4.2 \
+   -no-avx \
+   -no-neon
+   cd ${WRKBUILD} && env -i ${CONFIGURE_E

Re: Early Look: ruby 2.3.0-preview1

[Frank Groeneveld]

On 11/12/15 07:53, Jeremy Evans wrote:

Attached is a port for ruby 2.3.0-preview1.  This is useful if you want
to test your ruby software to make sure it will run on ruby 2.3, but it
won't be committed till the ruby 2.3.0 final release in late December.

Release announcement is at:
https://www.ruby-lang.org/en/news/2015/11/11/ruby-2-3-0-preview1-released/


Thanks, good work preparing for the release like this! I tested it out 
and receive errors like this when installing some gems (json, sqlite3) 
using bundler 1.3.5 from ports:


Installing json (1.8.3)
Gem::Ext::BuildError: ERROR: Failed to build gem native extension.

current directory: 
/home/frank/.gem/ruby/2.3/gems/json-1.8.3/ext/json/ext/generator

/usr/local/bin/ruby23 -r ./siteconf20151115-14676-coy40a.rb extconf.rb
creating Makefile

current directory: 
/home/frank/.gem/ruby/2.3/gems/json-1.8.3/ext/json/ext/generator

make "DESTDIR=" clean

current directory: 
/home/frank/.gem/ruby/2.3/gems/json-1.8.3/ext/json/ext/generator

make "DESTDIR="
compiling generator.c
linking shared-object json/ext/generator.so

current directory: 
/home/frank/.gem/ruby/2.3/gems/json-1.8.3/ext/json/ext/generator

make "DESTDIR=" install
/usr/ports/pobj/ruby-2.3.0-preview1/bin/install -c  -m 0755 generator.so 
./.gem.20151115-14676-1oavqqb/json/ext

/usr/ports/pobj/ruby-2.3.0-preview1/bin/install: not found
*** Error 1 in 
/home/frank/.gem/ruby/2.3/gems/json-1.8.3/ext/json/ext/generator 
(Makefile:186 'install-so')


make install failed, exit code 1

Gem files will remain installed in 
/home/frank/.gem/ruby/2.3/gems/json-1.8.3 for inspection.
Results logged to 
/home/frank/.gem/ruby/2.3/extensions/x86_64-openbsd/2.3/json-1.8.3/gem_make.out


An error occurred while installing json (1.8.3), and Bundler cannot 
continue.

Make sure that `gem install json -v '1.8.3'` succeeds before bundling.

Do you think this is a bug in the port? You can reproduce this by running:
git clone https://github.com/ivaldi/brimir
bundle install --path ~/.gem

Let me know if I can help or re-test.

Frank

Re: textproc/wkhtmltopdf - switch to QT5

[Frank Groeneveld]

On 11/15/15 13:56, Rafael Sadowski wrote:

Why? Is there any benefit from Qt5 now?


It was suggested earlier on the list and I thought Amit had a good point:

On 11/11/15 20:53, Amit Kulkarni wrote:

why have multi-packages for the same functionality? eventually the
ports@ tree will move towards qt5. qt4 is deprecated and over time
will suffer bit-rot, so if it works equally well with stock qt5 (with
missing features), IMHO wkhtmltopdf should be switched to work with
qt5 only.


Are you not able to use the QT5 version? Or is there another reason to 
use the QT4 version?


Frank

UPDATE: devel/ruby-bundler

[Frank Groeneveld]

Attached a diff that updates ruby-bundler to vesion 1.10.6.

I use bundler on a daily basis and having the --jobs option available 
(introduced in 1.5) is a real time saver on big projects. I've tested 
the new version with a few of my projects on amd64.


Any comments?

Frank

Index: Makefile
===
RCS file: /cvs/ports/devel/ruby-bundler/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile11 Oct 2014 19:54:46 -  1.9
+++ Makefile15 Nov 2015 14:33:14 -
@@ -2,11 +2,10 @@
 
 COMMENT=   ruby application dependency manager
 
-DISTNAME=  bundler-1.3.5
-REVISION = 1
+DISTNAME=  bundler-1.10.6
 CATEGORIES=devel
 
-HOMEPAGE=  http://gembundler.com/
+HOMEPAGE=  http://bundler.io/
 
 # MIT
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/ruby-bundler/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo28 Jun 2013 16:44:23 -  1.3
+++ distinfo15 Nov 2015 14:33:14 -
@@ -1,2 +1,2 @@
-SHA256 (bundler-1.3.5.gem) = CLiQR/e4KfPhl6KPsb3nTD9c/qFVL5nfuiN/7jDq/+Q=
-SIZE (bundler-1.3.5.gem) = 268800
+SHA256 (bundler-1.10.6.gem) = +ykz0SMEzsddrHW5OhywRdoCaykebGWwl0TOuQB2n+4=
+SIZE (bundler-1.10.6.gem) = 251392
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ruby-bundler/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   28 Jun 2013 16:44:23 -  1.3
+++ pkg/PLIST   15 Nov 2015 14:33:14 -
@@ -1,27 +1,52 @@
 @comment $OpenBSD: PLIST,v 1.3 2013/06/28 16:44:23 jasper Exp $
 ${GEM_BIN}/bundle${GEM_BIN_SUFFIX}
+${GEM_BIN}/bundler${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/.gitignore
 ${GEM_LIB}/gems/${DISTNAME}/.rspec
 ${GEM_LIB}/gems/${DISTNAME}/.travis.yml
 ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
-${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTE.md
+${GEM_LIB}/gems/${DISTNAME}/CODE_OF_CONDUCT.md
 ${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.md
+${GEM_LIB}/gems/${DISTNAME}/DEVELOPMENT.md
 ${GEM_LIB}/gems/${DISTNAME}/ISSUES.md
 ${GEM_LIB}/gems/${DISTNAME}/LICENSE.md
 ${GEM_LIB}/gems/${DISTNAME}/README.md
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
-${GEM_LIB}/gems/${DISTNAME}/UPGRADING.md
 ${GEM_LIB}/gems/${DISTNAME}/bin/
 ${GEM_LIB}/gems/${DISTNAME}/bin/bundle
 ${GEM_LIB}/gems/${DISTNAME}/bin/bundle_ruby
+${GEM_LIB}/gems/${DISTNAME}/bin/bundler
 ${GEM_LIB}/gems/${DISTNAME}/bundler.gemspec
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/capistrano.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/binstubs.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/cache.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/check.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/clean.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/common.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/config.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/console.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/exec.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/gem.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/init.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/inject.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/install.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/lock.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/open.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/outdated.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/package.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/platform.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/show.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/update.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/cli/viz.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/constants.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/current_ruby.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/definition.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/dep_proxy.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/dependency.rb
@@ -31,7 +56,12 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/endpoint_specification.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/env.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/environment.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/base.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/dependency.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/downloader.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/fetcher/index.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/friendly_errors.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_helper.rb
 

textproc/wkhtmltopdf - switch to QT5

[Frank Groeneveld]

The following diff changes the textproc/wkhtmltopdf port to use QT5 
instead of QT4. Any comments?


Thanks!

Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Nov 2015 21:11:16 -   1.1.1.1
+++ Makefile15 Nov 2015 08:33:27 -
@@ -7,6 +7,7 @@ GH_PROJECT =wkhtmltopdf
 GH_TAGNAME =   0.12.2.4
 
 DISTNAME = wkhtmltopdf-${GH_TAGNAME}
+REVISION = 0
 
 SHARED_LIBS =  wkhtmltox 0.0 # 0.12
 
@@ -19,11 +20,11 @@ MAINTAINER =Frank Groeneveld <frank@fr
 # LGPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread stdc++ QtCore QtGui QtNetwork
-WANTLIB += QtSvg QtWebKit QtXmlPatterns
+WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5PrintSupport Qt5Svg
+WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns
+WANTLIB += c m pthread
 
-MODULES =  x11/qt4
+MODULES =  x11/qt5
 
 MAKE_FLAGS =   LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
 FAKE_FLAGS =   INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
@@ -33,6 +34,6 @@ SEPARATE_BUILD =  Yes
 NO_TEST =  Yes
 
 do-configure:
-   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake4 
${WRKSRC}/wkhtmltopdf.pro
+   cd ${WRKBUILD} && env -i ${CONFIGURE_ENV} qmake-qt5 
${WRKSRC}/wkhtmltopdf.pro
 
 .include 

Re: Early Look: ruby 2.3.0-preview1

[Frank Groeneveld]

On 11/15/15 18:04, Jeremy Evans wrote:

There's various ports that don't build without modifications
(textproc/ruby-nokogiri) or that have issues at runtime with ruby
2.3.0-preview1 (www/ruby-capybara).  Hopefully these issues will be fixed
before the ruby 2.3.0 final release, but they aren't a bug in the port as
far as I know.  If you believe this is a bug in the port itself, please
provide a diff or at least a reason why you think that.


I believe this is a bug in the port, because of the error:

> /usr/ports/pobj/ruby-2.3.0-preview1/bin/install: not found

It seems Ruby is somehow passing the install command to the gem with the 
build path of ruby-2.3.0-preview1 prepended.



Note that the json gem ships with ruby since 1.9.  Instead of bundle
install, try:

   gem23 install -G ~/.gem --conservative


Thanks, but the bug occurs in various other gems as well, including sqlite3.

Thanks.

Frank

Re: Early Look: ruby 2.3.0-preview1

[Frank Groeneveld]

On 11/15/15 20:08, Jeremy Evans wrote:

I apologize, I obviously didn't read your bug report closely enough. Yes
that is a bug in the port, and it's because the port adds a post-install
target to fix a bug, which overrides the post-install target in
Makefile.inc.


No problem. I tested your fix and it works great. Thanks for solving it 
and lets hope 2.3 is release soon!


Frank

Re: NEW: textproc/wkhtmltopdf

[Frank Groeneveld]

On 11/09/15 17:51, Amit Kulkarni wrote:

I asked the upstream author privately, and he said that if you prefer the
stock qt4 or the "unpatched" as he calls it, you can switch as well to the
qt5 in ports.


Thanks for bringing that to my attention! It does compile and seems to 
run fine against qt5 in ports indeed.


What would be the correct way to support both qt versions in this port? 
A multi-package port with a -qt4 and -qt5 variant?


Frank

Re: NEW: textproc/wkhtmltopdf

[Frank Groeneveld]

On 11/04/15 22:34, Stuart Henderson wrote:

Done. (I also added a blank line before the COMMENT).


Thank you!


Seems pretty common for Qt things unfortunately. phantomjs needs a
patched Qt too, calibre uses private interfaces so it needs a :patch
target to find the headers...


Yes, I saw the phanomjs port indeed. I've built wkhtmltopdf with it's 
statically linked, patched QT and needed a few patches from the 
phantomjs port to get it going. It seems however, phantomjs is always 
statically build against the patched qt.



I wonder how much time it would add to builds, it loses a lot of
features without the patched Qt (and I have somewhere I might
want to use that too).


On my computer the current port builds within minutes, while the build 
with patched QT takes around one hour.


I'll try to make a port for it, I got it building a few weeks ago:
https://github.com/wkhtmltopdf/wkhtmltopdf/issues/1991

Frank

Re: NEW: textproc/wkhtmltopdf

[Frank Groeneveld]

On 11/03/15 21:59, Landry Breuil wrote:
> That reads good to me - minor nit, if you run make update-plist it
> should remove the man/ man/man1/ dirs from the PLIST which i think are
> not needed.

Thanks for the feedback, I've done this and the updated PLIST is in the 
tarball attached.


On 11/04/15 18:08, Jérémie Courrèges-Anglas wrote:

Another nit: the first word in COMMENT should not be capitalized:
Convert -> convert.


Fixed that too, thank you for testing.


Other than that, ok jca@ to import.


Could somebody commit it for me? I don't have commit access.


Frank: it would be nice to discuss upstream how the manpage install path
should be handled.  OTOH I don't think that gzip'ed manpages are
a problem.


You mean making the manpage installation path configurable, so that we 
don't need to patch around it?



As for the background dep on QT4, i highly prefer depending on the
existing one instead of building another bundled copy, so the way you
did it makes perfect sense.


Well, the only place where I've seen wkhtmltopdf used is within Odoo
(https://www.odoo.com/), where it's used to produce invoices,
quotations, etc.  And there you *need* a wkhtmltopdf program built
against the bundled and patched Qt.  But since I don't see anyone
porting Odoo to OpenBSD tomorrow I think we're fine with using Qt from
ports. (:


That's right, we use it in our company to create PDF files with headings 
and page numbers on headless servers, so eventually I would need the 
patced QT also. Would it be possible to make a flavor of this that is 
normally not build?


Frank


wkhtmltopdf-port-0.12.2.4p1.tar.gz
Description: application/gzip

Re: NEW: textproc/wkhtmltopdf

[Frank Groeneveld]

On 10/31/15 16:47, Frank Groeneveld wrote:

Ping?

It's quite a simple port which only takes a few minutes to build on my
machine. You can then test it by running something like:
wkhtmltopdf http://www.openbsd.org/ openbsd.pdf

Frank


As noted by somebody off-list, it might be useful to have the port 
attached again to my ping mail, so people don't have to search for it. 
I've attached it to this mail. Please let me know what you think about it.


Frank


wkhtmltopdf-port-0.12.2.4p0.tar.gz
Description: application/gzip

Re: NEW: textproc/wkhtmltopdf

[Frank Groeneveld]

On 10/23/15 22:27, Frank Groeneveld wrote:

This is my first attempt at writing a port.

wkthmltopdf is a program that uses Webkit to convert an HTML file to a
PDF or image file.  More information can be found on their website:
http://wkhtmltopdf.org

I use it in a number of Ruby on Rails applications with the wickedpdf
gem to generate PDF invoices for example.

Note that upstream advises to build it using their patched QT in order
to support the following options:

  * Printing more then one HTML document into a PDF file.
  * Running without an X11 server.
  * Adding a document outline to the PDF file.
  * Adding headers and footers to the PDF file.
  * Generating a table of contents.
  * Adding links in the generated PDF file.
  * Printing using the screen media-type.
  * Disabling the smart shrink feature of webkit.

My port doesn't use their patched QT as I find it quite ugly. However,
some of these options are pretty handy on servers, especially running
without an X11 server.

What are your thoughts and comments on this port?

Frank


Ping?

It's quite a simple port which only takes a few minutes to build on my 
machine. You can then test it by running something like:

wkhtmltopdf http://www.openbsd.org/ openbsd.pdf

Frank

NEW: textproc/wkhtmltopdf

[Frank Groeneveld]

This is my first attempt at writing a port.

wkthmltopdf is a program that uses Webkit to convert an HTML file to a 
PDF or image file.  More information can be found on their website: 
http://wkhtmltopdf.org


I use it in a number of Ruby on Rails applications with the wickedpdf 
gem to generate PDF invoices for example.


Note that upstream advises to build it using their patched QT in order 
to support the following options:


 * Printing more then one HTML document into a PDF file.
 * Running without an X11 server.
 * Adding a document outline to the PDF file.
 * Adding headers and footers to the PDF file.
 * Generating a table of contents.
 * Adding links in the generated PDF file.
 * Printing using the screen media-type.
 * Disabling the smart shrink feature of webkit.

My port doesn't use their patched QT as I find it quite ugly. However, 
some of these options are pretty handy on servers, especially running 
without an X11 server.


What are your thoughts and comments on this port?

Frank


wkhtmltopdf-port-0.12.2.4p0.tar.gz
Description: application/gzip