CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2018/08/26 21:56:17 Removed files: net/ntp/patches: patch-include_ssl_applink_c patch-ports_winnt_include_msvc_ssl_autolib_h Log message: Remove Windows specific LIBRESSL_VERSION_NUMBER patches. ok jca sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2018/08/26 21:54:57 Modified files: x11/qt4: Makefile x11/qt4/patches: patch-src_network_ssl_qsslsocket_openssl_symbols_cpp Added files: x11/qt4/patches: patch-src_network_ssl_qsslcertificate_cpp patch-src_network_ssl_qsslsocket_openssl_symbols_p_h Log message: Fix build after libcrypto bump. ok jca
[UPDATE] x11/tint2 16.2 -> 16.6.1
The attached diff updates tint2 to the latest stable release
https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog.
The update fixes some regressions, adds the ability to sort the task bar
and turn off logging of script executors.
Builds and runs on my -current/amd64. Additional testing and critique
appreciated.
--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile1 Jul 2018 18:33:39 - 1.10
+++ Makefile25 Aug 2018 20:06:26 -
@@ -2,12 +2,11 @@
COMMENT= freedesktop-compliant panel
-V= 16.2
+V= 16.6.1
CATEGORIES=x11
DISTNAME= tint2-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST= ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION= 2
+WRKDIST= ${WRKDIR}/tint2-v$V-a82b9a1d7f4ad835183ca17ec38273556cc4b1ff
HOMEPAGE= https://gitlab.com/o9000/tint2/
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo12 Mar 2018 22:49:54 - 1.3
+++ distinfo25 Aug 2018 20:06:26 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = /cIGoBqV+PsSm0Nveb1ensXi5EwiMYmD5S/PgQHPyb8=
+SIZE (tint2-16.6.1.tar.gz) = 546590
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 1 Jul 2018 18:33:39 - 1.6
+++ pkg/PLIST 25 Aug 2018 20:06:26 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2018/07/01 18:33:39 espie Exp $
+@comment $OpenBSD: PLIST,v$
@pkgpath x11/tint
@bin bin/tint2
@bin bin/tint2conf
@@ -46,6 +46,6 @@ share/locale/sr/LC_MESSAGES/tint2conf.mo
share/mime/packages/tint2conf.xml
share/tint2/
share/tint2/default_icon.png
-@tag update-desktop-database
-@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-mime-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-desktop-database
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2018/08/26 18:16:24 Modified files: textproc/groff : Makefile textproc/groff/patches: patch-Makefile_in textproc/groff/pkg: PLIST Added files: textproc/groff/patches: patch-tmac_groff_www_man Removed files: textproc/groff/patches: patch-Makefile_comm Log message: No longer preformat the manual pages with groff, install the sources. Mandoc is now able to handle them. OK jca@ bentley@
LibreOffice offline help
Has anyone installed offline help for LibreOffice? How does that work? There isn't a package for it. -- Edward Ahlsen-Girard Ft Walton Beach, FL
Re: net/ntp: remove Windows-only LIBRESSL_VERSION_NUMBER patches
On Sun, Aug 26 2018, Theo Buehler wrote: > The patch for include/ssl_applink.c has two hunks inside > defined(SYS_WINNT). The second file concerns the winnt port. > > The packages with and without this diff differ only because the built > binaries have the build time and date embedded, so I don't think this > needs a bump. ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/08/26 14:46:21 Modified files: archivers/cabextract: Makefile Log message: add missing dep on libiconv
net/ntp: remove Windows-only LIBRESSL_VERSION_NUMBER patches
The patch for include/ssl_applink.c has two hunks inside
defined(SYS_WINNT). The second file concerns the winnt port.
The packages with and without this diff differ only because the built
binaries have the build time and date embedded, so I don't think this
needs a bump.
Index: patches/patch-include_ssl_applink_c
===
RCS file: patches/patch-include_ssl_applink_c
diff -N patches/patch-include_ssl_applink_c
--- patches/patch-include_ssl_applink_c 27 Mar 2017 11:33:40 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-include_ssl_applink_c,v 1.1 2017/03/27 11:33:40 bluhm Exp $
include/ssl_applink.c.orig Thu Mar 23 21:54:28 2017
-+++ include/ssl_applink.c Thu Mar 23 21:55:47 2017
-@@ -14,7 +14,7 @@
- # include "msvc_ssl_autolib.h"
- # endif
- # endif
--# if OPENSSL_VERSION_NUMBER < 0x1010L
-+# if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- # include
- # endif
- # ifdef _MSC_VER
-@@ -41,7 +41,7 @@ void ssl_applink(void);
- void
- ssl_applink(void)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !
defined(LIBRESSL_VERSION_NUMBER)
- # ifdef WRAP_DBG_MALLOC
- CRYPTO_set_mem_functions(wrap_dbg_malloc, wrap_dbg_realloc,
wrap_dbg_free_ex);
- # else
Index: patches/patch-ports_winnt_include_msvc_ssl_autolib_h
===
RCS file: patches/patch-ports_winnt_include_msvc_ssl_autolib_h
diff -N patches/patch-ports_winnt_include_msvc_ssl_autolib_h
--- patches/patch-ports_winnt_include_msvc_ssl_autolib_h27 Mar 2017
11:33:40 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ports_winnt_include_msvc_ssl_autolib_h,v 1.1 2017/03/27
11:33:40 bluhm Exp $
ports/winnt/include/msvc_ssl_autolib.h.origThu Mar 23 22:03:03 2017
-+++ ports/winnt/include/msvc_ssl_autolib.h Thu Mar 23 22:17:23 2017
-@@ -85,7 +85,7 @@
- * request in the object file, depending on the SSL version and the
- * build variant.
- */
--# if OPENSSL_VERSION_NUMBER >= 0x1010L
-+# if OPENSSL_VERSION_NUMBER >= 0x1010L && !
defined(LIBRESSL_VERSION_NUMBER)
- # pragma comment(lib, "libcrypto" LTAG_SIZE LTAG_RTLIB LTAG_DEBUG ".lib")
- # else
- # pragma comment(lib, "libeay32" LTAG_RTLIB LTAG_DEBUG ".lib")
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/08/26 14:07:28 Modified files: net/p5-Zonemaster/ldns: Makefile distinfo Log message: update to p5-Zonemaster-LDNS-1.1.0
Re: fix qt4 after libcrypto bump
On Sun, Aug 26 2018, Theo Buehler wrote:
> Turns out I accidentally committed one diff too many to libcrypto
> (meaning one that didn't go through sthen's bulk) and as a well-deserved
> punishment, I broke Qt stuff (what else?).
>
> The diff below fixes the build of x11/qt4 for me.
>
> The problem is that X509_getm_not{Before,After}() are now proper
> functions instead of #defines accessing a X509 struct member, so
> they need to be taught to the Qt dynamic linking mechanism.
ok jca@
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/08/26 13:37:27 Modified files: net/p5-Zonemaster/cli: Makefile distinfo Log message: update to zonemaster-1.1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/08/26 13:33:15 Modified files: net/p5-Zonemaster/engine: Makefile distinfo Log message: update to p5-Zonemaster-engine-2.0.7
Re: NEW: devel/py-binaryornot (cookiecutter porting 1/5)
On 2018/08/26 11:46, Edward Lopez-Acosta wrote: > Didn't mean to top post, was still at the PC when I saw Stuart's replay. > I have attached a diff of the DESCR file based on the recommended changes. > Should I have packed up another tarball since only one file is being changed > here? > > Does everything look in order with this? It's easier to put up a new tarball, that way there's no doubt about what is being tested and no need to assemble parts from multiple emails. Anyway the attached one is OK sthen@ to import. py-binaryornot.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/08/26 11:56:06 Modified files: net/cppzmq : Makefile Log message: Disable building the test to prevent the use of git. (Unbreak bulk) "If that works, go for it" Jasper
Re: NEW: devel/py-binaryornot (cookiecutter porting 1/5)
Didn't mean to top post, was still at the PC when I saw Stuart's replay.
I have attached a diff of the DESCR file based on the recommended
changes. Should I have packed up another tarball since only one file is
being changed here?
Does everything look in order with this?
Edward Lopez-Acosta
On 8/25/18 9:03 PM, Jeremie Courreges-Anglas wrote:
(Please avoid top-posting.)
On Sat, Aug 25 2018, Edward Lopez-Acosta wrote:
On 8/25/18 4:21 PM, Stuart Henderson wrote:
On 2018/08/25 15:43, Edward Lopez-Acosta wrote:
Hello,
I am working on porting the larger cookiecutter project and this is one of
the required modules.
This port is for the binaryornot python module needed for the cookiecutter
application. It checks a specified file based on heuristic data and is
similar to Perl's pp_fttext, and is lightweight.
All tests pass and I am able to build it for both py2 and py3 on amd64.
No current ports depend on this module.
Any changes needed or can it be merged please?
--
Edward Lopez-Acosta
You have a ${MODPY_COMMENT} on a line which shouldn't have one, and don't
have one on
"lib/python${MODPY_VERSION}/site-packages/binaryornot/${MODPY_PYCACHE}"
which should be present (haven't tested but I would expect packaging to fail
for py2).
PLIST fixed and new tarball attached.
Verified both py2 and py3 `make package` works without error.
DESCR appears to be copy-pasted, the last two parapgraphs sound
superfluous to me, and the "Has tests for these file types:" list
should probably mention "text" and "binary" on their own lines.
Actually I would only keep the first paragraph, since syncing that list
when upgrading to newer versions doesn't look like a good idea in the
long run.
And what is "@eliben" supposed to mean? https://twitter.com/eliben
doesn't look like Eli Bendersky's twitter account.
Except for this, LGTM.
--- DESCR.orig Sun Aug 26 11:40:21 2018
+++ DESCR Sun Aug 26 11:41:33 2018
@@ -1,15 +1,3 @@
Ultra-lightweight pure Python package to guess whether a file is binary or
-text, using a heuristic similar to Perl's `pp_fttext` and its analysis by
-@eliben.
-
-Has tests for these file types:
-
-* Text: .txt, .css, .json, .svg, .js, .lua, .pl, .rst * Binary: .png, .gif,
-.jpg, .tiff, .bmp, .DS_Store, .eot, .otf, .ttf, .woff, .rgb
-
-You may be thinking, "I can write this in 2 lines of code?!" It's actually not
-that easy. Over time, more edge cases have been found and our heuristic has
-gotten more complex.
-
-Also, this package saves you from having to write and thoroughly test your code
-with all sorts of weird file types and encodings, and is cross-platform.
+text, using a heuristic similar to Perl's `pp_fttext`. This package is
+cross platform and works with a variety of file types and encodings.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2018/08/26 10:15:39 Modified files: net/ntp: Makefile net/ntp/patches: patch-sntp_libevent_test_regress_ssl_c Removed files: net/ntp/patches: patch-include_libssl_compat_h patch-libntp_libssl_compat_c Log message: Better fix for ntp breakage. Disable some code that was guarded by defined(LIBRESSL_VERSION_NUMBER) but shouldn't have been for some time now. Pointed out by jsing ok jca
Fix build of x11/qt5/qtdeclarative after libcrypto bump
Without the patch to x11/qt5/qtbase below, the build of x11/qt5/qtdeclarative fails with the following linking errors: /usr/local/lib/qt5/libQt5Network.so.2.2: undefined reference to `X509_getm_notBefore' /usr/local/lib/qt5/libQt5Network.so.2.2: undefined reference to `X509_getm_notAfter' (note that the above library is part of the qtbase package) The patch is analogous to the fix for qt4 that I sent out earlier today, but for some reason its absence doesn't break the build for qtbase. Index: patches/patch-src_network_ssl_qsslcertificate_openssl_cpp === RCS file: patches/patch-src_network_ssl_qsslcertificate_openssl_cpp diff -N patches/patch-src_network_ssl_qsslcertificate_openssl_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_network_ssl_qsslcertificate_openssl_cpp 26 Aug 2018 11:41:26 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: src/network/ssl/qsslcertificate_openssl.cpp +--- src/network/ssl/qsslcertificate_openssl.cpp.orig src/network/ssl/qsslcertificate_openssl.cpp +@@ -619,8 +619,8 @@ QSslCertificate QSslCertificatePrivate::QSslCertificat + if (!x509 || !QSslSocket::supportsSsl()) + return certificate; + +-ASN1_TIME *nbef = q_X509_get_notBefore(x509); +-ASN1_TIME *naft = q_X509_get_notAfter(x509); ++ASN1_TIME *nbef = q_X509_getm_notBefore(x509); ++ASN1_TIME *naft = q_X509_getm_notAfter(x509); + certificate.d->notValidBefore = q_getTimeFromASN1(nbef); + certificate.d->notValidAfter = q_getTimeFromASN1(naft); + certificate.d->null = false; Index: patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp === RCS file: /var/cvs/ports/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_network_ssl_qsslsocket_openssl_symbols_cpp --- patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp21 Jul 2017 15:28:25 - 1.3 +++ patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp26 Aug 2018 12:51:23 - @@ -13,7 +13,16 @@ Index: src/network/ssl/qsslsocket_openss DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) #endif DEFINEFUNC2(BN_ULONG, BN_mod_word, const BIGNUM *a, a, BN_ULONG w, w, return static_cast(-1), return) -@@ -461,6 +461,8 @@ DEFINEFUNC5(int, PKCS12_parse, PKCS12 *p12, p12, const +@@ -378,6 +378,8 @@ DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, ASN1_ST + DEFINEFUNC2(int, X509_check_issued, X509 *a, a, X509 *b, b, return -1, return) + DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return 0, return) + DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return 0, return) ++DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, const X509 *a, a, return 0, return) ++DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, const X509 *a, a, return 0, return) + DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return) + DEFINEFUNC(int, X509_NAME_entry_count, X509_NAME *a, a, return 0, return) + DEFINEFUNC2(X509_NAME_ENTRY *, X509_NAME_get_entry, X509_NAME *a, a, int b, b, return 0, return) +@@ -461,6 +463,8 @@ DEFINEFUNC5(int, PKCS12_parse, PKCS12 *p12, p12, const DEFINEFUNC2(PKCS12 *, d2i_PKCS12_bio, BIO *bio, bio, PKCS12 **pkcs12, pkcs12, return 0, return); DEFINEFUNC(void, PKCS12_free, PKCS12 *pkcs12, pkcs12, return, DUMMYARG) @@ -22,7 +31,7 @@ Index: src/network/ssl/qsslsocket_openss #define RESOLVEFUNC(func) \ if (!(_q_##func = _q_PTR_##func(libs.first->resolve(#func))) \ && !(_q_##func = _q_PTR_##func(libs.second->resolve(#func \ -@@ -790,7 +792,7 @@ bool q_resolveOpenSslSymbols() +@@ -790,7 +794,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EC_GROUP_get_degree) #endif RESOLVEFUNC(BN_num_bits) @@ -31,7 +40,16 @@ Index: src/network/ssl/qsslsocket_openss RESOLVEFUNC(BN_is_word) #endif RESOLVEFUNC(BN_mod_word) -@@ -1028,12 +1030,13 @@ bool q_resolveOpenSslSymbols() +@@ -982,6 +986,8 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(X509_check_issued) + RESOLVEFUNC(X509_get_issuer_name) + RESOLVEFUNC(X509_get_subject_name) ++RESOLVEFUNC(X509_getm_notAfter) ++RESOLVEFUNC(X509_getm_notBefore) + RESOLVEFUNC(X509_verify_cert) + RESOLVEFUNC(d2i_X509) + RESOLVEFUNC(i2d_X509) +@@ -1028,12 +1034,13 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(d2i_PKCS12_bio) RESOLVEFUNC(PKCS12_free) Index: patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h === RCS file: /var/cvs/ports/x11/qt5/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_network_ssl_qsslsocket_openssl_symbols_p_h --- patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h21 Jul 2017 15:28:25 - 1.3 +++
Re: Update emulators/mednafen 0.9.48 -> 1.21.3
On 2018-08-25 11:54:05, Jeremy Evans wrote: > On 08/20 05:53, Bryan Linton wrote: > > Sound doesn't work though. > > > > Initializing sound... > > Using "OpenBSD(/dev/audio*)" audio driver with SexyAL's default > > device selection.OpenBSD Audio Error: fd = open(id ? id : > > "/dev/audio", O_WRONLY) No such file or directory > > Error opening a sound device. > > > > [...] > > > > % ls -la /dev/audio > > ls: /dev/audio: No such file or directory > > I did some more work on this and found out the reason it worked for me > was not related to this change, but because I use the sdl sound driver. > I think sdl should be the default, because it works with sndiod, while > the openbsd driver does not. > > Here's a patch that does that. It also updates the default device from > from /dev/audio to /dev/audio0. > > You can modify the mednafen sound driver and sound device using > the appropriate settings in the mednafen configuration file. > Everything seems to work well for me. No regressions seen in my use-case at least. -- Bryan
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/08/26 09:30:27 Modified files: games : Makefile Log message: wesnoth's lite flavor is gone
Re: fix net/ntp after libcrypto bumps
On Sun, Aug 26 2018, Theo Buehler wrote:
> On Sun, Aug 26, 2018 at 11:07:36PM +1000, Joel Sing wrote:
>> On Sunday 26 August 2018 12:52:52 Theo Buehler wrote:
>> > A simple one:
>>
>> This doesn't look right - the entire OPENSSL_VERSION_NUMBER < 1.1.0 path (on
>> line 40 of include/libssl_compat.h) should no longer be taken (or
>> substantially reduced).
>
> Right. It looks like we can get rid of many (most?) of the
> LIBRESSL_VERSION_NUMBER patches in this port.
Indeed.
It's good to see those "defined(LIBRESSL_VERSION_NUMBER)" hacks go away.
> I'd rather do this in several steps. Here's a first step that excludes
> the code path mentioned above.
ok jca@
> Index: Makefile
> ===
> RCS file: /var/cvs/ports/net/ntp/Makefile,v
> retrieving revision 1.74
> diff -u -p -r1.74 Makefile
> --- Makefile 11 Jan 2018 19:27:07 - 1.74
> +++ Makefile 26 Aug 2018 13:45:31 -
> @@ -7,7 +7,7 @@ COMMENT= Network Time Protocol reference
> # 'pl' for local use.
>
> VERSION= 4.2.8p10
> -REVISION=1
> +REVISION=2
> DISTNAME=ntp-${VERSION}
> PKGNAME= ntp-${VERSION:S/p/pl/}
> CATEGORIES= net
> Index: patches/patch-include_libssl_compat_h
> ===
> RCS file: patches/patch-include_libssl_compat_h
> diff -N patches/patch-include_libssl_compat_h
> --- patches/patch-include_libssl_compat_h 26 Aug 2018 11:57:49 -
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,26 +0,0 @@
> -$OpenBSD: patch-include_libssl_compat_h,v 1.3 2018/08/26 11:57:49 tb Exp $
> -Index: include/libssl_compat.h
> include/libssl_compat.h.orig
> -+++ include/libssl_compat.h
> -@@ -37,7 +37,7 @@
> - #endif
> -
> - /* - */
> --#if OPENSSL_VERSION_NUMBER < 0x1010L
> -+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
> - /* - */
> -
> - # include
> -@@ -107,10 +107,12 @@ extern int sslshim_X509_get_signature_nid(const
> X509 *
> -
> - #define OpenSSL_version_num SSLeay
> - #define OpenSSL_version SSLeay_version
> -+#if !defined(LIBRESSL_VERSION_NUMBER)
> - #define X509_get0_notBefore X509_get_notBefore
> - #define X509_getm_notBefore X509_get_notBefore
> - #define X509_get0_notAfter X509_get_notAfter
> - #define X509_getm_notAfter X509_get_notAfter
> -+#endif
> -
> - /* - */
> - #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */
> Index: patches/patch-libntp_libssl_compat_c
> ===
> RCS file: patches/patch-libntp_libssl_compat_c
> diff -N patches/patch-libntp_libssl_compat_c
> --- patches/patch-libntp_libssl_compat_c 27 Mar 2017 11:33:40 -
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-libntp_libssl_compat_c,v 1.2 2017/03/27 11:33:40 bluhm Exp $
> libntp/libssl_compat.c.orig Thu Mar 23 19:36:53 2017
> -+++ libntp/libssl_compat.c Thu Mar 23 21:47:42 2017
> -@@ -26,7 +26,7 @@
> - /* - */
> -
> - /* - */
> --#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010L
> -+#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010L ||
> defined(LIBRESSL_VERSION_NUMBER)
> - /* - */
> -
> - #include "libssl_compat.h"
> Index: patches/patch-sntp_libevent_test_regress_ssl_c
> ===
> RCS file:
> /var/cvs/ports/net/ntp/patches/patch-sntp_libevent_test_regress_ssl_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-sntp_libevent_test_regress_ssl_c
> --- patches/patch-sntp_libevent_test_regress_ssl_c27 Mar 2017 11:33:40
> - 1.1
> +++ patches/patch-sntp_libevent_test_regress_ssl_c26 Aug 2018 13:36:59
> -
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-sntp_libevent_test_regress_ssl_c,v 1.1 2017/03/27 11:33:40
> bluhm Exp $
> sntp/libevent/test/regress_ssl.c.origThu Mar 23 21:54:28 2017
> -+++ sntp/libevent/test/regress_ssl.c Thu Mar 23 21:59:01 2017
> +Index: sntp/libevent/test/regress_ssl.c
> +--- sntp/libevent/test/regress_ssl.c.orig
> sntp/libevent/test/regress_ssl.c
> @@ -61,7 +61,7 @@
>
> #include
> @@ -10,12 +11,3 @@ $OpenBSD: patch-sntp_libevent_test_regre
> #define OpenSSL_version_num SSLeay
> #endif /* OPENSSL_VERSION_NUMBER */
>
> -@@ -130,7 +130,7 @@ getcert(void)
> - X509_set_subject_name(x509, name);
> - X509_set_issuer_name(x509, name);
> -
> --#if OPENSSL_VERSION_NUMBER < 0x1010L
> -+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
> -
Re: Update emulators/mednafen 0.9.48 -> 1.21.3
On Sat, Aug 25, 2018 at 05:24:43PM -0700, Jeremy Evans wrote: > > The /dev/audio -> /dev/audio0 diff is a noop by default, as I also > switched the default driver from openbsd to sdl (which uses sndio). > > I don't express an opinion on putting the symlinks back. I think most > programs that use audio on OpenBSD use sndio (directly or indirectly). > Those that don't are problematic to use in general, since you have to > stop using sndiod to use them (this is how mednafen currently operates > in ports, before the patch). > That's correct. Furthermore, the code won't work on all devices because by using directly audio(4) it bypasses the format & rate coversions. Switching to sdl by default until this get fixed seems the best thing to do for now. Replacing /dev/audio -> /dev/audio0 in the non-default backend brings mednafen to the same state as before the symlink removal, so it's fine as well.
Re: Update emulators/mednafen 0.9.48 -> 1.21.3
On Sun, Aug 26, 2018 at 04:53:41PM +0200, Alexandre Ratchov wrote: > > Back in 2015, when we made massive API changes to the (private) > audio(4) API, we carefully audited the ports tree and *all* ports were > using libsndio to play/record sound. > > I don't know how this could even compile, as the current audio(4) API > is very different to SunAudio or whatever we inherited from NetBSD. > According to mednafen changelog the OpenBSD audio backend was added recently; too bad they choosed to implement it using the private audio(4) API instead of using the sio_open(4) API. Anyway, both APIs use similar semantics, so fixing this is a matter of blindly replacing audio(4) ioctls by their libsndio equivalents.
UPDATE: x11/qt5/qtwebkit (security)
Hi All!
We all know QtWebkit is insecure and outdated. Unfortunately, there are
many consumers, so let's try to make our ports tree a better and
safer place.
Long time ago gonzalo@ pointed out annulen/webkit[0].
A short all-round view shows us that FreeBSD[1] and ArchLinux[2] use
this version. You can also see that other projects use this version too:
"QtWebEngine, or QtWebKit - only the updated fork (5.212) is supported"
-- https://www.qutebrowser.org/
However, a few things are ugly. USE_NINJA=No, Is that okay with the bulk
group?
How do we do that with the version? I start with a REVISION only!? Better
ideas? Switch from qtwebkit-5.9.6 to qtwebkit-5.212.0 with EPOCH?
I haven't tested all consumers yet. Most patches from www/webkitgtk4.
Comments, Feedback welcome
Rafael Sadowski
[0]: https://github.com/annulen/webkit/wiki
[1]: https://www.freshports.org/www/qt5-webkit/
[2]: https://www.archlinux.org/packages/extra/x86_64/qt5-webkit/
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile14 Aug 2018 14:19:50 - 1.12
+++ Makefile26 Aug 2018 14:09:31 -
@@ -1,29 +1,40 @@
# $OpenBSD: Makefile,v 1.12 2018/08/14 14:19:50 rsadowski Exp $
-QT5NAME = QtWebkit
-REVISION = 6
-COMMENT = old Webkit integration framework for Qt
+COMMENT = QtWebKit with a more modern WebKit code base
USE_WXNEEDED = Yes
-DPB_PROPERTIES = parallel
-VERSION = ${QT5_WEBKIT_VERSION}
-DIST_VERSION = ${QT5_WEBKIT_VERSION}
-SHARED_LIBS += Qt5WebKit 2.1
-SHARED_LIBS += Qt5WebKitWidgets2.1
+DISTNAME = qtwebkit-5.212.0-alpha2
+PKGNAME = qtwebkit-${VERSION}
+REVISION = 0
+
+SHARED_LIBS += Qt5WebKit 3.0
+SHARED_LIBS += Qt5WebKitWidgets3.0
CATEGORIES = www
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
-WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick Qt5Sensors
-WANTLIB += Qt5Sql Qt5WebChannel Qt5Widgets X11 Xext Xrender c
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gstapp-1.0 gstaudio-1.0
-WANTLIB += gstbase-1.0 gstpbutils-1.0 gstreamer-1.0 gstvideo-1.0
-WANTLIB += icudata icui18n icuuc intl jpeg m png sqlite3 webp
-WANTLIB += xml2 xslt z
+# Mostly LGPLv2.1 or LGPLv3 for code; FDLv1.3 for documentation.
+# Some third-party parts are BSD-licensed.
+# Also, many parts have are dual-licensed having either commercial, GPL,
+# Apache 2.0 or other type of license as an alternative option.
+# A few components, including QtWebEngine, are LGPLv3 only, no LGPLv2.1.
+PERMIT_PACKAGE_CDROM = Yes
+
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5Positioning
+WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5Sensors Qt5WebChannel
+WANTLIB += Qt5Widgets X11 Xcomposite Xrender c gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstfft-1.0
+WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0
+WANTLIB += icui18n icuuc jpeg m png sqlite3 webp xml2 xslt z
+
+MASTER_SITES =
https://github.com/annulen/webkit/releases/download/${DISTNAME}/
+
+MODULES = perl \
+ lang/ruby \
+ devel/cmake \
+ x11/qt5
-MASTER_SITES =
https://download.qt.io/community_releases/${DIST_VERSION:R}/${DIST_VERSION}-final/
+USE_NINJA =No
-MODULES = perl lang/python lang/ruby
MODPY_RUNDEP = No
MODRUBY_RUNDEP = No
@@ -43,75 +54,55 @@ LIB_DEPENDS = databases/sqlite3 \
multimedia/gstreamer1/plugins-base \
textproc/icu4c \
textproc/libxslt \
+ graphics/libwebp \
x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} \
x11/qt5/qtlocation>=${QT5_VERSION},<${QT5_NEXT_VERSION}
\
x11/qt5/qtsensors>=${QT5_VERSION},<${QT5_NEXT_VERSION} \
x11/qt5/qtwebchannel>=${QT5_VERSION},<${QT5_NEXT_VERSION}
-MAKE_ENV = NINJA_PATH="${LOCALBASE}/bin/ninja" \
- PYTHON=${MODPY_BIN} \
- RUBY=${RUBY}
-
-MAKE_FLAGS = PYTHON=${MODPY_BIN} \
- RUBY=${RUBY}
-
-FLAVORS = debug
-PSEUDO_FLAVORS = no_tests
-
-#MODQMAKE_ARGS = WEBKIT_CONFIG+=web_audio
+CONFIGURE_ARGS += -DPORT=Qt \
+ -DENABLE_TOOLS=OFF
# See qtbase/tests/README for details
TEST_IS_INTERACTIVE = X11
TEST_DEPENDS = ${MODPY_RUN_DEPENDS} \
${MODRUBY_RUN_DEPENDS} \
- audio/sox \
- kde4-minimal-*|kdebase-*:meta/kde4,-minimal
+
Re: installing non-interactively emacs-26.1p1-no_x11
On Sun, Aug 26 2018, "Jiri B." wrote: > Hi, > > I cannot figure out how to install non-interactively emacs-26.1p1-no_x11 > > Is it branch, right? But what is it's value after '%'? afaik it's the last directory in the package path. "editors/emacs" -> "emacs". > emacs--no_x11 still request version selection, emacs%--no_x11 is wrong. emacs--no_x11%emacs, see also pkg_info -z. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: fix net/ntp after libcrypto bumps
On Sun, Aug 26, 2018 at 11:07:36PM +1000, Joel Sing wrote:
> On Sunday 26 August 2018 12:52:52 Theo Buehler wrote:
> > A simple one:
>
> This doesn't look right - the entire OPENSSL_VERSION_NUMBER < 1.1.0 path (on
> line 40 of include/libssl_compat.h) should no longer be taken (or
> substantially reduced).
Right. It looks like we can get rid of many (most?) of the
LIBRESSL_VERSION_NUMBER patches in this port.
I'd rather do this in several steps. Here's a first step that excludes
the code path mentioned above.
Index: Makefile
===
RCS file: /var/cvs/ports/net/ntp/Makefile,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile
--- Makefile11 Jan 2018 19:27:07 - 1.74
+++ Makefile26 Aug 2018 13:45:31 -
@@ -7,7 +7,7 @@ COMMENT=Network Time Protocol reference
# 'pl' for local use.
VERSION= 4.2.8p10
-REVISION= 1
+REVISION= 2
DISTNAME= ntp-${VERSION}
PKGNAME= ntp-${VERSION:S/p/pl/}
CATEGORIES=net
Index: patches/patch-include_libssl_compat_h
===
RCS file: patches/patch-include_libssl_compat_h
diff -N patches/patch-include_libssl_compat_h
--- patches/patch-include_libssl_compat_h 26 Aug 2018 11:57:49 -
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-include_libssl_compat_h,v 1.3 2018/08/26 11:57:49 tb Exp $
-Index: include/libssl_compat.h
include/libssl_compat.h.orig
-+++ include/libssl_compat.h
-@@ -37,7 +37,7 @@
- #endif
-
- /* - */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- /* - */
-
- # include
-@@ -107,10 +107,12 @@ extern int sslshim_X509_get_signature_nid(const
X509 *
-
- #define OpenSSL_version_num SSLeay
- #define OpenSSL_version SSLeay_version
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- #define X509_get0_notBefore X509_get_notBefore
- #define X509_getm_notBefore X509_get_notBefore
- #define X509_get0_notAfterX509_get_notAfter
- #define X509_getm_notAfterX509_get_notAfter
-+#endif
-
- /* - */
- #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */
Index: patches/patch-libntp_libssl_compat_c
===
RCS file: patches/patch-libntp_libssl_compat_c
diff -N patches/patch-libntp_libssl_compat_c
--- patches/patch-libntp_libssl_compat_c27 Mar 2017 11:33:40 -
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libntp_libssl_compat_c,v 1.2 2017/03/27 11:33:40 bluhm Exp $
libntp/libssl_compat.c.origThu Mar 23 19:36:53 2017
-+++ libntp/libssl_compat.c Thu Mar 23 21:47:42 2017
-@@ -26,7 +26,7 @@
- /* - */
-
- /* - */
--#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010L
-+#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010L ||
defined(LIBRESSL_VERSION_NUMBER)
- /* - */
-
- #include "libssl_compat.h"
Index: patches/patch-sntp_libevent_test_regress_ssl_c
===
RCS file:
/var/cvs/ports/net/ntp/patches/patch-sntp_libevent_test_regress_ssl_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sntp_libevent_test_regress_ssl_c
--- patches/patch-sntp_libevent_test_regress_ssl_c 27 Mar 2017 11:33:40
- 1.1
+++ patches/patch-sntp_libevent_test_regress_ssl_c 26 Aug 2018 13:36:59
-
@@ -1,6 +1,7 @@
$OpenBSD: patch-sntp_libevent_test_regress_ssl_c,v 1.1 2017/03/27 11:33:40
bluhm Exp $
sntp/libevent/test/regress_ssl.c.orig Thu Mar 23 21:54:28 2017
-+++ sntp/libevent/test/regress_ssl.c Thu Mar 23 21:59:01 2017
+Index: sntp/libevent/test/regress_ssl.c
+--- sntp/libevent/test/regress_ssl.c.orig
sntp/libevent/test/regress_ssl.c
@@ -61,7 +61,7 @@
#include
@@ -10,12 +11,3 @@ $OpenBSD: patch-sntp_libevent_test_regre
#define OpenSSL_version_num SSLeay
#endif /* OPENSSL_VERSION_NUMBER */
-@@ -130,7 +130,7 @@ getcert(void)
- X509_set_subject_name(x509, name);
- X509_set_issuer_name(x509, name);
-
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- X509_time_adj(X509_get_notBefore(x509), 0, );
- now += 3600;
- X509_time_adj(X509_get_notAfter(x509), 0, );
installing non-interactively emacs-26.1p1-no_x11
Hi, I cannot figure out how to install non-interactively emacs-26.1p1-no_x11 Is it branch, right? But what is it's value after '%'? emacs--no_x11 still request version selection, emacs%--no_x11 is wrong. Jiri
Re: [NEW] gzdoom-3.5.0
On Fri, Aug 03 2018, timo.my...@bittivirhe.fi (Timo Myyrä) wrote: > timo.my...@bittivirhe.fi (Timo Myyrä) writes: > >> Solene Rapenne writes: >> >>> timo.my...@bittivirhe.fi (Timo Myyrä) wrote: >>> Hi, Here's a updated port for latest gzdoom version. Merged the stuff from Solene's port into my old gzdoom port and bumped it to latest version. Tested on amd64 and quick gameplay test seems to work and installing soundfont and tuning the ini file, the fluidsynth playback works. - added patch to fix the fluidsynth library name - dropped old linker args from Makefile, these don't seem to be needed at all - Added flag to disable GTK dialogs from building so no need for Gtk dependency - fluidsynth is detected at build time so add it as build_depends. At run time it needs to be installed but gzdoom can use other midi players as well so I didn't add it to run_depends. - Dropped previous gxmessage dependy, the game tries kdialog, gxmessage and finally xmessage to show crash log. - OpenAL needs to be installed to have audio. Timo >>> >>> Your port is way better than the one I submitted last month, good work! >>> Still >>> when using mods, I only have music and no other sound, do you have the same >>> issue? Doom1 and Doom2 runs fine, so it may be related to the mods... >> >> I tested Doom One mod and only got sound in menu and no gameplay sounds or >> music >> at all. Got bunch of errors in console so I guess the mods are to blame. >> >> Timo > > Actually its the problem in library loading. There was wrong library names for > libmpg123, libsndfile in the code. I've patched those and the sounds seem to > work now after quick test. > > Updated port attached. Here's some late feedback. Regarding the patches, I don't think that #ifdef __OpenBSD__ is a good approach. (For more on this subject, please look at "#ifdef considered harmful" from Henry Spencer.) Please don't push such patches upstream. For our needs in ports land, we can just patch and hardcode the use of the un-versioned .so libs. Ideas for solutions pushable upstream: a cmake option that controls whether dlopened library names should contain a version; or just #ifndef LIBFOO_NAME #define LIBFOO_NAME "libfoo.so.1" ... which would allow downstreams to override the name. About the dlopened libraries: I guess it would be good to list them in LIB_DEPENDS and add the relevant entries to WANTLIB so that gzdoom gets properly updated when its deps change. (Even if ''make port-lib-depends-check'' complains about extra libs.) On sparc64, I get this from cmake: ... -- Performing Test HAVE_THREAD_LOCAL -- Performing Test HAVE_THREAD_LOCAL - Failed CMake Error at src/CMakeLists.txt:408 (message): C++ compiler doesn't support thread_local storage duration specifier COMPILER = base-clang ports-gcc lets the port build and package on sparc64. The rest of the port looks fine. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: CVS: cvs.openbsd.org: ports
On Sun Aug 26, 2018 at 11:26:36AM +0100, Stuart Henderson wrote: > On 2018/08/23 12:47, Jasper Lievisse Adriaanse wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: jas...@cvs.openbsd.org 2018/08/23 12:47:13 > > > > Modified files: > > net/cppzmq : Makefile distinfo > > net/cppzmq/pkg : PLIST > > Added files: > > net/cppzmq/patches: patch-libzmq-pkg-config_FindZeroMQ_cmake > > Removed files: > > net/cppzmq/patches: patch-libzmqPkgConfigFallback_cmake > > > > Log message: > > update to cppzmq-4.3.0 > > > > ===> Configuring for cppzmq-4.3.0 > -- Detected CPPZMQ Version - 4.3.0 > -- The C compiler identification is Clang 6.0.0 > -- The CXX compiler identification is Clang 6.0.0 > -- Check for working C compiler: /usr/obj/ports/cppzmq-4.3.0/bin/cc > -- Check for working C compiler: /usr/obj/ports/cppzmq-4.3.0/bin/cc -- works > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Detecting C compile features > -- Detecting C compile features - done > -- Check for working CXX compiler: /usr/obj/ports/cppzmq-4.3.0/bin/c++ > -- Check for working CXX compiler: /usr/obj/ports/cppzmq-4.3.0/bin/c++ -- > works > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- CMake libzmq package not found, trying again with pkg-config (normal > install of zeromq) > -- Found PkgConfig: /usr/bin/pkg-config (found version "0.27.1") > -- cppzmq v4.3.0 > CMake Error at /usr/local/share/cmake/Modules/ExternalProject.cmake:2275 > (message): > error: could not find git for clone of googletest > Call Stack (most recent call first): > /usr/local/share/cmake/Modules/ExternalProject.cmake:3029 > (_ep_add_download_command) > CMakeLists.txt:8 (ExternalProject_Add) > > -- Configuring incomplete, errors occurred! > See also > "/usr/obj/ports/cppzmq-4.3.0/build-i386/tests/googletest/CMakeFiles/CMakeOutput.log". > > ninja: error: loading 'build.ninja': No such file or directory > CMake Error at tests/cmake/googletest.cmake:33 (add_subdirectory): > The source directory > > /usr/obj/ports/cppzmq-4.3.0/build-i386/tests/googletest/googletest-src > > does not contain a CMakeLists.txt file. > Call Stack (most recent call first): > tests/CMakeLists.txt:13 (fetch_googletest) > > > -- Configuring incomplete, errors occurred! > Disable tests!? Index: Makefile === RCS file: /cvs/ports/net/cppzmq/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- Makefile23 Aug 2018 18:47:13 - 1.2 +++ Makefile26 Aug 2018 13:24:32 - @@ -19,4 +19,6 @@ MODULES = devel/cmake BUILD_DEPENDS =net/zeromq +CONFIGURE_ARGS += -DCPPZMQ_BUILD_TESTS:Bool=No + .include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2018/08/26 07:14:31 Modified files: news/multimail : Makefile distinfo news/multimail/patches: patch-Makefile patch-interfac_main_cc Removed files: news/multimail/patches: patch-interfac_ansiview_cc patch-mmail_bw_cc Log message: Update multimail to 0.51.
Re: fix net/ntp after libcrypto bumps
On Sunday 26 August 2018 12:52:52 Theo Buehler wrote: > A simple one: This doesn't look right - the entire OPENSSL_VERSION_NUMBER < 1.1.0 path (on line 40 of include/libssl_compat.h) should no longer be taken (or substantially reduced). > Index: patches/patch-include_libssl_compat_h > === > RCS file: /var/cvs/ports/net/ntp/patches/patch-include_libssl_compat_h,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-include_libssl_compat_h > --- patches/patch-include_libssl_compat_h 27 Mar 2017 11:33:40 - > 1.2 > +++ patches/patch-include_libssl_compat_h 26 Aug 2018 10:47:47 - > @@ -1,6 +1,7 @@ > $OpenBSD: patch-include_libssl_compat_h,v 1.2 2017/03/27 11:33:40 bluhm Exp > $ include/libssl_compat.h.orig Thu Mar 23 19:36:53 2017 > -+++ include/libssl_compat.h Thu Mar 23 19:58:13 2017 > +Index: include/libssl_compat.h > +--- include/libssl_compat.h.orig > include/libssl_compat.h > @@ -37,7 +37,7 @@ > #endif > > @@ -10,3 +11,16 @@ $OpenBSD: patch-include_libssl_compat_h, > /* - */ > > # include > +@@ -107,10 +107,12 @@ extern int sslshim_X509_get_signature_nid(const > X509 > * + > + #define OpenSSL_version_num SSLeay > + #define OpenSSL_version SSLeay_version > ++#if !defined(LIBRESSL_VERSION_NUMBER) > + #define X509_get0_notBefore X509_get_notBefore > + #define X509_getm_notBefore X509_get_notBefore > + #define X509_get0_notAfter X509_get_notAfter > + #define X509_getm_notAfter X509_get_notAfter > ++#endif > + > + /* - */ > + #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */
NEW: devel/hs-Decimal
This is for Haskell programmers who have to work with fixed-precision numbers; where floating point isn't appropriate. The reason I'm doing this is it's one of about 50 dependencies required to get productivity/hledger going. (All of which is done already over in openbsd-wip if you want to take a look.) hledger is a famous text-based accounting system suitable for personal accounting and some small business accounting. My plan is to try to do one dependency per week for the next year until everything is in place. hs-Decimal.tgz Description: application/gtar-compressed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2018/08/26 06:24:50 Modified files: games/wesnoth : Makefile distinfo games/wesnoth/patches: patch-po_LINGUAS patch-src_campaign_server_campaign_server_cpp patch-src_clipboard_cpp games/wesnoth/pkg: PLIST Added files: games/wesnoth/patches: patch-src_gui_dialogs_loading_screen_cpp Removed files: games/wesnoth/patches: patch-src_ai_lua_core_cpp patch-src_lua_lbaselib_cpp patch-src_multiplayer_create_cpp patch-src_network_cpp patch-src_network_hpp patch-src_preferences_cpp patch-src_scripting_lua_cpp patch-src_server_server_cpp games/wesnoth/pkg: PFRAG.no-lite Log message: update to wesnoth-1.14.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2018/08/26 05:58:36 Modified files: textproc/wkhtmltopdf/patches: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h Log message: Fix build after libcrypto bump. ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2018/08/26 05:57:49 Modified files: net/ntp/patches: patch-include_libssl_compat_h Log message: Fix build after libcrypto bump. ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2018/08/26 05:47:10 Modified files: security/encfs : Makefile Log message: it is no longer broken on powerpc. sync WANTLIB for gcc-arches. discussed and OK jca@
update databases/redis to 4.0.11
Redis 4.0.11 Released Fri Aug 03 17:09:24 CEST 2018
Upgrade urgency HIGH: not critical but very important bugs fixed.
Dear users, this is just a bugfix release of Redis 4. All new work
is now focused on Redis 5, however we backported a number of bug fixes here:
* The disconnection time between the master and slave was reset in an
incorrect place, sometimes a good slave will not be able to failover
because it claims it was disconnected for too much time from the master.
* A replication bug, rare to trigger but non impossible, is in Redis for
years. It was lately discovered at Redis Labs and fixed by Oran Agra.
It may cause disconnections, desynchronizations and other issues.
* RANDOMKEY may go in infinite loop on rare situations. Now fixed.
* EXISTS now works in a more consistent way on slaves.
* Sentinel: backport of an option to deny a potential security problem
when the SENTINEL command is used to configure an arbitrary script
to execute.
Many of these issues are there for a very long time, however upgrading
is a good idea.
---
Tests pass on amd64 and sparc64, redis continues to work for me.
OK?
Index: Makefile
===
RCS file: /cvs/ports/databases/redis/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- Makefile10 Jul 2018 13:44:57 - 1.104
+++ Makefile26 Aug 2018 11:33:08 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.104 2018/07/10 13:44:57 kn Exp $
COMMENT = persistent key-value database
-DISTNAME = redis-4.0.10
+DISTNAME = redis-4.0.11
CATEGORIES = databases
HOMEPAGE = https://redis.io/
Index: distinfo
===
RCS file: /cvs/ports/databases/redis/distinfo,v
retrieving revision 1.81
diff -u -p -r1.81 distinfo
--- distinfo10 Jul 2018 13:44:57 - 1.81
+++ distinfo15 Aug 2018 12:26:56 -
@@ -1,2 +1,2 @@
-SHA256 (redis-4.0.10.tar.gz) = HbZ0NacE+NGK7JuWN7Nzw0qiM9ZbbhdL2sTBsWHzjKQ=
-SIZE (redis-4.0.10.tar.gz) = 1738465
+SHA256 (redis-4.0.11.tar.gz) = /FPnOudYa82stLY4ddH/BPaMVHTB3e2njwDlri7tG7s=
+SIZE (redis-4.0.11.tar.gz) = 1739656
Index: patches/patch-sentinel_conf
===
RCS file: /cvs/ports/databases/redis/patches/patch-sentinel_conf,v
retrieving revision 1.5
diff -u -p -r1.5 patch-sentinel_conf
--- patches/patch-sentinel_conf 27 Sep 2016 14:38:26 - 1.5
+++ patches/patch-sentinel_conf 15 Aug 2018 12:27:24 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-sentinel_conf,v 1.5 2016/09/27 14:38:26 dcoppa Exp $
sentinel.conf.orig Mon Sep 26 09:10:17 2016
-+++ sentinel.conf Tue Sep 27 16:34:54 2016
+Index: sentinel.conf
+--- sentinel.conf.orig
sentinel.conf
@@ -167,7 +167,7 @@ sentinel failover-timeout mymaster 18
#
# Example:
@@ -10,10 +11,12 @@ $OpenBSD: patch-sentinel_conf,v 1.5 2016
# CLIENTS RECONFIGURATION SCRIPT
#
-@@ -192,5 +192,5 @@ sentinel failover-timeout mymaster 18
+@@ -192,7 +192,7 @@ sentinel failover-timeout mymaster 18
#
# Example:
#
-# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh
+# sentinel client-reconfig-script mymaster ${DBDIR}/reconfig.sh
+ # SECURITY
+ #
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/redis/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 10 May 2016 09:38:48 - 1.10
+++ pkg/PLIST 28 Jun 2018 09:38:19 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.10 2016/05/10 09:38:48 dcoppa Exp $
@newgroup _redis:686
@newuser _redis:686:_redis:daemon:redis account:${DBDIR}:/sbin/nologin
+@rcscript ${RCDIR}/redis
@bin bin/redis-benchmark
@bin bin/redis-check-aof
@bin bin/redis-check-rdb
@@ -17,7 +18,3 @@ share/examples/redis/sentinel.conf
@owner _redis
@group _redis
@sample ${DBDIR}/
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/redis
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/08/26 05:14:15 Modified files: x11/qt5: qt5.port.mk Log message: add MODQT5_LUPDATE and MODQT_LUPDATE
fix net/ntp after libcrypto bumps
A simple one: Index: patches/patch-include_libssl_compat_h === RCS file: /var/cvs/ports/net/ntp/patches/patch-include_libssl_compat_h,v retrieving revision 1.2 diff -u -p -r1.2 patch-include_libssl_compat_h --- patches/patch-include_libssl_compat_h 27 Mar 2017 11:33:40 - 1.2 +++ patches/patch-include_libssl_compat_h 26 Aug 2018 10:47:47 - @@ -1,6 +1,7 @@ $OpenBSD: patch-include_libssl_compat_h,v 1.2 2017/03/27 11:33:40 bluhm Exp $ include/libssl_compat.h.orig Thu Mar 23 19:36:53 2017 -+++ include/libssl_compat.hThu Mar 23 19:58:13 2017 +Index: include/libssl_compat.h +--- include/libssl_compat.h.orig include/libssl_compat.h @@ -37,7 +37,7 @@ #endif @@ -10,3 +11,16 @@ $OpenBSD: patch-include_libssl_compat_h, /* - */ # include +@@ -107,10 +107,12 @@ extern int sslshim_X509_get_signature_nid(const X509 * + + #define OpenSSL_version_num SSLeay + #define OpenSSL_version SSLeay_version ++#if !defined(LIBRESSL_VERSION_NUMBER) + #define X509_get0_notBefore X509_get_notBefore + #define X509_getm_notBefore X509_get_notBefore + #define X509_get0_notAfterX509_get_notAfter + #define X509_getm_notAfterX509_get_notAfter ++#endif + + /* - */ + #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */
fix wktmltopdf build after libcrypto bump
Undoing the removal of the code dealing with X509_getm_not{Before,After}
in our patches fixes the build for me:
Index: patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp
===
RCS file:
/var/cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp
--- patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp 24 Jul
2018 12:03:11 - 1.2
+++ patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp 26 Aug
2018 09:17:55 -
@@ -102,7 +102,7 @@ Index: qt/src/network/ssl/qsslsocket_ope
DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return
0, return)
#ifdef SSLEAY_MACROS
DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b,
return -1, return)
-@@ -321,40 +286,11 @@ DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, u
+@@ -321,30 +286,11 @@ DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, u
DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long
c, c, return 0, return)
DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long
c, c, return 0, return)
#endif
@@ -130,20 +130,20 @@ Index: qt/src/network/ssl/qsslsocket_ope
-DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
-DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return)
-DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
--#if OPENSSL_VERSION_NUMBER < 0x1010L
--DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
--DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
--#else
--DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x, return 0, return)
--DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return)
--#endif
+ #if OPENSSL_VERSION_NUMBER < 0x1010L
+ DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
+ DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
+@@ -352,9 +298,6 @@ DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x
+ DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x, return 0, return)
+ DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return)
+ #endif
-DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const
BIGNUM **q, q, const BIGNUM **g, g, return, return)
-#endif
-
#ifdef Q_OS_SYMBIAN
#define RESOLVEFUNC(func, ordinal, lib) \
if (!(_q_##func = _q_PTR_##func(lib->resolve(#ordinal \
-@@ -648,12 +584,8 @@ bool q_resolveOpenSslSymbols()
+@@ -648,12 +591,8 @@ bool q_resolveOpenSslSymbols()
static volatile bool symbolsResolved = false;
static volatile bool triedToResolveSymbols = false;
#ifndef QT_NO_THREAD
@@ -156,7 +156,7 @@ Index: qt/src/network/ssl/qsslsocket_ope
if (symbolsResolved)
return true;
if (triedToResolveSymbols)
-@@ -686,11 +618,9 @@ bool q_resolveOpenSslSymbols()
+@@ -686,11 +625,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(BIO_write, 269, libs.second )
RESOLVEFUNC(BN_num_bits, 387, libs.second )
RESOLVEFUNC(CRYPTO_free, 469, libs.second )
@@ -168,7 +168,7 @@ Index: qt/src/network/ssl/qsslsocket_ope
RESOLVEFUNC(DSA_free, 594, libs.second )
RESOLVEFUNC(ERR_error_string, 744, libs.second )
RESOLVEFUNC(ERR_get_error, 749, libs.second )
-@@ -748,10 +678,8 @@ bool q_resolveOpenSslSymbols()
+@@ -748,10 +685,8 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first )
RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first )
RESOLVEFUNC(SSL_get_verify_result, 132, libs.first )
@@ -179,7 +179,7 @@ Index: qt/src/network/ssl/qsslsocket_ope
RESOLVEFUNC(SSL_new, 140, libs.first )
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
RESOLVEFUNC(SSL_ctrl, 95, libs.first )
-@@ -823,11 +751,9 @@ bool q_resolveOpenSslSymbols()
+@@ -823,11 +758,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(BIO_write)
RESOLVEFUNC(BN_num_bits)
RESOLVEFUNC(CRYPTO_free)
@@ -191,7 +191,7 @@ Index: qt/src/network/ssl/qsslsocket_ope
RESOLVEFUNC(DSA_free)
RESOLVEFUNC(ERR_error_string)
RESOLVEFUNC(ERR_get_error)
-@@ -857,17 +783,10 @@ bool q_resolveOpenSslSymbols()
+@@ -857,17 +790,10 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(RAND_seed)
RESOLVEFUNC(RAND_status)
RESOLVEFUNC(RSA_free)
@@ -209,7 +209,7 @@ Index: qt/src/network/ssl/qsslsocket_ope
RESOLVEFUNC(SSL_CIPHER_description)
RESOLVEFUNC(SSL_CTX_check_private_key)
RESOLVEFUNC(SSL_CTX_ctrl)
-@@ -882,7 +801,6 @@ bool q_resolveOpenSslSymbols()
+@@ -882,7 +808,6 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_PrivateKey)
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
Re: CVS: cvs.openbsd.org: ports
On 2018/08/23 12:47, Jasper Lievisse Adriaanse wrote: > CVSROOT: /cvs > Module name: ports > Changes by: jas...@cvs.openbsd.org 2018/08/23 12:47:13 > > Modified files: > net/cppzmq : Makefile distinfo > net/cppzmq/pkg : PLIST > Added files: > net/cppzmq/patches: patch-libzmq-pkg-config_FindZeroMQ_cmake > Removed files: > net/cppzmq/patches: patch-libzmqPkgConfigFallback_cmake > > Log message: > update to cppzmq-4.3.0 > ===> Configuring for cppzmq-4.3.0 -- Detected CPPZMQ Version - 4.3.0 -- The C compiler identification is Clang 6.0.0 -- The CXX compiler identification is Clang 6.0.0 -- Check for working C compiler: /usr/obj/ports/cppzmq-4.3.0/bin/cc -- Check for working C compiler: /usr/obj/ports/cppzmq-4.3.0/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Check for working CXX compiler: /usr/obj/ports/cppzmq-4.3.0/bin/c++ -- Check for working CXX compiler: /usr/obj/ports/cppzmq-4.3.0/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- CMake libzmq package not found, trying again with pkg-config (normal install of zeromq) -- Found PkgConfig: /usr/bin/pkg-config (found version "0.27.1") -- cppzmq v4.3.0 CMake Error at /usr/local/share/cmake/Modules/ExternalProject.cmake:2275 (message): error: could not find git for clone of googletest Call Stack (most recent call first): /usr/local/share/cmake/Modules/ExternalProject.cmake:3029 (_ep_add_download_command) CMakeLists.txt:8 (ExternalProject_Add) -- Configuring incomplete, errors occurred! See also "/usr/obj/ports/cppzmq-4.3.0/build-i386/tests/googletest/CMakeFiles/CMakeOutput.log". ninja: error: loading 'build.ninja': No such file or directory CMake Error at tests/cmake/googletest.cmake:33 (add_subdirectory): The source directory /usr/obj/ports/cppzmq-4.3.0/build-i386/tests/googletest/googletest-src does not contain a CMakeLists.txt file. Call Stack (most recent call first): tests/CMakeLists.txt:13 (fetch_googletest) -- Configuring incomplete, errors occurred!
Re: UPDATE: devel/jenkins
On 2018/08/26 08:53, Rafael Sadowski wrote:
> Simple security update to the latest highest versions:
>
> https://jenkins.io/security/advisory/2018-08-15/
If this is going to -stable as well, the PLIST change won't work there,
so I would commit to both -stable and -current without touching PLIST,
then do a separate commit to -current with the PLIST change and a
REVISION bump.
Otherwise you'll have two different PLISTs with the same version number
and pkg_add will probably complain during update from 6.3-stable to
6.4-release.
> Index: devel/Makefile
> ===
> RCS file: /cvs/ports/devel/jenkins/devel/Makefile,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 Makefile
> --- devel/Makefile25 May 2018 06:50:04 - 1.28
> +++ devel/Makefile26 Aug 2018 06:49:23 -
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.28 2018/05/25 06:50:04 rsadowski Exp $
>
> -VERSION =2.122
> +VERSION =2.138
> MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
> DIST_SUBDIR =jenkins-devel
>
> Index: devel/distinfo
> ===
> RCS file: /cvs/ports/devel/jenkins/devel/distinfo,v
> retrieving revision 1.16
> diff -u -p -u -p -r1.16 distinfo
> --- devel/distinfo25 May 2018 06:50:04 - 1.16
> +++ devel/distinfo26 Aug 2018 06:49:23 -
> @@ -1,2 +1,2 @@
> -SHA256 (jenkins/2.122/jenkins.war) =
> 0uOerS1oQwjnCISGcaeZdBnQanutRjISupIituTcjOk=
> -SIZE (jenkins/2.122/jenkins.war) = 74741090
> +SHA256 (jenkins/2.138/jenkins.war) =
> 4cKA8SQZmcnHeVqOo+U0bevra+XiZ0TBOwO8SU3O9Ww=
> +SIZE (jenkins/2.138/jenkins.war) = 75704621
> Index: devel/pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/jenkins/devel/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- devel/pkg/PLIST 17 May 2018 09:48:15 - 1.3
> +++ devel/pkg/PLIST 26 Aug 2018 06:49:23 -
> @@ -10,7 +10,7 @@
> @sample ${HOMEDIR}/
> @owner
> @group
> +@rcscript ${RCDIR}/jenkins
> share/doc/pkg-readmes/${FULLPKGNAME}
> share/jenkins/
> share/jenkins/jenkins.war
> -@rcscript ${RCDIR}/jenkins
> Index: stable/Makefile
> ===
> RCS file: /cvs/ports/devel/jenkins/stable/Makefile,v
> retrieving revision 1.27
> diff -u -p -u -p -r1.27 Makefile
> --- stable/Makefile 25 May 2018 06:49:25 - 1.27
> +++ stable/Makefile 26 Aug 2018 06:49:23 -
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.27 2018/05/25 06:49:25 rsadowski Exp $
>
> -VERSION =2.107.3
> +VERSION =2.121.3
> MASTER_SITES = http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
> DIST_SUBDIR =jenkins-stable
>
> Index: stable/distinfo
> ===
> RCS file: /cvs/ports/devel/jenkins/stable/distinfo,v
> retrieving revision 1.16
> diff -u -p -u -p -r1.16 distinfo
> --- stable/distinfo 25 May 2018 12:14:11 - 1.16
> +++ stable/distinfo 26 Aug 2018 06:49:23 -
> @@ -1,2 +1,2 @@
> -SHA256 (jenkins/2.107.3/jenkins.war) =
> F6nlCb7FsWveW1C8f1nV8eRYpV/kM964b9c7hlv4mrg=
> -SIZE (jenkins/2.107.3/jenkins.war) = 74576216
> +SHA256 (jenkins/2.121.3/jenkins.war) =
> UPvOEfoUfQ7Nns82za6D73lft9R3bzO16hO8Fb9uPBM=
> +SIZE (jenkins/2.121.3/jenkins.war) = 74764818
> Index: stable/pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/jenkins/stable/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- stable/pkg/PLIST 17 May 2018 09:48:15 - 1.3
> +++ stable/pkg/PLIST 26 Aug 2018 06:49:23 -
> @@ -10,7 +10,7 @@
> @sample ${HOMEDIR}/
> @owner
> @group
> +@rcscript ${RCDIR}/jenkins
> share/doc/pkg-readmes/${FULLPKGNAME}
> share/jenkins/
> share/jenkins/jenkins.war
> -@rcscript ${RCDIR}/jenkins
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: aw...@cvs.openbsd.org 2018/08/26 03:00:14 Modified files: editors/ghostwriter: Makefile distinfo editors/ghostwriter/pkg: PLIST Log message: Update editors/ghostwriter to 1.7.3 OK rsadowski@
Re: update editors/ghostwriter 1.7.0 => 1.7.3
On Sat, Aug 11, 2018 at 10:20:01PM +0200, Adam Wolk wrote: > Hi ports@, > > trivial bump for ghostwriter. > > feedback? OK's? > > Regards, > Adam Ping, with a diff bumped to 1.7.3 Index: Makefile === RCS file: /cvs/ports/editors/ghostwriter/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile18 Jul 2018 11:51:15 - 1.10 +++ Makefile26 Aug 2018 08:36:09 - @@ -7,7 +7,7 @@ COMMENT = distraction-free Markdown edit GH_ACCOUNT = wereturtle GH_PROJECT = ghostwriter -GH_TAGNAME = v1.7.0 +GH_TAGNAME = v1.7.3 CATEGORIES = editors Index: distinfo === RCS file: /cvs/ports/editors/ghostwriter/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo18 Jul 2018 11:51:15 - 1.4 +++ distinfo26 Aug 2018 08:36:09 - @@ -1,2 +1,2 @@ -SHA256 (ghostwriter-1.7.0.tar.gz) = U2VqP3DlPHIecOxNLjKfsdlBwQWddsvNLiuUHfUOSX0= -SIZE (ghostwriter-1.7.0.tar.gz) = 680767 +SHA256 (ghostwriter-1.7.3.tar.gz) = NOs4VcXPfFQRKOt0DuQd5AAMkfcemiz0ZMNdd91SPHk= +SIZE (ghostwriter-1.7.3.tar.gz) = 673328 Index: pkg/PLIST === RCS file: /cvs/ports/editors/ghostwriter/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 29 Jun 2018 22:16:11 - 1.4 +++ pkg/PLIST 26 Aug 2018 08:36:09 - @@ -6,7 +6,16 @@ share/appdata/ghostwriter.appdata.xml share/applications/ghostwriter.desktop share/ghostwriter/ share/ghostwriter/translations/ +share/ghostwriter/translations/ghostwriter_cs.qm +share/ghostwriter/translations/ghostwriter_de.qm share/ghostwriter/translations/ghostwriter_en.qm +share/ghostwriter/translations/ghostwriter_es.qm +share/ghostwriter/translations/ghostwriter_fr.qm +share/ghostwriter/translations/ghostwriter_it.qm +share/ghostwriter/translations/ghostwriter_ja.qm +share/ghostwriter/translations/ghostwriter_pl.qm +share/ghostwriter/translations/ghostwriter_pt_BR.qm +share/ghostwriter/translations/ghostwriter_ru.qm share/ghostwriter/translations/ghostwriter_zh.qm share/icons/hicolor/128x128/apps/ghostwriter.png share/icons/hicolor/16x16/apps/ghostwriter.png
fix qt4 after libcrypto bump
Turns out I accidentally committed one diff too many to libcrypto
(meaning one that didn't go through sthen's bulk) and as a well-deserved
punishment, I broke Qt stuff (what else?).
The diff below fixes the build of x11/qt4 for me.
The problem is that X509_getm_not{Before,After}() are now proper
functions instead of #defines accessing a X509 struct member, so
they need to be taught to the Qt dynamic linking mechanism.
Index: patches/patch-src_network_ssl_qsslcertificate_cpp
===
RCS file: patches/patch-src_network_ssl_qsslcertificate_cpp
diff -N patches/patch-src_network_ssl_qsslcertificate_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_network_ssl_qsslcertificate_cpp 26 Aug 2018 07:57:02
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/network/ssl/qsslcertificate.cpp
+--- src/network/ssl/qsslcertificate.cpp.orig
src/network/ssl/qsslcertificate.cpp
+@@ -698,8 +698,8 @@ QSslCertificate QSslCertificatePrivate::QSslCertificat
+ if (!x509 || !QSslSocket::supportsSsl())
+ return certificate;
+
+-ASN1_TIME *nbef = q_X509_get_notBefore(x509);
+-ASN1_TIME *naft = q_X509_get_notAfter(x509);
++ASN1_TIME *nbef = q_X509_getm_notBefore(x509);
++ASN1_TIME *naft = q_X509_getm_notAfter(x509);
+ certificate.d->notValidBefore = q_getTimeFromASN1(nbef);
+ certificate.d->notValidAfter = q_getTimeFromASN1(naft);
+ certificate.d->null = false;
Index: patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
===
RCS file:
/cvs/ports/x11/qt4/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
--- patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp17 Sep
2015 12:24:42 - 1.3
+++ patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp26 Aug
2018 07:57:02 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.3
2015/09/17 12:24:42 dcoppa Exp $
src/network/ssl/qsslsocket_openssl_symbols.cpp.origWed Sep 16
13:27:39 2015
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:33:06 2015
+Index: src/network/ssl/qsslsocket_openssl_symbols.cpp
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -228,13 +228,17 @@ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, re
#ifndef OPENSSL_NO_SSL2
DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG,
return 0, return)
@@ -19,7 +20,16 @@ $OpenBSD: patch-src_network_ssl_qsslsock
DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG,
return 0, return)
DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG,
return 0, return)
#else
-@@ -822,13 +826,17 @@ bool q_resolveOpenSslSymbols()
+@@ -257,6 +261,8 @@ DEFINEFUNC(void, X509_free, X509 *a, a, return, DUMMYA
+ DEFINEFUNC2(X509_EXTENSION *, X509_get_ext, X509 *a, a, int b, b, return 0,
return)
+ DEFINEFUNC(int, X509_get_ext_count, X509 *a, a, return 0, return)
+ DEFINEFUNC4(void *, X509_get_ext_d2i, X509 *a, a, int b, b, int *c, c, int
*d, d, return 0, return)
++DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, const X509 *x, x, return 0,
return)
++DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, const X509 *x, x, return 0,
return)
+ DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return 0, return)
+ DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return 0, return)
+ DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return)
+@@ -822,13 +828,17 @@ bool q_resolveOpenSslSymbols()
#ifndef OPENSSL_NO_SSL2
RESOLVEFUNC(SSLv2_client_method)
#endif
@@ -37,3 +47,12 @@ $OpenBSD: patch-src_network_ssl_qsslsock
RESOLVEFUNC(SSLv23_server_method)
RESOLVEFUNC(TLSv1_server_method)
RESOLVEFUNC(X509_NAME_entry_count)
+@@ -858,6 +868,8 @@ bool q_resolveOpenSslSymbols()
+ RESOLVEFUNC(X509_get_ext_d2i)
+ RESOLVEFUNC(X509_get_issuer_name)
+ RESOLVEFUNC(X509_get_subject_name)
++RESOLVEFUNC(X509_getm_notAfter)
++RESOLVEFUNC(X509_getm_notBefore)
+ RESOLVEFUNC(X509_verify_cert)
+ RESOLVEFUNC(d2i_X509)
+ RESOLVEFUNC(i2d_X509)
Index: patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
===
RCS file: patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
diff -N patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_network_ssl_qsslsocket_openssl_symbols_p_h26 Aug
2018 07:57:02 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/network/ssl/qsslsocket_openssl_symbols_p.h
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig
src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -410,8 +410,8 @@ DSA
UPDATE: devel/jenkins
Simple security update to the latest highest versions:
https://jenkins.io/security/advisory/2018-08-15/
Index: devel/Makefile
===
RCS file: /cvs/ports/devel/jenkins/devel/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- devel/Makefile 25 May 2018 06:50:04 - 1.28
+++ devel/Makefile 26 Aug 2018 06:49:23 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.28 2018/05/25 06:50:04 rsadowski Exp $
-VERSION = 2.122
+VERSION = 2.138
MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
DIST_SUBDIR = jenkins-devel
Index: devel/distinfo
===
RCS file: /cvs/ports/devel/jenkins/devel/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- devel/distinfo 25 May 2018 06:50:04 - 1.16
+++ devel/distinfo 26 Aug 2018 06:49:23 -
@@ -1,2 +1,2 @@
-SHA256 (jenkins/2.122/jenkins.war) =
0uOerS1oQwjnCISGcaeZdBnQanutRjISupIituTcjOk=
-SIZE (jenkins/2.122/jenkins.war) = 74741090
+SHA256 (jenkins/2.138/jenkins.war) =
4cKA8SQZmcnHeVqOo+U0bevra+XiZ0TBOwO8SU3O9Ww=
+SIZE (jenkins/2.138/jenkins.war) = 75704621
Index: devel/pkg/PLIST
===
RCS file: /cvs/ports/devel/jenkins/devel/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- devel/pkg/PLIST 17 May 2018 09:48:15 - 1.3
+++ devel/pkg/PLIST 26 Aug 2018 06:49:23 -
@@ -10,7 +10,7 @@
@sample ${HOMEDIR}/
@owner
@group
+@rcscript ${RCDIR}/jenkins
share/doc/pkg-readmes/${FULLPKGNAME}
share/jenkins/
share/jenkins/jenkins.war
-@rcscript ${RCDIR}/jenkins
Index: stable/Makefile
===
RCS file: /cvs/ports/devel/jenkins/stable/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- stable/Makefile 25 May 2018 06:49:25 - 1.27
+++ stable/Makefile 26 Aug 2018 06:49:23 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.27 2018/05/25 06:49:25 rsadowski Exp $
-VERSION = 2.107.3
+VERSION = 2.121.3
MASTER_SITES = http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
DIST_SUBDIR = jenkins-stable
Index: stable/distinfo
===
RCS file: /cvs/ports/devel/jenkins/stable/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- stable/distinfo 25 May 2018 12:14:11 - 1.16
+++ stable/distinfo 26 Aug 2018 06:49:23 -
@@ -1,2 +1,2 @@
-SHA256 (jenkins/2.107.3/jenkins.war) =
F6nlCb7FsWveW1C8f1nV8eRYpV/kM964b9c7hlv4mrg=
-SIZE (jenkins/2.107.3/jenkins.war) = 74576216
+SHA256 (jenkins/2.121.3/jenkins.war) =
UPvOEfoUfQ7Nns82za6D73lft9R3bzO16hO8Fb9uPBM=
+SIZE (jenkins/2.121.3/jenkins.war) = 74764818
Index: stable/pkg/PLIST
===
RCS file: /cvs/ports/devel/jenkins/stable/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- stable/pkg/PLIST17 May 2018 09:48:15 - 1.3
+++ stable/pkg/PLIST26 Aug 2018 06:49:23 -
@@ -10,7 +10,7 @@
@sample ${HOMEDIR}/
@owner
@group
+@rcscript ${RCDIR}/jenkins
share/doc/pkg-readmes/${FULLPKGNAME}
share/jenkins/
share/jenkins/jenkins.war
-@rcscript ${RCDIR}/jenkins
