diff --git a/Manual.md b/Manual.md index d625ba263df..ff6e00e0c9b 100644 --- a/Manual.md +++ b/Manual.md @@ -212,8 +212,8 @@ the package name should contain them too; if it doesn't, the package name is lowercase. Programs can be split into program packages and library packages. The program -package should be named as describe above. The library package should be prefix -with "lib" (see section `Libraries`) +package should be named as described above. The library package should be +prefixed with "lib" (see section `Libraries`) ### Global functions diff --git a/common/shlibs b/common/shlibs index c958e8e0fd0..5732fad1817 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1748,18 +1748,9 @@ libid3.so id3lib-3.8.3_1 libid3-3.8.so.3 id3lib-3.8.3_1 libgirara-gtk3.so.3 girara-0.2.8_1 libjq.so.1 jq-devel-1.4_1 -libcrypto.so.37 libcrypto37-2.3.3_1 -libcrypto.so.38 libcrypto38-2.4.2_1 -libcrypto.so.41 libcrypto41-2.5.3_1 -libcrypto.so.42 libcrypto42-2.6.4_1 -libssl.so.38 libssl38-2.3.3_1 -libssl.so.39 libssl39-2.4.2_1 -libssl.so.43 libssl43-2.5.3_1 -libssl.so.44 libssl44-2.6.4_1 -libtls.so.10 libtls10-2.3.3_1 -libtls.so.11 libtls11-2.4.2_1 -libtls.so.15 libtls15-2.5.3_1 -libtls.so.16 libtls16-2.6.4_1 +libcrypto.so.43 libcrypto43-2.7.2_1 +libssl.so.45 libssl45-2.7.2_1 +libtls.so.17 libtls17-2.7.2_1 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 libportmidi.so portmidi-217_1 libsox.so.3 sox-14.4.2_1 @@ -2864,7 +2855,7 @@ libmutter-cogl-2.so mutter-3.28.0_1 libmutter-cogl-pango-2.so mutter-3.28.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 -libslopy.so.0.1.0 slop-5.3.37_1 +libslopy.so.7.4 slop-7.4_1 libbcunit.so.1 bcunit-3.0_1 libzbar.so.0 libzbar-0.10_1 libzbargtk.so.0 libzbar-0.10_1 diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index 51c790a197e..098fa103983 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,7 +1,8 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.93.0.277 +version=3.93.1.1 revision=1 +noarch=yes build_style=gnu-configure wrksrc="adapta-gtk-theme-$version" hostmakedepends="automake glib-devel gnome-shell inkscape parallel pkg-config @@ -12,9 +13,11 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage=https://github.com/adapta-project/adapta-gtk-theme distfiles="https://github.com/adapta-project/adapta-gtk-theme/archive/$version.tar.gz" -checksum=dabccef33a0adc18bba1184d01875170e2c818bb26a48764b535a932877164bc +checksum=edb029bb476b51b3ba635bad41b0514225d0993a0b684294977c02cad2a147db -noarch=y +case "$XBPS_TARGET_MACHINE" in + aarch64*) broken="unbreak aarch64* builders" +esac pre_configure() { ./autogen.sh diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template index ae2f4da33da..8bac8980963 100644 --- a/srcpkgs/FreeRADIUS/template +++ b/srcpkgs/FreeRADIUS/template @@ -1,7 +1,7 @@ # Template file for 'FreeRADIUS' pkgname=FreeRADIUS version=3.0.17 -revision=1 +revision=2 wrksrc=freeradius-server-${version} build_style=gnu-configure nocross=yes # Not supported by upstream diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index a7f78ab57c3..211a4ed4e46 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -1,7 +1,7 @@ # Template file for 'Ice' pkgname=Ice version=3.5.1 -revision=17 +revision=18 build_wrksrc=cpp homepage="http://www.zeroc.com" # XXX: other language bindings diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index 278bfb116e0..7d969509c38 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk version=3.3.1 -revision=1 +revision=2 wrksrc=sdk-${version} build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template index 7dd155114e7..45fd2a71494 100644 --- a/srcpkgs/acme-client/template +++ b/srcpkgs/acme-client/template @@ -1,7 +1,7 @@ # Template file for 'acme-client' pkgname=acme-client version=0.1.16 -revision=1 +revision=2 _distver=VERSION_${version//./_} wrksrc=acme-client-portable-${_distver} build_style=gnu-makefile diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template index b839549cad7..5f45cd3549e 100644 --- a/srcpkgs/aircrack-ng/template +++ b/srcpkgs/aircrack-ng/template @@ -3,7 +3,7 @@ pkgname=aircrack-ng _aircrack_ver=1.2 _aircrack_rc=rc4 version="${_aircrack_ver}${_aircrack_rc}" -revision=6 +revision=7 wrksrc="${pkgname}-${_aircrack_ver}-${_aircrack_rc}" hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel sqlite-devel libnl3-devel" diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template index 0229c08788f..12a5ee63009 100644 --- a/srcpkgs/amp/template +++ b/srcpkgs/amp/template @@ -1,9 +1,10 @@ # Template file for 'amp' pkgname=amp version=0.3.4 -revision=1 +revision=2 hostmakedepends="cargo git python3 pkg-config cmake perl" -makedepends="libxcb-devel libressl-devel zlib-devel" +makedepends="libxcb-devel libressl-devel zlib-devel libcurl-devel libssh2-devel + libgit2-devel" short_desc="A complete text editor for your terminal" maintainer="Wilson Birney " license="GPL-3" @@ -13,6 +14,8 @@ checksum=c950560292984d135ed5c92c87a2969a7b2b2d3ab97c5d4d5f66075edbc95169 nocross=yes do_build() { + cargo update --package openssl-sys --precise 0.9.28 + export LIBGIT2_SYS_USE_PKG_CONFIG=1 cargo build --release ${makejobs} } diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index 2c0f7e1345d..2e9fd9e7122 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -1,7 +1,7 @@ # Template file for 'antibody' pkgname=antibody -version=3.4.3 -revision=4 +version=3.4.5 +revision=1 build_style=go go_import_path="github.com/getantibody/antibody" hostmakedepends="git" @@ -10,7 +10,7 @@ maintainer="SolitudeSF " license="MIT" homepage="https://getantibody.github.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=6acc44b1be8efe29260a67fa01f56a9685a2d89b52ef11ec0dc95b171abed7dc +checksum=affd74144426ee11a8605427a387a6a704ad5a28a11c08b17007a16f78a221de post_install() { vlicense LICENSE.md diff --git a/srcpkgs/apache/patches/fix-libressl-2.7.patch b/srcpkgs/apache/patches/fix-libressl-2.7.patch new file mode 100644 index 00000000000..bdd5926bf54 --- /dev/null +++ b/srcpkgs/apache/patches/fix-libressl-2.7.patch @@ -0,0 +1,12 @@ +LibreSSL 2.7 supports newer OpenSSL APIs. Remove special handling for libreSSL. +--- modules/ssl/ssl_private.h.orig 2018-04-23 11:51:35.849536609 +0200 ++++ modules/ssl/ssl_private.h 2018-04-23 11:51:49.578557354 +0200 +@@ -123,7 +123,7 @@ + #define MODSSL_SSL_METHOD_CONST + #endif + +-#if defined(LIBRESSL_VERSION_NUMBER) ++#if 0 + /* Missing from LibreSSL */ + #if LIBRESSL_VERSION_NUMBER < 0x2060000f + #define SSL_CTRL_SET_MIN_PROTO_VERSION 123 diff --git a/srcpkgs/apache/patches/fix-libressl.patch b/srcpkgs/apache/patches/fix-libressl.patch deleted file mode 100644 index 258812e8b47..00000000000 --- a/srcpkgs/apache/patches/fix-libressl.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ./modules/ssl/ssl_private.h.orig -+++ ./modules/ssl/ssl_private.h -@@ -123,6 +123,16 @@ - #define MODSSL_SSL_METHOD_CONST - #endif - -+#if defined(LIBRESSL_VERSION_NUMBER) -+/* Missing from LibreSSL */ -+#define SSL_CTRL_SET_MIN_PROTO_VERSION 123 -+#define SSL_CTRL_SET_MAX_PROTO_VERSION 124 -+#define SSL_CTX_set_min_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) -+#define SSL_CTX_set_max_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) -+#endif -+ - #if defined(OPENSSL_FIPS) - #define HAVE_FIPS - #endif ---- ./support/ab.c.orig -+++ ./support/ab.c -@@ -197,6 +197,14 @@ - #if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) - #define HAVE_TLSEXT - #endif -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2060000f -+# define SSL_CTRL_SET_MIN_PROTO_VERSION 123 -+# define SSL_CTRL_SET_MAX_PROTO_VERSION 124 -+#define SSL_CTX_set_min_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) -+#define SSL_CTX_set_max_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) -+#endif - #endif - - #include diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 2ca6d35d8dc..e68dc8e09c6 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.29 -revision=2 +revision=3 wrksrc=httpd-${version} build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 8dcdceeec44..93aa388e3c4 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -1,7 +1,7 @@ # Template file for 'apk-tools' pkgname=apk-tools version=2.9.1 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="LUAAPK=" hostmakedepends="pkg-config" diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template index 70e2192f345..3040bface53 100644 --- a/srcpkgs/argyllcms/template +++ b/srcpkgs/argyllcms/template @@ -1,7 +1,7 @@ # Template file for 'argyllcms' pkgname=argyllcms version=2.0.0 -revision=2 +revision=3 wrksrc="Argyll_V${version}" hostmakedepends="ftjam zip unzip" makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel diff --git a/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch b/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch new file mode 100644 index 00000000000..aedaa65199a --- /dev/null +++ b/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_libssl_compat_h,v 1.1 2018/02/18 11:12:22 sthen Exp $ + +Index: src/libssl_compat.h +--- src/libssl_compat.h.orig ++++ src/libssl_compat.h +@@ -43,7 +43,9 @@ + #define LIBRESSL_IN_USE 0 + #endif // !defined(LIBRESSL_VERSION_NUMBER) + ++/* XXX really OPENSSL_110_API... */ + #define OPENSSL_101_API \ +- (!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x1010000fL) ++ OPENSSL_VERSION_NUMBER >= 0x1010000fL || \ ++ (LIBRESSL_IN_USE && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + #endif // LIBSSL_COMPAT_H diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index 1e131b87e18..dca8c00f4ec 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,7 +1,7 @@ # Template file for 'aria2' pkgname=aria2 version=1.33.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template index 5e848c74826..0dab0cd0b13 100644 --- a/srcpkgs/attic/template +++ b/srcpkgs/attic/template @@ -1,7 +1,7 @@ # Template file for 'attic' pkgname=attic version=0.16 -revision=10 +revision=11 wrksrc="Attic-$version" build_style=python3-module hostmakedepends="python3-setuptools python3-devel libressl-devel python3-Sphinx" diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template index bdf4e68fd04..628449dfb4c 100644 --- a/srcpkgs/axel/template +++ b/srcpkgs/axel/template @@ -1,7 +1,7 @@ # Template file for 'axel' pkgname=axel version=2.16.1 -revision=2 +revision=3 wrksrc=${pkgname}-${version}${_patch} build_style=gnu-configure conf_files=/etc/axelrc diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index 7ad0e482eab..809b06c218d 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -1,7 +1,7 @@ # Template file for 'bacula-common' pkgname="bacula-common" version="9.0.4" -revision=2 +revision=3 build_style=gnu-configure _common_desc="Bacula - A Network Backup Tool " short_desc="${_common_desc} (common libs)" diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template index 1efad2decd0..eea74a0aa56 100644 --- a/srcpkgs/badvpn/template +++ b/srcpkgs/badvpn/template @@ -1,7 +1,7 @@ # Template file for 'badvpn' pkgname=badvpn version=1.999.130 -revision=8 +revision=9 build_style=cmake hostmakedepends="pkg-config" makedepends="libressl-devel nspr-devel nss-devel" diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template index e127115e9a3..972b96026a7 100644 --- a/srcpkgs/balsa/template +++ b/srcpkgs/balsa/template @@ -1,7 +1,7 @@ # Template file for 'balsa'. pkgname=balsa version=2.5.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-nm --without-gtkspell --without-gnome --with-ssl --with-libsecret --with-gpgme --with-sqlite --with-html-widget=webkit" diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template index af2e81beb3e..388a334bb13 100644 --- a/srcpkgs/bettercap/template +++ b/srcpkgs/bettercap/template @@ -12,3 +12,8 @@ go_import_path="github.com/bettercap/bettercap" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" checksum=90f437ce132cc080c573a5bbc568d31859105117db2e1bf77f209c01ef2fa5ee + + +case $XBPS_TARGET_MACHINE in + *-musl) broken="fails to build";; +esac diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template index da101186888..e27f73cc0af 100644 --- a/srcpkgs/bitchx/template +++ b/srcpkgs/bitchx/template @@ -1,7 +1,7 @@ # Template file for 'bitchx' pkgname=bitchx version=1.2.1 -revision=11 +revision=12 build_style=gnu-configure configure_args="--with-ssl --with-ipv6 --with-plugins" makedepends="libressl-devel ncurses-devel" diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 4eee4580146..c23984972ac 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.16.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config yasm" diff --git a/srcpkgs/bitlbee/template b/srcpkgs/bitlbee/template index 26808f30a3d..f928079a93a 100644 --- a/srcpkgs/bitlbee/template +++ b/srcpkgs/bitlbee/template @@ -1,7 +1,7 @@ # Template file for 'bitlbee' pkgname=bitlbee version=3.5.1 -revision=4 +revision=5 build_style=gnu-configure configure_args="--etcdir=/etc/bitlbee --sbindir=/usr/bin --pidfile=/run/${pkgname}/${pkgname}.pid diff --git a/srcpkgs/boinc/patches/fix-libressl-crypt_h.patch b/srcpkgs/boinc/patches/fix-libressl-crypt_h.patch deleted file mode 100644 index 66e93c9de0b..00000000000 --- a/srcpkgs/boinc/patches/fix-libressl-crypt_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypt.h 2017-08-28 22:29:59.000000000 +0200 -+++ lib/crypt.h 2017-09-21 15:15:32.882784075 +0200 -@@ -26,7 +26,7 @@ - - #include - --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) /* OpenSSL 1.1.0+ */ -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL 1.1.0+ */ - #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */ - #define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */ - #endif diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index eedf114b12c..0e25ece9593 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,10 +1,10 @@ # Template file for 'boinc' pkgname=boinc version=7.8.6 -revision=2 +revision=3 wrksrc=boinc-client_release-${version%.*}-${version} build_style=gnu-configure -hostmakedepends="automake libtool pkg-config python" +hostmakedepends="automake libtool pkg-config python xorgproto" makedepends="glu-devel libfreeglut-devel libcurl-devel libjpeg-turbo-devel libnotify-devel sqlite-devel libxcb-devel libXmu-devel libXi-devel gtk+-devel webkitgtk2-devel wxWidgets-devel" diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template index ce664262994..4053ed1f5ec 100644 --- a/srcpkgs/borg/template +++ b/srcpkgs/borg/template @@ -1,7 +1,7 @@ # Template file for 'borg' pkgname=borg version=1.1.5 -revision=1 +revision=2 wrksrc="borgbackup-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-devel libressl-devel python3-Sphinx" @@ -15,6 +15,7 @@ homepage="https://borgbackup.github.io/" _changelog="https://borgbackup.readthedocs.io/en/stable/changes.html#changelog" distfiles="${PYPI_SITE}/b/borgbackup/borgbackup-${version}.tar.gz" checksum=4356e6c712871f389e3cb1d6382e341ea635f9e5c65de1cd8fcd103d0fb66d3d +broken=https://build.voidlinux.eu/builders/x86_64_builder/builds/8948/steps/shell_3/logs/stdio export BORG_LZ4_PREFIX="${XBPS_CROSS_BASE}/usr" export BORG_OPENSSL_PREFIX="${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 23a3b62060e..c12f7782adf 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,7 +1,7 @@ # Template file for 'botan' pkgname=botan version=2.6.0 -revision=1 +revision=2 wrksrc="${pkgname^}-${version}" build_style=gnu-makefile hostmakedepends="doxygen epstopdf python" diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 306f5d5b76e..a752d5eaa33 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,7 +1,7 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs -version=4.16 -revision=2 +version=4.16.1 +revision=1 wrksrc=${pkgname}-v${version} build_style=gnu-configure configure_args="--disable-backtrace --disable-python" @@ -11,9 +11,9 @@ checkdepends="acl-progs e2fsprogs util-linux" short_desc="Btrfs filesystem utilities" maintainer="Juan RP " license="GPL-2.0-only, LGPL-3.0-or-later" -homepage="http://btrfs.wiki.kernel.org/" +homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" -checksum=f3e0ec4864b7b89db1a6a36fa48bf8a9217117714a04b13c84d0fea1eac154b2 +checksum=013403fb67b17975b21408fa9eb7523b0ecf94f84f8a4397cf972e8e254d2246 make_check_target="test" pre_configure() { diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template index f3dec21c6fe..100c48805a5 100644 --- a/srcpkgs/bum/template +++ b/srcpkgs/bum/template @@ -1,10 +1,10 @@ # Template file for 'bum' pkgname=bum -version=0.1.2 +version=0.1.3 revision=1 +noarch=yes build_style=python3-module pycompile_modules="bum" -noarch=yes hostmakedepends="python3-setuptools" depends="python3-mpd2 python3-musicbrainzngs python3-mpv" short_desc="Daemon that downloads and displays album arts via MPD events" @@ -12,7 +12,7 @@ maintainer="maxice8 " license="MIT" homepage="https://github.com/dylanaraps/bum" distfiles="https://github.com/dylanaraps/bum/archive/${version}.tar.gz" -checksum=de6ecaaf532d2e1f5c25a8db9f1cb87e08d2fd278b1770e914524e3bec9aaf39 +checksum=512b64d2fbd0d96b1c242f5e2b916c126671bd16dfbb5c71d164a39b5ebeeebe post_install() { vlicense LICENSE.md diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template index aa59a50f285..cb17130ec39 100644 --- a/srcpkgs/burp-server/template +++ b/srcpkgs/burp-server/template @@ -3,7 +3,7 @@ _desc="A network-based backup and restore program" pkgname=burp-server version=1.4.40 -revision=6 +revision=7 short_desc="${_desc} - Server" maintainer="Pierre Bourgin " license="AGPL-3, BSD, GPL-2.1 and LGPL-2.1" diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template index c3ee101000f..d13ba6a464c 100644 --- a/srcpkgs/burp2-server/template +++ b/srcpkgs/burp2-server/template @@ -3,7 +3,7 @@ _desc="A network-based backup and restore program" pkgname=burp2-server version=2.1.32 -revision=1 +revision=2 configure_args="--sysconfdir=/etc/burp --sbindir=/usr/bin" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/cJSON-devel b/srcpkgs/cJSON-devel new file mode 120000 index 00000000000..a61aff54d37 --- /dev/null +++ b/srcpkgs/cJSON-devel @@ -0,0 +1 @@ +cJSON \ No newline at end of file diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template new file mode 100644 index 00000000000..0b5e22424e0 --- /dev/null +++ b/srcpkgs/cJSON/template @@ -0,0 +1,22 @@ +# Template file for 'cJSON' +pkgname=cJSON +version=1.7.6 +revision=1 +build_style=cmake +short_desc="Ultralightweight JSON parser in ANSI C" +maintainer="maxice8 " +license="MIT" +homepage="https://github.com/DaveGamble/cJSON" +distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz" +checksum=d1ca2665b34fea164a877637b4ad1624aa23390fe75de91b88e18c5d6ec91978 + +cJSON-devel_package() { + depends="cJSON-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} \ No newline at end of file diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 6dcb0a02000..d9fc40ba087 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre version=3.22.1 -revision=1 +revision=2 hostmakedepends="qt5-qmake python-devel pkg-config python-dateutil python-lxml python-Pillow python-PyQt5-webkit python-apsw python-cssutils python-CherryPy" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index a09c7285b58..b7ab17c6340 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=0.26.0 -revision=1 +revision=2 hostmakedepends="rust python curl cmake pkg-config" makedepends="libcurl-devel libgit2-devel" depends="rust" @@ -16,9 +16,9 @@ nocross=yes case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://repo.voidlinux.eu/distfiles/cargo-0.25.0-x86_64-unknown-linux-musl.tar.gz" + https://repo.voidlinux.eu/distfiles/cargo-0.26.0-x86_64-unknown-linux-musl.tar.gz" checksum+=" - b909608608b36cd75f63f7aab1efb31f3eb50a1f0744151474ebc9559f721bdd" + 406a348567577cb2859749f1b1e1a843de20e7c1f305de89d3a3760635c4979e" ;; x86_64) distfiles+=" diff --git a/srcpkgs/ccnet/template b/srcpkgs/ccnet/template index 207359c3b1a..ab08df2ae68 100644 --- a/srcpkgs/ccnet/template +++ b/srcpkgs/ccnet/template @@ -1,7 +1,7 @@ # Template file for 'ccnet' pkgname=ccnet version=6.1.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libsearpc-codegen libtool pkg-config vala" diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template index d41ea097e60..6b6a6010f83 100644 --- a/srcpkgs/cgit/template +++ b/srcpkgs/cgit/template @@ -3,7 +3,7 @@ _git_version=2.10.2 pkgname=cgit version=1.1 -revision=3 +revision=4 hostmakedepends="asciidoc" makedepends="libressl-devel zlib-devel" short_desc="A fast webinterface for git" diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template index 85eff889d2d..6fa2bd3d1b7 100644 --- a/srcpkgs/clamav/template +++ b/srcpkgs/clamav/template @@ -1,7 +1,7 @@ # Template file for 'clamav' pkgname=clamav version=0.100.0 -revision=1 +revision=2 build_style=gnu-configure # XXX: system llvm is too new (< 3.7 required) # Shipped llvm does not build with gcc6 diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template index b2a9168194e..8cb44bafd9d 100644 --- a/srcpkgs/cmusfm/template +++ b/srcpkgs/cmusfm/template @@ -1,7 +1,7 @@ # Template file for 'cmusfm' pkgname=cmusfm version=0.3.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-libnotify" hostmakedepends="automake pkg-config" diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index 8d86cd3fe89..5e7402d5f9e 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -1,7 +1,7 @@ # Template file for 'coturn' pkgname=coturn version=4.5.0.7 -revision=2 +revision=3 build_style=gnu-configure conf_files="/etc/turnserver.conf" makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel diff --git a/srcpkgs/cryptsetup/patches/flush-stdout.patch b/srcpkgs/cryptsetup/patches/flush-stdout.patch new file mode 100644 index 00000000000..ae21a235f5a --- /dev/null +++ b/srcpkgs/cryptsetup/patches/flush-stdout.patch @@ -0,0 +1,17 @@ +--- ./src/utils_tools.c.orig 2014-10-24 12:58:35.151717616 -0200 ++++ ./src/utils_tools.c 2014-10-24 13:00:42.716855265 -0200 +@@ -105,10 +105,13 @@ + + case CRYPT_LOG_NORMAL: + fputs(msg, stdout); ++ fflush(stdout); + break; + case CRYPT_LOG_VERBOSE: +- if (opt_verbose) ++ if (opt_verbose) { + fputs(msg, stdout); ++ fflush(stdout); ++ } + break; + case CRYPT_LOG_ERROR: + fputs(msg, stderr); diff --git a/srcpkgs/cryptsetup/patches/libressl-2.7.patch b/srcpkgs/cryptsetup/patches/libressl-2.7.patch new file mode 100644 index 00000000000..03ece58371e --- /dev/null +++ b/srcpkgs/cryptsetup/patches/libressl-2.7.patch @@ -0,0 +1,13 @@ +diff --git a/lib/crypto_backend/crypto_openssl.c b/lib/crypto_backend/crypto_openssl.c +index 4929f82..463c3dd 100644 +--- ./lib/crypto_backend/crypto_openssl.c ++++ ./lib/crypto_backend/crypto_openssl.c +@@ -52,7 +52,7 @@ struct crypt_hmac { + /* + * Compatible wrappers for OpenSSL < 1.1.0 + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + static void openssl_backend_init(void) + { + OpenSSL_add_all_algorithms(); diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index ec6c3e95ca7..1f7eec8be10 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,7 +1,7 @@ # Template file for 'cryptsetup' pkgname=cryptsetup version=2.0.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality) --enable-cryptsetup-reencrypt" diff --git a/srcpkgs/ctpp2/template b/srcpkgs/ctpp2/template index 4e5da752879..ed12b4e748a 100644 --- a/srcpkgs/ctpp2/template +++ b/srcpkgs/ctpp2/template @@ -1,7 +1,7 @@ # Template file for 'ctpp2' pkgname=ctpp2 version=2.8.3 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_OPTIMIZATION=OFF -DSKIP_RELINK_RPATH=ON -DBUILD_TESTING=OFF" makedepends="libressl-devel" diff --git a/srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch b/srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch new file mode 100644 index 00000000000..4b36cef2226 --- /dev/null +++ b/srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch @@ -0,0 +1,31 @@ +$OpenBSD: patch-lib_vtls_openssl_c,v 1.3 2018/02/15 22:13:20 sthen Exp $ + +Index: lib/vtls/openssl.c +--- lib/vtls/openssl.c.orig ++++ lib/vtls/openssl.c +@@ -117,12 +117,7 @@ + #define X509_get0_notBefore(x) X509_get_notBefore(x) + #define X509_get0_notAfter(x) X509_get_notAfter(x) + #define CONST_EXTS /* nope */ +-#ifdef LIBRESSL_VERSION_NUMBER +-static unsigned long OpenSSL_version_num(void) +-{ +- return LIBRESSL_VERSION_NUMBER; +-} +-#else ++#ifndef LIBRESSL_VERSION_NUMBER + #define OpenSSL_version_num() SSLeay() + #endif + #endif +@@ -3527,7 +3522,11 @@ static size_t Curl_ossl_version(char *buffer, size_t s + unsigned long ssleay_value; + sub[2]='\0'; + sub[1]='\0'; ++#ifdef LIBRESSL_VERSION_NUMBER ++ ssleay_value = LIBRESSL_VERSION_NUMBER; ++#else + ssleay_value = OpenSSL_version_num(); ++#endif + if(ssleay_value < 0x906000) { + ssleay_value = SSLEAY_VERSION_NUMBER; + sub[0]='\0'; diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 2172b79fc90..e438d871c7a 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,7 +1,7 @@ # Template build file for 'curl'. pkgname=curl version=7.59.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp) diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index f1fcebeeb61..d1a6aa5cbc9 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -1,7 +1,7 @@ # Template file for 'cyrus-sasl' pkgname=cyrus-sasl version=2.1.26 -revision=12 +revision=13 patch_args="-Np1" hostmakedepends="automake libtool groff pkg-config" makedepends="libsasl-devel libressl-devel db-devel libldap-devel diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template index df28882e75f..70183238f05 100644 --- a/srcpkgs/dillo/template +++ b/srcpkgs/dillo/template @@ -1,7 +1,7 @@ # Template file for 'dillo' pkgname=dillo version=3.0.5 -revision=7 +revision=8 build_style=gnu-configure configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns" conf_files="/etc/dillo/dillorc diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template index f88c674425a..bdb1a6a5063 100644 --- a/srcpkgs/dma/template +++ b/srcpkgs/dma/template @@ -1,7 +1,7 @@ # Template file for 'dma' pkgname=dma version=0.11 -revision=7 +revision=8 conf_files="/etc/dma/*.conf" make_dirs="/var/spool/dma 2775 root mail" hostmakedepends="flex" diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 54a74d8c2df..9f4c5ef15fb 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -2,7 +2,7 @@ # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot version=2.3.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin --disable-static --with-pam --with-mysql --with-pgsql --with-lucene diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template index b6428769f52..211580bd3b2 100644 --- a/srcpkgs/ecryptfs-utils/template +++ b/srcpkgs/ecryptfs-utils/template @@ -1,13 +1,13 @@ # Template file for 'ecryptfs-utils' pkgname=ecryptfs-utils version=111 -revision=4 +revision=5 lib32disabled=yes build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-pamdir=/usr/lib/security --enable-gpg --enable-gui --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" -hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig" +hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python" makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel" depends="gettext" _desc="Ecryptfs cryptographic filesystem" @@ -23,6 +23,7 @@ CPPFLAGS="-D_FILE_OFFSET_BITS=64 -I${XBPS_CROSS_BASE}/usr/include/python2.7" pre_configure() { NOCONFIGURE=1 ./autogen.sh sed -i 's/__SWORD_TYPE/unsigned long/g' src/utils/mount.ecryptfs_private.c + export PYTHON=python2 } post_install() { diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 977f09619c4..b486dbf8510 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl version=1.20.7 -revision=2 +revision=3 build_style=gnu-configure configure_args="CXX= --enable-multisense --enable-image-loader-webp --enable-liblz4 --disable-systemd $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template index d21dc1235a9..67063b9ad2b 100644 --- a/srcpkgs/eiskaltdcpp-qt/template +++ b/srcpkgs/eiskaltdcpp-qt/template @@ -1,7 +1,7 @@ # Template file for 'eiskaltdcpp-qt' pkgname=eiskaltdcpp-qt version=2.2.10 -revision=2 +revision=3 wrksrc="eiskaltdcpp-${version}" build_style=cmake configure_args="-DUSE_MINIUPNP=ON" diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template index 7e4f31b8f1e..b4fb1def152 100644 --- a/srcpkgs/ejabberd/template +++ b/srcpkgs/ejabberd/template @@ -1,7 +1,7 @@ # Template file for 'ejabberd' pkgname=ejabberd version=18.03 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-redis --enable-elixir $(vopt_enable sqlite)" diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template index 5f64f6aac6f..730c75757f0 100644 --- a/srcpkgs/elinks/template +++ b/srcpkgs/elinks/template @@ -1,7 +1,7 @@ # Template file for 'elinks' pkgname=elinks version=0.12pre6 -revision=16 +revision=17 build_style=gnu-configure configure_args="--enable-true-color --enable-fastmem" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index 3a73758db20..58d5f9b2701 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -1,7 +1,7 @@ # Template file for 'encfs' pkgname=encfs version=1.9.1 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config perl" makedepends="fuse-devel libressl-devel gettext-devel" diff --git a/srcpkgs/erlang/patches/fix-libressl.patch b/srcpkgs/erlang/patches/fix-libressl.patch new file mode 100644 index 00000000000..81144bfb4c9 --- /dev/null +++ b/srcpkgs/erlang/patches/fix-libressl.patch @@ -0,0 +1,14 @@ +--- ./otp_src_20.3/lib/crypto/c_src/crypto.c.orig 2018-04-23 18:04:06.652997515 +0200 ++++ ./otp_src_20.3/lib/crypto/c_src/crypto.c 2018-04-23 18:03:47.480968547 +0200 +@@ -102,8 +102,10 @@ + # undef FIPS_SUPPORT + # endif + ++# if LIBRESSL_VERSION_NUMBER < 0x2070000fL + /* LibreSSL wants the 1.0.1 API */ +-# define NEED_EVP_COMPATIBILITY_FUNCTIONS ++# define NEED_EVP_COMPATIBILITY_FUNCTIONS ++# endif + #endif + + diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index 0950f24e732..f5e7c3c54fa 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,7 +1,7 @@ # Template file for 'erlang' pkgname=erlang version=20.3 -revision=1 +revision=2 create_wrksrc=yes build_wrksrc=otp_src_${version} build_style=gnu-configure diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index 90175ef67ba..e9d3fcc1b99 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,7 +1,7 @@ # Template file for 'etcd' pkgname=etcd -version=3.3.3 -revision=2 +version=3.3.4 +revision=1 build_style=go short_desc="Distributed reliable key-value store" maintainer="Andrea Brancaleoni " @@ -11,7 +11,7 @@ go_import_path="github.com/coreos/etcd" go_package="${go_import_path} ${go_import_path}/etcdctl" homepage="https://coreos.com/etcd/docs/latest/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=6551878987f860d1b47fbf10ec34b910399f642c6541d86d835e1b5c29bc25ed +checksum=95405df7febae747ebc34432977ac180ba007deb84fe97ccc16b64e1f8a0cd1f conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template index daf847c29ae..cebd7f2f8dd 100644 --- a/srcpkgs/ettercap/template +++ b/srcpkgs/ettercap/template @@ -1,7 +1,7 @@ # Template file for 'ettercap' pkgname=ettercap version=0.8.2 -revision=9 +revision=10 lib32disabled=yes build_style=cmake configure_args="-DENABLE_GTK=OFF" diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index ab6fd06be50..3f9a07e58f4 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.11.1 -revision=1 +revision=2 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="ruby-devel" diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template index 496c1caeb44..72a00bcfffb 100644 --- a/srcpkgs/fdm/template +++ b/srcpkgs/fdm/template @@ -1,7 +1,7 @@ # Template file for 'fdm' pkgname=fdm version=1.9 -revision=6 +revision=7 build_style=gnu-configure CFLAGS="-DPCRE" configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no LIBS=-lpcre" diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template index d4fa324dc54..1c1cdcff9d6 100644 --- a/srcpkgs/fetchmail/template +++ b/srcpkgs/fetchmail/template @@ -1,7 +1,7 @@ # Template file for 'fetchmail' pkgname=fetchmail version=6.3.26 -revision=12 +revision=13 build_style=gnu-configure configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="python-devel" diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template index 141914a09f1..e7ae8fa2cd5 100644 --- a/srcpkgs/fossil/template +++ b/srcpkgs/fossil/template @@ -1,7 +1,7 @@ # Template file for 'fossil' pkgname=fossil version=2.5 -revision=2 +revision=3 build_style=configure configure_args="--disable-internal-sqlite --prefix=/usr" hostmakedepends="tcl" diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index f47fb18fd55..eaa3a118ab7 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,7 +1,7 @@ # Template file for 'freerdp' pkgname=freerdp version=2.0.0rc1 -revision=2 +revision=3 wrksrc="FreeRDP-${version/r/-r}" build_style=cmake configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index ecb15ff3c77..d78f62b0bca 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -1,7 +1,7 @@ # Template file for 'freshplayerplugin' pkgname=freshplayerplugin version=0.3.7 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config ragel" makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template index acf2543dc59..78ad5e8f432 100644 --- a/srcpkgs/gambit/template +++ b/srcpkgs/gambit/template @@ -1,7 +1,7 @@ # Template file for 'gambit' pkgname=gambit version=4.8.9 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template index 83dbdf4d674..ad9735b7a46 100644 --- a/srcpkgs/gatling/template +++ b/srcpkgs/gatling/template @@ -1,7 +1,7 @@ # Template file for 'gatling' pkgname=gatling version=0.15 -revision=5 +revision=6 build_style=gnu-makefile makedepends="libowfat libressl-devel zlib-devel" short_desc="High performance web server" diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template index 7bd5da4f927..8bfa3857c11 100644 --- a/srcpkgs/gftp/template +++ b/srcpkgs/gftp/template @@ -1,7 +1,7 @@ # Template file for 'gftp' pkgname=gftp version=2.0.19 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel libressl-devel" diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template index 540144b625d..5a2d0eca6a6 100644 --- a/srcpkgs/git-crypt/template +++ b/srcpkgs/git-crypt/template @@ -1,7 +1,7 @@ # Template file for 'git-crypt' pkgname=git-crypt version=0.6.0 -revision=2 +revision=3 build_style=gnu-makefile make_use_env=yes makedepends="libressl-devel" diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template index 0de0aa97258..21171107cd8 100644 --- a/srcpkgs/git-series/template +++ b/srcpkgs/git-series/template @@ -1,9 +1,9 @@ # Template file for 'git-series' pkgname=git-series version=0.9.1 -revision=5 +revision=6 hostmakedepends="cargo cmake pkg-config rust perl" -makedepends="libgit2-devel" +makedepends="libgit2-devel libcurl-devel" depends="git" short_desc="Track patch series in git" maintainer="Leah Neukirchen " diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 67ab7644ee1..12ef6217e2f 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for "git" pkgname=git version=2.17.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index d69c0fa6d77..5e8ea656a16 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -1,7 +1,7 @@ # Template build file for 'gkrellm'. pkgname=gkrellm version=2.3.10 -revision=3 +revision=4 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel" diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 65459805436..8ed4612a200 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,16 +1,16 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.28.0 +version=3.28.1 revision=1 -noarch="yes" +noarch=yes build_style=meson configure_args="-Dextension_set=all" -hostmakedepends="pkg-config intltool" -makedepends="unzip libglib-devel libgtop-devel" -depends="gnome-shell>=${version} nautilus>=3.14 unzip" +hostmakedepends="intltool pkg-config" +makedepends="libgtop-devel unzip" +depends="gnome-shell>=${version} nautilus unzip" short_desc="Extensions for GNOME shell, including classic mode" maintainer="Enno Boland " +license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" -license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=215dceb77ba355bdcc9e71dc72aa0debef3c9d7858e70d5094800182492eb503 +checksum=e9c602338b529c8282e7d13e075703028ea384a1d946f3e8ce760e6c5b469058 diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 68e8aeb8838..7b54c80862b 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,27 +1,20 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.28.0 -revision=2 +version=3.28.1 +revision=1 build_style=meson configure_args="-Dsystemd=false" -hostmakedepends=" - pkg-config intltool gnome-doc-utils $(vopt_if gir gobject-introspection) python3 - meson sassc" +hostmakedepends="gobject-introspection gtk-doc intltool pkg-config sassc" makedepends="caribou-devel folks-devel gjs-devel gnome-bluetooth-devel - gnome-control-center-devel gnome-desktop-devel gnome-menus-devel - ibus-devel libcanberra-devel libcroco-devel mutter-devel - network-manager-applet-devel polkit-devel pulseaudio-devel - startup-notification-devel telepathy-logger-devel" -depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils - gir-freedesktop gnome-control-center>=3.16 elogind upower" + gnome-control-center-devel gnome-desktop-devel gnome-menus-devel ibus-devel + libcanberra-devel libcroco-devel mutter-devel network-manager-applet-devel + polkit-devel pulseaudio-devel startup-notification-devel + telepathy-logger-devel" +depends="caribou elogind glxinfo gnome-control-center upower" short_desc="GNOME core user interface" maintainer="Enno Boland " +license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" -license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=c7dec00d3c2b26e16611aac99630e3d41842179e9ec30cc873233b56c080ba4e - -build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" -fi +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=65e8c4eefd9d0bc3f9cabf9545a3f7c32f15384cb05ea0a3647324e1a77a4ccc +nocross="hard dependency on gobject-introspection" diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template index 779d9f8c4fa..da1cd2e290b 100644 --- a/srcpkgs/grub-customizer/template +++ b/srcpkgs/grub-customizer/template @@ -1,7 +1,7 @@ # Template file for 'grub-customizer' pkgname=grub-customizer version=5.0.6 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="gtkmm-devel libressl-devel libarchive-devel" diff --git a/srcpkgs/gsoap/patches/libressl.patch b/srcpkgs/gsoap/patches/libressl.patch deleted file mode 100644 index 71ff17383c7..00000000000 --- a/srcpkgs/gsoap/patches/libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/gsoap/plugin/smdevp.c b/gsoap/plugin/smdevp.c -index a42d7be..193f470 100644 ---- gsoap/plugin/smdevp.c -+++ gsoap/plugin/smdevp.c -@@ -479,7 +479,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data *data, int alg, const void - /* allocate and init the OpenSSL HMAC or EVP_MD context */ - if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX)); - if (data->ctx) - HMAC_CTX_init((HMAC_CTX*)data->ctx); -@@ -489,7 +489,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data *data, int alg, const void - } - else - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX)); - if (data->ctx) - EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx); -@@ -642,7 +642,7 @@ soap_smd_final(struct soap *soap, struct soap_smd_data *data, char *buf, int *le - *len = (int)n; - } - /* cleanup */ --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); - else -@@ -687,7 +687,7 @@ soap_smd_check(struct soap *soap, struct soap_smd_data *data, int ok, const char - } - if (data->ctx) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(OPENSSL_VERSION_NUMBER) - if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) - HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); - else diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index 39bbb2a051c..a04a2172c2e 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -1,7 +1,7 @@ # Template file for 'gsoap' pkgname=gsoap version=2.8.65 -revision=1 +revision=2 build_style=gnu-configure wrksrc="${pkgname}-${version%.*}" disable_parallel_build=yes diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index d079b366e76..97ebd36e8b5 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.14.0 -revision=2 +revision=3 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template index 18899924b83..eae041985f8 100644 --- a/srcpkgs/gwenhywfar/template +++ b/srcpkgs/gwenhywfar/template @@ -1,7 +1,7 @@ # Template file for 'gwenhywfar' pkgname=gwenhywfar version=4.20.0 -revision=2 +revision=3 _dnrel=208 hostmakedepends="automake pkg-config libgcrypt-devel libtool" makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt-devel qt5-devel diff --git a/srcpkgs/h2o/patches/fix-libressl-2.7.patch b/srcpkgs/h2o/patches/fix-libressl-2.7.patch new file mode 100644 index 00000000000..2c128f0cc93 --- /dev/null +++ b/srcpkgs/h2o/patches/fix-libressl-2.7.patch @@ -0,0 +1,35 @@ +--- include/h2o/openssl_backport.h.orig 2018-04-25 12:44:38.649149571 +0200 ++++ include/h2o/openssl_backport.h 2018-04-25 12:44:50.546167553 +0200 +@@ -25,7 +25,8 @@ + #include + + /* backports for OpenSSL 1.0.2 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + #define BIO_get_data(bio) ((bio)->ptr) + #define BIO_set_data(bio, p) ((bio)->ptr = (p)) +--- deps/neverbleed/neverbleed.c.orig 2018-04-25 12:58:28.060403297 +0200 ++++ deps/neverbleed/neverbleed.c 2018-04-25 12:58:09.600375394 +0200 +@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu + return 0; + } + +-#if !OPENSSL_1_1_API ++#if !OPENSSL_1_1_API && defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL + + static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) + { +--- deps/picotls/lib/openssl.c.orig 2018-04-25 13:02:07.728735340 +0200 ++++ deps/picotls/lib/openssl.c 2018-04-25 13:01:39.228692266 +0200 +@@ -41,7 +41,7 @@ + #define OPENSSL_1_0_API 0 + #endif + +-#if OPENSSL_1_0_API ++#if OPENSSL_1_0_API && defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL + + #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY) + #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE) + diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template index 2cf6b324a11..e10731075c8 100644 --- a/srcpkgs/h2o/template +++ b/srcpkgs/h2o/template @@ -1,7 +1,7 @@ # Template file for 'h2o' pkgname=h2o version=2.2.4 -revision=2 +revision=3 build_style=cmake conf_files="/etc/h2o.conf" system_accounts="h2o" diff --git a/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch b/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch new file mode 100644 index 00000000000..474a51e22bc --- /dev/null +++ b/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch @@ -0,0 +1,15 @@ +$OpenBSD: patch-include_proto_openssl-compat_h,v 1.6 2018/03/20 21:57:55 sthen Exp $ + +Index: include/proto/openssl-compat.h +--- include/proto/openssl-compat.h.orig ++++ include/proto/openssl-compat.h +@@ -89,7 +89,8 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESS + } + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* + * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL + */ diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 3e87f1d25fc..5acd03052dd 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,7 +1,7 @@ # Template file for 'haproxy' pkgname=haproxy version=1.7.10 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="TARGET=linux2628 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1" diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index 51192bd551f..700de6a4a4b 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -1,7 +1,7 @@ # Template file for 'hexchat' pkgname=hexchat version=2.14.1 -revision=1 +revision=2 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false -Dwith-perl=true -Dwith-python=python3" build_style=meson diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template index be214596a96..bd5a000bb24 100644 --- a/srcpkgs/hfsprogs/template +++ b/srcpkgs/hfsprogs/template @@ -3,7 +3,7 @@ pkgname=hfsprogs _distver=540.1 _patchver=3 version=${_distver}.linux${_patchver} -revision=1 +revision=2 wrksrc="diskdev_cmds-${version}" hostmakedepends="clang" makedepends="libressl-devel libuuid-devel" diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template index b5214b9000d..4445dddf375 100644 --- a/srcpkgs/hitch/template +++ b/srcpkgs/hitch/template @@ -1,7 +1,7 @@ # Template file for 'hitch' pkgname=hitch version=1.4.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="ac_cv_so_reuseport_works=yes" hostmakedepends="pkg-config" diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template index 93fee575655..dfb8156617f 100644 --- a/srcpkgs/hopper/template +++ b/srcpkgs/hopper/template @@ -1,6 +1,6 @@ # Template file for 'hopper' pkgname=hopper -version=4.3.19 +version=4.3.20 revision=1 _build=1 create_wrksrc=yes @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="EULA" homepage="https://www.hopperapp.com" distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz" -checksum=d993ca22d66444458a41a45833a4da92c4f3dcdc503d8837a0a018092a4392ef +checksum=3c6a7f47b3592c2bdd4b1c5727d95878d71a83fbd68f96d9938de27d447201a3 only_for_archs="x86_64" restricted=yes diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index 7dade56f321..094d7bae508 100644 --- a/srcpkgs/hostapd/template +++ b/srcpkgs/hostapd/template @@ -1,7 +1,7 @@ # Template file for 'hostapd' pkgname=hostapd version=2.6 -revision=5 +revision=6 build_wrksrc=${pkgname} conf_files="/etc/hostapd/hostapd.conf" hostmakedepends="pkg-config" diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index c54c4723f50..e57ba9dcc2b 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,7 +1,7 @@ # Template file for 'hplip' pkgname=hplip version=3.18.3 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --enable-gui-build diff --git a/srcpkgs/httperf/template b/srcpkgs/httperf/template index 80d6bdacf4a..a125192ebe4 100644 --- a/srcpkgs/httperf/template +++ b/srcpkgs/httperf/template @@ -1,7 +1,7 @@ # Template file for 'httperf' pkgname=httperf version=0.9.0 -revision=5 +revision=6 build_style=gnu-configure makedepends="libressl-devel" short_desc="A tool for measuring web server performance" diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template index 909bd1a0443..f849997e44d 100644 --- a/srcpkgs/httrack/template +++ b/srcpkgs/httrack/template @@ -1,7 +1,7 @@ # Template file for 'httrack' pkgname="httrack" version=3.49.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr" short_desc="A free and easy-to-use offline browser utility" diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index 02601f4a293..ffda6a1b1e6 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,7 +1,7 @@ # Template file for 'i2pd' pkgname=i2pd version=2.15.0 -revision=2 +revision=3 short_desc="I2P Daemon - a full-featured C++ implementation of I2P client" homepage="http://i2pd.website/" license="BSD" diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template index b8cb1727949..516eb2b88bb 100644 --- a/srcpkgs/icecast/template +++ b/srcpkgs/icecast/template @@ -1,7 +1,7 @@ # Template file for 'icecast' pkgname=icecast version=2.4.3 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config libxml2-devel" makedepends="libressl-devel libcurl-devel speex-devel diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index dcfbdd0b468..7c613b66ed3 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,7 +1,7 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.5.4 -revision=7 +revision=8 build_style=cmake configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template index ed9e75a9f92..2ac98289091 100644 --- a/srcpkgs/ifupdown/template +++ b/srcpkgs/ifupdown/template @@ -1,17 +1,17 @@ # Template file for 'ifupdown' pkgname=ifupdown -version=0.8.31 +version=0.8.32 revision=1 -wrksrc=$pkgname +wrksrc="$pkgname" build_style=gnu-makefile make_use_env=1 hostmakedepends="dpkg perl" short_desc="High level tools to configure network interfaces" maintainer="Michael Aldridge " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/ifupdown" distfiles="http://http.debian.net/debian/pool/main/i/ifupdown/ifupdown_${version}.tar.xz" -checksum=a5dd8c6e79465b81a4c4f9dab3f00de83a2f6fbea4dc01ecbb2fbb727f8bcad6 +checksum=fe562c9934cd4d95d5d3374bb49097824b53e7d48c38ab1a4411cb19d407cfcf make_dirs="/etc/network/interfaces.d 0755 root root /etc/network/if-pre-up.d 0755 root root @@ -24,7 +24,6 @@ post_install() { vman interfaces.5 vman ifup.8 - for _i in examples/* ; do vsconf $_i done diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index adfeab4a199..c5f2cfdea8a 100644 --- a/srcpkgs/imapfilter/template +++ b/srcpkgs/imapfilter/template @@ -1,7 +1,7 @@ # Template file for 'imapfilter' pkgname=imapfilter version=2.6.11 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr" hostmakedepends="lua-devel" diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template index c8f30946d30..de0702021f0 100644 --- a/srcpkgs/inadyn/template +++ b/srcpkgs/inadyn/template @@ -1,7 +1,7 @@ # Template file for 'inadyn' pkgname=inadyn version=2.3.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-openssl" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index 71958e05d4c..59502aa6a39 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,7 +1,7 @@ # Template file for 'inspircd' pkgname=inspircd version=2.0.25 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="perl pkg-config" makedepends="geoip-devel libressl-devel sqlite-devel" diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index 9cb348d35c4..5bd6384f811 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,7 +1,7 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=3 +revision=4 build_style=gnu-configure makedepends="libressl-devel" short_desc="Command-line interface to IPMI-enabled devices" diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template index 3b6eecde980..0893e9a6969 100644 --- a/srcpkgs/ipmiutil/template +++ b/srcpkgs/ipmiutil/template @@ -1,7 +1,7 @@ # Template file for 'ipmiutil' pkgname=ipmiutil version=3.0.0 -revision=4 +revision=5 build_style=gnu-configure makedepends="libressl-devel" short_desc="Series of utilities that perform common IPMI management functions" diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index ed1af05348a..e58b7a0514d 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -1,7 +1,7 @@ # Template file for 'iputils' pkgname=iputils version=20161105 -revision=2 +revision=3 patch_args="-Np1" wrksrc="${pkgname}-s${version}" makedepends="libcap-devel libressl-devel" diff --git a/srcpkgs/irssi/patches/patch-src_core_network-openssl_c.patch b/srcpkgs/irssi/patches/patch-src_core_network-openssl_c.patch new file mode 100644 index 00000000000..f783356d450 --- /dev/null +++ b/srcpkgs/irssi/patches/patch-src_core_network-openssl_c.patch @@ -0,0 +1,25 @@ +$OpenBSD: patch-src_core_network-openssl_c,v 1.6 2018/02/23 14:39:51 sthen Exp $ + +Index: src/core/network-openssl.c +--- src/core/network-openssl.c.orig ++++ src/core/network-openssl.c +@@ -35,7 +35,8 @@ + #include + + /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* The two functions below could be already defined if OPENSSL_API_COMPAT is + * below the 1.1.0 version so let's do a clean start */ + #undef X509_get_notBefore +@@ -47,7 +48,8 @@ + + /* OpenSSL 1.1.0 also introduced some useful additions to the api */ + #if (OPENSSL_VERSION_NUMBER >= 0x10002000L) +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + static int X509_STORE_up_ref(X509_STORE *vfy) + { + int n; diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index 8593b897cd4..ed8bddcaa03 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,7 +1,7 @@ # Template build file for 'irssi' pkgname=irssi version=1.1.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --with-proxy --enable-true-color" hostmakedepends="pkg-config" diff --git a/srcpkgs/isync/patches/libressl.patch b/srcpkgs/isync/patches/libressl.patch deleted file mode 100644 index f8b9c175506..00000000000 --- a/srcpkgs/isync/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/socket.c.orig -+++ src/socket.c -@@ -40,7 +40,7 @@ - # include - # include - # include --# if OPENSSL_VERSION_NUMBER < 0x10100000L -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - # define X509_OBJECT_get0_X509(o) ((o)->data.x509) - # define X509_STORE_get0_objects(o) ((o)->objs) - # endif diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template index 80f11c983de..89fe6a71e23 100644 --- a/srcpkgs/isync/template +++ b/srcpkgs/isync/template @@ -1,7 +1,7 @@ # Template file for 'isync' pkgname=isync version=1.3.0 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="perl pkg-config" makedepends="libressl-devel libsasl-devel db-devel zlib-devel" diff --git a/srcpkgs/john/template b/srcpkgs/john/template index 03a006fc57d..aa5b9b5f11b 100644 --- a/srcpkgs/john/template +++ b/srcpkgs/john/template @@ -1,7 +1,7 @@ # Template file for 'john' pkgname=john version=1.8.0 -revision=10 +revision=11 _jumbover=1 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}" build_wrksrc="src" diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index d30f7497ec1..7e4ab5223f6 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,7 +1,7 @@ # Template file for 'kea' pkgname=kea version=1.3.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-dhcp-mysql) diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template index d3922aa466e..2eb35432542 100644 --- a/srcpkgs/keepalived/template +++ b/srcpkgs/keepalived/template @@ -1,7 +1,7 @@ # Template file for 'keepalived' pkgname=keepalived version=1.4.2 -revision=1 +revision=2 conf_files="/etc/${pkgname}/${pkgname}.conf" build_style=gnu-configure configure_args="--enable-sha1" diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index e96d0f3f6e2..d67d65ab7e1 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,7 +1,7 @@ # Template file for 'kicad' pkgname=kicad version=4.0.7 -revision=5 +revision=6 build_style=cmake configure_args="-DKICAD_BUILD_VERSION=$version -DKICAD_SKIP_BOOST=ON -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON" @@ -23,9 +23,13 @@ if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" python" configure_args+=" -DPYTHON_SITE_PACKAGE_PATH=${XBPS_CROSS_BASE}/usr/lib/python${py2_ver}/site-packages -DPYTHON_DEST=/usr/lib/python${py2_ver}/site-packages" - - pre_configure() { - CXXFLAGS+=" $(wx-config --cxxflags)" - } fi +pre_configure() { + if [ -n "$CROSS_BUILD" ]; then + CXXFLAGS+=" $(wx-config --cxxflags)" + fi + + sed 's/_CHECK_SYMBOL_EXISTS/CHECK_SYMBOL_EXISTS/' \ + -i CMakeModules/CheckCXXSymbolExists.cmake +} diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template index 58f5c578691..30a78964a63 100644 --- a/srcpkgs/kvirc/template +++ b/srcpkgs/kvirc/template @@ -1,7 +1,7 @@ # Template file for 'kvirc' pkgname=kvirc version=4.2.0 -revision=14 +revision=15 build_style=cmake configure_args="-DWANT_ENV_FLAGS=1" hostmakedepends="automoc4" diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template index 6984b2beec8..4d0b741a360 100644 --- a/srcpkgs/lastpass-cli/template +++ b/srcpkgs/lastpass-cli/template @@ -1,7 +1,7 @@ # Template file for 'lastpass-cli' pkgname=lastpass-cli version=1.3.0 -revision=1 +revision=2 build_style=cmake make_install_target="install install-doc" hostmakedepends="pkg-config asciidoc" diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template index 9bec045dbc1..f6ceaeac02b 100644 --- a/srcpkgs/ldapvi/template +++ b/srcpkgs/ldapvi/template @@ -1,7 +1,7 @@ # Template file for 'ldapvi' pkgname=ldapvi version=1.7 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-sha" maintainer="Leah Neukirchen " diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template index 62510a80f6d..f6f9b80af11 100644 --- a/srcpkgs/ldns/template +++ b/srcpkgs/ldns/template @@ -1,7 +1,7 @@ # Template file for 'ldns' pkgname=ldns version=1.7.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-drill --with-examples --disable-dane-ta-usage --with-trust-anchor=/etc/dns/root.key diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index 11e8c7b46c2..ff58a5bf9f2 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -1,7 +1,7 @@ # Template file for 'lftp' pkgname=lftp version=4.8.3 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure configure_args="--with-modules --disable-rpath --without-included-regex diff --git a/srcpkgs/libarchive/patches/patch-libarchive_archive_openssl_hmac_private_h.patch b/srcpkgs/libarchive/patches/patch-libarchive_archive_openssl_hmac_private_h.patch new file mode 100644 index 00000000000..362c08ecc44 --- /dev/null +++ b/srcpkgs/libarchive/patches/patch-libarchive_archive_openssl_hmac_private_h.patch @@ -0,0 +1,15 @@ +$OpenBSD: patch-libarchive_archive_openssl_hmac_private_h,v 1.3 2018/02/18 14:57:47 sthen Exp $ + +Index: libarchive/archive_openssl_hmac_private.h +--- libarchive/archive_openssl_hmac_private.h.orig ++++ libarchive/archive_openssl_hmac_private.h +@@ -28,7 +28,8 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + #include /* malloc, free */ + #include /* memset */ + static inline HMAC_CTX *HMAC_CTX_new(void) diff --git a/srcpkgs/libcrypto43 b/srcpkgs/libcrypto43 new file mode 120000 index 00000000000..cab5b6fcb51 --- /dev/null +++ b/srcpkgs/libcrypto43 @@ -0,0 +1 @@ +libressl \ No newline at end of file diff --git a/srcpkgs/libdill/template b/srcpkgs/libdill/template index dc8e6c44299..6739a98adc6 100644 --- a/srcpkgs/libdill/template +++ b/srcpkgs/libdill/template @@ -1,6 +1,6 @@ # Template file for 'libdill' pkgname=libdill -version=2.7 +version=2.8 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,11 +9,7 @@ maintainer="Tai Chi Minh Ralph Eastwood " license="MIT" homepage="http://libdill.org/" distfiles="https://github.com/sustrik/libdill/archive/${version}.tar.gz" -checksum=b78353308cbbcd442f9c3feab86afeac1bf79eb27186bad9f75efc07c4bfedbf - -case "$XBPS_TARGET_MACHINE" in - i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/7735/steps/shell_3/logs/stdio" ;; -esac +checksum=117038cd0f9bbfc51e6001a28ae6fd915b7c9047d8da7358208792d997037d6d pre_configure() { export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}" @@ -32,6 +28,6 @@ libdill-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" - vmove "usr/share/man/man3/*.3" + vmove usr/share/man/man3 } } diff --git a/srcpkgs/libepoxy/patches/fix-test-musl.patch b/srcpkgs/libepoxy/patches/fix-test-musl.patch deleted file mode 100644 index 823fb599454..00000000000 --- a/srcpkgs/libepoxy/patches/fix-test-musl.patch +++ /dev/null @@ -1,38 +0,0 @@ -Source: OpenEmbedded -Upstream: No -Reason: Fixes musl compilation - ---- meson_options.txt -+++ meson_options.txt -@@ -1,6 +1,9 @@ - option('docs', - type: 'boolean', value: false, - description: 'Enable generating the Epoxy API reference (depends on Doxygen)') -+option('has-dlvsym', -+ type: 'boolean', value: true, -+ description: 'Whether dlvsym() is available (it is not when using musl C library)') - option('glx', - type: 'combo', - choices: [ 'auto', 'yes', 'no' ], ---- test/meson.build -+++ test/meson.build -@@ -92,8 +92,8 @@ if build_glx - [ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.c' ], [], [], true ], - [ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ], - [ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ], -- [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ], -- [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple ], -+ [ 'glx_alias_prefer_same_name', [ 'glx_alias_prefer_same_name.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ], -+ [ 'glx_gles2', [ 'glx_gles2.c', 'dlwrap.c', 'dlwrap.h' ], [], [ '-rdynamic' ], not build_apple and get_option('has-dlvsym') == true ], - ] - - foreach test: glx_tests -@@ -114,7 +114,7 @@ if build_glx - endif - endforeach - -- if not build_apple -+ if not build_apple and get_option('has-dlvsym') == true - # GLX/EGL tests - if build_egl - glx_egl_sources = [ diff --git a/srcpkgs/libepoxy/template b/srcpkgs/libepoxy/template index 7ca3f4a9ffb..e4de297cc00 100644 --- a/srcpkgs/libepoxy/template +++ b/srcpkgs/libepoxy/template @@ -1,16 +1,16 @@ # Template file for 'libepoxy' pkgname=libepoxy -version=1.5.0 +version=1.5.1 revision=1 build_style=meson hostmakedepends="pkg-config python xorg-util-macros" -makedepends="libX11-devel MesaLib-devel" +makedepends="MesaLib-devel" short_desc="Library for handling OpenGL function pointer management for you" maintainer="Juan RP " license="MIT" homepage="https://github.com/anholt/libepoxy" distfiles="https://github.com/anholt/libepoxy/archive/${version}.tar.gz" -checksum=76c18bf8a8c48c804f4ce64f533c6631b3b19357735bf0b2f6fb4abe752fd2e9 +checksum=f53a35db484341c0a77f1bb0eb04cc9389e3049d2437bcf5915a1cebd2c04ff7 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -Dhas-dlvsym=false" ;; @@ -25,7 +25,7 @@ libepoxy-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template index fa53b2da609..ea11a64bff0 100644 --- a/srcpkgs/libesmtp/template +++ b/srcpkgs/libesmtp/template @@ -1,7 +1,7 @@ # Template file for 'libesmtp' pkgname=libesmtp version=1.0.6 -revision=15 +revision=16 build_style=gnu-configure configure_args="--disable-static --with-openssl" makedepends="libressl-devel" diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template index 57cabf53715..e0e020591fc 100644 --- a/srcpkgs/libetpan/template +++ b/srcpkgs/libetpan/template @@ -1,7 +1,7 @@ # Template file for 'libetpan' pkgname=libetpan version=1.8 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl --with-zlib --with-sasl" diff --git a/srcpkgs/libevent/patches/fix-libressl-2.7.patch b/srcpkgs/libevent/patches/fix-libressl-2.7.patch new file mode 100644 index 00000000000..5a42a4a577a --- /dev/null +++ b/srcpkgs/libevent/patches/fix-libressl-2.7.patch @@ -0,0 +1,23 @@ +--- openssl-compat.h.orig 2018-04-23 16:26:06.271112397 +0200 ++++ openssl-compat.h 2018-04-23 16:27:06.157202883 +0200 +@@ -1,7 +1,11 @@ + #ifndef OPENSSL_COMPAT_H + #define OPENSSL_COMPAT_H + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++#define BIO_get_init(b) (b)->init ++#define BIO_get_data(b) (b)->ptr ++#define BIO_get_shutdown(b) (b)->shutdown ++#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + + static inline BIO_METHOD *BIO_meth_new(int type, const char *name) + { +@@ -30,6 +34,6 @@ static inline BIO_METHOD *BIO_meth_new(i + + #define TLS_method SSLv23_method + +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ + + #endif /* OPENSSL_COMPAT_H */ diff --git a/srcpkgs/libevent/patches/libressl.patch b/srcpkgs/libevent/patches/libressl.patch deleted file mode 100644 index a7cfcc59870..00000000000 --- a/srcpkgs/libevent/patches/libressl.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- openssl-compat.h.orig -+++ openssl-compat.h -@@ -1,7 +1,7 @@ - #ifndef OPENSSL_COMPAT_H - #define OPENSSL_COMPAT_H - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - - static inline BIO_METHOD *BIO_meth_new(int type, const char *name) - { -@@ -30,6 +30,6 @@ static inline BIO_METHOD *BIO_meth_new(i - - #define TLS_method SSLv23_method - --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ - - #endif /* OPENSSL_COMPAT_H */ ---- sample/https-client.c.orig -+++ sample/https-client.c -@@ -312,7 +312,7 @@ main(int argc, char **argv) - } - uri[sizeof(uri) - 1] = '\0'; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - // Initialize OpenSSL - SSL_library_init(); - ERR_load_crypto_strings(); -@@ -480,7 +480,7 @@ cleanup: - SSL_CTX_free(ssl_ctx); - if (type == HTTP && ssl) - SSL_free(ssl); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - EVP_cleanup(); - ERR_free_strings(); - -@@ -492,7 +492,7 @@ cleanup: - CRYPTO_cleanup_all_ex_data(); - - sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); --#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ - - #ifdef _WIN32 - WSACleanup(); ---- sample/le-proxy.c.orig -+++ sample/le-proxy.c -@@ -259,7 +259,7 @@ main(int argc, char **argv) - - if (use_ssl) { - int r; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init(); - ERR_load_crypto_strings(); - SSL_load_error_strings(); ---- sample/openssl_hostname_validation.c.orig -+++ sample/openssl_hostname_validation.c -@@ -48,7 +48,7 @@ SOFTWARE. - - #define HOSTNAME_MAX_SIZE 255 - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - #define ASN1_STRING_get0_data ASN1_STRING_data - #endif - ---- test/regress_ssl.c.orig -+++ test/regress_ssl.c -@@ -186,7 +186,7 @@ get_ssl_ctx(void) - void - init_ssl(void) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init(); - ERR_load_crypto_strings(); - SSL_load_error_strings(); diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template index 6e3b5b75272..7994c42f5aa 100644 --- a/srcpkgs/libevent/template +++ b/srcpkgs/libevent/template @@ -1,7 +1,7 @@ # Template file for 'libevent' pkgname=libevent version=2.1.8 -revision=4 +revision=5 wrksrc="${pkgname}-${version}-stable" build_style=gnu-configure makedepends="libressl-devel" diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template index 02b4a0febf5..1c7cb65257b 100644 --- a/srcpkgs/libfetch/template +++ b/srcpkgs/libfetch/template @@ -1,7 +1,7 @@ # Template file for 'libfetch' pkgname=libfetch version=2.34 -revision=16 +revision=17 build_style=gnu-makefile makedepends="libressl-devel" short_desc="File Transfer Library for URLs" diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template index dd760a39d53..c991a5f9c51 100644 --- a/srcpkgs/libgda/template +++ b/srcpkgs/libgda/template @@ -1,7 +1,7 @@ # Template file for 'libgda' pkgname=libgda version=5.2.4 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json --enable-system-sqlite" diff --git a/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch b/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch new file mode 100644 index 00000000000..f5306b96d56 --- /dev/null +++ b/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_openssl_stream_h,v 1.8 2018/03/19 18:28:12 jasper Exp $ + +Index: src/openssl_stream.h +--- src/openssl_stream.h.orig ++++ src/openssl_stream.h +@@ -27,7 +27,8 @@ extern int git_openssl_stream_new(git_stream **out, co + + + +-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) + { diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 936260253e3..33c8d25c2d8 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,7 +1,7 @@ # Template file for 'libgit2' pkgname=libgit2 version=0.26.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="python git pkg-config" makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel" diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template index b72a2565521..a2bd9238d80 100644 --- a/srcpkgs/libimobiledevice/template +++ b/srcpkgs/libimobiledevice/template @@ -1,7 +1,7 @@ # Template file for 'libimobiledevice' pkgname=libimobiledevice version=1.2.0 -revision=9 +revision=10 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python-devel" makedepends="python-devel libglib-devel libressl-devel libusb-devel libplist-devel libusbmuxd-devel" diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template index 4573e53be60..8f12758332e 100644 --- a/srcpkgs/libmowgli/template +++ b/srcpkgs/libmowgli/template @@ -1,7 +1,7 @@ # Template file for 'libmowgli' pkgname=libmowgli version=2.1.3 -revision=2 +revision=3 wrksrc="${pkgname}-2-${version}" build_style=gnu-configure hostmakedepends="pkg-config" diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template index ac49bdf75e1..8a00ba1fd64 100644 --- a/srcpkgs/libostree/template +++ b/srcpkgs/libostree/template @@ -1,7 +1,7 @@ # Template file for 'libostree' pkgname=libostree version=2018.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-builtin-grub2-mkconfig --with-openssl" hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config" diff --git a/srcpkgs/libqtelegram-ae/template b/srcpkgs/libqtelegram-ae/template index 4ecf2d3a786..c32bf18ed65 100644 --- a/srcpkgs/libqtelegram-ae/template +++ b/srcpkgs/libqtelegram-ae/template @@ -2,7 +2,7 @@ pkgname=libqtelegram-ae reverts=10.0.0_1 version=6.1 -revision=7 +revision=8 wrksrc=${pkgname/-ae/-aseman-edition}-${version}-stable build_style=qmake # See https://github.com/Aseman-Land/libqtelegram-aseman-edition/issues/44 diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index f98db815da4..15b068cb1cd 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,6 +1,6 @@ # Template file for 'libressl' pkgname=libressl -version=2.6.4 +version=2.7.2 revision=1 bootstrap=yes build_style=gnu-configure @@ -9,8 +9,7 @@ maintainer="Juan RP " license="OpenSSL-License, SSLeay-License, ISC" homepage="http://www.libressl.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" -checksum=638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f - +checksum=917a8779c342177ff3751a2bf955d0262d1d8916a4b408930c45cef326700995 provides="openssl-${version}_${revision}" replaces="openssl>=0" conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf" @@ -38,21 +37,21 @@ post_install() { find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete } -libcrypto42_package() { +libcrypto43_package() { short_desc+=" - crypto library" pkg_install() { vmove usr/lib/libcrypto.so.* } } -libssl44_package() { +libssl45_package() { short_desc+=" - SSL/TLS library" pkg_install() { vmove usr/lib/libssl.so.* } } -libtls16_package() { +libtls17_package() { short_desc+=" - new TLS library" pkg_install() { vmove usr/lib/libtls.so.* @@ -61,11 +60,12 @@ libtls16_package() { libressl-devel_package() { short_desc+=" - development files" - depends="libcrypto42-${version}_${revision} libssl44-${version}_${revision} libtls16-${version}_${revision}" + depends="libcrypto43-${version}_${revision} libssl45-${version}_${revision} + libtls17-${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/share/man/man3 } diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index e7ab0211cce..a615ea95cd7 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -1,7 +1,7 @@ # Template file for 'libssh' pkgname=libssh version=0.7.5 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel" diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template index 8906bab26fb..bd621dfa99c 100644 --- a/srcpkgs/libssh2/template +++ b/srcpkgs/libssh2/template @@ -1,7 +1,7 @@ # Template file for 'libssh2' pkgname=libssh2 version=1.8.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr" makedepends="zlib-devel libressl-devel" diff --git a/srcpkgs/libssl45 b/srcpkgs/libssl45 new file mode 120000 index 00000000000..cab5b6fcb51 --- /dev/null +++ b/srcpkgs/libssl45 @@ -0,0 +1 @@ +libressl \ No newline at end of file diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template index 7cdf8896174..b0fde79dfe8 100644 --- a/srcpkgs/libstrophe/template +++ b/srcpkgs/libstrophe/template @@ -1,7 +1,7 @@ # Template file for 'libstrophe' pkgname=libstrophe version=0.9.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="expat-devel zlib-devel libressl-devel" diff --git a/srcpkgs/libtickit-devel b/srcpkgs/libtickit-devel new file mode 120000 index 00000000000..807803ff90c --- /dev/null +++ b/srcpkgs/libtickit-devel @@ -0,0 +1 @@ +libtickit \ No newline at end of file diff --git a/srcpkgs/libtickit/template b/srcpkgs/libtickit/template new file mode 100644 index 00000000000..1551e47df36 --- /dev/null +++ b/srcpkgs/libtickit/template @@ -0,0 +1,29 @@ +# Template file for 'libtickit' +pkgname=libtickit +version=0.2 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkg-config libtool" +makedepends="unibilium-devel libtermkey-devel" +checkdepends="perl" +short_desc="Library for building interactive full-screen terminal programs" +maintainer="maxice8 " +license="MIT" +homepage="http://www.leonerd.org.uk/code/libtickit/" +distfiles="http://www.leonerd.org.uk/code/libtickit/libtickit-${version}.tar.gz" +checksum=88e1eaeb0fcd3a0f0bb0cac9cfdbb66a97fe358344c68024acb9b2da3bcb1320 +make_check_target=test +nocross="failure to link" + +libtickit-devel_package() { + depends="libtickit-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 + vmove usr/share/man/man7 + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} diff --git a/srcpkgs/libtls17 b/srcpkgs/libtls17 new file mode 120000 index 00000000000..cab5b6fcb51 --- /dev/null +++ b/srcpkgs/libtls17 @@ -0,0 +1 @@ +libressl \ No newline at end of file diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 655fc65f0c5..4b640d440e5 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -1,7 +1,7 @@ # Template file for 'libtorrent-rasterbar' pkgname=libtorrent-rasterbar version=1.1.6 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-python-binding --with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="automake pkg-config intltool libtool python-devel" diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template index 646ed83b4d1..611b62ba59b 100644 --- a/srcpkgs/libtorrent/template +++ b/srcpkgs/libtorrent/template @@ -1,7 +1,7 @@ # Template build file for 'libtorrent' pkgname=libtorrent version=0.13.6 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-static --disable-debug --without-kqueue --enable-aligned --with-posix-fallocate" diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index 0a460a64989..6747fc907ef 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-host' pkgname=libu2f-host version=1.1.5 -revision=2 +revision=3 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d" diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template index 89e24daac6c..829d105bf77 100644 --- a/srcpkgs/libu2f-server/template +++ b/srcpkgs/libu2f-server/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-server' pkgname=libu2f-server version=1.1.0 -revision=3 +revision=4 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="automake libtool pkg-config gengetopt check" diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template index a484c87fa78..9c060d5bf30 100644 --- a/srcpkgs/libucl/template +++ b/srcpkgs/libucl/template @@ -1,7 +1,7 @@ # Template file for 'libucl' pkgname=libucl version=0.8.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-urls --enable-signatures" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template index 469d97b1284..8c9fd8c68dd 100644 --- a/srcpkgs/libvncserver/template +++ b/srcpkgs/libvncserver/template @@ -1,7 +1,7 @@ # Template file for 'libvncserver' pkgname=libvncserver version=0.9.11 -revision=3 +revision=4 wrksrc="libvncserver-LibVNCServer-${version}" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template index 8b12dda870f..676768b25e4 100644 --- a/srcpkgs/libwebsockets/template +++ b/srcpkgs/libwebsockets/template @@ -1,7 +1,7 @@ # Template file for 'libwebsockets' pkgname=libwebsockets version=2.4.2 -revision=1 +revision=2 build_style=cmake makedepends="zlib-devel libressl-devel libev-devel" configure_args="-DLWS_WITH_LIBEV=1 -DLWS_WITH_HTTP2=1 -DLWS_USE_IPV6=1" diff --git a/srcpkgs/libwps/template b/srcpkgs/libwps/template index c3f1bf9ed7c..21a5e9affea 100644 --- a/srcpkgs/libwps/template +++ b/srcpkgs/libwps/template @@ -1,17 +1,17 @@ # Template file for 'libwps' pkgname=libwps -version=0.4.8 +version=0.4.9 revision=1 build_style=gnu-configure configure_args="--disable-werror" +hostmakedepends="pkg-config" +makedepends="boost-devel librevenge-devel" short_desc="Library for importing Microsoft Works documents" maintainer="Enno Boland " -license="MPL/LGPL-2.1" -makedepends="boost-devel librevenge-devel" -hostmakedepends="pkg-config" -homepage="http://libwps.sourceforge.net/" +license="MPL-2.0, LGPL-2.1-or-later" +homepage="https://sourceforge.net/p/libwps/wiki/Home/" distfiles="${SOURCEFORGE_SITE}/libwps/libwps-${version}.tar.xz" -checksum=e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e +checksum=13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922 libwps-devel_package() { depends="libwps>=${version}_${revision} $makedepends" diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index 2d29f074c6a..7dcf0a030e1 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,7 +1,7 @@ # Template file for 'lighttpd' pkgname=lighttpd version=1.4.49 -revision=2 +revision=3 makedepends="libuuid-devel libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel libldap-devel attr-devel" hostmakedepends="automake pkg-config libtool" diff --git a/srcpkgs/links/template b/srcpkgs/links/template index 901f41412f2..a9d71939460 100644 --- a/srcpkgs/links/template +++ b/srcpkgs/links/template @@ -1,7 +1,7 @@ # Template file for 'links' pkgname=links version=2.15 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ssl --enable-graphics" hostmakedepends="pkg-config" diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index 7c7343ff50e..090051aee31 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,7 +1,7 @@ # Template file for 'linux4.14' pkgname=linux4.14 version=4.14.35 -revision=1 +revision=2 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " diff --git a/srcpkgs/linux4.15/template b/srcpkgs/linux4.15/template index 605ec1baaf2..6745846935f 100644 --- a/srcpkgs/linux4.15/template +++ b/srcpkgs/linux4.15/template @@ -1,7 +1,7 @@ # Template file for 'linux4.15' pkgname=linux4.15 version=4.15.15 -revision=1 +revision=2 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " diff --git a/srcpkgs/linux4.16/template b/srcpkgs/linux4.16/template index a06464934c0..4e13f601b50 100644 --- a/srcpkgs/linux4.16/template +++ b/srcpkgs/linux4.16/template @@ -1,7 +1,7 @@ # Template file for 'linux4.16' pkgname=linux4.16 -version=4.16.3 -revision=1 +version=4.16.4 +revision=2 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3 +checksum=9ab56da21230da8d9455aaf108f0e9c95fa9213bc2bd5d3b9aceaf1dea26896c nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 67335194e7d..f092453443a 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.15.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index 885bab79017..021961baea3 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -1,7 +1,7 @@ # Template file for 'loudmouth' pkgname="loudmouth" version="1.5.3" -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-ssl=openssl --with-asyncns" short_desc="A lightweight Jabber client library written in C/Glib" diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template index 7857e94e995..f9b459e0724 100644 --- a/srcpkgs/lua51-luasec/template +++ b/srcpkgs/lua51-luasec/template @@ -2,7 +2,7 @@ pkgname=lua51-luasec reverts=0.6_1 version=0.5.1 -revision=7 +revision=8 wrksrc=${pkgname#*-}-${pkgname#*-}-${version} build_style=gnu-makefile hostmakedepends="lua51" diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template index f84e5773d67..1849ceb4c67 100644 --- a/srcpkgs/lua52-luasec/template +++ b/srcpkgs/lua52-luasec/template @@ -1,7 +1,7 @@ # Template file for 'lua52-luasec' pkgname=lua52-luasec version=0.6 -revision=6 +revision=7 wrksrc=${pkgname#*-}-${pkgname#*-}-${version} build_style=gnu-makefile hostmakedepends="lua52" diff --git a/srcpkgs/luasec/template b/srcpkgs/luasec/template index dc9d32be647..f45168e02cb 100644 --- a/srcpkgs/luasec/template +++ b/srcpkgs/luasec/template @@ -1,7 +1,7 @@ # Template file for 'luasec' pkgname=luasec version=0.6 -revision=7 +revision=8 wrksrc=${pkgname}-${pkgname}-${version} build_style=gnu-makefile hostmakedepends="lua" diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template index 049a0f8eace..6589252e680 100644 --- a/srcpkgs/lynx/template +++ b/srcpkgs/lynx/template @@ -3,7 +3,7 @@ pkgname=lynx _distver=2.8.8 _patchver=2 version=${_distver}.${_patchver} -revision=15 +revision=16 wrksrc="${pkgname}${_distver//./-}" build_style=gnu-configure configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6" diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template index 5c4156190e5..6efefe0713e 100644 --- a/srcpkgs/mailx/template +++ b/srcpkgs/mailx/template @@ -1,7 +1,7 @@ # Template file for 'mailx' pkgname=mailx version=12.5 -revision=19 +revision=20 patch_args="-Np1" wrksrc="mailx-${version}" makedepends="libressl-devel mit-krb5-devel" diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template index c5127516182..43b09cad96e 100644 --- a/srcpkgs/maim/template +++ b/srcpkgs/maim/template @@ -1,7 +1,7 @@ # Template file for 'maim' pkgname=maim version=5.4.68 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_COMPRESS_MAN=FALSE" hostmakedepends="pkg-config" diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template index 21071815f15..d48299e7df3 100644 --- a/srcpkgs/mairix/template +++ b/srcpkgs/mairix/template @@ -1,7 +1,7 @@ # Template file for 'mairix' pkgname=mairix version=0.24 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/usr --mandir=/usr/share/man" hostmakedepends="flex bison" diff --git a/srcpkgs/makeself/template b/srcpkgs/makeself/template index ef134c55032..d0207255be2 100644 --- a/srcpkgs/makeself/template +++ b/srcpkgs/makeself/template @@ -1,19 +1,18 @@ # Template file for 'makeself' pkgname=makeself -version=2.3.1 +version=2.4.0 revision=1 noarch=yes create_wrksrc=yes makedepends="tar gzip bzip2" depends="${makedepends}" short_desc="Make self-extractable archives on Unix" -homepage="http://makeself.io" -license="GPL-2+" maintainer="Juan RP " +license="GPL-2.0-or-later" +homepage="http://makeself.io" distfiles="https://github.com/megastep/$pkgname/releases/download/release-$version/$pkgname-$version.run" -checksum=ca0ca386d97bd984f62e9475d9203e2df5fd5abfc55ff5c777e8d324909aa040 - -skip_extraction="$pkgname-$version.run" +checksum=ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2 +skip_extraction="${pkgname}-${version}.run" do_build() { cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.run . diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index dc0b1f5cbb6..d79d5b8bd94 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -7,7 +7,7 @@ homepage="http://mamedev.org" distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " -license="GPL-2.0-or-newer" +license="GPL-2.0-or-later" checksum=2ce7d6f79cdad2c904924db0eba90368026b6bc38ab7b0d1cc5792560b2dcedd hostmakedepends="automoc4 perl pkg-config python" diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 9746d548b74..4ab3d9dd5c8 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb version=10.1.30 -revision=2 +revision=3 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -30,7 +30,7 @@ short_desc="Fast SQL database server, drop-in replacement for MySQL" maintainer="Juan RP " homepage="https://mariadb.org/" license="GPL-2" -distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz" +distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz" checksum=173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88 disable_parallel_build=yes CFLAGS="-w" diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template index 65ea90edbfd..0798f7d14fd 100644 --- a/srcpkgs/mbuffer/template +++ b/srcpkgs/mbuffer/template @@ -1,7 +1,7 @@ # Template file for 'mbuffer' pkgname=mbuffer version=20180410 -revision=1 +revision=2 build_style=gnu-configure makedepends="libressl-devel" short_desc="Buffer data steams with many additional functions" diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template index 78784281a4a..00e697beea1 100644 --- a/srcpkgs/mdcat/template +++ b/srcpkgs/mdcat/template @@ -1,7 +1,7 @@ # Template file for 'mdcat' pkgname=mdcat version=0.8.0 -revision=1 +revision=2 wrksrc=${pkgname}-${pkgname}-${version} hostmakedepends="cargo cmake pkg-config" makedepends="libressl-devel" @@ -14,6 +14,7 @@ checksum=fb4ce097fff72fb53734568a8a1b96797cbedfbee2aabc2d2a5e8c794b1d5887 nocross=yes do_build() { + cargo update --package openssl-sys --precise 0.9.28 cargo build --release ${makejobs} } diff --git a/srcpkgs/megatools/patches/fix-libressl.patch b/srcpkgs/megatools/patches/fix-libressl.patch deleted file mode 100644 index 60049c09cdb..00000000000 --- a/srcpkgs/megatools/patches/fix-libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- lib/mega.c.orig 2017-09-27 14:15:26.356842896 +0200 -+++ lib/mega.c 2017-09-27 14:15:45.495808811 +0200 -@@ -803,7 +803,7 @@ static gboolean rsa_key_gen(rsa_key* k) - return FALSE; - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - RSA_get0_key(key, &k->m, &k->e, &k->d); - RSA_get0_factors(key, &k->q, &k->p); - RSA_get0_crt_params(key, NULL, NULL, &k->u); -@@ -2988,7 +2988,7 @@ struct _put_data - GByteArray* buffer; - }; - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - void AES_ctr128_encrypt( - const unsigned char *in, - unsigned char *out, ---- lib/tools.c.orig 2017-09-27 14:15:36.322825147 +0200 -+++ lib/tools.c 2017-09-27 14:15:58.974784808 +0200 -@@ -107,7 +107,7 @@ static GOptionEntry network_options[] = - { NULL } - }; - --#if OPENSSL_VERSION_NUMBER >= 0x10100004L -+#if OPENSSL_VERSION_NUMBER >= 0x10100004L && !defined(LIBRESSL_VERSION_NUMBER) - static void init_openssl_locking() - { - // OpenSSL >= 1.1.0-pre4 doesn't require specific callback setup -@@ -567,7 +567,7 @@ void tool_fini(mega_session* s) - CRYPTO_cleanup_all_ex_data(); - ERR_free_strings(); - --#if OPENSSL_VERSION_NUMBER < 0x10100004L -+#if OPENSSL_VERSION_NUMBER < 0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_set_id_callback(NULL); - CRYPTO_set_locking_callback(NULL); - #endif diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template index 6a014103f98..afc64598c64 100644 --- a/srcpkgs/megatools/template +++ b/srcpkgs/megatools/template @@ -1,7 +1,7 @@ # Template file for 'megatools' pkgname=megatools version=1.9.98 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config asciidoc" makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel" diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index bd37c433de1..098d2b17353 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,7 +1,7 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 version=1.16 -revision=3 +revision=4 short_desc="MIT Kerberos 5 implementation" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index d39cf1594a0..31c7a29b58b 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,7 +1,7 @@ # Template file for 'monero' pkgname=monero version=0.12.0.0 -revision=1 +revision=2 conf_files="/etc/monerod.conf" build_style=cmake hostmakedepends="pkg-config git qt5-host-tools" diff --git a/srcpkgs/mongo-tools/template b/srcpkgs/mongo-tools/template index 9e192dd0b51..50df1ca00a1 100644 --- a/srcpkgs/mongo-tools/template +++ b/srcpkgs/mongo-tools/template @@ -1,7 +1,7 @@ # Template file for 'mongo-tools' pkgname=mongo-tools version=3.5.13 -revision=6 +revision=7 wrksrc="${pkgname}-r${version}" build_style=go go_import_path="github.com/mongodb/mongo-tools" diff --git a/srcpkgs/mongodb/patches/libressl.patch b/srcpkgs/mongodb/patches/libressl.patch deleted file mode 100644 index c57f7ad8389..00000000000 --- a/srcpkgs/mongodb/patches/libressl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/mongo/crypto/sha1_block_openssl.cpp 2017-06-08 16:11:03.000000000 +0000 -+++ src/mongo/crypto/sha1_block_openssl.cpp 2017-07-05 17:52:36.991580944 +0000 -@@ -41,7 +41,7 @@ - #include - #include - #include --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - namespace { - // Copies of OpenSSL after 1.1.0 define new EVP digest routines. We must - // polyfill used definitions to interact with older OpenSSL versions. ---- src/mongo/util/net/ssl_manager.cpp.orig 2017-06-08 16:11:03.000000000 +0000 -+++ src/mongo/util/net/ssl_manager.cpp 2017-07-05 17:59:28.566556412 +0000 -@@ -125,7 +125,7 @@ - #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS - // clang-format on - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // Copies of OpenSSL after 1.1.0 define new functions for interaction with - // X509 structure. We must polyfill used definitions to interact with older - // OpenSSL versions. diff --git a/srcpkgs/mongodb/template b/srcpkgs/mongodb/template index 757713c8d37..2331dbe164f 100644 --- a/srcpkgs/mongodb/template +++ b/srcpkgs/mongodb/template @@ -1,7 +1,7 @@ # Template file for 'mongodb' pkgname=mongodb version=3.4.9 -revision=3 +revision=4 wrksrc="mongodb-src-r${version}" hostmakedepends="scons" makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index 47ba317d5a3..2a7a96f4e8a 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -1,7 +1,7 @@ # Template file for 'mongoose' pkgname=mongoose version=6.11 -revision=2 +revision=3 makedepends="libressl-devel" build_style=gnu-makefile make_use_env=compliant diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index 113161abf1e..9470ae14ad0 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -1,7 +1,7 @@ # Template file for 'monit' pkgname=monit version=5.25.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-ssl-dir=${XBPS_CROSS_BASE}/usr libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes" diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template index ecdda811c4c..c7edadc5e72 100644 --- a/srcpkgs/monitoring-plugins/template +++ b/srcpkgs/monitoring-plugins/template @@ -1,7 +1,7 @@ # Template file for 'monitoring-plugins' pkgname=monitoring-plugins version=2.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--libexecdir=/usr/lib/monitoring-plugins" hostmakedepends="fping openssh postfix procps-ng smbclient" diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index a483652a2fb..6e57757ed48 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config protobuf-devel" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template index 527b50b433a..ecf4bdf89a9 100644 --- a/srcpkgs/mosquitto/template +++ b/srcpkgs/mosquitto/template @@ -1,7 +1,7 @@ # Template file for 'mosquitto' pkgname=mosquitto version=1.4.15 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl make_install_args="prefix=/usr" diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template index e8b5f87776d..f2ae6a01acd 100644 --- a/srcpkgs/mpop/template +++ b/srcpkgs/mpop/template @@ -1,7 +1,7 @@ # Template file for 'mpop' pkgname=mpop version=1.2.6 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libressl-devel libidn-devel" diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template index 8f40ef27c29..f24a8d05359 100644 --- a/srcpkgs/msmtp/template +++ b/srcpkgs/msmtp/template @@ -1,7 +1,7 @@ # Template file for 'msmtp' pkgname=msmtp version=1.6.6 -revision=3 +revision=4 build_style=gnu-configure # Package build options build_options="idn sasl gnome" diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template index 92b5877e53d..5bf4e367f49 100644 --- a/srcpkgs/mtree/template +++ b/srcpkgs/mtree/template @@ -1,7 +1,7 @@ # Template file for 'mtree' pkgname=mtree version=1.0.4 -revision=2 +revision=3 wrksrc="${pkgname}-port-${version}" build_style=gnu-configure hostmakedepends="automake" diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template index 95459e60b27..2774d4dd05f 100644 --- a/srcpkgs/muchsync/template +++ b/srcpkgs/muchsync/template @@ -1,7 +1,7 @@ # Template file for 'muchsync' pkgname=muchsync version=5 -revision=2 +revision=3 short_desc="Synchronize notmuch mail across machines" maintainer="Anjandev Momi " license="GPL-3" diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index f7aad8e8b5b..3a8e3c3e1b4 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.2.19 -revision=8 +revision=9 hostmakedepends="pkg-config qt-host-tools qt-qmake protobuf Ice" makedepends=" libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel libressl-devel diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template index 250fbd47a4c..4b6d8e27945 100644 --- a/srcpkgs/munge/template +++ b/srcpkgs/munge/template @@ -1,7 +1,7 @@ # Template file for 'munge' pkgname=munge version=0.5.13 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-crypto-lib=openssl --with-openssl-prefix=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 2e164eca740..7f5d1b616d8 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,7 +1,7 @@ # Template file for 'mutt' pkgname=mutt version=1.9.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl --enable-sidebar diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index c5837152a96..f73646e2a2c 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,7 +1,7 @@ # Template file for 'mysql' pkgname=mysql version=5.6.38 -revision=2 +revision=3 build_style=cmake configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index 54b699bd8b3..d32f9876f01 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,7 +1,7 @@ # Template file for 'namecoin' pkgname=namecoin version=0.13.99 -revision=6 +revision=7 hostmakedepends="pkg-config yasm automake libtool" build_style=gnu-configure makedepends="libevent-devel db-devel protobuf-devel boost-devel miniupnpc-devel libevent-devel qrencode-devel" diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index d22371e98c7..170d7d4aa48 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,7 +1,7 @@ # Template file for 'neomutt' pkgname=neomutt version=20180323 -revision=2 +revision=3 wrksrc="neomutt-neomutt-${version}" build_style=configure configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl" diff --git a/srcpkgs/neon/patches/fix-libressl.patch b/srcpkgs/neon/patches/fix-libressl.patch deleted file mode 100644 index 385e056acae..00000000000 --- a/srcpkgs/neon/patches/fix-libressl.patch +++ /dev/null @@ -1,31 +0,0 @@ -Version number juggling for libressl - ---- src/ne_openssl.c 2016-09-30 10:46:00.000000000 +0200 -+++ src/ne_openssl.c 2016-10-06 00:19:58.366044580 +0200 -@@ -66,7 +66,7 @@ - typedef const unsigned char ne_d2i_uchar; - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - #define X509_up_ref(x) x->references++ - #define EVP_PKEY_up_ref(x) x->references++ - #define EVP_PKEY_get0_RSA(evp) (evp->pkey.rsa) -@@ -1199,7 +1199,7 @@ - - int ne__ssl_init(void) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_malloc_init(); - SSL_load_error_strings(); - SSL_library_init(); -@@ -1242,7 +1242,7 @@ - "for %" NE_FMT_SIZE_T " locks.\n", num_locks); - } - #endif --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ - - return 0; - } diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template index 88a1dc789ab..e6229778406 100644 --- a/srcpkgs/neon/template +++ b/srcpkgs/neon/template @@ -1,7 +1,7 @@ # Template file for 'neon' pkgname=neon version=0.30.2 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-expat --with-ssl=openssl --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static" diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template index b260e614343..d5533cc01a7 100644 --- a/srcpkgs/net-snmp/template +++ b/srcpkgs/net-snmp/template @@ -1,7 +1,7 @@ # Template build file for 'net-snmp'. pkgname=net-snmp version=5.7.3 -revision=13 +revision=14 hostmakedepends="pkg-config unzip" makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel" short_desc="Simple Network Management Protocol (SNMP) suite" diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index 45cd7ae9963..260839cf570 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -1,7 +1,7 @@ # Template file for 'netpgp' pkgname=netpgp version=20140220 -revision=13 +revision=14 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel bzip2-devel libressl-devel" diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index ff058bbdcff..5feacf02cec 100644 --- a/srcpkgs/netsurf/template +++ b/srcpkgs/netsurf/template @@ -1,7 +1,7 @@ # Template build file for 'netsurf'. pkgname=netsurf version=3.7 -revision=3 +revision=4 hostmakedepends="pkg-config gperf flex nsgenbind gdk-pixbuf-devel perl-HTML-Parser glib-devel" makedepends=" libidn-devel libmng-devel libxml2-devel libcurl-devel lcms-devel libwebp-devel diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index 60776dd8357..17e9a6e8977 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -1,7 +1,7 @@ # Template file for 'network-ups-tools' pkgname=network-ups-tools version=2.7.4 -revision=4 +revision=5 wrksrc="nut-${version}" build_style=gnu-configure configure_args=" diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 8ce0c519505..01b712fee14 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx version=1.14.0 -revision=1 +revision=2 makedepends="libressl-devel pcre-devel $(vopt_if geoip 'geoip-devel')" short_desc="A high performance web and reverse proxy server" maintainer="Juan RP " diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index 532cc7085f7..9356c2db4cf 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,7 +1,7 @@ # Template build file for 'ngircd' pkgname=ngircd version=24 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes" hostmakedepends="pkg-config" diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 868115ff0aa..925d7ee5764 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=1.11.16 -revision=3 +revision=4 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var" diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index 704c4f725ff..6a8210682fe 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -1,7 +1,7 @@ # Template file for 'nmap' pkgname=nmap version=7.70 -revision=1 +revision=2 build_style=gnu-configure build_options="lua" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template index 67384e8974c..55a6d6b4794 100644 --- a/srcpkgs/nmh/template +++ b/srcpkgs/nmh/template @@ -1,7 +1,7 @@ # Template file for 'nmh' pkgname=nmh version=1.7.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-cyrus-sasl --with-tls" makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel" diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template index 107ea2f4778..78c17467a62 100644 --- a/srcpkgs/nsd/template +++ b/srcpkgs/nsd/template @@ -1,7 +1,7 @@ # Template file for 'nsd' pkgname=nsd version=4.1.20 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ratelimit --enable-ratelimit-default-is-off --with-libevent=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index a3622faf40d..1359c8213d0 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.8p11 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd --enable-all-clocks ol_cv_pthread_select_yields=yes" diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template index c89bb634d13..bc160ce63a0 100644 --- a/srcpkgs/nzbget/template +++ b/srcpkgs/nzbget/template @@ -1,7 +1,7 @@ # Template file for 'nzbget' pkgname=nzbget version=19.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-tlslib=OpenSSL --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include diff --git a/srcpkgs/open-isns/patches/libressl.patch b/srcpkgs/open-isns/patches/libressl.patch deleted file mode 100644 index 7732295f239..00000000000 --- a/srcpkgs/open-isns/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pki.c.orig -+++ pki.c -@@ -30,7 +30,7 @@ - #endif - /* OpenSSL 1.1 made a lot of structures opaque, so we need to - * define the 1.1 wrappers in previous versions. */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define EVP_PKEY_base_id(o) ((o)->type) - #define EVP_PKEY_get0_DSA(o) ((o)->pkey.dsa) - static EVP_MD_CTX *EVP_MD_CTX_new(void) diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template index 1ec669d0e01..1c1e33cb1e5 100644 --- a/srcpkgs/open-isns/template +++ b/srcpkgs/open-isns/template @@ -1,7 +1,7 @@ # Template file for 'open-isns' pkgname=open-isns version=0.98 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-shared" makedepends="libressl-devel" diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template index 777c9472b2a..445fa8a4911 100644 --- a/srcpkgs/open-vm-tools/template +++ b/srcpkgs/open-vm-tools/template @@ -1,7 +1,7 @@ # Template file for 'open-vm-tools' pkgname=open-vm-tools version=10.2.5 -revision=1 +revision=2 _build=8068406 wrksrc=$pkgname-$version-$_build configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template index 5ea70e2cd39..1a1ff8bbe0e 100644 --- a/srcpkgs/opendkim/template +++ b/srcpkgs/opendkim/template @@ -1,7 +1,7 @@ # Template file for 'opendkim' pkgname=opendkim version=2.10.3 -revision=6 +revision=7 build_style="gnu-configure" configure_args="--with-milter=${XBPS_CROSS_BASE}/usr" makedepends="libbsd-devel libressl-devel libmilter-devel" diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template index 0a8829888b7..3d412088bd0 100644 --- a/srcpkgs/openldap/template +++ b/srcpkgs/openldap/template @@ -1,7 +1,7 @@ # Template file for 'libldap' pkgname=openldap version=2.4.45 -revision=3 +revision=4 build_style=gnu-configure configure_args="--prefix=/usr --libexecdir=/usr/libexec diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index 37b64ad04f6..8a5d8a0cd1e 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,7 +1,7 @@ # Template file for 'openntpd' pkgname=openntpd version=6.2p3 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-privsep-user=$pkgname --with-cacert=/etc/ssl/certs.pem" hostmakedepends="automake libtool" diff --git a/srcpkgs/opensc/patches/patch-src_libopensc_sc-ossl-compat_h.patch b/srcpkgs/opensc/patches/patch-src_libopensc_sc-ossl-compat_h.patch new file mode 100644 index 00000000000..1bc84149252 --- /dev/null +++ b/srcpkgs/opensc/patches/patch-src_libopensc_sc-ossl-compat_h.patch @@ -0,0 +1,42 @@ +$OpenBSD: patch-src_libopensc_sc-ossl-compat_h,v 1.3 2018/02/18 14:21:23 sthen Exp $ + +Index: src/libopensc/sc-ossl-compat.h +--- src/libopensc/sc-ossl-compat.h.orig ++++ src/libopensc/sc-ossl-compat.h +@@ -92,12 +92,16 @@ extern "C" { + #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay + #define OPENSSL_malloc_init CRYPTO_malloc_init + ++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL + #define EVP_PKEY_get0_RSA(x) (x->pkey.rsa) + #define EVP_PKEY_get0_DSA(x) (x->pkey.dsa) ++#endif + #define X509_get_extension_flags(x) (x->ex_flags) + #define X509_get_key_usage(x) (x->ex_kusage) + #define X509_get_extended_key_usage(x) (x->ex_xkusage) ++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL + #define EVP_PKEY_up_ref(user_key) CRYPTO_add(&user_key->references, 1, CRYPTO_LOCK_EVP_PKEY) ++#endif + #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL + #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) + #endif +@@ -110,7 +114,8 @@ extern "C" { + * If that is not good enough, versions could be added to libopensc + */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* based on OpenSSL-1.1.0 e_os2.h */ + /* sc_ossl_inline: portable inline definition usable in public headers */ + # if !defined(inline) && !defined(__cplusplus) +@@ -127,9 +132,6 @@ extern "C" { + # else + # define sc_ossl_inline inline + # endif +-#endif +- +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + #define RSA_bits(R) (BN_num_bits(R->n)) + diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template index e39b6a5928e..aab4574394d 100644 --- a/srcpkgs/opensc/template +++ b/srcpkgs/opensc/template @@ -1,7 +1,7 @@ # Template file for 'opensc' pkgname=opensc version=0.17.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-man --enable-sm --enable-static=no --enable-doc --with-xsl-stylesheetsdir=/usr/share/xsl/docbook" diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 017658f4036..d3c480859d6 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,7 +1,7 @@ # Template file for 'opensmtpd' pkgname=opensmtpd version=6.0.3p1 -revision=6 +revision=7 build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-path-socket=/run --with-mantype=doc --with-pie --with-table-db diff --git a/srcpkgs/openvpn/patches/patch-libressl.patch b/srcpkgs/openvpn/patches/patch-libressl.patch deleted file mode 100644 index 69da8071e8a..00000000000 --- a/srcpkgs/openvpn/patches/patch-libressl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/openvpn/openssl_compat.h.ori 2018-03-14 08:26:21.457718254 +0100 -+++ src/openvpn/openssl_compat.h 2018-03-14 08:27:09.869715997 +0100 -@@ -711,7 +711,7 @@ - } - #endif /* SSL_CTX_get_max_proto_version */ - --#ifndef SSL_CTX_set_min_proto_version -+#if !defined(SSL_CTX_set_min_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) - /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */ - static inline int - SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) -@@ -740,7 +740,7 @@ - } - #endif /* SSL_CTX_set_min_proto_version */ - --#ifndef SSL_CTX_set_max_proto_version -+#if !defined(SSL_CTX_set_max_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) - /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */ - static inline int - SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max) diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index 44e12819f17..db449a7b247 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -1,7 +1,7 @@ # Template file for 'openvpn' pkgname=openvpn -version=2.4.5 -revision=1 +version=2.4.6 +revision=2 build_style=gnu-configure configure_args="--enable-pkcs11 --enable-iproute2 --disable-systemd" hostmakedepends="iproute2 pkg-config" @@ -9,10 +9,10 @@ makedepends="libressl-devel lzo-devel pam-devel pkcs11-helper-devel" depends="iproute2" short_desc="An easy-to-use, robust, and highly configurable VPN" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-only" homepage="https://www.openvpn.net" distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz" -checksum=43c0a363a332350f620d1cd93bb431e082bedbc93d4fb872f758650d53c1d29e +checksum=4f6434fa541cc9e363434ea71a16a62cf2615fb2f16af5b38f43ab5939998c26 post_install() { vmkdir usr/share/examples/${pkgname} diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template index 1ce2e4e073c..f7954681ae6 100644 --- a/srcpkgs/openvswitch/template +++ b/srcpkgs/openvswitch/template @@ -1,7 +1,7 @@ # Template file for 'openvswitch' pkgname=openvswitch version=2.5.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-rundir=/run/openvswitch" hostmakedepends="python perl" diff --git a/srcpkgs/opusfile/patches/libressl.patch b/srcpkgs/opusfile/patches/libressl.patch deleted file mode 100644 index 5cb8a0bcb69..00000000000 --- a/srcpkgs/opusfile/patches/libressl.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- src/http.c.orig -+++ src/http.c -@@ -1530,7 +1530,7 @@ - return ret; - } - --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - # define BIO_set_data(_b,_ptr) ((_b)->ptr=(_ptr)) - # define BIO_set_init(_b,_init) ((_b)->init=(_init)) - # define ASN1_STRING_get0_data ASN1_STRING_data -@@ -1538,7 +1538,7 @@ - - static int op_bio_retry_new(BIO *_b){ - BIO_set_init(_b,1); --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - _b->num=0; - # endif - BIO_set_data(_b,NULL); -@@ -1549,7 +1549,7 @@ - return _b!=NULL; - } - --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /*This is not const because OpenSSL doesn't allow it, even though it won't - write to it.*/ - static BIO_METHOD op_bio_retry_method={ -@@ -1570,7 +1570,7 @@ - proxying https URL requests.*/ - static int op_http_conn_establish_tunnel(OpusHTTPStream *_stream, - OpusHTTPConn *_conn,op_sock _fd,SSL *_ssl_conn,BIO *_ssl_bio){ --# if OPENSSL_VERSION_NUMBER>=0x10100000L -+# if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - BIO_METHOD *bio_retry_method; - # endif - BIO *retry_bio; -@@ -1583,7 +1583,7 @@ - ret=op_http_conn_write_fully(_conn, - _stream->proxy_connect.buf,_stream->proxy_connect.nbuf); - if(OP_UNLIKELY(ret<0))return ret; --# if OPENSSL_VERSION_NUMBER>=0x10100000L -+# if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - bio_retry_method=BIO_meth_new(BIO_TYPE_NULL,"retry"); - if(bio_retry_method==NULL)return OP_EFAULT; - BIO_meth_set_write(bio_retry_method,op_bio_retry_write); -@@ -1606,7 +1606,7 @@ - /*This shouldn't succeed, since we can't read yet.*/ - OP_ALWAYS_TRUE(SSL_connect(_ssl_conn)<0); - SSL_set_bio(_ssl_conn,_ssl_bio,_ssl_bio); --# if OPENSSL_VERSION_NUMBER>=0x10100000L -+# if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - BIO_meth_free(bio_retry_method); - # endif - /*Only now do we disable write coalescing, to allow the CONNECT -@@ -1635,7 +1635,7 @@ - return NULL; - } - --# if OPENSSL_VERSION_NUMBER<0x10002000L -+# if OPENSSL_VERSION_NUMBER<0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - /*Match a host name against a host with a possible wildcard pattern according - to the rules of RFC 6125 Section 6.4.3. - Return: 0 if the pattern doesn't match, and a non-zero value if it does.*/ -@@ -1893,7 +1893,7 @@ - SSL_set_tlsext_host_name(_ssl_conn,_stream->url.host); - # endif - skip_certificate_check=_stream->skip_certificate_check; --# if OPENSSL_VERSION_NUMBER>=0x10002000L -+# if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - /*As of version 1.0.2, OpenSSL can finally do hostname checks automatically. - Of course, they make it much more complicated than it needs to be.*/ - if(!skip_certificate_check){ -@@ -1956,13 +1956,13 @@ - if(OP_UNLIKELY(ret<=0))return OP_FALSE; - ssl_session=_stream->ssl_session; - if(ssl_session==NULL --# if OPENSSL_VERSION_NUMBER<0x10002000L -+# if OPENSSL_VERSION_NUMBER<0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - ||!skip_certificate_check - # endif - ){ - ret=op_do_ssl_step(_ssl_conn,_fd,SSL_do_handshake); - if(OP_UNLIKELY(ret<=0))return OP_FALSE; --# if OPENSSL_VERSION_NUMBER<0x10002000L -+# if OPENSSL_VERSION_NUMBER<0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - /*OpenSSL before version 1.0.2 does not do automatic hostname verification, - despite the fact that we just passed it the hostname above in the call - to SSL_set_tlsext_host_name(). -@@ -2314,7 +2314,7 @@ - /*Initialize the SSL library if necessary.*/ - if(OP_URL_IS_SSL(&_stream->url)&&_stream->ssl_ctx==NULL){ - SSL_CTX *ssl_ctx; --# if OPENSSL_VERSION_NUMBER<0x10100000L -+# if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - # if !defined(OPENSSL_NO_LOCKING) - /*The documentation says SSL_library_init() is not reentrant. - We don't want to add our own depenencies on a threading library, and it diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template index 8657cb3c823..67bbf9f2f19 100644 --- a/srcpkgs/opusfile/template +++ b/srcpkgs/opusfile/template @@ -1,7 +1,7 @@ # Template file for 'opusfile' pkgname=opusfile version=0.10 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libogg-devel opus-devel libressl-devel" diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template index f49b90d9262..14f0a76d476 100644 --- a/srcpkgs/packer/template +++ b/srcpkgs/packer/template @@ -1,6 +1,6 @@ # Template file for 'packer' pkgname=packer -version=1.2.2 +version=1.2.3 revision=1 replaces="packer-bin>=0" short_desc="Create identical multiplatform machine images from a single source" @@ -11,7 +11,7 @@ license="MPL-2" homepage="http://www.packer.io" go_import_path="github.com/mitchellh/packer" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=ef600f5323acbcd05cccff84b7bc407fd07560603e74c85b245a0b5940327a91 +checksum=008a377d5fe8440822114e3196225cc2837be72d57210cf7944530723b255051 post_build() { for F in $(find -type f -name main.go); do diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template index 9c67b91f56b..d60d902c211 100644 --- a/srcpkgs/pen/template +++ b/srcpkgs/pen/template @@ -1,7 +1,7 @@ # Template file for 'pen' pkgname=pen version=0.34.1 -revision=1 +revision=2 build_style=gnu-configure makedepends="geoip-devel libressl-devel" configure_args="--with-docdir=/usr/share/doc/pen" diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template index 2e77c48d93a..0626a667235 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template +++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template @@ -1,7 +1,7 @@ # Template file for 'perl-Crypt-OpenSSL-Bignum' pkgname=perl-Crypt-OpenSSL-Bignum version=0.09 -revision=2 +revision=3 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template index d4476c1a085..a37759836f6 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-Random/template +++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template @@ -1,7 +1,7 @@ # Template file for 'perl-Crypt-OpenSSL-Random' pkgname=perl-Crypt-OpenSSL-Random version=0.11 -revision=7 +revision=8 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template index a51d7df7ede..5433facad08 100644 --- a/srcpkgs/perl-DBD-mysql/template +++ b/srcpkgs/perl-DBD-mysql/template @@ -1,7 +1,7 @@ # Template file for 'perl-DBD-mysql' pkgname=perl-DBD-mysql version=4.046 -revision=1 +revision=2 wrksrc="DBD-mysql-${version}" build_style=perl-module hostmakedepends="perl perl-DBI perl-Devel-CheckLib" diff --git a/srcpkgs/perl-Module-CPANfile/template b/srcpkgs/perl-Module-CPANfile/template index 7c12efb7203..49c6b31afd0 100644 --- a/srcpkgs/perl-Module-CPANfile/template +++ b/srcpkgs/perl-Module-CPANfile/template @@ -1,6 +1,6 @@ # Template file for 'perl-Module-CPANfile' pkgname=perl-Module-CPANfile -version=1.1003 +version=1.1004 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,5 +12,5 @@ maintainer="Christian Neukirchen " homepage="http://search.cpan.org/dist/Module-CPANfile" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/Module/Module-CPANfile-${version}.tar.gz" -checksum=5ca2938998cb11f6fd21bb96921b8dda2f627748befea71de56b14379c42a07b +checksum=88efbe2e9a642dceaa186430fedfcf999aaf0e06f6cced28a714b8e56b514921 noarch=yes diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template index 68bb2830167..74926a7752a 100644 --- a/srcpkgs/perl-Net-SSH2/template +++ b/srcpkgs/perl-Net-SSH2/template @@ -1,7 +1,7 @@ # Template file for 'perl-Net-SSH2' pkgname=perl-Net-SSH2 version=0.69 -revision=2 +revision=3 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib" diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template index 47db45f3cd8..64de54b059c 100644 --- a/srcpkgs/perl-Net-SSLeay/template +++ b/srcpkgs/perl-Net-SSLeay/template @@ -1,7 +1,7 @@ # Template build file for 'perl-Net-SSLeay'. pkgname=perl-Net-SSLeay version=1.85 -revision=1 +revision=2 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl libressl" diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template index c6881c58f6f..cf5f913be4a 100644 --- a/srcpkgs/pev/template +++ b/srcpkgs/pev/template @@ -1,7 +1,7 @@ # Template file for 'pev' pkgname=pev version=0.80 -revision=4 +revision=5 wrksrc=${pkgname} build_style=gnu-makefile make_build_args="prefix=/usr" diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template index c0e8fe12166..b3cd4d22a67 100644 --- a/srcpkgs/pgadmin3/template +++ b/srcpkgs/pgadmin3/template @@ -1,7 +1,7 @@ # Template file for 'pgadmin3' pkgname=pgadmin3 version=1.22.2 -revision=5 +revision=6 build_style=gnu-configure configure_args="ac_cv_path_WX_CONFIG=wx-config-3.0 --with-wx-version=3.0" makedepends="postgresql-libs-devel wxWidgets-devel libxslt-devel libressl-devel" diff --git a/srcpkgs/phantomjs/template b/srcpkgs/phantomjs/template index ccee385571f..a8ad55255f4 100644 --- a/srcpkgs/phantomjs/template +++ b/srcpkgs/phantomjs/template @@ -1,7 +1,7 @@ # Template file for 'phantomjs' pkgname=phantomjs version=2.0.0 -revision=9 +revision=10 hostmakedepends="unzip flex ruby gperf python perl pkg-config" makedepends=" fontconfig-devel icu-devel libressl-devel libpng-devel diff --git a/srcpkgs/php/patches/fix-libressl-2.7.patch b/srcpkgs/php/patches/fix-libressl-2.7.patch new file mode 100644 index 00000000000..19517ed34ea --- /dev/null +++ b/srcpkgs/php/patches/fix-libressl-2.7.patch @@ -0,0 +1,102 @@ +--- ext/openssl/openssl.c.orig 2018-04-24 17:49:42.959226505 +0200 ++++ ext/openssl/openssl.c 2018-04-24 18:05:49.423593182 +0200 +@@ -72,7 +72,8 @@ + #ifdef HAVE_OPENSSL_MD2_H + #define OPENSSL_ALGO_MD2 4 + #endif +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + #define OPENSSL_ALGO_DSS1 5 + #endif + #define OPENSSL_ALGO_SHA224 6 +@@ -566,7 +567,8 @@ ZEND_GET_MODULE(openssl) + #endif + + /* {{{ OpenSSL compatibility functions and macros */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa + #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh + #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa +@@ -683,7 +685,8 @@ static const unsigned char *ASN1_STRING_ + return M_ASN1_STRING_data(asn1); + } + +-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + static int X509_get_signature_nid(const X509 *x) + { +@@ -1243,7 +1246,8 @@ static void php_openssl_dispose_config(s + } + /* }}} */ + +-#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) ++#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) + #define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0) + #else + #define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval() +@@ -1330,7 +1334,8 @@ static EVP_MD * php_openssl_get_evp_md_f + mdtype = (EVP_MD *) EVP_md2(); + break; + #endif +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + case OPENSSL_ALGO_DSS1: + mdtype = (EVP_MD *) EVP_dss1(); + break; +@@ -1418,7 +1423,8 @@ PHP_MINIT_FUNCTION(openssl) + le_x509 = zend_register_list_destructors_ex(php_openssl_x509_free, NULL, "OpenSSL X.509", module_number); + le_csr = zend_register_list_destructors_ex(php_openssl_csr_free, NULL, "OpenSSL X.509 CSR", module_number); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + OPENSSL_config(NULL); + SSL_library_init(); + OpenSSL_add_all_ciphers(); +@@ -1461,7 +1467,8 @@ PHP_MINIT_FUNCTION(openssl) + #ifdef HAVE_OPENSSL_MD2_H + REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT); + #endif +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT); + #endif + REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT); +@@ -1599,7 +1606,8 @@ PHP_MINFO_FUNCTION(openssl) + */ + PHP_MSHUTDOWN_FUNCTION(openssl) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + EVP_cleanup(); + + /* prevent accessing locking callback from unloaded extension */ +@@ -3644,7 +3652,8 @@ PHP_FUNCTION(openssl_csr_get_public_key) + RETURN_FALSE; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* Due to changes in OpenSSL 1.1 related to locking when decoding CSR, + * the pub key is not changed after assigning. It means if we pass + * a private key, it will be returned including the private part. +@@ -3655,7 +3664,8 @@ PHP_FUNCTION(openssl_csr_get_public_key) + /* Retrieve the public key from the CSR */ + tpubkey = X509_REQ_get_pubkey(csr); + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && \ ++ LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* We need to free the CSR as it was duplicated */ + X509_REQ_free(csr); + #endif diff --git a/srcpkgs/php/template b/srcpkgs/php/template index a6e320b6996..e008181cd7f 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template build file for 'php' pkgname=php version=7.2.4 -revision=2 +revision=3 short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " license="PHP-3.01" diff --git a/srcpkgs/pidgin-sipe/patches/libressl.patch b/srcpkgs/pidgin-sipe/patches/libressl.patch deleted file mode 100644 index 291c3d6c0ca..00000000000 --- a/srcpkgs/pidgin-sipe/patches/libressl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/core/sipe-digest-openssl.c.orig 2017-06-11 00:58:07.000000000 +0000 -+++ src/core/sipe-digest-openssl.c 2017-07-15 11:50:28.560520967 +0000 -@@ -77,7 +77,7 @@ - /* Stream HMAC(SHA1) digest for file transfer */ - gpointer sipe_digest_ft_start(const guchar *sha1_digest) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - HMAC_CTX *ctx = g_malloc(sizeof(HMAC_CTX)); - HMAC_CTX_init(ctx); - #else -@@ -101,7 +101,7 @@ - - void sipe_digest_ft_destroy(gpointer context) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - HMAC_CTX_cleanup(context); - g_free(context); - #else diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template index 21af56656b7..1f664d03c02 100644 --- a/srcpkgs/pidgin-sipe/template +++ b/srcpkgs/pidgin-sipe/template @@ -1,7 +1,7 @@ # Template file for 'pidgin-sipe' pkgname=pidgin-sipe version=1.23.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel" diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template index ef449d21293..66db77601ac 100644 --- a/srcpkgs/pjproject/template +++ b/srcpkgs/pjproject/template @@ -3,7 +3,7 @@ # and this template is heavily based on Alpine's APKBUILD. pkgname=pjproject version=2.7.1 -revision=3 +revision=4 disable_parallel_build=yes build_style=gnu-configure configure_args="--enable-shared \ diff --git a/srcpkgs/pkcs11-helper/patches/libressl-2.7.patch b/srcpkgs/pkcs11-helper/patches/libressl-2.7.patch new file mode 100644 index 00000000000..ad474bc5ed4 --- /dev/null +++ b/srcpkgs/pkcs11-helper/patches/libressl-2.7.patch @@ -0,0 +1,50 @@ +--- lib/pkcs11h-openssl.c 2017-02-11 23:13:00.000000000 +0100 ++++ lib/pkcs11h-openssl.c 2018-04-27 17:46:48.160261853 +0200 +@@ -96,6 +96,7 @@ + }; + + #if OPENSSL_VERSION_NUMBER < 0x10100001L ++#if !defined(LIBRESSL_VERSION_NUMBER) + static RSA_METHOD * + RSA_meth_dup (const RSA_METHOD *meth) + { +@@ -123,6 +124,7 @@ + _pkcs11h_mem_free ((void *)&meth); + } + } ++#endif /* defined(LIBRESSL_VERSION_NUMBER) */ + + static int + RSA_meth_set1_name (RSA_METHOD *meth, const char *name) +@@ -139,6 +141,7 @@ + return 1; + } + ++#if !defined(LIBRESSL_VERSION_NUMBER) + static int + RSA_meth_set_priv_enc ( + RSA_METHOD *meth, +@@ -198,6 +201,7 @@ + _pkcs11h_mem_free ((void *)&meth); + } + } ++#endif /* defined(LIBRESSL_VERSION_NUMBER) */ + + static int + DSA_meth_set1_name (DSA_METHOD *meth, const char *name) +@@ -207,6 +211,7 @@ + return rv == CKR_OK ? 1 : 0; + } + ++#if !defined(LIBRESSL_VERSION_NUMBER) + static int + DSA_meth_set_sign (DSA_METHOD *meth, + DSA_SIG *(*sign) (const unsigned char *, int, DSA *)) +@@ -224,6 +229,7 @@ + sig->s = s; + return 1; + } ++#endif /* defined(LIBRESSL_VERSION_NUMBER) */ + #endif + + static struct { diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template index 4822fa5955c..5fadaa08ac7 100644 --- a/srcpkgs/pkcs11-helper/template +++ b/srcpkgs/pkcs11-helper/template @@ -1,7 +1,7 @@ # Template file for 'pkcs11-helper' pkgname=pkcs11-helper version=1.22 -revision=2 +revision=4 build_style=gnu-configure configure_args="--enable-doc" hostmakedepends="automake libtool pkg-config doxygen" diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template index 0b0df26a9d0..e5a936ab213 100644 --- a/srcpkgs/podofo/template +++ b/srcpkgs/podofo/template @@ -1,7 +1,7 @@ # Template file for 'podofo' pkgname=podofo version=0.9.5 -revision=3 +revision=4 build_style=cmake configure_args="-DPODOFO_BUILD_SHARED=1" makedepends="zlib-devel libressl-devel libidn-devel freetype-devel diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index c130ed2474e..114ae67d39a 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,7 +1,7 @@ # Template file for 'postfix' pkgname=postfix version=3.3.0 -revision=2 +revision=3 short_desc="High-performance mail transport agent" maintainer="Juan RP " license="IPL-1.0, EPL-2.0" diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index 1698c4e71ea..613e86ee80a 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,7 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql version=9.6.8 -revision=1 +revision=2 build_style=gnu-configure make_build_target="world" configure_args="--with-openssl --with-python diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template index 8f89494929d..424a26b088e 100644 --- a/srcpkgs/prosody/template +++ b/srcpkgs/prosody/template @@ -1,7 +1,7 @@ # Template file for 'prosody' pkgname=prosody version=0.10.0 -revision=3 +revision=4 build_style=configure configure_args=" --ostype=linux diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index e953184bb6a..7761bd9cc7f 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=11.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc diff --git a/srcpkgs/python-M2Crypto/patches/libressl.patch b/srcpkgs/python-M2Crypto/patches/libressl.patch new file mode 100644 index 00000000000..d82b408943f --- /dev/null +++ b/srcpkgs/python-M2Crypto/patches/libressl.patch @@ -0,0 +1,140 @@ +--- SWIG/_bio.i.orig ++++ SWIG/_bio.i +@@ -293,8 +293,12 @@ int bio_should_write(BIO* a) { + } + + /* Macros for things not defined before 1.1.0 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +-static BIO_METHOD * ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ ++#if !defined(LIBRESSL_VERSION_NUMBER) ++static ++#endif ++BIO_METHOD * + BIO_meth_new( int type, const char *name ) + { + BIO_METHOD *method = malloc( sizeof(BIO_METHOD) ); +@@ -306,7 +310,10 @@ BIO_meth_new( int type, const char *name ) + return method; + } + +-static void ++#if !defined(LIBRESSL_VERSION_NUMBER) ++static ++#endif ++void + BIO_meth_free( BIO_METHOD *meth ) + { + if ( meth == NULL ) { +--- SWIG/_evp.i.orig ++++ SWIG/_evp.i +@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights re + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + HMAC_CTX *HMAC_CTX_new(void) { + HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX)); +--- SWIG/_lib11_compat.i.orig ++++ SWIG/_lib11_compat.i +@@ -8,7 +8,7 @@ + */ + + %{ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + #include + #include +--- SWIG/_lib.i.orig ++++ SWIG/_lib.i +@@ -21,7 +21,7 @@ + + %{ + /* OpenSSL 1.0.2 copmatbility shim */ +-#if OPENSSL_VERSION_NUMBER < 0x10002000L ++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) + typedef void (*OPENSSL_sk_freefunc)(void *); + typedef void *(*OPENSSL_sk_copyfunc)(const void *); + typedef struct stack_st OPENSSL_STACK; +@@ -499,7 +499,7 @@ int passphrase_callback(char *buf, int num, int v, voi + %inline %{ + + void lib_init() { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSLeay_add_all_algorithms(); + ERR_load_ERR_strings(); + #endif +--- SWIG/_ssl.i.orig ++++ SWIG/_ssl.i +@@ -275,7 +275,7 @@ const SSL_METHOD *sslv3_method(void) { + #endif + + const SSL_METHOD *tlsv1_method(void) { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + PyErr_WarnEx(PyExc_DeprecationWarning, + "Function TLSv1_method has been deprecated.", 1); + #endif +--- SWIG/_threads.i.orig ++++ SWIG/_threads.i +@@ -5,7 +5,7 @@ + #include + #include + +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS) + static PyThread_type_lock lock_cs[CRYPTO_num_locks()]; + static long lock_count[CRYPTO_num_locks()]; +@@ -13,7 +13,7 @@ static int thread_mode = 0; + #endif + + void threading_locking_callback(int mode, int type, const char *file, int line) { +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if (mode & CRYPTO_LOCK) { + PyThread_acquire_lock(lock_cs[type], WAIT_LOCK); + lock_count[type]++; +@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, co + } + + unsigned long threading_id_callback(void) { +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return (unsigned long)PyThread_get_thread_ident(); + #else + return (unsigned long)0; +@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) { + + %inline %{ + void threading_init(void) { +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + int i; + if (!thread_mode) { + for (i=0; i + #include diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index a0c91fc4031..89eda8b18d9 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -1,6 +1,6 @@ # Template file for 'python-M2Crypto' pkgname=python-M2Crypto -version=0.29.0 +version=0.30.0 revision=2 wrksrc="M2Crypto-${version}" build_style=python-module @@ -13,12 +13,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://gitlab.com/m2crypto/m2crypto/" distfiles="${PYPI_SITE}/M/M2Crypto/M2Crypto-${version}.tar.gz" -checksum=a0fea2c5ab913e42864d1ccbaee5878c23886368b606e923609fda4ce37d26c0 - -pre_configure() { - sed -i 's/OPENSSL_VERSION_NUMBER < 0x10100000L/OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)/g' SWIG/*.i - sed -i 's/OPENSSL_VERSION_NUMBER >= 0x10100000L/OPENSSL_VERSION_NUMBER >= 0x10100000L \&\& !defined(LIBRESSL_VERSION_NUMBER)/g' SWIG/*.i -} +checksum=0faf8588cc472061ed90ef3dd2f1c11fc3d61d8ac368853ff05fa23a768ee893 post_install() { vlicense LICENCE diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template index dcd9bcd74ce..f19b73ef6ce 100644 --- a/srcpkgs/python-Sphinx/template +++ b/srcpkgs/python-Sphinx/template @@ -1,6 +1,6 @@ # Template file for 'python-Sphinx' pkgname=python-Sphinx -version=1.7.3 +version=1.7.4 revision=1 noarch=yes wrksrc="Sphinx-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="http://sphinx-doc.org/" license="BSD-2-Clause" distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz" -checksum=9495a1f78c13d0a725ab8104e923e9663519ecc04552aa4a8f684c2da355443d +checksum=e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10 alternatives=" sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc2 diff --git a/srcpkgs/python-cryptography/patches/patch-src__cffi_src_openssl_x509_py.patch b/srcpkgs/python-cryptography/patches/patch-src__cffi_src_openssl_x509_py.patch new file mode 100644 index 00000000000..b30e39ff227 --- /dev/null +++ b/srcpkgs/python-cryptography/patches/patch-src__cffi_src_openssl_x509_py.patch @@ -0,0 +1,37 @@ +$OpenBSD: patch-src__cffi_src_openssl_x509_py,v 1.2 2018/04/23 13:06:47 sthen Exp $ + +Index: src/_cffi_src/openssl/x509.py +--- src/_cffi_src/openssl/x509.py.orig ++++ src/_cffi_src/openssl/x509.py +@@ -256,8 +256,7 @@ int X509_get_signature_nid(const X509 *); + + const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *); + +-/* in 1.1.0 becomes const ASN1_BIT_STRING, const X509_ALGOR */ +-void X509_get0_signature(ASN1_BIT_STRING **, X509_ALGOR **, X509 *); ++void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *); + + long X509_get_version(X509 *); + +@@ -340,7 +339,8 @@ void X509_REQ_get0_signature(const X509_REQ *, const A + CUSTOMIZATIONS = """ + /* Added in 1.0.2 beta but we need it in all versions now due to the great + opaquing. */ +-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 ++#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* from x509/x_x509.c version 1.0.2 */ + void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, + const X509 *x) +@@ -388,9 +388,11 @@ X509_REVOKED *Cryptography_X509_REVOKED_dup(X509_REVOK + opaquing. */ + #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 + ++#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + int X509_up_ref(X509 *x) { + return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); + } ++#endif + + const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x) + { diff --git a/srcpkgs/python-cryptography/patches/patch-src__cffi_src_openssl_x509_vfy_py.patch b/srcpkgs/python-cryptography/patches/patch-src__cffi_src_openssl_x509_vfy_py.patch new file mode 100644 index 00000000000..24a35f5c629 --- /dev/null +++ b/srcpkgs/python-cryptography/patches/patch-src__cffi_src_openssl_x509_vfy_py.patch @@ -0,0 +1,74 @@ +$OpenBSD: patch-src__cffi_src_openssl_x509_vfy_py,v 1.7 2018/02/22 18:49:16 sthen Exp $ + +Index: src/_cffi_src/openssl/x509_vfy.py +--- src/_cffi_src/openssl/x509_vfy.py.orig ++++ src/_cffi_src/openssl/x509_vfy.py +@@ -204,7 +204,7 @@ int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJE + X509_OBJECT *sk_X509_OBJECT_value(Cryptography_STACK_OF_X509_OBJECT *, int); + X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *); + Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *); +-X509 *X509_OBJECT_get0_X509(X509_OBJECT *); ++X509 *X509_OBJECT_get0_X509(const X509_OBJECT *); + int X509_OBJECT_get_type(const X509_OBJECT *); + + /* added in 1.1.0 */ +@@ -220,14 +220,11 @@ static const long Cryptography_HAS_102_VERIFICATION_ER + static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; + #else + static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0; ++#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; ++#else + static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0; + +-static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0; +-static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0; +-static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0; +-static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; +-static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; +-static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; + /* These 3 defines are unavailable in LibreSSL 2.5.x, but may be added + in the future... */ + #ifndef X509_V_ERR_HOSTNAME_MISMATCH +@@ -240,12 +237,6 @@ static const long X509_V_ERR_EMAIL_MISMATCH = 0; + static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0; + #endif + +-/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately +- below because it shows up in some earlier 3rd party OpenSSL packages. */ +-static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0; +-static const long X509_V_FLAG_SUITEB_192_LOS = 0; +-static const long X509_V_FLAG_SUITEB_128_LOS = 0; +- + int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *, + size_t) = NULL; + int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *, +@@ -257,6 +248,19 @@ void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PA + unsigned int) = NULL; + #endif + ++static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0; ++static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0; ++static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0; ++static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; ++static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; ++static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; ++/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately ++ below because it shows up in some earlier 3rd party OpenSSL packages. */ ++static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0; ++static const long X509_V_FLAG_SUITEB_192_LOS = 0; ++static const long X509_V_FLAG_SUITEB_128_LOS = 0; ++#endif ++ + /* OpenSSL 1.0.2+ or Solaris's backport */ + #ifdef X509_V_FLAG_PARTIAL_CHAIN + static const long Cryptography_HAS_X509_V_FLAG_PARTIAL_CHAIN = 1; +@@ -292,7 +296,7 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) + return ctx->cert; + } + +-X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) { ++X509 *X509_OBJECT_get0_X509(const X509_OBJECT *x) { + return x->data.x509; + } + #endif diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index bc78883d71a..bae5d0825af 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -1,7 +1,7 @@ # Template file for 'python-cryptography' pkgname=python-cryptography version=2.2.2 -revision=1 +revision=2 wrksrc="cryptography-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools libressl-devel diff --git a/srcpkgs/python-curl/template b/srcpkgs/python-curl/template index 3aa05d448b1..163a670d57b 100644 --- a/srcpkgs/python-curl/template +++ b/srcpkgs/python-curl/template @@ -1,7 +1,7 @@ # Template file for 'python-curl' pkgname=python-curl version=7.43.0.1 -revision=2 +revision=3 wrksrc="pycurl-${version}" build_style=python-module hostmakedepends="python-devel python3-devel" diff --git a/srcpkgs/python-docker-pycreds/template b/srcpkgs/python-docker-pycreds/template index 2250968680a..b4b4819914f 100644 --- a/srcpkgs/python-docker-pycreds/template +++ b/srcpkgs/python-docker-pycreds/template @@ -1,6 +1,6 @@ # Template file for 'python-docker-pycreds pkgname=python-docker-pycreds -version=0.2.2 +version=0.2.3 revision=1 noarch=yes wrksrc="docker-pycreds-${version}" @@ -13,7 +13,7 @@ maintainer="Sergi Alvarez " homepage="https://github.com/shin-/dockerpy-creds" license="Apache-2.0" distfiles="${PYPI_SITE}/d/docker-pycreds/docker-pycreds-${version}.tar.gz" -checksum=c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299 +checksum=e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d python3-docker-pycreds_package() { noarch=yes diff --git a/srcpkgs/python-docker/patches/no-pip.patch b/srcpkgs/python-docker/patches/no-pip.patch deleted file mode 100644 index 2cfdb33412b..00000000000 --- a/srcpkgs/python-docker/patches/no-pip.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- setup.py.orig 2017-01-20 03:12:21.000000000 +0100 -+++ setup.py 2017-04-21 12:39:13.784172057 +0200 -@@ -5,17 +5,8 @@ - import os - import sys - --import pip -- - from setuptools import setup, find_packages - --if 'docker-py' in [x.project_name for x in pip.get_installed_distributions()]: -- print( -- 'ERROR: "docker-py" needs to be uninstalled before installing this' -- ' package:\npip uninstall docker-py', file=sys.stderr -- ) -- sys.exit(1) -- - ROOT_DIR = os.path.dirname(__file__) - SOURCE_DIR = os.path.join(ROOT_DIR) - diff --git a/srcpkgs/python-docker/template b/srcpkgs/python-docker/template index 661a674e19f..344c57ed1a4 100644 --- a/srcpkgs/python-docker/template +++ b/srcpkgs/python-docker/template @@ -1,12 +1,11 @@ # Template file for 'python-docker' pkgname=python-docker -version=3.2.1 +version=3.3.0 revision=1 noarch=yes wrksrc="docker-${version}" build_style=python-module pycompile_module="docker" -replaces="python-docker-py>=0" hostmakedepends="python-setuptools python3-setuptools" depends="python-requests python-six python-websocket-client python-ipaddress python-backports.ssl_match_hostname python-docker-pycreds" @@ -15,12 +14,11 @@ maintainer="Sergi Alvarez " homepage="https://github.com/docker/docker-py" license="Apache-2.0" distfiles="${PYPI_SITE}/d/docker/docker-${version}.tar.gz" -checksum=0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43 +checksum=dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a python3-docker_package() { noarch=yes pycompile_module="docker" - replaces="python3-docker-py>=0" depends="python3-requests python3-six python3-websocket-client python3-docker-pycreds" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-ndg_httpsclient/template b/srcpkgs/python-ndg_httpsclient/template index 0a14847d94a..ae5d806739c 100644 --- a/srcpkgs/python-ndg_httpsclient/template +++ b/srcpkgs/python-ndg_httpsclient/template @@ -1,6 +1,6 @@ # Template file for 'python-ndg_httpsclient' pkgname=python-ndg_httpsclient -version=0.4.4 +version=0.5.0 revision=1 noarch=yes wrksrc="ndg_httpsclient-${version}" @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python-openssl python-pyasn1" short_desc="HTTPS support for httplib and urllib2 (Python2)" maintainer="Joseph LaFreniere " +license="BSD-3-Clause" homepage="https://github.com/cedadev/ndg_httpsclient" -license="3-clause-BSD" distfiles="${PYPI_SITE}/n/ndg_httpsclient/ndg_httpsclient-${version}.tar.gz" -checksum=fba4d4798dcac2965874f24afb6631b4326baa4bd02505744d34f690c354856a +checksum=c009f5430790936b3a97eaf9f968516664d97e146ab2bda991f0caadb7cc088b alternatives="ndg_httpclient:ndg_httpclient:/usr/bin/ndg_httpclient2" post_install() { @@ -27,8 +27,8 @@ python3-ndg_httpsclient_package() { short_desc="${short_desc/Python2/Python3}" alternatives="ndg_httpclient:ndg_httpclient:/usr/bin/ndg_httpclient3" pkg_install() { - vmove usr/bin/*3 - vmove usr/lib/python3* + vmove "usr/bin/*3" + vmove "usr/lib/python3*" vlicense ndg/httpsclient/LICENSE } } diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template index e6cb2b07e69..880a0fc217d 100644 --- a/srcpkgs/python-pytest/template +++ b/srcpkgs/python-pytest/template @@ -1,47 +1,52 @@ # Template file for 'python-pytest' pkgname=python-pytest -version=3.5.0 -revision=1 +version=3.5.1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module -pycompile_module="_pytest" +pycompile_module="_pytest pytest.py" hostmakedepends="python-setuptools python3-setuptools" depends="python-attrs python-funcsigs python-more-itertools python-pluggy python-py python-setuptools" checkdepends="python3-hypothesis python3-more-itertools python3-pluggy python3-py" -short_desc="Pytest: simple powerful testing with Python2" +short_desc="Simple powerful testing with Python2" maintainer="maxice8 " license="MIT" homepage="https://docs.pytest.org/en/latest/" distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz" -checksum=fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1 +checksum=54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8 alternatives=" - python-pytest:pytest:/usr/bin/pytest2 - python-pytest:py.test:/usr/bin/py.test2 - " -noarch=yes + pytest:pytest:/usr/bin/pytest2 + pytest:py.test:/usr/bin/py.test2" +pre_build() { + sed -i setup.py \ + -e '/setup_requires=/d' \ + -e '/use_scm_version/,+2d' \ + -e "/name=/ a\ + version='${version}'," +} do_check() { python3 setup.py test } - post_install() { vlicense LICENSE } python3-pytest_package() { noarch=yes - pycompile_module="_pytest" + pycompile_module="_pytest pytest.py" alternatives=" - python-pytest:pytest:/usr/bin/pytest3 - python-pytest:py.test:/usr/bin/py.test3 - " + pytest:pytest:/usr/bin/pytest3 + pytest:py.test:/usr/bin/py.test3" short_desc="${short_desc/Python2/Python3}" - depends="python3-hypothesis python3-more-itertools python3-pluggy python3-py" + depends="python3-attrs python3-more-itertools python3-pluggy python3-py + python3-setuptools" pkg_install() { - vmove usr/bin/*3 - vmove usr/lib/python3* + vmove "usr/bin/*3" + vmove "usr/lib/python3*" vlicense LICENSE } } diff --git a/srcpkgs/python/patches/libressl-2.7.patch b/srcpkgs/python/patches/libressl-2.7.patch new file mode 100644 index 00000000000..1bbcdc7a438 --- /dev/null +++ b/srcpkgs/python/patches/libressl-2.7.patch @@ -0,0 +1,52 @@ +Based on https://github.com/python/cpython/pull/6210. + +--- Modules/_ssl.c.orig ++++ Modules/_ssl.c +@@ -102,6 +102,12 @@ struct py_ssl_library_code { + + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_VERSION_1_1 1 ++# define PY_OPENSSL_1_1_API 1 ++#endif ++ ++/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++# define PY_OPENSSL_1_1_API 1 + #endif + + /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 +@@ -149,16 +155,18 @@ struct py_ssl_library_code { + #define INVALID_SOCKET (-1) + #endif + +-#ifdef OPENSSL_VERSION_1_1 +-/* OpenSSL 1.1.0+ */ +-#ifndef OPENSSL_NO_SSL2 +-#define OPENSSL_NO_SSL2 +-#endif +-#else /* OpenSSL < 1.1.0 */ +-#if defined(WITH_THREAD) ++/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ ++#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) + #define HAVE_OPENSSL_CRYPTO_LOCK + #endif + ++#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) ++#define OPENSSL_NO_SSL2 ++#endif ++ ++#ifndef PY_OPENSSL_1_1_API ++/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ ++ + #define TLS_method SSLv23_method + + static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) +@@ -201,7 +209,7 @@ static X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *store) + { + return store->param; + } +-#endif /* OpenSSL < 1.1.0 or LibreSSL */ ++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + + enum py_ssl_error { diff --git a/srcpkgs/python/template b/srcpkgs/python/template index a8be35d2d2f..89a50a4dc6a 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -4,7 +4,7 @@ # pkgname=python version=2.7.14 -revision=4 +revision=6 wrksrc="Python-${version}" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel diff --git a/srcpkgs/python3-async_generator/template b/srcpkgs/python3-async_generator/template index cf2734acdec..db0e009cd92 100644 --- a/srcpkgs/python3-async_generator/template +++ b/srcpkgs/python3-async_generator/template @@ -1,6 +1,6 @@ # Template file for 'python3-async_generator' pkgname=python3-async_generator -version=1.8 +version=1.9 revision=1 wrksrc="async_generator-${version}" build_style=python3-module @@ -12,9 +12,9 @@ maintainer="maxice8 " license="Apache-2.0, MIT" homepage="https://github.com/python-trio/async_generator" distfiles="https://github.com/python-trio/async_generator/archive/v${version}.tar.gz" -checksum=4e5558912b5a7d142d4740a54f2e731e6492a5859e5cfcc166190c612de77874 +checksum=942d0de4ad4e3b66d7cce4cbed29f7307111aad98599d4ebf01b9f3ebfd10be0 noarch=yes post_install() { - vlicense LICENSE.txt + vlicense LICENSE.MIT } diff --git a/srcpkgs/python3/patches/libressl-2.6.patch b/srcpkgs/python3/patches/libressl-2.6.patch index b2658dc01e2..92dcf1ef06e 100644 --- a/srcpkgs/python3/patches/libressl-2.6.patch +++ b/srcpkgs/python3/patches/libressl-2.6.patch @@ -24,24 +24,3 @@ https://github.com/python/cpython/pull/4930 @unittest.skipUnless(ssl.HAS_NPN, "NPN support needed for this test") def test_npn_protocols(self): server_protocols = ['http/1.1', 'spdy/2'] ---- Tools/ssl/multissltests.py.orig -+++ Tools/ssl/multissltests.py -@@ -47,7 +47,7 @@ - - OPENSSL_RECENT_VERSIONS = [ - "1.0.2", -- "1.0.2m", -+ "1.0.2n", - "1.1.0g", - ] - -@@ -57,8 +57,8 @@ - ] - - LIBRESSL_RECENT_VERSIONS = [ -- "2.5.3", - "2.5.5", -+ "2.6.4", - ] - - # store files in ../multissl diff --git a/srcpkgs/python3/patches/libressl-2.7.patch b/srcpkgs/python3/patches/libressl-2.7.patch new file mode 100644 index 00000000000..f4732e1f79a --- /dev/null +++ b/srcpkgs/python3/patches/libressl-2.7.patch @@ -0,0 +1,75 @@ +Based on https://github.com/python/cpython/pull/6210. + +--- Lib/test/test_ssl.py.orig ++++ Lib/test/test_ssl.py +@@ -1687,6 +1687,7 @@ def test_get_ca_certs_capath(self): + self.assertEqual(len(ctx.get_ca_certs()), 1) + + @needs_sni ++ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2") + def test_context_setget(self): + # Check that the context of a connected socket can be replaced. + ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) +--- Modules/_ssl.c.orig ++++ Modules/_ssl.c +@@ -106,6 +106,12 @@ struct py_ssl_library_code { + + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_VERSION_1_1 1 ++# define PY_OPENSSL_1_1_API 1 ++#endif ++ ++/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++# define PY_OPENSSL_1_1_API 1 + #endif + + /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 +@@ -152,16 +158,18 @@ struct py_ssl_library_code { + #define INVALID_SOCKET (-1) + #endif + +-#ifdef OPENSSL_VERSION_1_1 +-/* OpenSSL 1.1.0+ */ +-#ifndef OPENSSL_NO_SSL2 +-#define OPENSSL_NO_SSL2 +-#endif +-#else /* OpenSSL < 1.1.0 */ +-#if defined(WITH_THREAD) ++/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ ++#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) + #define HAVE_OPENSSL_CRYPTO_LOCK + #endif + ++#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) ++#define OPENSSL_NO_SSL2 ++#endif ++ ++#ifndef PY_OPENSSL_1_1_API ++/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ ++ + #define TLS_method SSLv23_method + #define TLS_client_method SSLv23_client_method + #define TLS_server_method SSLv23_server_method +@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) + return s->tlsext_tick_lifetime_hint; + } + +-#endif /* OpenSSL < 1.1.0 or LibreSSL */ ++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + + enum py_ssl_error { +--- Tools/ssl/multissltests.py.orig ++++ Tools/ssl/multissltests.py +@@ -57,8 +57,9 @@ + ] + + LIBRESSL_RECENT_VERSIONS = [ +- "2.5.3", + "2.5.5", ++ "2.6.4", ++ "2.7.1", + ] + + # store files in ../multissl diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 374827ad60f..be1b3c6d829 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -4,7 +4,7 @@ # pkgname=python3 version=3.6.5 -revision=2 +revision=4 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (${version%.*} series)" maintainer="Juan RP " diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template index c25999e843f..566e87483bd 100644 --- a/srcpkgs/qca-qt5/template +++ b/srcpkgs/qca-qt5/template @@ -1,7 +1,7 @@ # Template file for 'qca-qt5' pkgname=qca-qt5 version=2.1.3 -revision=3 +revision=4 wrksrc=${pkgname%-*}-${version} build_style=cmake configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs" diff --git a/srcpkgs/qca/template b/srcpkgs/qca/template index ff48dbd5ea9..69b0997967f 100644 --- a/srcpkgs/qca/template +++ b/srcpkgs/qca/template @@ -1,7 +1,7 @@ # Template file for 'qca' pkgname=qca version=2.1.3 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTS=0 -DQC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes" diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template index ab8cb2a1f2f..e687743efa0 100644 --- a/srcpkgs/qingy/template +++ b/srcpkgs/qingy/template @@ -1,7 +1,7 @@ # Template file for 'qingy' pkgname=qingy version=1.0.0 -revision=24 +revision=25 lib32disabled=yes build_style=gnu-configure makedepends="ncurses-devel libressl-devel diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index d66bd59f046..ccaba5877a4 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.8.7 -revision=25 +revision=26 _distname=qt-everywhere-opensource-src patch_args="-Np1" wrksrc=${_distname}-${version} diff --git a/srcpkgs/qt5/patches/libressl-compat.patch b/srcpkgs/qt5/patches/libressl-compat.patch deleted file mode 100644 index baa72740a0a..00000000000 --- a/srcpkgs/qt5/patches/libressl-compat.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp 2017-01-18 15:20:58.000000000 +0100 -+++ qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp 2017-02-21 16:25:56.477986158 +0100 -@@ -83,7 +83,7 @@ - const QByteArray curveNameLatin1 = name.toLatin1(); - int nid = q_OBJ_sn2nid(curveNameLatin1.data()); - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (nid == 0 && QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) - nid = q_EC_curve_nist2nid(curveNameLatin1.data()); - #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-01-18 15:20:58.000000000 +0100 -+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-02-21 19:14:32.805677245 +0100 -@@ -791,7 +791,7 @@ - RESOLVEFUNC(EC_GROUP_get_degree) - #endif - RESOLVEFUNC(BN_num_bits) --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(BN_is_word) - #endif - RESOLVEFUNC(BN_mod_word) ---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-01-18 15:20:58.000000000 +0100 -+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-02-21 19:15:38.083714302 +0100 -@@ -228,7 +228,7 @@ - Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); - Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); - int q_BN_num_bits(const BIGNUM *a); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - int q_BN_is_word(BIGNUM *a, BN_ULONG w); - #else - // BN_is_word is implemented purely as a -@@ -241,7 +241,7 @@ - // - // Users are required to include . - #define q_BN_is_word BN_is_word --#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); - #ifndef OPENSSL_NO_EC - const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); -@@ -509,13 +509,13 @@ - - // EC curves management - size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems); --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - int q_EC_curve_nist2nid(const char *name); --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - #endif // OPENSSL_NO_EC --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - #define q_SSL_get_server_tmp_key(ssl, key) q_SSL_ctrl((ssl), SSL_CTRL_GET_SERVER_TMP_KEY, 0, (char *)key) --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - - // PKCS#12 support - int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca); ---- qtbase/src/network/ssl/qsslcontext_openssl.cpp 2017-01-18 15:20:58.000000000 +0100 -+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp 2017-02-21 19:23:04.291975945 +0100 -@@ -159,7 +159,7 @@ - m_npnContext.data = reinterpret_cast(m_supportedNPNVersions.data()); - m_npnContext.len = m_supportedNPNVersions.count(); - m_npnContext.status = QSslConfiguration::NextProtocolNegotiationNone; --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - // Callback's type has a parameter 'const unsigned char ** out' - // since it was introduced in 1.0.2. Internally, OpenSSL's own code ---- qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp 2017-11-30 14:49:46.000000000 +0100 -+++ qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp 2018-01-27 18:06:50.939540932 +0100 -@@ -228,7 +228,7 @@ - q_SSL_load_error_strings(); - q_OpenSSL_add_all_algorithms_safe(); - --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (q_SSLeay() >= 0x10001000L) - QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); - #endif -@@ -382,7 +382,7 @@ - } else { - const unsigned char *proto = 0; - unsigned int proto_len = 0; --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (q_SSLeay() >= 0x10002000L) { - q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); - if (proto_len && mode == QSslSocket::SslClientMode) { -@@ -405,7 +405,7 @@ - } - #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { - EVP_PKEY *key; - if (q_SSL_get_server_tmp_key(ssl, &key)) diff --git a/srcpkgs/qt5/patches/libressl-disable-1.1-APIs.patch b/srcpkgs/qt5/patches/libressl-disable-1.1-APIs.patch new file mode 100644 index 00000000000..ef2120b9c96 --- /dev/null +++ b/srcpkgs/qt5/patches/libressl-disable-1.1-APIs.patch @@ -0,0 +1,23 @@ +--- ./qtbase/config.tests/unix/openssl11/openssl.cpp.orig 2018-04-24 09:59:45.918038335 +0200 ++++ ./qtbase/config.tests/unix/openssl11/openssl.cpp 2018-04-24 10:01:21.255182441 +0200 +@@ -42,6 +42,9 @@ + #if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L + # error "OpenSSL >= 1.1 is required" + #endif ++#ifdef LIBRESSL_VERSION_NUMBER ++# error "LibreSSL does not support all used OpenSSL-1.1 APIs yet." ++#endif + + int main() + { +--- ./qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2018-04-24 10:40:49.121761681 +0200 ++++ ./qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-04-24 10:41:43.082843248 +0200 +@@ -232,7 +232,7 @@ BIO *q_BIO_new_mem_buf(void *a, int b); + int q_BIO_read(BIO *a, void *b, int c); + Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); + int q_BN_num_bits(const BIGNUM *a); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + int q_BN_is_word(BIGNUM *a, BN_ULONG w); + #else + // BN_is_word is implemented purely as a diff --git a/srcpkgs/qt5/patches/libressl-no-opensslv11.patch b/srcpkgs/qt5/patches/libressl-no-opensslv11.patch deleted file mode 100644 index ba534169f0e..00000000000 --- a/srcpkgs/qt5/patches/libressl-no-opensslv11.patch +++ /dev/null @@ -1,13 +0,0 @@ -Prevent detection of libressl as openssl >= 1.1 - ---- qtbase/config.tests/unix/openssl11/openssl.cpp 2017-11-30 14:49:46.000000000 +0100 -+++ qtbase/config.tests/unix/openssl11/openssl.cpp 2018-01-27 18:01:17.206523715 +0100 -@@ -39,7 +39,7 @@ - - #include - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -+#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER-0 < 0x10100000L) - # error "OpenSSL >= 1.1 is required" - #endif - diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index b2abc9ec4b1..b58eddc260a 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.10.1 -revision=7 +revision=8 wrksrc="qt-everywhere-src-${version}" build_style=gnu-configure hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja" diff --git a/srcpkgs/qupzilla/template b/srcpkgs/qupzilla/template index 2f97bc363cf..8708bda4ed9 100644 --- a/srcpkgs/qupzilla/template +++ b/srcpkgs/qupzilla/template @@ -1,7 +1,7 @@ # Template file for 'qupzilla' pkgname=qupzilla version=2.2.6 -revision=1 +revision=2 wrksrc=QupZilla-${version} build_style=qmake hostmakedepends="pkg-config qt5-tools" diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template index a35460ae246..51467348c62 100644 --- a/srcpkgs/qupzilla1/template +++ b/srcpkgs/qupzilla1/template @@ -1,7 +1,7 @@ # Template file for 'qupzilla1' pkgname=qupzilla1 version=1.8.9 -revision=8 +revision=9 wrksrc=QupZilla-${version} build_style=qmake hostmakedepends="pkg-config" diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template index 59d6771e8cd..8bc15bfe2c2 100644 --- a/srcpkgs/rdesktop/template +++ b/srcpkgs/rdesktop/template @@ -1,7 +1,7 @@ # Template file for 'rdesktop' pkgname=rdesktop version=1.8.3 -revision=11 +revision=12 build_style=gnu-configure configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config" diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template index ff1c93c3051..2f9e40913b1 100644 --- a/srcpkgs/rdis-git/template +++ b/srcpkgs/rdis-git/template @@ -1,7 +1,7 @@ # Template file for 'rdis-git' pkgname=rdis-git version=20150722 -revision=7 +revision=8 hostmakedepends="pkg-config git" makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel" short_desc="A binary analysis tool for Linux" diff --git a/srcpkgs/retroshare/patches/fix-libressl-2.7-2.patch b/srcpkgs/retroshare/patches/fix-libressl-2.7-2.patch new file mode 100644 index 00000000000..c1544f1c330 --- /dev/null +++ b/srcpkgs/retroshare/patches/fix-libressl-2.7-2.patch @@ -0,0 +1,14 @@ +--- ./libretroshare/src/tcponudp/bss_tou.c.orig 2018-04-24 21:11:00.988916163 +0200 ++++ ./libretroshare/src/tcponudp/bss_tou.c 2018-04-24 21:12:01.766008033 +0200 +@@ -90,7 +90,9 @@ static int clear_tou_socket_error(int s) + + #include "tou.h" + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++static int BIO_get_init(BIO *a) { return a->init; } ++#elif OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + //static void BIO_set_shutdown(BIO *a,int s) { a->shutdown=s; } + + static int BIO_get_shutdown(BIO *a) { return a->shutdown; } + diff --git a/srcpkgs/retroshare/patches/fix-libressl-2.7.patch b/srcpkgs/retroshare/patches/fix-libressl-2.7.patch new file mode 100644 index 00000000000..cacd42fb2dd --- /dev/null +++ b/srcpkgs/retroshare/patches/fix-libressl-2.7.patch @@ -0,0 +1,277 @@ +--- ./libretroshare/src/gxs/gxssecurity.cc.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./libretroshare/src/gxs/gxssecurity.cc 2018-04-24 21:55:24.805942754 +0200 +@@ -41,7 +41,7 @@ static const uint32_t MULTI_ENCRYPTION_F + + static RsGxsId getRsaKeyFingerprint_old_insecure_method(RSA *pubkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + int lenn = BN_num_bytes(pubkey -> n); + + RsTemporaryMemory tmp(lenn) ; +@@ -65,7 +65,7 @@ static RsGxsId getRsaKeyFingerprint_old_ + } + static RsGxsId getRsaKeyFingerprint(RSA *pubkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + int lenn = BN_num_bytes(pubkey -> n); + int lene = BN_num_bytes(pubkey -> e); + +--- ./libretroshare/src/gxstunnel/p3gxstunnel.cc.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./libretroshare/src/gxstunnel/p3gxstunnel.cc 2018-04-24 21:55:24.834942797 +0200 +@@ -1060,7 +1060,7 @@ bool p3GxsTunnelService::locked_sendDHPu + } + + RsGxsTunnelDHPublicKeyItem *dhitem = new RsGxsTunnelDHPublicKeyItem ; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + dhitem->public_key = BN_dup(dh->pub_key) ; + #else + const BIGNUM *pub_key=NULL ; +@@ -1144,7 +1144,7 @@ bool p3GxsTunnelService::locked_initDHSe + return false ; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + BN_hex2bn(&dh->p,dh_prime_2048_hex.c_str()) ; + BN_hex2bn(&dh->g,"5") ; + #else +--- ./libretroshare/src/pqi/pqissl.cc.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./libretroshare/src/pqi/pqissl.cc 2018-04-24 21:55:24.906942906 +0200 +@@ -361,7 +361,7 @@ void pqissl::getCryptoParams(RsPeerCrypt + + bool pqissl::actAsServer() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + return (bool)ssl_connection->server; + #else + return (bool)SSL_is_server(ssl_connection); +@@ -1230,7 +1230,7 @@ int pqissl::Extract_Failed_SSL_Certific + RsPeerId sslid ; + getX509id(peercert, sslid) ; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + RsPgpId gpgid(getX509CNString(peercert->cert_info->issuer)); + std::string sslcn = getX509CNString(peercert->cert_info->subject); + #else +--- ./libretroshare/src/pqi/pqissllistener.cc.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./libretroshare/src/pqi/pqissllistener.cc 2018-04-24 21:55:24.919942926 +0200 +@@ -493,7 +493,7 @@ int pqissllistenbase::continueSSL(Incomi + #endif + if(x509 != NULL) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + incoming_connexion_info.gpgid = RsPgpId(std::string(getX509CNString(x509->cert_info->issuer))); + incoming_connexion_info.sslcn = getX509CNString(x509->cert_info->subject); + #else +@@ -892,7 +892,7 @@ int pqissllistener::completeConnection(i + AuthSSL::getAuthSSL()->CheckCertificate(newPeerId, peercert); + + /* now need to get GPG id too */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + RsPgpId pgpid(std::string(getX509CNString(peercert->cert_info->issuer))); + #else + RsPgpId pgpid(std::string(getX509CNString(X509_get_issuer_name(peercert)))); +--- ./libretroshare/src/pqi/sslfns.cc.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./libretroshare/src/pqi/sslfns.cc 2018-04-24 21:55:24.935942950 +0200 +@@ -602,7 +602,7 @@ bool getX509id(X509 *x509, RsPeerId& xid + } + + // get the signature from the cert, and copy to the array. +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + ASN1_BIT_STRING *signature = x509->signature; + #else + const ASN1_BIT_STRING *signature = NULL ; +@@ -700,7 +700,7 @@ int LoadCheckX509(const char *cert_file, + if (valid) + { + // extract the name. +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + issuerName = RsPgpId(std::string(getX509CNString(x509->cert_info->issuer))); + location = getX509LocString(x509->cert_info->subject); + #else +--- ./libretroshare/src/util/rsrecogn.cc.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./libretroshare/src/util/rsrecogn.cc 2018-04-24 21:55:24.955942980 +0200 +@@ -508,7 +508,7 @@ bool RsRecogn::itemToRadix64(RsItem *ite + + std::string RsRecogn::getRsaKeyId(RSA *pubkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + int len = BN_num_bytes(pubkey -> n); + unsigned char tmp[len]; + BN_bn2bin(pubkey -> n, tmp); +--- ./openpgpsdk/src/openpgpsdk/openssl_crypto.c.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./openpgpsdk/src/openpgpsdk/openssl_crypto.c 2018-04-24 21:55:24.966942997 +0200 +@@ -45,7 +45,7 @@ void test_secret_key(const ops_secret_ke + { + RSA* test=RSA_new(); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + test->n=BN_dup(skey->public_key.key.rsa.n); + test->e=BN_dup(skey->public_key.key.rsa.e); + test->d=BN_dup(skey->key.rsa.d); +@@ -402,7 +402,7 @@ ops_boolean_t ops_dsa_verify(const unsig + + osig=DSA_SIG_new(); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + osig->r=sig->r; + osig->s=sig->s; + #else +@@ -417,7 +417,7 @@ ops_boolean_t ops_dsa_verify(const unsig + already_said=ops_true ; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + osig->r=NULL; // in this case, the values are not copied. + osig->s=NULL; + #endif +@@ -427,7 +427,7 @@ ops_boolean_t ops_dsa_verify(const unsig + } + + odsa=DSA_new(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + odsa->p=dsa->p; + odsa->q=dsa->q; + odsa->g=dsa->g; +@@ -471,7 +471,7 @@ ops_boolean_t ops_dsa_verify(const unsig + return ops_false ; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + osig->r=NULL; + osig->s=NULL; + +@@ -503,7 +503,7 @@ int ops_rsa_public_decrypt(unsigned char + int n; + + orsa=RSA_new(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=rsa->n; + orsa->e=rsa->e; + #else +@@ -512,7 +512,7 @@ int ops_rsa_public_decrypt(unsigned char + + n=RSA_public_decrypt(length,in,out,orsa,RSA_NO_PADDING); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=orsa->e=NULL; + #endif + RSA_free(orsa); +@@ -538,7 +538,7 @@ int ops_rsa_private_encrypt(unsigned cha + int n; + + orsa=RSA_new(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=rsa->n; // XXX: do we need n? + orsa->d=srsa->d; + orsa->p=srsa->q; +@@ -564,7 +564,7 @@ int ops_rsa_private_encrypt(unsigned cha + + n=RSA_private_encrypt(length,in,out,orsa,RSA_NO_PADDING); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=orsa->d=orsa->p=orsa->q=NULL; + orsa->e=NULL; + #endif +@@ -592,7 +592,7 @@ int ops_rsa_private_decrypt(unsigned cha + char errbuf[1024]; + + orsa=RSA_new(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=rsa->n; // XXX: do we need n? + orsa->d=srsa->d; + orsa->p=srsa->q; +@@ -618,7 +618,7 @@ int ops_rsa_private_decrypt(unsigned cha + ERR_error_string(err,&errbuf[0]); + fprintf(stderr,"openssl error : %s\n",errbuf); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=orsa->d=orsa->p=orsa->q=NULL; + orsa->e=NULL; + #endif +@@ -644,7 +644,7 @@ int ops_rsa_public_encrypt(unsigned char + // printf("ops_rsa_public_encrypt: length=%ld\n", length); + + orsa=RSA_new(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=rsa->n; + orsa->e=rsa->e; + #else +@@ -664,7 +664,7 @@ int ops_rsa_public_encrypt(unsigned char + BIO_free(fd_out) ; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + orsa->n=orsa->e=NULL; + #endif + RSA_free(orsa); +@@ -744,7 +744,7 @@ ops_boolean_t ops_rsa_generate_keypair(c + skey->public_key.days_valid=0; + skey->public_key.algorithm= OPS_PKA_RSA; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + skey->public_key.key.rsa.n=BN_dup(rsa->n); + skey->public_key.key.rsa.e=BN_dup(rsa->e); + skey->key.rsa.d=BN_dup(rsa->d); +@@ -766,7 +766,7 @@ ops_boolean_t ops_rsa_generate_keypair(c + skey->octet_count=0; + skey->checksum=0; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + skey->key.rsa.p=BN_dup(rsa->p); + skey->key.rsa.q=BN_dup(rsa->q); + skey->key.rsa.u=BN_mod_inverse(NULL,rsa->p, rsa->q, ctx); +@@ -888,7 +888,7 @@ DSA_SIG* ops_dsa_sign(unsigned char* has + DSA_SIG *dsasig; + + odsa=DSA_new(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + odsa->p=dsa->p; + odsa->q=dsa->q; + odsa->g=dsa->g; +@@ -901,7 +901,7 @@ DSA_SIG* ops_dsa_sign(unsigned char* has + + dsasig=DSA_do_sign(hashbuf,hashsize,odsa); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + odsa->p=odsa->q=odsa->g=odsa->pub_key=odsa->priv_key=NULL; + #endif + DSA_free(odsa); +--- ./openpgpsdk/src/openpgpsdk/signature.c.orig 2017-08-03 21:29:52.000000000 +0200 ++++ ./openpgpsdk/src/openpgpsdk/signature.c 2018-04-24 21:55:24.992943036 +0200 +@@ -298,7 +298,7 @@ static ops_boolean_t dsa_sign(ops_hash_t + dsasig=ops_dsa_sign(hashbuf, hashsize, sdsa, dsa); + + // convert and write the sig out to memory +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + ops_write_mpi(dsasig->r, cinfo); + ops_write_mpi(dsasig->s, cinfo); + #else diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index 626cf978a7d..074a956bfa8 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,7 +1,7 @@ # Template file for 'retroshare' pkgname=retroshare version=0.6.3 -revision=2 +revision=3 build_style=qmake wrksrc="RetroShare-${version}" homepage="http://retroshare.github.io" @@ -16,9 +16,3 @@ makedepends="qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel pulseaudio-devel" distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz" checksum=ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b - -post_extract() { - sed -i \ - 's/OPENSSL_VERSION_NUMBER < 0x10100000L/\0 || defined(LIBRESSL_VERSION_NUMBER)/' \ - $(grep -lr 'OPENSSL_VERSION_NUMBER < 0x10100000L') -} diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template index 4ad6339b14a..d2d3f3c9afc 100644 --- a/srcpkgs/rhash/template +++ b/srcpkgs/rhash/template @@ -1,7 +1,7 @@ # Template file for 'rhash' pkgname=rhash version=1.3.6 -revision=1 +revision=2 wrksrc="RHash-${version}" build_style=gnu-configure configure_args="--enable-openssl --disable-openssl-runtime" diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template index 9374a3f0a78..daeea9a8103 100644 --- a/srcpkgs/rmlint/template +++ b/srcpkgs/rmlint/template @@ -1,7 +1,7 @@ # Template file for 'rmlint' pkgname=rmlint -version=2.6.1 -revision=3 +version=2.7.0 +revision=1 build_style=scons hostmakedepends="scons pkg-config python3-Sphinx glib-devel" makedepends="libblkid-devel elfutils-devel json-glib-devel" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://rmlint.rtfd.org/" distfiles="https://github.com/sahib/$pkgname/archive/v$version.tar.gz" -checksum=b4de3de2f197b5978113eb9d013ee9890efbdf01ba739416255ecc2567199b81 +checksum=174aaf4a3fd4c2911b7ddffd2804c6b940e38bedbb5cf2a6ec51b552cf919c33 do_install() { scons install --prefix=${DESTDIR}/usr diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template index 4f31ff3009a..5a3d1cfc66b 100644 --- a/srcpkgs/rng-tools/template +++ b/srcpkgs/rng-tools/template @@ -1,7 +1,7 @@ # Template file for 'rng-tools' pkgname=rng-tools version=6.1 -revision=2 +revision=3 wrksrc=${pkgname}-${version} build_style=gnu-configure makedepends="libgcrypt-devel libsysfs-devel libcurl-devel libxml2-devel" diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index 5f472c3c38a..368922ef35e 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,7 +1,7 @@ # Template file for 'rspamd' pkgname=rspamd version=1.7.3 -revision=1 +revision=2 build_style=cmake configure_args=" -DRSPAMD_USER=rspamd diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index 71239ed6d90..d947780aa55 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -1,7 +1,7 @@ # Template file for 'rtmpdump' pkgname=rtmpdump version=2.4.20161210 -revision=4 +revision=5 _patchlevel=${version##*.} create_wrksrc=yes makedepends="zlib-devel libressl-devel" diff --git a/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch b/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch new file mode 100644 index 00000000000..d70ba513de5 --- /dev/null +++ b/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch @@ -0,0 +1,13 @@ +$OpenBSD: patch-ext_openssl_extconf_rb,v 1.1 2018/02/23 09:54:25 sthen Exp $ + +Index: ext/openssl/extconf.rb +--- ext/openssl/extconf.rb.orig ++++ ext/openssl/extconf.rb +@@ -134,6 +134,7 @@ have_func("HMAC_CTX_free") + OpenSSL.check_func("RAND_pseudo_bytes", "openssl/rand.h") # deprecated + have_func("X509_STORE_get_ex_data") + have_func("X509_STORE_set_ex_data") ++have_func("X509_STORE_get_ex_new_index") + have_func("X509_CRL_get0_signature") + have_func("X509_REQ_get0_signature") + have_func("X509_REVOKED_get0_serialNumber") diff --git a/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch b/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch new file mode 100644 index 00000000000..a06760c4186 --- /dev/null +++ b/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch @@ -0,0 +1,31 @@ +$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.4 2018/02/23 09:54:25 sthen Exp $ + +Index: ext/openssl/openssl_missing.h +--- ext/openssl/openssl_missing.h.orig ++++ ext/openssl/openssl_missing.h +@@ -72,6 +72,9 @@ void ossl_HMAC_CTX_free(HMAC_CTX *); + #if !defined(HAVE_X509_STORE_SET_EX_DATA) + # define X509_STORE_set_ex_data(x, idx, data) \ + CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data)) ++#endif ++ ++#if !defined(HAVE_X509_STORE_GET_EX_NEW_INDEX) + # define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \ + CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, (l), (p), \ + (newf), (dupf), (freef)) +@@ -145,6 +148,7 @@ void ossl_X509_REQ_get0_signature(const X509_REQ *, co + #endif + + #if !defined(HAVE_OPAQUE_OPENSSL) ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL + #define IMPL_PKEY_GETTER(_type, _name) \ + static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \ + return pkey->pkey._name; } +@@ -196,6 +200,7 @@ IMPL_PKEY_GETTER(EC_KEY, ec) + #undef IMPL_PKEY_GETTER + #undef IMPL_KEY_ACCESSOR2 + #undef IMPL_KEY_ACCESSOR3 ++#endif + #endif /* HAVE_OPAQUE_OPENSSL */ + + #if !defined(EVP_CTRL_AEAD_GET_TAG) diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 003b59615fe..7a7bd54b842 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -3,7 +3,7 @@ _ruby_abiver=2.5.0 pkgname=ruby version=2.5.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-shared --disable-rpath DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config" diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template index 748d47fa624..a3caa1206b4 100644 --- a/srcpkgs/rustup/template +++ b/srcpkgs/rustup/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname}.rs-${version}" conflicts="cargo rust" hostmakedepends="cargo perl pkg-config" -makedepends="libressl-devel zlib-devel" +makedepends="libressl-devel zlib-devel libcurl-devel" short_desc="The Rust toolchain installer" maintainer="Daniel Lee Ramírez " license="Apache-2.0, MIT" @@ -15,6 +15,7 @@ checksum=000b873f239e8c5219ede3fd5836d6346ebea64ea928e2d754cdfc0f2071a874 nocross=yes do_build() { + cargo update --package openssl-sys --precise 0.9.28 cargo build --release --features no-self-update --bin rustup-init } diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template index 5948ceac93f..9c0fec76984 100644 --- a/srcpkgs/s-nail/template +++ b/srcpkgs/s-nail/template @@ -1,7 +1,7 @@ # Template file for 's-nail' pkgname=s-nail version=14.8.16 -revision=3 +revision=4 makedepends="libressl-devel libidn-devel" conf_files="/etc/s-nail.rc" short_desc="Mail processing system with a command syntax reminiscent of ed" diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template index 15986c7c809..c17dfaa513f 100644 --- a/srcpkgs/s3fs-fuse/template +++ b/srcpkgs/s3fs-fuse/template @@ -1,7 +1,7 @@ # Template file for 's3fs-fuse' pkgname=s3fs-fuse version=1.83 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-openssl ac_cv_file__git=no" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 5fe1e665edc..a9ff596c194 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,7 +1,7 @@ # Template file for 's6-networking' pkgname=s6-networking version=2.3.0.2 -revision=2 +revision=3 build_style=gnu-configure makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel" configure_args="--libdir=/usr/lib --enable-ssl=libressl --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps --with-lib=${XBPS_CROSS_BASE}/usr/lib" diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template index b660007ed28..d9b8c97a827 100644 --- a/srcpkgs/scrypt/template +++ b/srcpkgs/scrypt/template @@ -1,7 +1,7 @@ # Template file for 'scrypt' pkgname=scrypt version=1.2.1 -revision=4 +revision=5 build_style=gnu-configure makedepends="libressl-devel" short_desc="The scrypt key derivation function" diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template index 63649666514..38f06ff5715 100644 --- a/srcpkgs/seafile-client-qt/template +++ b/srcpkgs/seafile-client-qt/template @@ -1,7 +1,7 @@ # Template file for 'seafile-client-qt' pkgname=seafile-client-qt version=6.1.7 -revision=1 +revision=2 _sourcename="seafile-client" wrksrc="${_sourcename}-${version}" build_style=cmake @@ -9,6 +9,7 @@ configure_args="$(vopt_if shibboleth -DBUILD_SHIBBOLETH_SUPPORT=ON)" hostmakedepends="pkg-config" makedepends="ccnet-devel qt5-tools-devel seafile-libclient-devel $(vopt_if shibboleth 'qt5-webengine-devel qt5-declarative-devel qt5-webchannel-devel qt5-location-devel')" +broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9597/steps/shell_3/logs/stdio" short_desc="Cloud storage system - Qt graphical client" maintainer="yopito " diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index f33af17cc6a..5a31c6df777 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,7 +1,7 @@ # Template file for 'seafile-libclient' pkgname=seafile-libclient version=6.1.7 -revision=1 +revision=2 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure diff --git a/srcpkgs/serf/patches/libressl.patch b/srcpkgs/serf/patches/libressl.patch deleted file mode 100644 index 8b0ad22ced4..00000000000 --- a/srcpkgs/serf/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- buckets/ssl_buckets.c.orig -+++ buckets/ssl_buckets.c -@@ -52,7 +52,7 @@ - #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary))) - #endif - --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - #define USE_OPENSSL_1_1_API - #endif - diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template index 9c5fb5b0529..4344ffe06ed 100644 --- a/srcpkgs/serf/template +++ b/srcpkgs/serf/template @@ -1,7 +1,7 @@ # Template file for 'serf' pkgname=serf version=1.3.9 -revision=5 +revision=6 nocross=yes hostmakedepends="scons libressl-devel apr-util-devel" makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel" diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template index fff517b6cb2..c8a3b45bbcf 100644 --- a/srcpkgs/sgfutils/template +++ b/srcpkgs/sgfutils/template @@ -1,7 +1,7 @@ # Template file for 'sgfutils' pkgname=sgfutils version=0.25 -revision=2 +revision=3 build_style=gnu-makefile short_desc="Collection of utilities to handle SGF files" maintainer='Brandon Wilson ' diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template index 8d74c6c6b38..8c675d6dd43 100644 --- a/srcpkgs/sitecopy/template +++ b/srcpkgs/sitecopy/template @@ -1,7 +1,7 @@ # Template file for 'sitecopy' pkgname=sitecopy version=0.16.6 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-ssl=openssl" hostmakedepends="pkg-config" diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template index 117d1e8bda1..2e51a8764df 100644 --- a/srcpkgs/slop/template +++ b/srcpkgs/slop/template @@ -1,20 +1,16 @@ # Template file for 'slop' pkgname=slop -version=7.3.49 -revision=2 +version=7.4 +revision=1 build_style=cmake hostmakedepends="pkg-config" -makedepends="libXext-devel libXrender-devel MesaLib-devel icu-devel glm glew-devel" +makedepends="glew-devel glm icu-devel libXrender-devel" short_desc="Utility to query for a selection and print the region to stdout" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/naelstrof/slop" distfiles="https://github.com/naelstrof/slop/archive/v${version}.tar.gz" -checksum=15befb4a2bf2cf15a64d8256ce2d4d6778df9814da9ce3946c7484b8c909b13f - -pre_configure() { - sed -i -e '$a\set_target_properties(slopy PROPERTIES VERSION 0.1.0)' CMakeLists.txt -} +checksum=8868590b0ebb712f82295266cb120f5bda022393d72caafa7564c9fb66ccedce slop-devel_package() { short_desc+=" - developments files" diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template index 95c1c610a86..e70698691d0 100644 --- a/srcpkgs/slrn/template +++ b/srcpkgs/slrn/template @@ -1,7 +1,7 @@ # Template file for 'slrn' pkgname=slrn version=1.0.3a -revision=3 +revision=4 wrksrc="${pkgname}-${version%a}" build_style=gnu-configure configure_args="--with-slrnpull --with-ssl diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index 604a3c0bcb1..8983b10b053 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -1,7 +1,7 @@ # Template file for 'slurm-wlm' pkgname=slurm-wlm version=17.11.5.1 -revision=2 +revision=3 _distver="${version//./-}" wrksrc="slurm-slurm-${_distver}" build_style=gnu-configure diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index 98e64a35cef..0561ab016d7 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -1,7 +1,7 @@ # Template file for 'socat' pkgname=socat version=1.7.3.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-libwrap --enable-fips ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 diff --git a/srcpkgs/spice-gtk/patches/libressl.patch b/srcpkgs/spice-gtk/patches/libressl.patch deleted file mode 100644 index fe8b3120d1b..00000000000 --- a/srcpkgs/spice-gtk/patches/libressl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/bio-gio.c.orig 2017-08-03 12:09:57.580574783 +0200 -+++ src/bio-gio.c 2017-08-03 12:10:18.768828015 +0200 -@@ -23,7 +23,7 @@ - #include "spice-util.h" - #include "bio-gio.h" - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - static BIO_METHOD one_static_bio; - - static int BIO_meth_set_read(BIO_METHOD *biom, ---- src/spice-channel.c.orig 2017-08-03 12:11:21.042572278 +0200 -+++ src/spice-channel.c 2017-08-03 12:11:45.780867937 +0200 -@@ -55,7 +55,7 @@ - static void spice_channel_send_migration_handshake(SpiceChannel *channel); - static gboolean channel_connect(SpiceChannel *channel, gboolean tls); - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey) - { - if (pkey->type != EVP_PKEY_RSA) { ---- spice-common/common/ssl_verify.c.orig 2017-08-03 12:13:04.694811076 +0200 -+++ spice-common/common/ssl_verify.c 2017-08-03 12:13:17.514964295 +0200 -@@ -33,7 +33,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) - { - return M_ASN1_STRING_data(asn1); diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index 00e43367f04..15db3aee8fb 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -1,7 +1,7 @@ # Template file for 'spice-gtk' pkgname=spice-gtk version=0.34 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --enable-vala $(vopt_enable gir introspection) --enable-smartcard=no --enable-usbredir --enable-polkit=yes diff --git a/srcpkgs/spice/patches/libressl.patch b/srcpkgs/spice/patches/libressl.patch deleted file mode 100644 index b77c3603b35..00000000000 --- a/srcpkgs/spice/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spice-common/common/ssl_verify.c.orig 2017-08-03 11:57:02.149307232 +0200 -+++ spice-common/common/ssl_verify.c 2017-08-03 11:57:29.209630642 +0200 -@@ -33,7 +33,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) - { - return M_ASN1_STRING_data(asn1); diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template index b1fb6d216ae..4b0b14cc51d 100644 --- a/srcpkgs/spice/template +++ b/srcpkgs/spice/template @@ -1,7 +1,7 @@ # Template file for 'spice' pkgname=spice version=0.14.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-tunnel --disable-opengl --enable-smartcard --with-sasl --disable-static --enable-xinerama --disable-celt051" diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template index 2f184c08e5c..deff8afe162 100644 --- a/srcpkgs/spiped/template +++ b/srcpkgs/spiped/template @@ -1,7 +1,7 @@ # Template file for 'spiped' pkgname=spiped version=1.6.0 -revision=2 +revision=3 build_style=gnu-makefile makedepends="libressl-devel" short_desc="The spiped secure pipe daemon" diff --git a/srcpkgs/sqlcipher/patches/fix-libressl-2.7.patch b/srcpkgs/sqlcipher/patches/fix-libressl-2.7.patch new file mode 100644 index 00000000000..9dfd7ffe938 --- /dev/null +++ b/srcpkgs/sqlcipher/patches/fix-libressl-2.7.patch @@ -0,0 +1,12 @@ +--- src/crypto_openssl.c.orig 2018-04-23 19:52:51.654950856 +0200 ++++ src/crypto_openssl.c 2018-04-23 19:54:16.786079484 +0200 +@@ -47,7 +47,8 @@ static unsigned int openssl_external_ini + static unsigned int openssl_init_count = 0; + static sqlite3_mutex* openssl_rand_mutex = NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + static HMAC_CTX *HMAC_CTX_new(void) + { + HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template index c2c76682b59..636c47a9038 100644 --- a/srcpkgs/sqlcipher/template +++ b/srcpkgs/sqlcipher/template @@ -1,7 +1,7 @@ # Template file for 'sqlcipher' pkgname=sqlcipher version=3.4.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-tempstore=yes" hostmakedepends="tcl" diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index 78480085633..2bba1cce984 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -1,7 +1,7 @@ # Template file for 'squid' pkgname=squid version=3.5.27 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --sbindir=/usr/bin diff --git a/srcpkgs/stunnel/patches/patch-src_ctx_c.patch b/srcpkgs/stunnel/patches/patch-src_ctx_c.patch new file mode 100644 index 00000000000..2fdcdbacca1 --- /dev/null +++ b/srcpkgs/stunnel/patches/patch-src_ctx_c.patch @@ -0,0 +1,41 @@ +$OpenBSD: patch-src_ctx_c,v 1.7 2018/02/23 10:26:56 sthen Exp $ +Index: src/ctx.c +--- src/ctx.c.orig ++++ src/ctx.c +@@ -93,7 +93,7 @@ NOEXPORT int ui_retry(); + /* session callbacks */ + NOEXPORT int sess_new_cb(SSL *, SSL_SESSION *); + NOEXPORT SSL_SESSION *sess_get_cb(SSL *, +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + const + #endif + unsigned char *, int, int *); +@@ -295,7 +295,8 @@ NOEXPORT int matches_wildcard(char *servername, char * + + #ifndef OPENSSL_NO_DH + +-#if OPENSSL_VERSION_NUMBER<0x10100000L ++#if OPENSSL_VERSION_NUMBER<0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) { + return ctx->cipher_list; + } +@@ -398,7 +399,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) { + /**************************************** initialize OpenSSL CONF */ + + NOEXPORT int conf_init(SERVICE_OPTIONS *section) { +-#if OPENSSL_VERSION_NUMBER>=0x10002000L ++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CONF_CTX *cctx; + NAME_LIST *curr; + char *cmd, *param; +@@ -907,7 +908,7 @@ NOEXPORT int sess_new_cb(SSL *ssl, SSL_SESSION *sess) + } + + NOEXPORT SSL_SESSION *sess_get_cb(SSL *ssl, +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + const + #endif + unsigned char *key, int key_len, int *do_copy) { diff --git a/srcpkgs/stunnel/patches/patch-src_ssl_c.patch b/srcpkgs/stunnel/patches/patch-src_ssl_c.patch new file mode 100644 index 00000000000..a2ca0c16c77 --- /dev/null +++ b/srcpkgs/stunnel/patches/patch-src_ssl_c.patch @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_ssl_c,v 1.8 2018/04/14 09:05:14 tb Exp $ +Index: src/ssl.c +--- src/ssl.c.orig ++++ src/ssl.c +@@ -51,7 +51,7 @@ int index_ssl_cli, index_ssl_ctx_opt; + int index_session_authenticated, index_session_connect_address; + + int ssl_init(void) { /* init TLS before parsing configuration file */ +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | + OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_LOAD_CONFIG, NULL); + #else diff --git a/srcpkgs/stunnel/patches/patch-src_verify_c.patch b/srcpkgs/stunnel/patches/patch-src_verify_c.patch new file mode 100644 index 00000000000..f4ee8c595dc --- /dev/null +++ b/srcpkgs/stunnel/patches/patch-src_verify_c.patch @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_verify_c,v 1.6 2017/09/12 16:15:24 gsoares Exp $ +Index: src/verify.c +--- src/verify.c.orig ++++ src/verify.c +@@ -353,7 +353,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback + cert=X509_STORE_CTX_get_current_cert(callback_ctx); + subject=X509_get_subject_name(cert); + +-#if OPENSSL_VERSION_NUMBER<0x10100006L ++#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER) + #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs + #endif + /* modern API allows retrieving multiple matching certificates */ diff --git a/srcpkgs/stunnel/patches/stunnel-3.40.patch b/srcpkgs/stunnel/patches/stunnel-3.40.patch deleted file mode 100644 index f24010cac14..00000000000 --- a/srcpkgs/stunnel/patches/stunnel-3.40.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ctx.c.orig 2017-01-19 03:51:32.000000000 -0500 -+++ src/ctx.c 2017-01-28 22:07:17.978178595 -0500 -@@ -287,7 +287,7 @@ - - #ifndef OPENSSL_NO_DH - --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) { - return ctx->cipher_list; - } diff --git a/srcpkgs/stunnel/patches/stunnel-5.39.patch b/srcpkgs/stunnel/patches/stunnel-5.39.patch deleted file mode 100644 index d93fccb9eb9..00000000000 --- a/srcpkgs/stunnel/patches/stunnel-5.39.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ssl.c.orig 2017-01-25 00:19:22.320035678 -0500 -+++ src/ssl.c 2017-01-25 00:19:26.536104001 -0500 -@@ -50,7 +50,7 @@ - int index_cli, index_opt, index_redirect, index_addr; - - int ssl_init(void) { /* init TLS before parsing configuration file */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | - OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); - #else diff --git a/srcpkgs/stunnel/patches/stunnel-5.43.patch b/srcpkgs/stunnel/patches/stunnel-5.43.patch deleted file mode 100644 index 1f9ba7c1c17..00000000000 --- a/srcpkgs/stunnel/patches/stunnel-5.43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/options.c -+++ src/options.c -@@ -3656,7 +3656,7 @@ NOEXPORT char *engine_init(void) { - } - #endif - /* engines can add new algorithms */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS| - OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); - #else diff --git a/srcpkgs/stunnel/patches/stunnel-CRYPTO_set_mem_functions.patch b/srcpkgs/stunnel/patches/stunnel-CRYPTO_set_mem_functions.patch deleted file mode 100644 index 8959e513f42..00000000000 --- a/srcpkgs/stunnel/patches/stunnel-CRYPTO_set_mem_functions.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/tls.c 2016-12-09 06:15:59.000000000 -0500 -+++ src/tls.c.new 2017-01-25 01:11:44.264271049 -0500 -@@ -41,7 +41,7 @@ - volatile int tls_initialized=0; - - NOEXPORT void tls_platform_init(); --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void free_function(void *); - #endif - -@@ -52,7 +52,7 @@ - tls_platform_init(); - tls_initialized=1; - ui_tls=tls_alloc(NULL, NULL, "ui"); --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_set_mem_functions(str_alloc_detached_debug, - str_realloc_detached_debug, str_free_debug); - #else -@@ -184,7 +184,7 @@ - - /**************************************** OpenSSL allocator hook */ - --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void free_function(void *ptr) { - /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */ - /* unfortunately, OpenSSL provides no file:line information here */ diff --git a/srcpkgs/stunnel/patches/stunnel-libressl.patch b/srcpkgs/stunnel/patches/stunnel-libressl.patch deleted file mode 100644 index 7fdda8f7386..00000000000 --- a/srcpkgs/stunnel/patches/stunnel-libressl.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- src/verify.c 2015-11-26 13:32:51.458101892 +0100 -+++ src/verify.c 2015-11-26 13:37:51.442682192 +0100 -@@ -51,7 +51,7 @@ - NOEXPORT int verify_callback(int, X509_STORE_CTX *); - NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *); - NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int); --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *); - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ - NOEXPORT int cert_check_local(X509_STORE_CTX *); -@@ -280,7 +280,7 @@ - } - - if(depth==0) { /* additional peer certificate checks */ --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if(!cert_check_subject(c, callback_ctx)) - return 0; /* reject */ - #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */ -@@ -291,7 +291,7 @@ - return 1; /* accept */ - } - --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) { - X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx); - NAME_LIST *ptr; ---- src/options.c 2015-11-26 13:32:51.457101897 +0100 -+++ src/options.c 2015-11-26 13:39:04.422336822 +0100 -@@ -1261,7 +1261,7 @@ - break; - } - --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - - /* checkEmail */ - switch(cmd) { -@@ -1398,7 +1398,7 @@ - break; - } - --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - - /* config */ - switch(cmd) { diff --git a/srcpkgs/stunnel/patches/stunnel-openbsd.patch b/srcpkgs/stunnel/patches/stunnel-openbsd.patch deleted file mode 100644 index 9ee8a9271a1..00000000000 --- a/srcpkgs/stunnel/patches/stunnel-openbsd.patch +++ /dev/null @@ -1,96 +0,0 @@ -$OpenBSD: patch-src_verify_c,v 1.5 2016/11/10 10:10:50 gsoares Exp $ ---- src/verify.c.orig 2017-04-04 20:02:57.168123782 -0400 -+++ src/verify.c 2017-04-04 20:51:08.931284080 -0400 -@@ -352,7 +352,7 @@ - cert=X509_STORE_CTX_get_current_cert(callback_ctx); - subject=X509_get_subject_name(cert); - --#if OPENSSL_VERSION_NUMBER<0x10100006L -+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER) - #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs - #endif - /* modern API allows retrieving multiple matching certificates */ - -$OpenBSD: patch-src_sthreads_c,v 1.2 2016/11/10 10:10:50 gsoares Exp $ ---- src/sthreads.c.orig Sat Oct 29 05:25:37 2016 -+++ src/sthreads.c Wed Nov 9 20:22:39 2016 -@@ -47,7 +47,7 @@ - STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS]; - #endif - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - #define CRYPTO_THREAD_lock_new() CRYPTO_get_new_dynlockid() - #endif - - -$OpenBSD: patch-src_ssl_c,v 1.4 2016/11/09 23:14:31 gsoares Exp $ ---- src/ssl.c.orig Fri Aug 5 06:39:57 2016 -+++ src/ssl.c Thu Nov 3 23:50:50 2016 -@@ -83,7 +83,7 @@ int ssl_init(void) { /* init SSL before parsing config - } - - #ifndef OPENSSL_NO_DH --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0 - * to be linked against the older versions */ - int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { - -$OpenBSD: patch-src_prototypes_h,v 1.2 2016/11/10 10:10:50 gsoares Exp $ ---- src/options.c.orig Fri Aug 5 06:39:57 2016 -+++ src/options.c Thu Nov 3 23:13:15 2016 -@@ -2617,7 +2617,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O - /* sslVersion */ - switch(cmd) { - case CMD_BEGIN: --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - section->client_method=(SSL_METHOD *)TLS_client_method(); - section->server_method=(SSL_METHOD *)TLS_server_method(); - #else -@@ -2629,7 +2629,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O - if(strcasecmp(opt, "sslVersion")) - break; - if(!strcasecmp(arg, "all")) { --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - section->client_method=(SSL_METHOD *)TLS_client_method(); - section->server_method=(SSL_METHOD *)TLS_server_method(); - #else - -$OpenBSD: patch-src_ctx_c,v 1.4 2016/11/09 23:14:31 gsoares Exp $ ---- src/ctx.c.orig Tue Jun 21 12:06:14 2016 -+++ src/ctx.c Thu Nov 3 23:13:15 2016 -@@ -366,7 +366,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) { - /**************************************** initialize OpenSSL CONF */ - - NOEXPORT int conf_init(SERVICE_OPTIONS *section) { --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *cctx; - NAME_LIST *curr; - char *cmd, *param; - -$OpenBSD: patch-src_common_h,v 1.1 2016/11/09 23:14:31 gsoares Exp $ ---- src/common.h.orig Mon Jun 27 04:29:32 2016 -+++ src/common.h Thu Nov 3 23:57:29 2016 -@@ -448,7 +448,7 @@ extern char *sys_errlist[]; - #define OPENSSL_NO_TLS1_2 - #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - #ifndef OPENSSL_NO_SSL2 - #define OPENSSL_NO_SSL2 - #endif /* !defined(OPENSSL_NO_SSL2) */ -@@ -474,7 +474,7 @@ extern char *sys_errlist[]; - #include - #ifndef OPENSSL_NO_DH - #include --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); - #endif /* OpenSSL older than 1.1.0 */ - #endif /* !defined(OPENSSL_NO_DH) */ - diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index 51865a5362a..848d0a58007 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,7 +1,7 @@ # Template file for 'stunnel' pkgname=stunnel version=5.44 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index a238e9493ce..c87daa5769e 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -1,7 +1,7 @@ # Template file for 'swi-prolog' pkgname=swi-prolog version=7.6.4 -revision=2 +revision=3 wrksrc="swipl-${version}" build_style=gnu-configure hostmakedepends="pkg-config" diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index f904cb6cba6..a4d4ed61441 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -1,7 +1,7 @@ # Template file for 'swiften' pkgname=swiften version=3.0 -revision=7 +revision=8 build_style=scons hostmakedepends="scons" makedepends="boost-devel libressl-devel libxml2-devel libidn-devel" diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index cb2307c05eb..34ef58a4780 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -1,7 +1,7 @@ # Template build file for 'sylpheed'. pkgname=sylpheed version=3.7.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template index c8678fc9aaa..145d2f0e3b1 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -1,7 +1,7 @@ # Template file for 'synergy' pkgname=synergy version=1.8.8 -revision=3 +revision=4 wrksrc="${pkgname}-core-${version}-stable" build_style=cmake hostmakedepends="unzip pkg-config" diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 3b488f3ef07..667ade0a645 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.21.0 -revision=1 +revision=2 build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF" diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template index 5b6cfbe6c98..c02ddfba17d 100644 --- a/srcpkgs/tcpdump/template +++ b/srcpkgs/tcpdump/template @@ -1,7 +1,7 @@ # Template file for 'tcpdump' pkgname=tcpdump version=4.9.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 td_cv_buggygetaddrinfo=no" makedepends="libpcap-devel libressl-devel" diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template index 0e018b9a5a4..8c4df72ec39 100644 --- a/srcpkgs/tcpflow/template +++ b/srcpkgs/tcpflow/template @@ -1,7 +1,7 @@ # Template file for 'tcpflow' pkgname=tcpflow version=1.4.5 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="automake" makedepends="libpcap-devel zlib-devel libressl-devel boost-devel" diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template index a9368dac3d8..04ae88f63fe 100644 --- a/srcpkgs/tectonic/template +++ b/srcpkgs/tectonic/template @@ -1,7 +1,7 @@ #template file for 'tectonic' pkgname=tectonic version=0.1.7 -revision=3 +revision=4 hostmakedepends="rust cargo pkg-config" makedepends="fontconfig-devel freetype-devel harfbuzz-devel graphite-devel libressl-devel libpng-devel zlib-devel icu-devel icu-libs" short_desc="A modernized, complete, self-contained TeX/LaTeX engine" @@ -12,7 +12,12 @@ distfiles="https://github.com/tectonic-typesetting/${pkgname}/archive/v${version checksum=c39acc8a4e2e102245037fd2ea3e77b058d25e29bbab0dcc53a3167c5d3fee2a nocross=yes +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9607/steps/shell_3/logs/stdio" +esac + do_build() { + cargo update --package openssl-sys --precise 0.9.28 cargo build --release } diff --git a/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch b/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch new file mode 100644 index 00000000000..2c43a8844ac --- /dev/null +++ b/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch @@ -0,0 +1,13 @@ +diff --git Telegram/SourceFiles/mtproto/rsa_public_key.cpp Telegram/SourceFiles/mtproto/rsa_public_key.cpp +index fcb11979..add50d03 100644 +--- Telegram/SourceFiles/mtproto/rsa_public_key.cpp ++++ Telegram/SourceFiles/mtproto/rsa_public_key.cpp +@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + namespace MTP { + namespace internal { + namespace { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + // This is a key setter for compatibility with OpenSSL 1.0 + int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 81b38fd4de0..0c8b7b830ed 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=1.2.17 -revision=1 +revision=2 _libtgvoip_commit=6e0e1026147364cfb1234489980a2625ab50b598 _GSL_commit=9d65e74400976b3509833f49b16d401600c7317d _variant_commit=550ac2f159ca883d360c196149b466955c77a573 diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template index 52c56dd56a3..2e1fd2457b5 100644 --- a/srcpkgs/telepathy-salut/template +++ b/srcpkgs/telepathy-salut/template @@ -1,7 +1,7 @@ # Template file for 'telepathy-salut' pkgname=telepathy-salut version=0.8.1 -revision=14 +revision=15 lib32disabled=yes build_style=gnu-configure configure_args="--disable-tests --disable-plugins --with-tls=openssl diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template index 0c897df817f..f196244d19c 100644 --- a/srcpkgs/thc-hydra/template +++ b/srcpkgs/thc-hydra/template @@ -1,7 +1,7 @@ # Template file for 'thc-hydra' pkgname=thc-hydra version=8.6 -revision=2 +revision=3 nocross=yes build_style=gnu-configure makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 4e84c9d3317..49b73d2a493 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,20 +1,21 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.25 -revision=1 +version=3.26 +revision=2 +noarch=yes build_style=python3-module pycompile_module="thefuck" -noarch=yes hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-requests python3-psutil python3-decorator - python3-six python3-colorama python3-pyte" -checkdepends="python3-pytest python3-pytest-mock ${depends}" +depends="python3-setuptools python3-colorama python3-decorator python3-psutil + python3-pyte python3-requests" +checkdepends="python3-colorama python3-decorator python3-psutil python3-pyte + python3-pytest-mock python3-requests" short_desc="Magnificent app which corrects your previous console command" -maintainer='Benjamin "Doctors" Hoffmeyer ' +maintainer="Benjamin 'Doctors' Hoffmeyer " license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=73ea219a317f0d2ef4617c483fa41d218d1e30515edabb9aa5d89c11a8b00b21 +checksum=37d8cd1b578cbf473e337490d8e050a63a0a9defa2b0cb1619ffa4198b70b435 do_check() { # on python3 mock is unittest.mock diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template index 17c7a053ca1..f5f22a4f91d 100644 --- a/srcpkgs/tinc/template +++ b/srcpkgs/tinc/template @@ -1,7 +1,7 @@ # Template file for 'tinc' pkgname=tinc version=1.0.33 -revision=2 +revision=3 build_style=gnu-configure makedepends="zlib-devel lzo-devel libressl-devel" short_desc="VPN (Virtual Private Network) daemon" diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template index 105705ff350..38d55ccab84 100644 --- a/srcpkgs/tlsdate/template +++ b/srcpkgs/tlsdate/template @@ -1,7 +1,7 @@ # Template file for 'tlsdate' pkgname=tlsdate version=0.0.13 -revision=10 +revision=11 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes" diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template index 2c766b9787c..a8decf2d0c1 100644 --- a/srcpkgs/tnftp/template +++ b/srcpkgs/tnftp/template @@ -1,7 +1,7 @@ # Template file for 'tnftp' pkgname=tnftp version=20151004 -revision=5 +revision=6 build_style=gnu-configure makedepends="libressl-devel ncurses-devel" short_desc="NetBSD enhanced ftp client" diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index bfa7ea50c0e..4f8ec9506c6 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -1,7 +1,7 @@ # Template file for 'tor' pkgname=tor version=0.3.2.10 -revision=2 +revision=3 build_style=gnu-configure makedepends="zlib-devel libressl-devel libevent-devel libseccomp-devel" depends="ca-certificates torsocks" diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template index 8763b291b26..f3a29f010c5 100644 --- a/srcpkgs/tpm-tools/template +++ b/srcpkgs/tpm-tools/template @@ -1,7 +1,7 @@ # Template file for 'tpm-tools' pkgname=tpm-tools version=1.3.9.1 -revision=2 +revision=3 create_wrksrc=yes build_style=gnu-configure hostmakedepends="perl" # wants pod2man diff --git a/srcpkgs/transmission/patches/libressl.patch b/srcpkgs/transmission/patches/libressl.patch index cd03d1fed85..292d0e33f2e 100644 --- a/srcpkgs/transmission/patches/libressl.patch +++ b/srcpkgs/transmission/patches/libressl.patch @@ -1,11 +1,12 @@ --- libtransmission/crypto-utils-openssl.c 2018-02-10 11:23:12.597680584 +0100 +++ libtransmission/crypto-utils-openssl.c 2018-02-10 11:27:01.843383653 +0100 -@@ -230,7 +230,7 @@ +@@ -230,7 +230,8 @@ **** ***/ -#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) static inline int DH_set0_pqg (DH * dh, BIGNUM * p, diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 7f89ec439a2..e752cae4581 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,7 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=2.93 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp --without-systemd-daemon" hostmakedepends="pkg-config intltool" diff --git a/srcpkgs/trousers/patches/fix-libressl.patch b/srcpkgs/trousers/patches/fix-libressl.patch deleted file mode 100644 index b7ac6243444..00000000000 --- a/srcpkgs/trousers/patches/fix-libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/trspi/crypto/openssl/rsa.c 2016-11-21 03:16:10 UTC -+++ src/trspi/crypto/openssl/rsa.c -@@ -38,7 +38,7 @@ - #define DEBUG_print_openssl_errors() - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100001L -+#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER) - static int - RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) - { diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template index 365af1285be..36fe35cb204 100644 --- a/srcpkgs/trousers/template +++ b/srcpkgs/trousers/template @@ -1,7 +1,7 @@ # Template file for 'trousers' pkgname=trousers version=0.3.14 -revision=4 +revision=5 build_style=gnu-configure conf_files="/etc/tcsd.conf" makedepends="libressl-devel" diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template index 0dfe793b14d..906657d8fa7 100644 --- a/srcpkgs/ttyd/template +++ b/srcpkgs/ttyd/template @@ -1,7 +1,7 @@ # Template file for 'ttyd' pkgname=ttyd version=1.4.0 -revision=4 +revision=5 build_style=cmake hostmakedepends="pkg-config xxd" makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel" diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template index 0f5dffb0a96..5a10acc1b0e 100644 --- a/srcpkgs/tvheadend/template +++ b/srcpkgs/tvheadend/template @@ -1,7 +1,7 @@ # Template file for 'tvheadend' pkgname=tvheadend version=4.2.6 -revision=1 +revision=2 wrksrc=tvheadend-${version} build_style=gnu-configure configure_args="--disable-dvbscan --disable-ffmpeg_static --disable-hdhomerun_static --disable-bintray_cache" diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template index 3dbefc1b7cb..85cc62414fd 100644 --- a/srcpkgs/ucspi-ssl/template +++ b/srcpkgs/ucspi-ssl/template @@ -1,7 +1,7 @@ # Template file for 'ucspi-ssl' pkgname=ucspi-ssl version=0.99d -revision=2 +revision=3 short_desc="Command-line tools for building SSL client-server applications" maintainer="Evan Deaubl " license="Public Domain" @@ -10,7 +10,8 @@ hostmakedepends="perl libressl-devel" makedepends="libressl-devel" depends="ucspi-tcp" homepage="http://www.fehcom.de/ipnet/ucspi-ssl.html" -distfiles="http://www.fehcom.de/ipnet/ucspi-ssl/${pkgname}-${version}.tgz" +#distfiles="http://www.fehcom.de/ipnet/ucspi-ssl/${pkgname}-${version}.tgz" +distfiles="https://sources.voidlinux.eu/${pkgname}-${version}/${pkgname}-${version}.tgz" checksum=f056deb954f4396123cdd97c8c8adc6386a51b49b0be6e22a9eb4a24e43e7f69 wrksrc="${pkgname}-${version}" create_wrksrc=yes diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template index 6279c03cfcb..b10c0d46e99 100644 --- a/srcpkgs/uget/template +++ b/srcpkgs/uget/template @@ -1,7 +1,7 @@ # Template file for 'uget' pkgname=uget version=2.2.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel" diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template index 1057606e2f5..ec9925d6ff3 100644 --- a/srcpkgs/umurmur/template +++ b/srcpkgs/umurmur/template @@ -1,7 +1,7 @@ # Template file for 'umurmur' pkgname=umurmur version=0.2.17 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-shmapi --with-ssl=openssl" conf_files="/etc/umurmur/umurmur.conf" diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index f2474c25ef4..0ab1508aeac 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -1,7 +1,7 @@ # Template file for 'unbound' pkgname=unbound version=1.7.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template index ba6371d8363..49c22009d0d 100644 --- a/srcpkgs/vanitygen/template +++ b/srcpkgs/vanitygen/template @@ -1,7 +1,7 @@ # Template file for 'vanitygen' pkgname=vanitygen version=0.21 -revision=13 +revision=14 makedepends="pcre-devel libressl-devel" short_desc="Bitcoin vanity address generator" maintainer="Juan RP " diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template index 25c30c58929..fca947cf1f7 100644 --- a/srcpkgs/vboot-utils/template +++ b/srcpkgs/vboot-utils/template @@ -1,7 +1,7 @@ # Template file for 'vboot-utils' pkgname=vboot-utils version=45.7262 -revision=9 +revision=10 _githash=0e8c964915fffb58032bb59bdb31949de718ca90 hostmakedepends="pkg-config git" makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel" diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template index 9a153089e81..bd305dd8318 100644 --- a/srcpkgs/vde2/template +++ b/srcpkgs/vde2/template @@ -1,7 +1,7 @@ # Template file for 'vde2' pkgname=vde2 version=2.3.2 -revision=18 +revision=19 build_style=gnu-configure configure_args="--disable-static --enable-experimental --disable-python --enable-kernel-switch" diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index c7183c55e31..9c004be7eec 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,7 +1,7 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose version=5.2.8 -revision=1 +revision=2 wrksrc="VirtualBox-${version%*a}" short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template index b3d1ea36730..4636ecc9299 100644 --- a/srcpkgs/virtuoso/template +++ b/srcpkgs/virtuoso/template @@ -1,7 +1,7 @@ # Template file for 'virtuoso' pkgname=virtuoso version=6.1.8 -revision=11 +revision=12 build_style=gnu-configure wrksrc="${pkgname}-opensource-${version}" hostmakedepends="flex gperf net-tools" diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template index 071db15daf8..e458cd09292 100644 --- a/srcpkgs/vpn-ws/template +++ b/srcpkgs/vpn-ws/template @@ -1,7 +1,7 @@ # Template file for 'vpn-ws' pkgname=vpn-ws version=0.2 -revision=2 +revision=3 build_style=gnu-makefile make_use_env=yes makedepends="libressl-devel" diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template index a11330c2e90..d8c400057e7 100644 --- a/srcpkgs/vsftpd/template +++ b/srcpkgs/vsftpd/template @@ -1,7 +1,7 @@ # Template file for 'vsftpd' pkgname=vsftpd version=3.0.3 -revision=8 +revision=9 build_style=gnu-makefile makedepends="pam-devel libcap-devel libressl-devel" short_desc="FTP deamon with focus on security" diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template index 7a3db12e42e..9dbcb4dea36 100644 --- a/srcpkgs/w3m/template +++ b/srcpkgs/w3m/template @@ -1,7 +1,7 @@ # Template file for 'w3m' pkgname=w3m version=0.5.3.git20170102 -revision=5 +revision=6 wrksrc="${pkgname}-${version/.git/-git}" build_style=gnu-configure configure_args=" diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index 455ae840ab4..ddeb28e8dae 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,7 +1,7 @@ # Template file for 'warzone2100' pkgname=warzone2100 version=3.2.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-distributor=void" hostmakedepends="zip unzip asciidoc pkg-config perl" diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template index a744f2dbc20..c50836a7e10 100644 --- a/srcpkgs/watchman/template +++ b/srcpkgs/watchman/template @@ -1,7 +1,7 @@ # Template file for 'watchman' pkgname=watchman version=4.9.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-statedir --disable-lenient" hostmakedepends="pkg-config automake libtool" diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template index bea23d4ccbb..aa91db6a392 100644 --- a/srcpkgs/wayland/template +++ b/srcpkgs/wayland/template @@ -1,7 +1,7 @@ # Template file for 'wayland'. pkgname=wayland version=1.15.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-documentation --disable-static" hostmakedepends="automake flex libtool pkg-config" diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index f29afc8b979..5f1c288f8fa 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -1,7 +1,7 @@ # Template file for 'wget' pkgname=wget version=1.19.4 -revision=3 +revision=4 build_style=gnu-configure configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')" hostmakedepends="perl pkg-config" diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index ab291ab3b43..1ebf30ce3b8 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,7 +1,7 @@ # Template file for 'wireshark' pkgname=wireshark version=2.4.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua --with-krb5 --with-gtk=3 --with-qt=5 --without-portaudio CC_FOR_BUILD=cc" diff --git a/srcpkgs/wpa_supplicant/patches/libressl.patch b/srcpkgs/wpa_supplicant/patches/libressl.patch index 0037a9fdcbc..507227f2267 100644 --- a/srcpkgs/wpa_supplicant/patches/libressl.patch +++ b/srcpkgs/wpa_supplicant/patches/libressl.patch @@ -1,49 +1,76 @@ ---- src/crypto/crypto_openssl.c.orig -+++ src/crypto/crypto_openssl.c -@@ -611,7 +611,7 @@ +--- ./src/crypto/crypto_openssl.c.orig 2016-10-02 20:51:11.000000000 +0200 ++++ ./src/crypto/crypto_openssl.c 2018-04-25 07:45:26.063040958 +0200 +@@ -33,7 +33,7 @@ + #include "aes_wrap.h" + #include "crypto.h" - void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* Compatibility wrappers for older versions. */ + + static HMAC_CTX * HMAC_CTX_new(void) +@@ -79,7 +79,7 @@ static void EVP_MD_CTX_free(EVP_MD_CTX * + + static BIGNUM * get_group5_prime(void) { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DH *dh; - struct wpabuf *pubkey = NULL, *privkey = NULL; - size_t publen, privlen; -@@ -712,7 +712,7 @@ +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + return BN_get_rfc3526_prime_1536(NULL); + #elif !defined(OPENSSL_IS_BORINGSSL) + return get_rfc3526_prime_1536(NULL); +--- ./src/crypto/tls_openssl.c.orig 2016-10-02 20:51:11.000000000 +0200 ++++ ./src/crypto/tls_openssl.c 2018-04-25 07:45:26.087040994 +0200 +@@ -59,7 +59,7 @@ typedef int stack_index_t; + #endif /* SSL_set_tlsext_status_type */ - void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) + #if (OPENSSL_VERSION_NUMBER < 0x10100000L || \ +- defined(LIBRESSL_VERSION_NUMBER)) && \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) && \ + !defined(BORINGSSL_API_VERSION) + /* + * SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL +@@ -3105,7 +3105,7 @@ int tls_connection_get_random(void *ssl_ + #ifdef OPENSSL_NEED_EAP_FAST_PRF + static int openssl_get_keyblock_size(SSL *ssl) { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DH *dh; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + const EVP_CIPHER *c; + const EVP_MD *h; + int md_size; +@@ -3562,7 +3562,7 @@ int tls_connection_set_cipher_list(void - dh = DH_new(); ---- src/crypto/tls_openssl.c.orig -+++ src/crypto/tls_openssl.c -@@ -919,7 +919,7 @@ - } - #endif /* OPENSSL_FIPS */ - #endif /* CONFIG_FIPS */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - #ifndef OPENSSL_NO_SHA256 -@@ -1043,7 +1043,7 @@ + wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1); - tls_openssl_ref_count--; - if (tls_openssl_ref_count == 0) { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); - #endif /* OPENSSL_NO_ENGINE */ -@@ -2334,7 +2334,7 @@ +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) + if (os_strstr(buf, ":ADH-")) { + /* +@@ -4146,7 +4146,7 @@ int tls_global_set_params(void *tls_ctx, + * commented out unless explicitly needed for EAP-FAST in order to be able to + * build this file with unmodified openssl. */ + +-#if (defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (defined(OPENSSL_IS_BORINGSSL) || OPENSSL_VERSION_NUMBER >= 0x10100000L) && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len, + STACK_OF(SSL_CIPHER) *peer_ciphers, + const SSL_CIPHER **cipher, void *arg) +@@ -4159,7 +4159,7 @@ static int tls_sess_sec_cb(SSL *s, void + struct tls_connection *conn = arg; + int ret; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + if (conn == NULL || conn->session_ticket_cb == NULL) return 0; - #ifdef PKCS12_FUNCS --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - /* - * Clear previously set extra chain certificates, if any, from PKCS#12 - * processing in tls_parse_pkcs12() to allow OpenSSL to build a new +@@ -4254,7 +4254,7 @@ int tls_connection_set_session_ticket_cb + + int tls_get_library_version(char *buf, size_t buf_len) + { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + return os_snprintf(buf, buf_len, "OpenSSL build=%s run=%s", + OPENSSL_VERSION_TEXT, + OpenSSL_version(OPENSSL_VERSION)); diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index c767e73e82a..ca9891859ee 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.6 -revision=8 +revision=9 build_wrksrc=$pkgname short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP " diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template index 5a35fa1a35c..9a219e43f49 100644 --- a/srcpkgs/wrk/template +++ b/srcpkgs/wrk/template @@ -1,7 +1,7 @@ # Template file for 'wrk' pkgname=wrk version=4.0.2 -revision=3 +revision=4 build_style=gnu-makefile make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr" hostmakedepends="LuaJIT" diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template index b8ad4bd770a..c590cb7f24a 100644 --- a/srcpkgs/wvstreams/template +++ b/srcpkgs/wvstreams/template @@ -1,7 +1,7 @@ # Template file for 'wvstreams' pkgname=wvstreams version=4.6.1 -revision=15 +revision=16 build_style=gnu-configure maintainer="Enno Boland " license="LGPL-2" diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template index 187db8d0f59..3f1ff687dfd 100644 --- a/srcpkgs/x11vnc/template +++ b/srcpkgs/x11vnc/template @@ -1,7 +1,7 @@ # Template file for 'x11vnc' pkgname=x11vnc version=0.9.13 -revision=13 +revision=14 build_style=gnu-configure makedepends="zlib-devel libX11-devel libXtst-devel libXinerama-devel libXdamage-devel libXrandr-devel libressl-devel libjpeg-turbo-devel" short_desc="VNC server for real X displays" diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template index 288902230cf..176bf31b362 100644 --- a/srcpkgs/xar/template +++ b/srcpkgs/xar/template @@ -1,7 +1,7 @@ # Template file for 'xar' pkgname=xar version=1.6.1 -revision=4 +revision=5 build_style=gnu-configure configure_args="ac_cv_sizeof_uid_t=4" makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel" diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template index b28be0b1a61..8be18b3696f 100644 --- a/srcpkgs/xarcan/template +++ b/srcpkgs/xarcan/template @@ -1,6 +1,6 @@ pkgname=xarcan version=0.5.4 -revision=3 +revision=4 build_style=gnu-configure short_desc="Patched Xserver that bridges connections to Arcan" maintainer="Piraty " diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 9502b8cf39c..2cfdcbda3cf 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.51 -revision=20 +revision=21 bootstrap=yes build_style=configure short_desc="The XBPS package system utilities" diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template index a5c72df736c..be5ef97799a 100644 --- a/srcpkgs/xca/template +++ b/srcpkgs/xca/template @@ -1,7 +1,7 @@ # Template file for 'xca' pkgname=xca version=1.3.2 -revision=3 +revision=4 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config qt5-tools qt5-host-tools" diff --git a/srcpkgs/xchat/template b/srcpkgs/xchat/template index 804e072cbc6..3de7a96ae4f 100644 --- a/srcpkgs/xchat/template +++ b/srcpkgs/xchat/template @@ -1,7 +1,7 @@ # Template file for 'xchat' pkgname=xchat version=2.8.8 -revision=18 +revision=19 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config gdk-pixbuf-devel perl" diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index fe9bfe3212c..e6082b445ea 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.19.6 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-ipv6 --enable-record --enable-xorg --enable-xnest --enable-xephyr --enable-composite --enable-xvfb diff --git a/srcpkgs/yara/patches/libressl.patch b/srcpkgs/yara/patches/libressl.patch deleted file mode 100644 index 6619f483b05..00000000000 --- a/srcpkgs/yara/patches/libressl.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- libyara/libyara.c.orig 2017-05-22 10:24:23.000000000 +0000 -+++ libyara/libyara.c 2017-05-23 00:18:32.658793790 +0000 -@@ -71,7 +71,7 @@ - char yr_altercase[256]; - - --#if defined(HAVE_LIBCRYPTO) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(HAVE_LIBCRYPTO) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - - // The OpenSSL library before version 1.1 requires some locks in order - // to be thread-safe. These locks are initialized in yr_initialize -@@ -133,7 +133,7 @@ - FAIL_ON_ERROR(yr_thread_storage_create(&yr_tidx_key)); - FAIL_ON_ERROR(yr_thread_storage_create(&yr_recovery_state_key)); - -- #if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L -+ #if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - - openssl_locks = (YR_MUTEX*) OPENSSL_malloc( - CRYPTO_num_locks() * sizeof(YR_MUTEX)); -@@ -178,7 +178,7 @@ - - YR_API int yr_finalize(void) - { -- #if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L -+ #if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - int i; - #endif - -@@ -194,7 +194,7 @@ - if (init_count > 0) - return ERROR_SUCCESS; - -- #if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L -+ #if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - - for (i = 0; i < CRYPTO_num_locks(); i ++) - yr_mutex_destroy(&openssl_locks[i]); diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index 11e47c9f53f..b02b1963f49 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -1,7 +1,7 @@ # Template file for 'yara' pkgname=yara version=3.7.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-magic --enable-cuckoo" hostmakedepends="automake libtool" diff --git a/srcpkgs/ykpers/template b/srcpkgs/ykpers/template index d937d0eaf3d..55c08fc1631 100644 --- a/srcpkgs/ykpers/template +++ b/srcpkgs/ykpers/template @@ -1,21 +1,17 @@ # Template file for 'ykpers' pkgname=ykpers -version=1.18.1 -revision=3 +version=1.19.0 +revision=1 build_style=gnu-configure configure_args="--enable-static=no --disable-rpath --with-backend=libusb" -hostmakedepends="automake pkg-config libtool json-c-devel" +hostmakedepends="pkg-config" makedepends="libusb-compat-devel libyubikey-devel" short_desc="Yubikey Personalization Tools cmdline" maintainer="yopito " -license="BSD" +license="BSD-2-Clause" homepage="https://developers.yubico.com/yubikey-personalization/" distfiles="https://developers.yubico.com/yubikey-personalization/releases/${pkgname}-${version}.tar.gz" -checksum=9ffdb938121a867aa0b350b49daff5807884c2268dfe6d245d133474cd9c5256 - -pre_configure() { - autoreconf -fi -} +checksum=2bc8afa16d495a486582bad916d16de1f67c0cce9bb0a35c3123376c2d609480 post_install() { vlicense COPYING LICENSE diff --git a/srcpkgs/ykpivmgr/template b/srcpkgs/ykpivmgr/template index 5dc2889fc4e..a5a98390983 100644 --- a/srcpkgs/ykpivmgr/template +++ b/srcpkgs/ykpivmgr/template @@ -7,7 +7,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library" pkgname=ykpivmgr version=1.5.0 -revision=2 +revision=3 wrksrc="${_real_name}-${version}" build_style=gnu-configure configure_args="--enable-doxygen-man --program-transform-name='s/^yubico-piv-tool$/ykpivmgr/'" diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template index c3c5f1b7310..ca482e4fa76 100644 --- a/srcpkgs/ympd/template +++ b/srcpkgs/ympd/template @@ -1,7 +1,7 @@ # Template file for 'ympd' pkgname=ympd version=1.3.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="perl" makedepends="libmpdclient-devel libressl-devel" diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 9ea0d7b2bbf..46e097664fe 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2018.04.16 +version=2018.04.25 revision=1 wrksrc="${pkgname}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://rg3.github.io/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=2d2565cd65b20da05aa0e16b48b2fdc1a1c72452811db8a20faf0bce2f7adf10 +checksum=7ced20712c1c4ef98d748cdd0f7cdd4f94f88b1300bed67d7b861dcf1c7ffd9f alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" noarch=yes diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index e79edc1d68a..1e1f6c07bdc 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=8 +revision=9 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template index 17307c7e995..8d32bb18e66 100644 --- a/srcpkgs/znc/template +++ b/srcpkgs/znc/template @@ -1,7 +1,7 @@ # Template file for 'znc' pkgname=znc version=1.6.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-python --enable-perl --enable-tcl --enable-cyrus" hostmakedepends="pkg-config perl" diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template index 670597b874b..5b3ff918548 100644 --- a/srcpkgs/zou/template +++ b/srcpkgs/zou/template @@ -1,7 +1,7 @@ # Template file for 'zou' pkgname=zou version=0.2.0 -revision=2 +revision=3 hostmakedepends="cargo rust pkg-config" makedepends="libressl-devel" short_desc="A simple and fast download accelerator, written in Rust" @@ -12,6 +12,10 @@ distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz" checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f nocross=yes +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9605/steps/shell_3/logs/stdio" +esac + do_build() { cargo build --release }