November 2011 - macports-changes - lists.macosforge.org

[87258] trunk/dports/science/udunits2/Portfile
by takeshi＠macports.org 15 Nov '11

15 Nov '11

Revision: 87258 http://trac.macports.org/changeset/87258 Author: takeshi(a)macports.org Date: 2011-11-14 23:03:32 -0800 (Mon, 14 Nov 2011) Log Message: ----------- udunits2: updated for 2.1.24 Modified Paths: -------------- trunk/dports/science/udunits2/Portfile Modified: trunk/dports/science/udunits2/Portfile =================================================================== --- trunk/dports/science/udunits2/Portfile 2011-11-15 06:06:13 UTC (rev 87257) +++ trunk/dports/science/udunits2/Portfile 2011-11-15 07:03:32 UTC (rev 87258) @@ -4,7 +4,7 @@ PortSystem 1.0 name udunits2 -version 2.1.23 +version 2.1.24 distname udunits-${version} maintainers takeshi platforms darwin @@ -26,9 +26,9 @@ master_sites ftp://ftp.unidata.ucar.edu/pub/udunits/ \ http://www.gfd-dennou.org/arch-large1/ucar/unidata/pub/udunits -checksums md5 b018d3e6defc3d4cfaabce38122842a5 \ - sha1 cdf4012309552d821e72a5740de4cdd272339465 \ - rmd160 417e9adfa53e1ac0a7b0f56dcf820e194394419f +checksums md5 6986545721747a51285c765644dcd9d8 \ + sha1 64bbb4b852146fb5d476baf4d37c9d673cfa42f9 \ + rmd160 141d765332818c06b6a4bcbda17473fde5cd1853 depends_lib port:expat

1 0

[87257] trunk/dports/lang/erlang/Portfile
by bfulgham＠macports.org 15 Nov '11

15 Nov '11

Revision: 87257 http://trac.macports.org/changeset/87257 Author: bfulgham(a)macports.org Date: 2011-11-14 22:06:13 -0800 (Mon, 14 Nov 2011) Log Message: ----------- Add a dist_subdir stanza to override the caching of files from erlang.org by the Macports serverr, closes 31542. Add Clang override to use llvm-gcc front-end to avoid lock-up (in some cases) and missing symbol (_bp_sched2ix) in others, closes 31585. Modified Paths: -------------- trunk/dports/lang/erlang/Portfile Modified: trunk/dports/lang/erlang/Portfile =================================================================== --- trunk/dports/lang/erlang/Portfile 2011-11-15 04:45:02 UTC (rev 87256) +++ trunk/dports/lang/erlang/Portfile 2011-11-15 06:06:13 UTC (rev 87257) @@ -30,6 +30,8 @@ homepage http://www.erlang.org/ master_sites http://www.erlang.org/download/ \ http://www.erlang.org/download/patches/:patches +# The following line works around Erlang's stealth upgrade of the HTML tarball +dist_subdir ${name}/${version}_1 # Parallel build doesn't work as per R13B01 use_parallel_build no @@ -47,8 +49,8 @@ sha1 41f4ea59c9622e39b30882e173983252b6faca81 \ rmd160 420d89fd32f2851253a5cef124ced50851dc2bb0 \ otp_doc_html_R14B04.tar.gz \ - sha1 f70762b30aa37aa677c4055060366006a9800af2 \ - rmd160 c748140ee1fc2f3d5d9e9c0f5b643808a626b2f1 + sha1 86f76adee9bf953e5578d7998fda9e7dfc0d43f5 \ + rmd160 0e44a933ae35fe95d1ecd9958c9e86ce398e259f pre-patch { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} } @@ -110,6 +112,12 @@ # This is a workaround. #patchfiles-append patch-erts_emulator_sys_unix_ddll.c.diff configure.ldflags-append -framework CoreFoundation + + # Erlang seems to have an on-again/off-again relationship with Clang. + # As of XCode 4.2, it's off again. + if {${configure.compiler} == "clang"} { + configure.compiler llvm-gcc-4.2 + } } platform macosx {

1 0

[87256] trunk/dports/print
by takeshi＠macports.org 15 Nov '11

15 Nov '11

Revision: 87256 http://trac.macports.org/changeset/87256 Author: takeshi(a)macports.org Date: 2011-11-14 20:45:02 -0800 (Mon, 14 Nov 2011) Log Message: ----------- pslib: adding pslib Added Paths: ----------- trunk/dports/print/pslib/ trunk/dports/print/pslib/Portfile Added: trunk/dports/print/pslib/Portfile =================================================================== --- trunk/dports/print/pslib/Portfile (rev 0) +++ trunk/dports/print/pslib/Portfile 2011-11-15 04:45:02 UTC (rev 87256) @@ -0,0 +1,35 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name pslib +version 0.4.5 +categories print +maintainers igf.fuw.edu.pl:slayoo +license GPL/LGPL +platforms darwin +description C-library to create PostScript files on the fly +long_description \ + pslib is a C-library to create PostScript files on the fly. \ + It offers many drawing primitives, inclusion of png and eps images \ + and a very sophisticated text rendering including hyphenation, kerning and ligatures. \ + It can read external Type1 fonts and embed them into the output file. \ + It supports pdfmarks which makes it in combination with ghostscript's pdfwriter \ + an alternative for libraries creating PDF. +homepage http://pslib.sourceforge.net/ +master_sites sourceforge +distfiles ${name}-${version}.tar.gz + +checksums md5 03f39393628a6d758799b9f845047e27 \ + sha1 2ad904b650b7d55b7c12be0c99f77073770ece56 \ + rmd160 8400b078bd643325109e988df7971e0eb164f492 + +depends_lib port:libpng \ + port:jpeg \ + port:giflib \ + port:tiff + +destroot.target install-strip + +use_parallel_build yes

1 0

[87255] trunk/dports/science/ncarg/Portfile
by takeshi＠macports.org 15 Nov '11

15 Nov '11

Revision: 87255 http://trac.macports.org/changeset/87255 Author: takeshi(a)macports.org Date: 2011-11-14 20:16:21 -0800 (Mon, 14 Nov 2011) Log Message: ----------- ncarg: use llvm-gcc-4.2 on Snow Leopard and Lion to avoidseg fault on ncl function setfileoption(). Modified Paths: -------------- trunk/dports/science/ncarg/Portfile Modified: trunk/dports/science/ncarg/Portfile =================================================================== --- trunk/dports/science/ncarg/Portfile 2011-11-15 02:13:43 UTC (rev 87254) +++ trunk/dports/science/ncarg/Portfile 2011-11-15 04:16:21 UTC (rev 87255) @@ -5,7 +5,7 @@ name ncarg version 6.0.0 -revision 1 +revision 3 categories science maintainers takeshi description language for scientific data processing and visualization @@ -70,29 +70,25 @@ if {$build_arch eq "x86_64"} { patchfiles-append patch-config-ymake.diff } + post-patch { reinplace "s|INC=-I/usr/include|INC=${configure.cppflags} ${configure.cflags}|" ${workpath}/${g2clib_worksrcdir}/makefile reinplace "s|CC=gcc -fPIC|CC=${configure.cc}|" ${workpath}/${g2clib_worksrcdir}/makefile if {$build_arch eq "x86_64" || $build_arch eq "ppc64"} { reinplace "s|-DUSE_PNG$|-DUSE_PNG -D__64BIT__|" ${workpath}/${g2clib_worksrcdir}/makefile } + if {[variant_isset g95]} { + set fortranlib -lf95 + } elseif {[variant_isset gcc43]} { + set fortranlib "-L${prefix}/lib/gcc43 -lgfortran" + } elseif {[variant_isset gcc45]} { + set fortranlib "-L${prefix}/lib/gcc45 -lgfortran" + } else { + set fortranlib "-L${prefix}/lib/gcc44 -lgfortran" + } foreach f {Darwin Darwin_Intel} { - if {[variant_isset g95]} { - reinplace "s|-lgfortran|-lf95|" ${worksrcpath}/config/${f} - reinplace "s| gfortran$| g95|" ${worksrcpath}/config/${f} - } elseif {[variant_isset gcc43]} { - reinplace "s|-lgfortran|-L${prefix}/lib/gcc43 -lgfortran|" \ - ${worksrcpath}/config/${f} - reinplace "s| gfortran$| gfortran-mp-4.3|" ${worksrcpath}/config/${f} - } elseif {[variant_isset gcc45]} { - reinplace "s|-lgfortran|-L${prefix}/lib/gcc45 -lgfortran|" \ - ${worksrcpath}/config/${f} - reinplace "s| gfortran$| gfortran-mp-4.5|" ${worksrcpath}/config/${f} - } else { - reinplace "s|-lgfortran|-L${prefix}/lib/gcc44 -lgfortran|" \ - ${worksrcpath}/config/${f} - reinplace "s| gfortran$| gfortran-mp-4.4|" ${worksrcpath}/config/${f} - } + reinplace "s|-lgfortran|${fortranlib}|" ${worksrcpath}/config/${f} + reinplace "s| gfortran$| ${configure.fc}|" ${worksrcpath}/config/${f} reinplace "s|gcc$|${configure.cc}|" ${worksrcpath}/config/${f} reinplace "/CcOptions/d" ${worksrcpath}/config/${f} reinplace "s|-lXext$|-lXext\\ @@ -128,6 +124,12 @@ } } +# avoid segmentation fault on ncl function setfileoption() +# clang fails to build ncl +if {${os.major}>=10} { + configure.compiler llvm-gcc-4.2 +} + pre-configure { system "cd ${workpath}/${g2clib_worksrcdir}; make all" file copy ${workpath}/${g2clib_worksrcdir}/libgrib2c.a ${worksrcpath} @@ -170,21 +172,38 @@ } build.target Build -build.args-append EXTRA_CCOPTIONS=\"${configure.cc_archflags}\" +if {${os.major}<10} { + if {[varinant_isset g95]} { + build.args-append EXTRA_CCOPTIONS=\"${configure.cc_archflags}\" + } else { + if {[string match *64* $build_arch]} { + build.args-append EXTRA_CCOPTIONS=-m64 + } else { + build.args-append EXTRA_CCOPTIONS=-m32 + } + } +} +# Only configure.fc is set (against UsingTheRightCompiler) since +# ncl function setfileoption() causes Segmentation Fault +# when built with macports-gcc-4.x. variant g95 conflicts gcc43 gcc44 gcc45 description {compile with g95} { + configure.fc ${prefix}/bin/g95 depends_build-append port:g95 } variant gcc43 conflicts gcc44 gcc45 g95 description {compile with gcc 4.3} { + configure.fc ${prefix}/bin/gfortran-mp-4.3 depends_build-append port:gcc43 } variant gcc44 conflicts gcc43 gcc45 g95 description {compile with gcc 4.4} { + configure.fc ${prefix}/bin/gfortran-mp-4.4 depends_build-append port:gcc44 } variant gcc45 conflicts gcc43 gcc44 g95 description {compile with gcc 4.5} { + configure.fc ${prefix}/bin/gfortran-mp-4.5 depends_build-append port:gcc45 }

1 0

[87254] trunk/dports/python/py-pydicom/Portfile
by eborisch＠macports.org 15 Nov '11

15 Nov '11

Revision: 87254 http://trac.macports.org/changeset/87254 Author: eborisch(a)macports.org Date: 2011-11-14 18:13:43 -0800 (Mon, 14 Nov 2011) Log Message: ----------- py-pydicom: Fix checksum Modified Paths: -------------- trunk/dports/python/py-pydicom/Portfile Modified: trunk/dports/python/py-pydicom/Portfile =================================================================== --- trunk/dports/python/py-pydicom/Portfile 2011-11-15 01:41:23 UTC (rev 87253) +++ trunk/dports/python/py-pydicom/Portfile 2011-11-15 02:13:43 UTC (rev 87254) @@ -28,9 +28,9 @@ master_sites http://pydicom.googlecode.com/files/ distname pydicom-${version} -checksums md5 ff9d143d632a9e305ac840023350ff61 \ - sha1 d476cbcb198465fb09e41c9e688ea93c9d34e037 \ - rmd160 b42d080b5616f9f114175ad6d8babab9bee821e3 +checksums md5 0c0deee14183259301ae0e3f7ed7b654 \ + sha1 ee0cac0bb8ae246b87f70c0fe366b8b90ab6bd9e \ + rmd160 7e63d63f89b0bff900538d3dda72036b6a7397a3 if {${subport} != ${name}} { if {${python.version} != 24} {

1 0

[87253] trunk/base/portmgr/jobs/port_binary_distributable.tcl
by dports＠macports.org 15 Nov '11

15 Nov '11

Revision: 87253 http://trac.macports.org/changeset/87253 Author: dports(a)macports.org Date: 2011-11-14 17:41:23 -0800 (Mon, 14 Nov 2011) Log Message: ----------- port_binary_distributable: CNRI license (another old Python license) is distributable but GPL-conflicting Modified Paths: -------------- trunk/base/portmgr/jobs/port_binary_distributable.tcl Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl =================================================================== --- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-15 01:25:10 UTC (rev 87252) +++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-15 01:41:23 UTC (rev 87253) @@ -35,8 +35,8 @@ # to do so below. # 'Noncommercial' means a license that prohibits commercial use. set good_licenses {afl agpl apache apsl artistic autoconf beopen bitstreamvera \ - boost bsd bsd-old cecill cecill-b cecill-c copyleft cpl \ - curl epl fpll fontconfig freetype gd gfdl gpl \ + boost bsd bsd-old cecill cecill-b cecill-c cnri copyleft \ + cpl curl epl fpll fontconfig freetype gd gfdl gpl \ gplconflict ibmpl ijg isc jasper lgpl libtool lppl mit \ mpl ncsa noncommercial openldap openssl permissive php \ psf public-domain qpl restrictive/distributable ruby \ @@ -64,12 +64,13 @@ apsl {cecill gpl} beopen {cecill gpl} bsd-old {cecill gpl} + cnri {cecill gpl} cpl {cecill gpl} - cecill {afl agpl apache apsl beopen bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} + cecill {afl agpl apache apsl beopen bsd-old cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} epl {cecill gpl} freetype {gpl-2} gd {cecill gpl} - gpl {afl agpl apache-1 apache-1.1 apsl beopen bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} + gpl {afl agpl apache-1 apache-1.1 apsl beopen cnri bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} gpl-1 {apache gpl-3 gpl-3+ lgpl-3 lgpl-3+} gpl-2 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+} gpl-3 {gpl-1 gpl-2}

1 0

[87252] trunk/dports/python/py27-xml/Portfile
by dports＠macports.org 15 Nov '11

15 Nov '11

Revision: 87252 http://trac.macports.org/changeset/87252 Author: dports(a)macports.org Date: 2011-11-14 17:25:10 -0800 (Mon, 14 Nov 2011) Log Message: ----------- py27-xml: license Modified Paths: -------------- trunk/dports/python/py27-xml/Portfile Modified: trunk/dports/python/py27-xml/Portfile =================================================================== --- trunk/dports/python/py27-xml/Portfile 2011-11-15 01:24:35 UTC (rev 87251) +++ trunk/dports/python/py27-xml/Portfile 2011-11-15 01:25:10 UTC (rev 87252) @@ -6,6 +6,7 @@ name py27-xml version 0.8.4 categories-append devel textproc +license MIT BeOpen CNRI ZPL-1.0 BSD maintainers nomaintainer description XML Tools for Python long_description \

1 0

[87251] trunk/dports/python/py26-xml/Portfile
by dports＠macports.org 15 Nov '11

15 Nov '11

Revision: 87251 http://trac.macports.org/changeset/87251 Author: dports(a)macports.org Date: 2011-11-14 17:24:35 -0800 (Mon, 14 Nov 2011) Log Message: ----------- py26-xml: fix license Modified Paths: -------------- trunk/dports/python/py26-xml/Portfile Modified: trunk/dports/python/py26-xml/Portfile =================================================================== --- trunk/dports/python/py26-xml/Portfile 2011-11-15 01:01:26 UTC (rev 87250) +++ trunk/dports/python/py26-xml/Portfile 2011-11-15 01:24:35 UTC (rev 87251) @@ -13,7 +13,7 @@ XML applications in Python. platforms darwin -license X11 BeOpen Python PD ZPL +license MIT BeOpen CNRI ZPL-1.0 BSD homepage http://pyxml.sourceforge.net/ master_sites sourceforge:pyxml distname PyXML-${version}

1 0

[87250] trunk/base/portmgr/jobs/port_binary_distributable.tcl
by dports＠macports.org 15 Nov '11

15 Nov '11

Revision: 87250 http://trac.macports.org/changeset/87250 Author: dports(a)macports.org Date: 2011-11-14 17:01:26 -0800 (Mon, 14 Nov 2011) Log Message: ----------- port_binary_distributable: beopen license is OK and GPL-conflicting Modified Paths: -------------- trunk/base/portmgr/jobs/port_binary_distributable.tcl Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl =================================================================== --- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-15 00:43:21 UTC (rev 87249) +++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-15 01:01:26 UTC (rev 87250) @@ -34,7 +34,7 @@ # variants like CeCILL and the AGPL) and is not in the list of licenses known # to do so below. # 'Noncommercial' means a license that prohibits commercial use. -set good_licenses {afl agpl apache apsl artistic autoconf bitstreamvera \ +set good_licenses {afl agpl apache apsl artistic autoconf beopen bitstreamvera \ boost bsd bsd-old cecill cecill-b cecill-c copyleft cpl \ curl epl fpll fontconfig freetype gd gfdl gpl \ gplconflict ibmpl ijg isc jasper lgpl libtool lppl mit \ @@ -62,13 +62,14 @@ apache-1 {agpl gpl} apache-1.1 {agpl gpl} apsl {cecill gpl} + beopen {cecill gpl} bsd-old {cecill gpl} cpl {cecill gpl} - cecill {afl agpl apache apsl bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} + cecill {afl agpl apache apsl beopen bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} epl {cecill gpl} freetype {gpl-2} gd {cecill gpl} - gpl {afl agpl apache-1 apache-1.1 apsl bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} + gpl {afl agpl apache-1 apache-1.1 apsl beopen bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} gpl-1 {apache gpl-3 gpl-3+ lgpl-3 lgpl-3+} gpl-2 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+} gpl-3 {gpl-1 gpl-2}

1 0

[87249] trunk/dports/audio/pianobar
by ryandesign＠macports.org 15 Nov '11

15 Nov '11

Revision: 87249 http://trac.macports.org/changeset/87249 Author: ryandesign(a)macports.org Date: 2011-11-14 16:43:21 -0800 (Mon, 14 Nov 2011) Log Message: ----------- pianobar: update to 2011.11.11 with one additional change from upstream for easier ssl support; see #32027 Modified Paths: -------------- trunk/dports/audio/pianobar/Portfile Added Paths: ----------- trunk/dports/audio/pianobar/files/ trunk/dports/audio/pianobar/files/a0e4f1e0f5989505f4aab10d64194b635f9af53c.diff Modified: trunk/dports/audio/pianobar/Portfile =================================================================== --- trunk/dports/audio/pianobar/Portfile 2011-11-15 00:37:26 UTC (rev 87248) +++ trunk/dports/audio/pianobar/Portfile 2011-11-15 00:43:21 UTC (rev 87249) @@ -4,12 +4,12 @@ PortSystem 1.0 name pianobar -version 2011.09.22 +version 2011.11.11 categories audio platforms darwin maintainers gmail.com:aguynamedryan+pianobar -homepage http://6xq.net/html/00/17.html -master_sites http://6xq.net/media/00/16/ +homepage http://6xq.net/projects/pianobar/ +master_sites http://6xq.net/static/projects/pianobar/ use_bzip2 yes description Console-based pandora.com player @@ -24,11 +24,15 @@ depends_lib port:libao \ port:faad2 \ - port:libmad + port:libmad \ + port:gnutls -checksums sha256 6e54d4881e7ada6b0443611b0853215e9e54253667a58310d96dfe38be258ed3 \ - rmd160 d69c4a94c59613fa6ca3e8ce2d9a6fe0878674a5 +checksums sha256 c1f5df7813b543992b79ac1558d27ff3fb0198f7bfb2d5d2e39173df4fae951b \ + rmd160 e2627ccf8a6423711494e91316504b14f5e4a7bd +patch.pre_args -p1 +patchfiles a0e4f1e0f5989505f4aab10d64194b635f9af53c.diff + use_configure no variant universal {} Added: trunk/dports/audio/pianobar/files/a0e4f1e0f5989505f4aab10d64194b635f9af53c.diff =================================================================== --- trunk/dports/audio/pianobar/files/a0e4f1e0f5989505f4aab10d64194b635f9af53c.diff (rev 0) +++ trunk/dports/audio/pianobar/files/a0e4f1e0f5989505f4aab10d64194b635f9af53c.diff 2011-11-15 00:43:21 UTC (rev 87249) @@ -0,0 +1,247 @@ +diff --git a/contrib/pianobar.1 b/contrib/pianobar.1 +index dbff073..c5d3347 100644 +--- a/contrib/pianobar.1 ++++ b/contrib/pianobar.1 +@@ -282,9 +282,8 @@ sorts by name from a to z, quickmix_01_name_za by type (quickmix at the + bottom) and name from z to a. + + .TP +-.B tls_ca_path = /etc/ssl/certs/ca-certificates.crt +-File that contains the root certificate (and possibly intermediate +-certificates) of Pandora’s CA. ++.B tls_fingerprint = D9980BA2CC0F97BB03822C6211EAEA4A06EEF427 ++Hex-encoded SHA1 fingerprint of Pandora’s TLS certificate. + + .TP + .B user = your(a)user.name +diff --git a/src/libwaitress/waitress.c b/src/libwaitress/waitress.c +index 8bb519a..7082ffd 100644 +--- a/src/libwaitress/waitress.c ++++ b/src/libwaitress/waitress.c +@@ -53,21 +53,11 @@ typedef struct { + size_t pos; + } WaitressFetchBufCbBuffer_t; + +-WaitressReturn_t WaitressInit (WaitressHandle_t *waith, const char *caPath) { ++void WaitressInit (WaitressHandle_t *waith) { + assert (waith != NULL); + + memset (waith, 0, sizeof (*waith)); + waith->timeout = 30000; +- if (caPath != NULL) { +- gnutls_certificate_allocate_credentials (&waith->tlsCred); +- if (gnutls_certificate_set_x509_trust_file (waith->tlsCred, caPath, +- GNUTLS_X509_FMT_PEM) <= 0) { +- return WAITRESS_RET_TLS_TRUSTFILE_ERR; +- } +- waith->tlsInitialized = true; +- } +- +- return WAITRESS_RET_OK; + } + + void WaitressFree (WaitressHandle_t *waith) { +@@ -75,9 +65,6 @@ void WaitressFree (WaitressHandle_t *waith) { + + free (waith->url.url); + free (waith->proxy.url); +- if (waith->tlsInitialized) { +- gnutls_certificate_free_credentials (waith->tlsCred); +- } + memset (waith, 0, sizeof (*waith)); + } + +@@ -709,22 +696,10 @@ static int WaitressTlsVerify (gnutls_session_t session) { + waith = gnutls_session_get_ptr (session); + assert (waith != NULL); + +- if (gnutls_certificate_verify_peers2 (session, &status) != GNUTLS_E_SUCCESS) { +- return GNUTLS_E_CERTIFICATE_ERROR; +- } +- +- /* don't accept invalid certs */ +- if (status & (GNUTLS_CERT_INVALID | GNUTLS_CERT_SIGNER_NOT_FOUND | +- GNUTLS_CERT_REVOKED | GNUTLS_CERT_EXPIRED | +- GNUTLS_CERT_NOT_ACTIVATED)) { +- return GNUTLS_E_CERTIFICATE_ERROR; +- } +- + if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { + return GNUTLS_E_CERTIFICATE_ERROR; + } + +- /* check hostname */ + if ((certList = gnutls_certificate_get_peers (session, + &certListSize)) == NULL) { + return GNUTLS_E_CERTIFICATE_ERROR; +@@ -739,7 +714,14 @@ static int WaitressTlsVerify (gnutls_session_t session) { + return GNUTLS_E_CERTIFICATE_ERROR; + } + +- if (gnutls_x509_crt_check_hostname (cert, waith->url.host) == 0) { ++ char fingerprint[20]; ++ size_t fingerprintSize = sizeof (fingerprint); ++ if (gnutls_x509_crt_get_fingerprint (cert, GNUTLS_DIG_SHA1, fingerprint, ++ &fingerprintSize) != 0) { ++ return GNUTLS_E_CERTIFICATE_ERROR; ++ } ++ ++ if (memcmp (fingerprint, waith->tlsFingerprint, sizeof (fingerprint)) != 0) { + return GNUTLS_E_CERTIFICATE_ERROR; + } + +@@ -1036,8 +1018,6 @@ WaitressReturn_t WaitressFetchCall (WaitressHandle_t *waith) { + waith->request.write = WaitressOrdinaryWrite; + + if (waith->url.tls) { +- assert (waith->tlsInitialized); +- + waith->request.read = WaitressGnutlsRead; + waith->request.write = WaitressGnutlsWrite; + gnutls_init (&waith->request.tlsSession, GNUTLS_CLIENT); +@@ -1046,6 +1026,7 @@ WaitressReturn_t WaitressFetchCall (WaitressHandle_t *waith) { + "PERFORMANCE", &err) != GNUTLS_E_SUCCESS) { + return WAITRESS_RET_ERR; + } ++ gnutls_certificate_allocate_credentials (&waith->tlsCred); + if (gnutls_credentials_set (waith->request.tlsSession, + GNUTLS_CRD_CERTIFICATE, + waith->tlsCred) != GNUTLS_E_SUCCESS) { +@@ -1083,6 +1064,7 @@ WaitressReturn_t WaitressFetchCall (WaitressHandle_t *waith) { + if (waith->url.tls) { + gnutls_bye (waith->request.tlsSession, GNUTLS_SHUT_RDWR); + gnutls_deinit (waith->request.tlsSession); ++ gnutls_certificate_free_credentials (waith->tlsCred); + } + close (waith->request.sockfd); + +diff --git a/src/libwaitress/waitress.h b/src/libwaitress/waitress.h +index e1cf303..7e4401a 100644 +--- a/src/libwaitress/waitress.h ++++ b/src/libwaitress/waitress.h +@@ -92,8 +92,8 @@ typedef struct { + void *data; + WaitressCbReturn_t (*callback) (void *, size_t, void *); + int timeout; ++ const char *tlsFingerprint; + gnutls_certificate_credentials_t tlsCred; +- bool tlsInitialized; + + /* per-request data */ + struct { +@@ -110,7 +110,7 @@ typedef struct { + } request; + } WaitressHandle_t; + +-WaitressReturn_t WaitressInit (WaitressHandle_t *, const char *); ++void WaitressInit (WaitressHandle_t *); + void WaitressFree (WaitressHandle_t *); + bool WaitressSetProxy (WaitressHandle_t *, const char *); + char *WaitressUrlEncode (const char *); +diff --git a/src/main.c b/src/main.c +index e14a88a..afa75da 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -192,7 +192,7 @@ static void BarMainStartPlayback (BarApp_t *app, pthread_t *playerThread) { + /* setup player */ + memset (&app->player, 0, sizeof (app->player)); + +- WaitressInit (&app->player.waith, NULL); ++ WaitressInit (&app->player.waith); + WaitressSetUrl (&app->player.waith, app->playlist->audioUrl); + + /* set up global proxy, player is NULLed on songfinish */ +@@ -328,7 +328,6 @@ int main (int argc, char **argv) { + static BarApp_t app; + /* terminal attributes _before_ we started messing around with ~ECHO */ + struct termios termOrig; +- WaitressReturn_t wRet; + + memset (&app, 0, sizeof (app)); + +@@ -355,19 +354,10 @@ int main (int argc, char **argv) { + app.settings.keys[BAR_KS_HELP]); + } + +- if ((wRet = WaitressInit (&app.waith, app.settings.tlsCaPath)) != WAITRESS_RET_OK) { +- if (wRet == WAITRESS_RET_TLS_TRUSTFILE_ERR) { +- BarUiMsg (&app.settings, MSG_ERR, "Can't load root certificates. " +- "Please check the tls_ca_path setting in your config file.\n"); +- } else { +- BarUiMsg (&app.settings, MSG_ERR, "Can't initialize HTTP library: " +- "%s\n", WaitressErrorToStr (wRet)); +- } +- goto die; +- } +- ++ WaitressInit (&app.waith); + app.waith.url.host = strdup (PIANO_RPC_HOST); + app.waith.url.tls = true; ++ app.waith.tlsFingerprint = app.settings.tlsFingerprint; + + /* init fds */ + FD_ZERO(&app.input.set); +@@ -388,7 +378,6 @@ int main (int argc, char **argv) { + + BarMainLoop (&app); + +-die: + if (app.input.fds[1] != -1) { + close (app.input.fds[1]); + } +diff --git a/src/settings.c b/src/settings.c +index f29fcfa..ee332cc 100644 +--- a/src/settings.c ++++ b/src/settings.c +@@ -93,7 +93,6 @@ void BarSettingsDestroy (BarSettings_t *settings) { + free (settings->npStationFormat); + free (settings->listSongFormat); + free (settings->fifo); +- free (settings->tlsCaPath); + for (size_t i = 0; i < MSG_COUNT; i++) { + free (settings->msgFormat[i].prefix); + free (settings->msgFormat[i].postfix); +@@ -132,7 +131,9 @@ void BarSettingsRead (BarSettings_t *settings) { + settings->listSongFormat = strdup ("%i) %a - %t%r"); + settings->fifo = malloc (PATH_MAX * sizeof (*settings->fifo)); + BarGetXdgConfigDir (PACKAGE "/ctl", settings->fifo, PATH_MAX); +- settings->tlsCaPath = strdup ("/etc/ssl/certs/ca-certificates.crt"); ++ memcpy (settings->tlsFingerprint, "\xD9\x98\x0B\xA2\xCC\x0F\x97\xBB" ++ "\x03\x82\x2C\x62\x11\xEA\xEA\x4A\x06\xEE\xF4\x27", ++ sizeof (settings->tlsFingerprint)); + + settings->msgFormat[MSG_NONE].prefix = NULL; + settings->msgFormat[MSG_NONE].postfix = NULL; +@@ -241,9 +242,16 @@ void BarSettingsRead (BarSettings_t *settings) { + } else if (streq ("fifo", key)) { + free (settings->fifo); + settings->fifo = strdup (val); +- } else if (streq ("tls_ca_path", key)) { +- free (settings->tlsCaPath); +- settings->tlsCaPath = strdup (val); ++ } else if (streq ("tls_fingerprint", key)) { ++ /* expects 40 byte hex-encoded sha1 */ ++ if (strlen (val) == 40) { ++ for (size_t i = 0; i < 20; i++) { ++ char hex[3]; ++ memcpy (hex, &val[i*2], 2); ++ hex[2] = '\0'; ++ settings->tlsFingerprint[i] = strtol (hex, NULL, 16); ++ } ++ } + } else if (strncmp (formatMsgPrefix, key, + strlen (formatMsgPrefix)) == 0) { + static const char *mapping[] = {"none", "info", "nowplaying", +diff --git a/src/settings.h b/src/settings.h +index 6cb4cb2..8ce1225 100644 +--- a/src/settings.h ++++ b/src/settings.h +@@ -96,7 +96,7 @@ typedef struct { + char *npStationFormat; + char *listSongFormat; + char *fifo; +- char *tlsCaPath; ++ char tlsFingerprint[20]; + BarMsgFormatStr_t msgFormat[MSG_COUNT]; + } BarSettings_t; +

1 0