January 2017 - crux-commits

ports/compat-32 (3.2): libpcre-32: 8.39 -> 8.40
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 7943587794da9da0b617c7e5d2acfd44481bfe49 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Jan 26 00:24:33 2017 +1100 libpcre-32: 8.39 -> 8.40 diff --git a/libpcre-32/.footprint b/libpcre-32/.footprint index 09e1962..2437eaf 100644 --- a/libpcre-32/.footprint +++ b/libpcre-32/.footprint @@ -2,9 +2,9 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libpcre.a -rwxr-xr-x root/root usr/lib32/libpcre.la -lrwxrwxrwx root/root usr/lib32/libpcre.so -> libpcre.so.1.2.7 -lrwxrwxrwx root/root usr/lib32/libpcre.so.1 -> libpcre.so.1.2.7 --rwxr-xr-x root/root usr/lib32/libpcre.so.1.2.7 +lrwxrwxrwx root/root usr/lib32/libpcre.so -> libpcre.so.1.2.8 +lrwxrwxrwx root/root usr/lib32/libpcre.so.1 -> libpcre.so.1.2.8 +-rwxr-xr-x root/root usr/lib32/libpcre.so.1.2.8 -rw-r--r-- root/root usr/lib32/libpcrecpp.a -rwxr-xr-x root/root usr/lib32/libpcrecpp.la lrwxrwxrwx root/root usr/lib32/libpcrecpp.so -> libpcrecpp.so.0.0.1 diff --git a/libpcre-32/.md5sum b/libpcre-32/.md5sum index 27fdb05..b471d27 100644 --- a/libpcre-32/.md5sum +++ b/libpcre-32/.md5sum @@ -1 +1 @@ -e3fca7650a0556a2647821679d81f585 pcre-8.39.tar.bz2 +41a842bf7dcecd6634219336e2167d1d pcre-8.40.tar.bz2 diff --git a/libpcre-32/Pkgfile b/libpcre-32/Pkgfile index eb29add..c504a35 100644 --- a/libpcre-32/Pkgfile +++ b/libpcre-32/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu name=libpcre-32 -version=8.39 +version=8.40 release=1 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)

1 0

ports/compat-32 (3.2): mesa3d-32: 12.0.5 -> 12.0.6
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 6856ac2daf205dc8fb33a85c907e1ce98c714b03 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Jan 26 00:25:33 2017 +1100 mesa3d-32: 12.0.5 -> 12.0.6 diff --git a/mesa3d-32/.md5sum b/mesa3d-32/.md5sum index 4ee40f3..0818736 100644 --- a/mesa3d-32/.md5sum +++ b/mesa3d-32/.md5sum @@ -1 +1 @@ -7012526b35e589fd3acf7e07939e5915 mesa-12.0.5.tar.xz +1a3d4fea0656c208db59289e4ed33b3f mesa-12.0.6.tar.xz diff --git a/mesa3d-32/Pkgfile b/mesa3d-32/Pkgfile index f5cc553..db1a427 100644 --- a/mesa3d-32/Pkgfile +++ b/mesa3d-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: elfutils-32 eudev-32 expat-32 libdrm-32 libvdpau-32 llvm-32 mesa3d xorg-dri3proto-32 xorg-glproto-32 xorg-libxdamage-32 xorg-libxshmfence-32 xorg-libxvmc-32 xorg-presentproto-32 name=mesa3d-32 -version=12.0.5 +version=12.0.6 release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/mesa-$version.tar.xz)

1 0

ports/opt (3.2): wine: 2.0-rc6 -> 2.0
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit c506194cfb8f4cd41c1c6d3d1fbbfbaa3a7cfeea Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jan 25 23:29:16 2017 +1100 wine: 2.0-rc6 -> 2.0 diff --git a/wine/.md5sum b/wine/.md5sum index 299a925..fd52572 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,4 +1,4 @@ -80dc66cb5769537e71aeb24310e14c36 wine-2.0-rc6.tar.bz2 +fde8a855080279f74fb2e9ccec926db7 wine-2.0.tar.bz2 b0760cf51527b70435c3e4d0361a129a wine-mono-4.6.4.msi 5ebc4ec71c92b3db3d84b334a1db385d wine_gecko-2.47-x86.msi d93ac0d2e6aceafe9113a9918916df45 wine_gecko-2.47-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index 18b198e..49f8b95 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 xorg-libxxf86vm-32 name=wine -version=2.0-rc6 +version=2.0 release=1 source=(http://dl.winehq.org/wine/source/2.0/$name-$version.tar.bz2 http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi

1 0

ports/xorg (3.2): mesa3d: update to 12.0.6
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit a8bc8482eb8a293d1382a7684e681555fad16cf0 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Jan 25 11:19:28 2017 +0100 mesa3d: update to 12.0.6 diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index 4ee40f3..0818736 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1 +1 @@ -7012526b35e589fd3acf7e07939e5915 mesa-12.0.5.tar.xz +1a3d4fea0656c208db59289e4ed33b3f mesa-12.0.6.tar.xz diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 56226ab..d904c51 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -5,7 +5,7 @@ # Optional: nettle name=mesa3d -version=12.0.5 +version=12.0.6 release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/mesa-$version.tar.xz)

1 0

ports/core (3.3): updated signatures
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 4be05e831b1835617da8917e2037e1be04abebd2 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 03:08:51 2017 +0100 updated signatures diff --git a/curl/.signature b/curl/.signature index ded05a9..e4458ed 100644 --- a/curl/.signature +++ b/curl/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqsAjvM7uN5PrkUqrNc3+fjQPM/ujN1EOBC6++RF8IDpvZPMSAL7JCgIwNUCLT0bBI0i2LHb3Qb1rm7HEdMsC8gA= -SHA256 (Pkgfile) = edb871a7753866dbb53c6ea661a1885e4cca237148e7de00a7cb04dd0dc4dd51 +RWRJc1FUaeVeqvx/97rRYai6wf9HBq4bvx3nUuollLl7Oomkh6z7+QO5fn5tLT6uZom2STitAB/1T5wakW6N0QUb/EFYehRG8g0= +SHA256 (Pkgfile) = f056c86595b226c1abf6dd5f887b1a9a93fcf5602e902b34e830792218bf5847 SHA256 (.footprint) = 218a4dde5089c4ae7f858d499b3428cecb34c7302e5b5aefabf096943463bb62 SHA256 (curl-7.52.1.tar.lzma) = 44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365 +SHA256 (0002-vtls-s-SSLEAY-OPENSSL.patch) = a329c611b4708125594732d8c814b4434d61cd433845b1bf18e8655b40eb195b

1 0

ports/core (3.3): Merge branch '3.2' into 3.3
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit ca9412a381333bdede9883998df6c5c24ef042bb Merge: 3592871 d66e796 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 03:08:36 2017 +0100 Merge branch '3.2' into 3.3

1 0

ports/core (3.3): curl: added patch for upstream bug #1174
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 7b7ea6702f9f8b246bb0a4559a8ecd664ee06327 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 03:07:03 2017 +0100 curl: added patch for upstream bug #1174 diff --git a/curl/.md5sum b/curl/.md5sum index 5123918..0ee13bf 100644 --- a/curl/.md5sum +++ b/curl/.md5sum @@ -1 +1,2 @@ +e71496f422359ccb7783fe495569541a 0002-vtls-s-SSLEAY-OPENSSL.patch ddbd157359bc8a9174e11b151254b264 curl-7.52.1.tar.lzma diff --git a/curl/0002-vtls-s-SSLEAY-OPENSSL.patch b/curl/0002-vtls-s-SSLEAY-OPENSSL.patch new file mode 100644 index 0000000..386dfe1 --- /dev/null +++ b/curl/0002-vtls-s-SSLEAY-OPENSSL.patch @@ -0,0 +1,39 @@ +From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel(a)haxx.se> +Date: Mon, 26 Dec 2016 00:06:33 +0100 +Subject: [PATCH 02/76] vtls: s/SSLEAY/OPENSSL + +Fixed an old leftover use of the USE_SSLEAY define which would make a +socket get removed from the applications sockets to monitor when the +multi_socket API was used, leading to timeouts. + +Bug: #1174 +--- + lib/vtls/vtls.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index b808e1c5f..707f24b02 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data) + curlssl_close_all(data); + } + +-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \ ++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \ + defined(USE_DARWINSSL) || defined(USE_NSS) + /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */ + int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks, +@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn, + (void)numsocks; + return GETSOCK_BLANK; + } +-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */ ++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */ + #endif + + void Curl_ssl_close(struct connectdata *conn, int sockindex) +-- +2.11.0 + diff --git a/curl/Pkgfile b/curl/Pkgfile index bc8e204..43df000 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -6,10 +6,11 @@ name=curl version=7.52.1 release=1 -source=(http://curl.haxx.se/download/$name-$version.tar.lzma) +source=(http://curl.haxx.se/download/$name-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) build() { cd $name-$version + patch -p1 -i $SRC/0002-vtls-s-SSLEAY-OPENSSL.patch ./configure --prefix=/usr \ --enable-ipv6 \ --without-libidn \

1 0

ports/core (3.3): curl: bumped release
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit d66e796c49f1e0f1a1499c34efa3b1cb25f0ba9e Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 03:07:31 2017 +0100 curl: bumped release diff --git a/curl/Pkgfile b/curl/Pkgfile index 43df000..0813ba1 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -5,7 +5,7 @@ name=curl version=7.52.1 -release=1 +release=2 source=(http://curl.haxx.se/download/$name-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) build() {

1 0

ports/core (3.2): curl: bumped release
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit d66e796c49f1e0f1a1499c34efa3b1cb25f0ba9e Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 03:07:31 2017 +0100 curl: bumped release diff --git a/curl/Pkgfile b/curl/Pkgfile index 43df000..0813ba1 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -5,7 +5,7 @@ name=curl version=7.52.1 -release=1 +release=2 source=(http://curl.haxx.se/download/$name-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) build() {

1 0

ports/core (3.2): curl: added patch for upstream bug #1174
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 7b7ea6702f9f8b246bb0a4559a8ecd664ee06327 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 03:07:03 2017 +0100 curl: added patch for upstream bug #1174 diff --git a/curl/.md5sum b/curl/.md5sum index 5123918..0ee13bf 100644 --- a/curl/.md5sum +++ b/curl/.md5sum @@ -1 +1,2 @@ +e71496f422359ccb7783fe495569541a 0002-vtls-s-SSLEAY-OPENSSL.patch ddbd157359bc8a9174e11b151254b264 curl-7.52.1.tar.lzma diff --git a/curl/0002-vtls-s-SSLEAY-OPENSSL.patch b/curl/0002-vtls-s-SSLEAY-OPENSSL.patch new file mode 100644 index 0000000..386dfe1 --- /dev/null +++ b/curl/0002-vtls-s-SSLEAY-OPENSSL.patch @@ -0,0 +1,39 @@ +From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel(a)haxx.se> +Date: Mon, 26 Dec 2016 00:06:33 +0100 +Subject: [PATCH 02/76] vtls: s/SSLEAY/OPENSSL + +Fixed an old leftover use of the USE_SSLEAY define which would make a +socket get removed from the applications sockets to monitor when the +multi_socket API was used, leading to timeouts. + +Bug: #1174 +--- + lib/vtls/vtls.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index b808e1c5f..707f24b02 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data) + curlssl_close_all(data); + } + +-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \ ++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \ + defined(USE_DARWINSSL) || defined(USE_NSS) + /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */ + int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks, +@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn, + (void)numsocks; + return GETSOCK_BLANK; + } +-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */ ++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */ + #endif + + void Curl_ssl_close(struct connectdata *conn, int sockindex) +-- +2.11.0 + diff --git a/curl/Pkgfile b/curl/Pkgfile index bc8e204..43df000 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -6,10 +6,11 @@ name=curl version=7.52.1 release=1 -source=(http://curl.haxx.se/download/$name-$version.tar.lzma) +source=(http://curl.haxx.se/download/$name-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) build() { cd $name-$version + patch -p1 -i $SRC/0002-vtls-s-SSLEAY-OPENSSL.patch ./configure --prefix=/usr \ --enable-ipv6 \ --without-libidn \

1 0