Use 'pkg-config' instead of heuristics to find 'tk' flags. --- matplotlib-1.4.3/setupext.py.orig 2015-12-01 14:21:19.554417453 +0100 +++ matplotlib-1.4.3/setupext.py 2015-12-02 10:39:47.282363530 +0100 @@ -1457,7 +1457,7 @@ p = subprocess.Popen( '. %s ; eval echo ${%s}' % (file, varname), shell=True, - executable="/bin/sh", + executable="sh", stdout=subprocess.PIPE) result = p.communicate()[0] return result.decode('ascii') @@ -1601,8 +1601,19 @@ # of distros. # Query Tcl/Tk system for library paths and version string + def getoutput(s): + ret = os.popen(s).read().strip() + return ret try: - tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk() + pkg_config_libs = getoutput('pkg-config --libs-only-L tk').split() + # drop '-L' part of strings + pkg_config_libs = [s[2:] for s in pkg_config_libs] + pkg_config_ver = getoutput('pkg-config --modversion tk') + tk_ver = re.match(r"(\d+.\d+)[\d.]*", pkg_config_ver).group(1) + tcl_lib_dir = next(s for s in pkg_config_libs + if re.match(r".*-tcl-.*", s)) + '/tcl' + tk_ver + tk_lib_dir = next(s for s in pkg_config_libs + if re.match(r".*-tk-.*", s)) + '/tk' + tk_ver except: tk_ver = '' result = self.hardcoded_tcl_config() c4531608e0'/>
path: root/tests/cve.scm
AgeCommit message (Expand)Author
2019-10-23cve: Rewrite to read the JSON feed instead of the XML feed....The XML feed was discontinued on Oct. 16th, 2019: <https://nvd.nist.gov/General/News/XML-Vulnerability-Feed-Retirement-Phase-3> * guix/cve.scm (string->date*): New procedure. (<cve-item>, <cve>, <cve-reference>): New record types. (cpe-match->cve-configuration, configuration-data->cve-configurations) (json->cve-items, version-matches?): New procedures. (yearly-feed-uri): Change URL to refer to JSON feed. (cpe->product-alist, %parse-vulnerability-feed) (xml->vulnerabilities): Remove. (cve-configuration->package-list, merge-package-lists) (cve-item->vulnerability, json->vulnerabilities): New procedures. (write-cache): Use 'json->vulnerabilities' instead of 'xml->vulnerabilities', and remove 'parameterize'. (vulnerabilities->lookup-proc): Use 'version-matches?' when VERSION is true. * tests/cve.scm (%sample): Use 'tests/cve-sample.json'. (%expected-vulnerabilities): Rewrite accordingly. ("json->cve-items", "cve-item-published-date") ("json->vulnerabilities"): New tests. ("xml->vulnerabilities"): Remove. ("vulnerabilities->lookup-proc"): Adjust to new vulnerabilities. * tests/cve-sample.json: New file. * tests/cve-sample.xml: Remove. * Makefile.am (EXTRA_DIST): Adjust accordingly. * doc/guix.texi (Invoking guix lint): Update nist.gov URLs. Ludovic Courtès
2019-10-20tests: Avoid now-deprecated 'make-struct'....* tests/cve.scm (vulnerability): Use 'make-struct/no-tail' instead of 'make-struct', which is deprecated. * tests/lint.scm ("cve: one vulnerability") ("cve: one patched vulnerability") ("cve: known safe from vulnerability") ("cve: vulnerability fixed in replacement version") ("cve: patched vulnerability in replacement"): Likewise. Ludovic Courtès