From 006c3f2240d9c4f90205dea12aea5341140087c6 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 12 May 2020 15:50:27 +0100 Subject: gnu: Add perl-lwpx-paranoidagent. * gnu/packages/web.scm (perl-lwpx-paranoidagent): New variable. --- gnu/packages/web.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eabc3c0197..a3f69e1587 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -126,6 +126,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) @@ -3718,6 +3719,35 @@ possibly-temporary error (like a DNS lookup timeout), it'll wait a few seconds and retry a few times.") (license license:perl-license))) +(define-public perl-lwpx-paranoidagent + (package + (name "perl-lwpx-paranoidagent") + (version "1.12") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-" + version ".tar.gz")) + (sha256 + (base32 + "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-libwww" ,perl-libwww) + ;; Users should instead make sure SSL_ca_path is set properly. + ;; ("perl-mozilla-ca" ,perl-mozilla-ca) + ("perl-net-dns" ,perl-net-dns))) + (home-page "https://metacpan.org/release/LWPx-ParanoidAgent") + (synopsis "Security enhanced subclass of LWP::UserAgent") + (description "@code{LWPx::ParanoidAgent} is a class subclassing +@code{LWP::UserAgent} but paranoid against attackers. Its purpose is +to vet requests for a remote resource on behalf of a possibly +malicious user. The class can do the same as @code{LWP::UserAgent}, +except that proxy support has been removed. Support for URI schemes +is limited to http and https.") + (license license:perl-license))) + (define-public perl-net-amazon-s3 (package (name "perl-net-amazon-s3") -- cgit v1.2.3 From 89bd9f41ff572d8e96a6e589e07f3f8802e36535 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 14 May 2020 13:35:33 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-lwpx-paranoidagent. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a3f69e1587..5b18f84ac3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4904,6 +4904,7 @@ NetSurf project.") ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) + ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-timedate" ,perl-timedate) ("perl-xml-sax" ,perl-xml-sax) -- cgit v1.2.3 From 273380fda2889e5ba4e7fba28b5b104306872c69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 14:51:06 +0200 Subject: gnu: Add hitch. * gnu/packages/web.scm (hitch): New public variable. --- gnu/packages/web.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5b18f84ac3..3be0da69f8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -123,6 +123,7 @@ #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) + #:use-module (gnu packages lsof) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) @@ -5468,6 +5469,60 @@ HTTP statistics for system administrators that require a visual server report on the fly.") (license license:x11))) +(define-public hitch + (package + (name "hitch") + (version "1.5.2") + (home-page "https://hitch-tls.org/") + (source (origin + (method url-fetch) + (uri (string-append home-page "source/hitch-" version ".tar.gz")) + (sha256 + (base32 + "1nnzqqigfw78nqhp81a72x1s8d6v49ayw4w5df0zzm2cb1jgv95i")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Most tests attempts to access hitch-tls.org which is + ;; unavailable in the build container. Run them against + ;; a dummy local web server instead. + (for-each (lambda (test) + (substitute* test + (("\\[hitch-tls\\.org\\]:80") + "[localhost]:8000"))) + (find-files "src/tests" "\\.sh$")) + (system "python3 -m http.server &") + + ;; The build container does not reap zombie processes, + ;; causing stop_hitch to hang indefinitely while waiting + ;; for the process to terminate because 'kill -0' never + ;; succeeds. Use a different test to see whether the + ;; process has shut down. + (substitute* "src/tests/hitch_test.sh" + (("kill -0 \"\\$HITCH_PID\"") + "$(ps -p $HITCH_PID -o state= | grep -qv '^Z$')")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + + ;; For tests. + ("curl" ,curl) + ("egrep" ,grep) + ("lsof" ,lsof) + ("python" ,python))) + (inputs + `(("libev" ,libev) + ("openssl" ,openssl))) + (synopsis "Scalable TLS proxy") + (description + "Hitch is a performant TLS proxy based on @code{libev}. It terminates +SSL/TLS connections and forwards the unencrypted traffic to a backend such +as a web server. It is designed to handle many thousand connections on +multicore machines.") + (license license:bsd-2))) + (define-public httptunnel (package (name "httptunnel") -- cgit v1.2.3 From 4d9e4801d2e5975702e957d1bb76dbeb90ea0e09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 04:27:52 +0200 Subject: gnu: http-parser: Update to 2.9.4. * gnu/packages/web.scm (http-parser): Update to 2.9.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3be0da69f8..285d2b3bf0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5911,7 +5911,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread (define-public http-parser (package (name "http-parser") - (version "2.9.3") + (version "2.9.4") (home-page "https://github.com/nodejs/http-parser") (source (origin (method git-fetch) @@ -5934,7 +5934,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) (sha256 (base32 - "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811")))) + "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 5c30eb61d74034a1b7c188b8d7be7df0b926025f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:08:10 +0200 Subject: gnu: http-parser: Fix build [and guix pull] on armhf-linux. * gnu/packages/web.scm (http-parser)[source]: Add patch. * gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../http-parser-fix-assertion-on-armhf.patch | 39 ++++++++++++++++++++++ gnu/packages/web.scm | 24 +++++++------ 3 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch (limited to 'gnu/packages/web.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2e12c5a873..8d737f211e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1081,6 +1081,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/http-parser-fix-assertion-on-armhf.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ diff --git a/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch b/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch new file mode 100644 index 0000000000..79bd3e8dbc --- /dev/null +++ b/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch @@ -0,0 +1,39 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 20 May 2020 19:17:13 +0200 +Subject: [PATCH] gnu: http-client: Fix assertion on armhf-linux. + +Copied verbatim from [0] to fix guix pull[1] on ARM systems. + +[0]: https://github.com/nodejs/http-parser/pull/510 +[1]: https://issues.guix.gnu.org/40604 + +From 0e5868aebb9eb92b078d27bb2774c2154dc167e2 Mon Sep 17 00:00:00 2001 +From: Ben Noordhuis +Date: Thu, 30 Apr 2020 11:22:50 +0200 +Subject: [PATCH] Fix sizeof(http_parser) assert + +The result should be 32 on both 32 bits and 64 bits architectures +because of struct padding. + +Fixes: https://github.com/nodejs/http-parser/issues/507 +--- + test.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test.c b/test.c +index 7983424..f60a84f 100644 +--- a/test.c ++++ b/test.c +@@ -4220,8 +4220,11 @@ main (void) + patch = version & 255; + printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); + ++ /* Should be 32 on both 32 bits and 64 bits architectures because of ++ * struct padding, see https://github.com/nodejs/http-parser/issues/507. ++ */ + printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); +- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); ++ assert(sizeof(http_parser) == 32); + + //// API + test_preserve_data(); diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 285d2b3bf0..1851590628 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5917,24 +5917,26 @@ into your tests. It automatically starts up a HTTP server in a separate thread (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "v" version)))) + (sha256 + (base32 + "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) (file-name (git-file-name name version)) (patches - ;; When parsing URLs, treat an empty port (eg - ;; `http://hostname:/`) as if it were unspecified. This patch is - ;; applied to Fedora's http-parser and to libgit2's bundled version. - (list + (cons* (origin + ;; Treat an empty port (e.g. `http://hostname:/`) when parsing + ;; URLs as if no port were specified. This patch is applied + ;; to Fedora's http-parser and to libgit2's bundled version. (method url-fetch) (uri (string-append - "https://src.fedoraproject.org/rpms/http-parser/raw/" - "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" - "f/0001-url-treat-empty-port-as-default.patch")) + "https://src.fedoraproject.org/rpms/http-parser/raw/" + "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" + "f/0001-url-treat-empty-port-as-default.patch")) (sha256 (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) - (sha256 - (base32 - "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))) + ;; A fix for . + (search-patches "http-parser-fix-assertion-on-armhf.patch"))))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 4dd8677f7b0eb282f5e8c9126cd279a26692e231 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 20:05:54 +0200 Subject: gnu: varnish-modules: Update to 0.16.0. * gnu/packages/web.scm (varnish-modules): Update to 0.16.0. [source](uri): Adjust for new location. --- gnu/packages/web.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1851590628..5f80a035b2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5686,15 +5686,15 @@ configuration language.") (package (name "varnish-modules") (home-page "https://github.com/varnish/varnish-modules") - (version "0.15.0") + (version "0.16.0") (source (origin (method url-fetch) - (uri (string-append "https://download.varnish-software.com" - "/varnish-modules/varnish-modules-" - version ".tar.gz")) + (uri (string-append "https://github.com/varnish/varnish-modules" + "/releases/download/varnish-modules-" version + "/varnish-modules-" version ".tar.gz")) (sha256 (base32 - "09li9lqa1kb275w1rby2zldyg8r9cfcl4qyv53qyd9xbzilrz751")))) + "1ph5bplsip4rycql1c2hgbvmrwbgcrgv2ldgfp7saxxbsv5cpcds")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 453e66d7772a2182244e35dd6224a73f97cfc07d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 20:06:29 +0200 Subject: gnu: varnish-modules: Update description. * gnu/packages/web.scm (varnish-modules)[description]: Use @acronym instead of @dfn. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5f80a035b2..d550e78bad 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5704,7 +5704,7 @@ configuration language.") (synopsis "Collection of Varnish modules") (description "This package provides a collection of modules (@dfn{vmods}) for the Varnish -cache server, extending the @dfn{Varnish Configuration Language} (VCL) with +cache server, extending the @acronym{VCL, Varnish Configuration Language} with additional capabilities.") (license license:bsd-2))) -- cgit v1.2.3 From 3da3ec93a373a23e43d70aeabaac8fba681b07f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:00:02 +0200 Subject: gnu: uhttpmock: Update to 0.5.2. * gnu/packages/web.scm (uhttpmock): Update to 0.5.2. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d550e78bad..baea844e4f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4671,15 +4671,14 @@ you'd expect.") (define-public uhttpmock (package (name "uhttpmock") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/" name "-" version ".tar.xz")) (sha256 - (base32 - "163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6")))) + (base32 "0glyx07kxc3s3cx5vp30kfgscl9q6bghcq1zysfyxm24r0h6j58p")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From a7f89f97b73a732b7333b21e95946ed4c794b121 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 21 May 2020 13:10:08 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-xml-feed. [arguments]: Add 'pre-check' phase. --- gnu/packages/web.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index baea844e4f..cf9bff8b3b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4876,6 +4876,13 @@ NetSurf project.") (invoke "find" "doc" "underlays" "-type" "f" "-exec" "touch" "{}" "+") #t)) + (add-before 'check 'pre-check + ;; XDG_DATA_DIRS is needed by the podcast.t test. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" + (string-append (assoc-ref inputs "shared-mime-info") + "/share")) + #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4907,6 +4914,7 @@ NetSurf project.") ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-timedate" ,perl-timedate) + ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-twig" ,perl-xml-twig) -- cgit v1.2.3 From c1ab9e881a0a5ba840ddb998dd7c60f6649f0f69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:00:06 +0200 Subject: gnu: uhttpmock: Don't use NAME in source URI. * gnu/packages/web.scm (uhttpmock)[source]: Hard-code NAME. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cf9bff8b3b..0aaa5e80bb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4676,7 +4676,7 @@ you'd expect.") (origin (method url-fetch) (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/" - name "-" version ".tar.xz")) + "uhttpmock-" version ".tar.xz")) (sha256 (base32 "0glyx07kxc3s3cx5vp30kfgscl9q6bghcq1zysfyxm24r0h6j58p")))) (build-system glib-or-gtk-build-system) -- cgit v1.2.3 From f2de892b375d30ad79502509a47a15f0f4d68fee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 14:52:01 +0200 Subject: gnu: http-parser: Fix build [and guix pull!] on i686-linux. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on commit 5c30eb61d74034a1b7c188b8d7be7df0b926025f. * gnu/packages/web.scm (http-parser)[source]: Apply the armhf patch not here… [arguments]: …but in a phase & only on armhf-linux. [native-inputs]: Add it on armhf-linux. --- gnu/packages/web.scm | 62 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 24 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0aaa5e80bb..f6fab8f036 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5920,30 +5920,28 @@ into your tests. It automatically starts up a HTTP server in a separate thread (name "http-parser") (version "2.9.4") (home-page "https://github.com/nodejs/http-parser") - (source (origin - (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) - (sha256 - (base32 - "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) - (file-name (git-file-name name version)) - (patches - (cons* - (origin - ;; Treat an empty port (e.g. `http://hostname:/`) when parsing - ;; URLs as if no port were specified. This patch is applied - ;; to Fedora's http-parser and to libgit2's bundled version. - (method url-fetch) - (uri (string-append - "https://src.fedoraproject.org/rpms/http-parser/raw/" - "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" - "f/0001-url-treat-empty-port-as-default.patch")) - (sha256 - (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))) - ;; A fix for . - (search-patches "http-parser-fix-assertion-on-armhf.patch"))))) + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) + (file-name (git-file-name name version)) + (patches + (list + (origin + ;; Treat an empty port (e.g. `http://hostname:/`) when parsing + ;; URLs as if no port were specified. This patch is applied + ;; to Fedora's http-parser and to libgit2's bundled version. + (method url-fetch) + (uri (string-append + "https://src.fedoraproject.org/rpms/http-parser/raw/" + "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" + "f/0001-url-treat-empty-port-as-default.patch")) + (sha256 + (base32 + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -5956,6 +5954,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread '("CC=gcc"))) #:phases (modify-phases %standard-phases + ,@(match (%current-system) + ("armhf-linux" + '((add-before 'check 'apply-assertion.patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs "assertion.patch"))) + (invoke "patch" "-p1" "-i" patch) + #t))))) + (_ '())) ,@(if (%current-target-system) '((replace 'configure (lambda* (#:key target #:allow-other-keys) @@ -5966,6 +5972,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread (string-append "AR=" target "-ar\n"))) #t))) '((delete 'configure)))))) + (native-inputs + `(,@(match (%current-system) + ("armhf-linux" + ;; A fix for which in turn + ;; breaks i686-linux builds. + `(("assertion.patch" + ,@(search-patches "http-parser-fix-assertion-on-armhf.patch")))) + (_ '())))) (synopsis "HTTP request/response parser for C") (description "This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in -- cgit v1.2.3 From 06df0f9fd9191c614485c1672ddb15156911e7f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:00:47 +0300 Subject: gnu: perl-cgi: Update to 4.47. * gnu/packages/web.scm (perl-cgi): Update to 4.47. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f6fab8f036..c7bea4c5ae 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2607,7 +2607,7 @@ development server with Starman.") (define-public perl-cgi (package (name "perl-cgi") - (version "4.46") + (version "4.47") (source (origin (method url-fetch) @@ -2615,7 +2615,7 @@ development server with Starman.") "CGI-" version ".tar.gz")) (sha256 (base32 - "16225vmdsfa2y7i1ydv7634nd0qxxb0ccwnfszjq58rwqgfri2bq")))) + "1a9cylhqsm5icvbg09m21nj0xx4zy5gbk4p74npm1ch3qlryzyyr")))) (build-system perl-build-system) (native-inputs `(("perl-test-deep" ,perl-test-deep) -- cgit v1.2.3 From 41701f4b2394036dc3d6616c349d0374516cd7fb Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:40:44 -0500 Subject: gnu: netsurf-buildsystem: Update to 1.9. * gnu/packages/web.scm (netsurf-buildsystem): Update to 1.9. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c7bea4c5ae..da392937d5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4735,7 +4735,7 @@ tools they trust (e.g. wget).") (define netsurf-buildsystem (package (name "netsurf-buildsystem") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) @@ -4743,7 +4743,7 @@ tools they trust (e.g. wget).") "buildsystem-" version ".tar.gz")) (sha256 (base32 - "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw")))) + "0alsmaig9ln8dgllb3z63gq90fiz75jz0ic71fi0k0k898qix14k")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From 3f0f147a5f21791be3e57b4f117887db3590262e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:43:15 -0500 Subject: gnu: hubbub: Update to 0.3.7. * gnu/packages/web.scm (hubbub): Update to 0.3.7. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index da392937d5..de28c3c711 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4799,7 +4799,7 @@ C. It is developed as part of the NetSurf project.") (define-public hubbub (package (name "hubbub") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) @@ -4807,7 +4807,7 @@ C. It is developed as part of the NetSurf project.") "libhubbub-" version "-src.tar.gz")) (sha256 (base32 - "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp")) + "1dimfyblmym98qa1b80c5jslv2zk8r44xbdrgrsrw1n9wr9y4yly")) (patches (search-patches "hubbub-sort-entities.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From b0228793704298c2d40154ed63fd75e95b9b1180 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:43:46 -0500 Subject: gnu: libwapcaplet: Update to 0.4.3. * gnu/packages/web.scm (libwapcaplet): Update to 0.4.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index de28c3c711..a2e4c80fe2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4938,7 +4938,7 @@ commenting.") (define-public libwapcaplet (package (name "libwapcaplet") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) @@ -4946,7 +4946,7 @@ commenting.") "libwapcaplet-" version "-src.tar.gz")) (sha256 (base32 - "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86")))) + "0p0c2q9lsj4vs97aa7vjllfhw33zv3dpysdkjblzhib6dpfs2alv")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 1953b48966379c9e324c3fa05d959a3cdc15807e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:44:13 -0500 Subject: gnu: libcss: Update to 0.9.1. * gnu/packages/web.scm (libcss): Update to 0.9.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a2e4c80fe2..95d11bcf43 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4964,7 +4964,7 @@ developed as part of the Netsurf project.") (define-public libcss (package (name "libcss") - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) @@ -4972,7 +4972,7 @@ developed as part of the Netsurf project.") "libcss-" version "-src.tar.gz")) (sha256 (base32 - "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr")))) + "1p66sdiiqm7w4jkq23hsf08khsnmq93hshh9f9m8sbirjdpf3p6j")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From a1c6bab52acf244e7f2410837ee2d1ffa4631ee9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:47:14 -0500 Subject: gnu: libdom: Update to 0.4.1. * gnu/packages/web.scm (libdom): Update to 0.4.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 95d11bcf43..adef56d9d1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5032,7 +5032,7 @@ in which the loaded data is arranged in memory.") (define-public libdom (package (name "libdom") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) @@ -5040,7 +5040,7 @@ in which the loaded data is arranged in memory.") "libdom-" version "-src.tar.gz")) (sha256 (base32 - "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy")))) + "0jpg5hx3y0mdxk5szd47dyijqimd2321brbqk2620pp5f4j0gvlq")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 82441f35c2d52fb1bce8545145a88086853bc97f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:47:51 -0500 Subject: gnu: libnsbmp: Update to 0.1.6. * gnu/packages/web.scm (libnsbmp): Update to 0.1.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index adef56d9d1..278fd5d263 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5099,7 +5099,7 @@ project.") (define-public libnsbmp (package (name "libnsbmp") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -5107,7 +5107,7 @@ project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35")))) + "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 2f3cf0b655c553097f7caafcc0ecd4279860add6 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:48:18 -0500 Subject: gnu: libnslog: Update to 0.1.3. * gnu/packages/web.scm (libnslog): Update to 0.1.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 278fd5d263..4bf1199c2a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5145,7 +5145,7 @@ C. It is developed as part of the NetSurf project.") (define-public libnslog (package (name "libnslog") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -5153,7 +5153,7 @@ C. It is developed as part of the NetSurf project.") "libnslog-" version "-src.tar.gz")) (sha256 (base32 - "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd")))) + "1l2k0kdv9iv18svhv360vszjavhl4g09cp8a8yb719pgsylxr67w")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 7c91bca9a14345a4eb782665f20d3d3d7b1bd965 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:48:41 -0500 Subject: gnu: libnsutils: Update to 0.1.0. * gnu/packages/web.scm (libnsutils): Update to 0.1.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4bf1199c2a..bebfa0eb53 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5173,7 +5173,7 @@ client applications. It is developed as part of the NetSurf project.") (define-public libnsutils (package (name "libnsutils") - (version "0.0.5") + (version "0.1.0") (source (origin (method url-fetch) @@ -5181,7 +5181,7 @@ client applications. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf")))) + "1w5fyy2i60a3v3if3iqcn9sy9sycx6966rcx53v85gja6hb6a33r")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From a7597d2dce8377390896ba5222eb4dfb7e3f69be Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:49:16 -0500 Subject: gnu: libnspsl: Update to 0.1.6. * gnu/packages/web.scm (libnspsl): Update to 0.1.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bebfa0eb53..4f5646df24 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5196,7 +5196,7 @@ developed as part of the NetSurf project.") (define-public libnspsl (package (name "libnspsl") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -5204,7 +5204,7 @@ developed as part of the NetSurf project.") "libnspsl-" version "-src.tar.gz")) (sha256 (base32 - "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd")))) + "02q28n5i6fwqcz1nn167rb71k1q95mx38mfah6zi1lvqrc2q5ifk")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 981d80b331afc39365ccf393684b9b94cd0eaec0 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:49:48 -0500 Subject: gnu: nsgenbind: Update to 0.8. * gnu/packages/web.scm (nsgenbind): Update to 0.8. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4f5646df24..68b0336781 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5219,7 +5219,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (define-public nsgenbind (package (name "nsgenbind") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) @@ -5227,7 +5227,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") "nsgenbind-" version "-src.tar.gz")) (sha256 (base32 - "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq")))) + "1cqwgwca49jvmijwiyaab2bwxicgxdrnlpinf8kp3nha02nm73ad")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 5c133ca561acfc1a1b9fe6dfc03d2bd12784242c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:50:10 -0500 Subject: gnu: netsurf: Update to 3.10. * gnu/packages/web.scm (netsurf): Update to 3.10. * gnu/packages/patches/netsurf-system-utf8proc.patch: Adjust to new source. --- gnu/packages/patches/netsurf-system-utf8proc.patch | 51 +++------------------- gnu/packages/web.scm | 4 +- 2 files changed, 9 insertions(+), 46 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/patches/netsurf-system-utf8proc.patch b/gnu/packages/patches/netsurf-system-utf8proc.patch index a2ee52ca05..04bf828f37 100644 --- a/gnu/packages/patches/netsurf-system-utf8proc.patch +++ b/gnu/packages/patches/netsurf-system-utf8proc.patch @@ -1,50 +1,13 @@ -Use upstream utf8proc package, as suggested in -http://source.netsurf-browser.org/libutf8proc.git/commit/?id=770e329cceaf0620c7b482589a9b17ed1d19c16d +Fix include directory for system utf8proc. -Work around upstream's lack of a pkg-config file and update API. - ---- netsurf-3.6/Makefile -+++ netsurf-3.6/Makefile -@@ -527,10 +527,9 @@ - $(eval $(call pkg_config_find_and_add,libcss,CSS)) - $(eval $(call pkg_config_find_and_add,libdom,DOM)) - $(eval $(call pkg_config_find_and_add,libnsutils,nsutils)) --$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) - - # Common libraries without pkg-config support --LDFLAGS += -lz -+LDFLAGS += -lz -lutf8proc +--- netsurf-3.10/utils/idna.c ++++ netsurf-3.10/utils/idna.c +@@ -167,7 +167,7 @@ - # Optional libraries with pkgconfig + #ifdef WITH_UTF8PROC ---- netsurf-3.8/utils/idna.c -+++ netsurf-3.8/utils/idna.c -@@ -27,7 +27,7 @@ - #include - #include - #include -#include +#include - #include "netsurf/inttypes.h" - ---- netsurf-3.8/test/Makefile -+++ netsurf-3.8/test/Makefile -@@ -142,14 +142,15 @@ - -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \ - -Dnsgtk \ - $(SAN_FLAGS) \ -- $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \ -+ $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \ - $(LIB_CFLAGS) - TESTCFLAGS := $(BASE_TESTCFLAGS) \ - $(COV_CFLAGS) \ - $(COV_CPPFLAGS) - - TESTLDFLAGS := -L$(TESTROOT) \ -- $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \ -+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \ -+ $(LDFLAGS) \ - $(SAN_FLAGS) \ - $(LIB_LDFLAGS)\ - $(COV_LDFLAGS) + int32_t idna_contexto[] = { + /* CONTEXTO codepoints which have a rule defined */ diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 68b0336781..d8290ff53a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5247,7 +5247,7 @@ w3c webidl files and a binding configuration file.") (define-public netsurf (package (name "netsurf") - (version "3.9") + (version "3.10") (source (origin (method url-fetch) @@ -5255,7 +5255,7 @@ w3c webidl files and a binding configuration file.") "releases/source/netsurf-" version "-src.tar.gz")) (sha256 (base32 - "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp")) + "0plra64c5xyiw12yx2q13brxsv8apmany97zqa2lcqckw4ll8j1n")) (patches (search-patches "netsurf-system-utf8proc.patch" "netsurf-y2038-tests.patch" "netsurf-longer-test-timeout.patch" -- cgit v1.2.3 From cfdefb863c274ecdbd452836364e68e1028c7bb1 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 15:15:10 -0500 Subject: gnu: netsurf: Remove tabulations in source. * gnu/packages/web.scm (netsurf): Remove tabulations. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d8290ff53a..66774c4a2d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5322,18 +5322,18 @@ w3c webidl files and a binding configuration file.") (display (read-line in 'concat) out) (sxml->xml (let rec ((sxml (xml->sxml in - #:default-entity-handler - (lambda (port name) - (string-append "" - (symbol->string name) - ""))))) + #:default-entity-handler + (lambda (port name) + (string-append "" + (symbol->string name) + ""))))) ;; We'd like to use sxml-match here, but it can't ;; match against generic tag symbols... (match sxml (`(div (@ (class "links")) . ,rest) '()) - (`(ENTITY ,ent) - `(*ENTITY* ,ent)) + (`(ENTITY ,ent) + `(*ENTITY* ,ent)) ((x ...) (map rec x)) (x x))) -- cgit v1.2.3 From beec29da921345c2e46852c531161fb5ddd3076f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:54:27 +0200 Subject: gnu: json-c: Update to 0.14. * gnu/packages/web.scm (json-c): Update to 0.14. [source](modules, snippet): Remove. [build-system]: Change to CMAKE-BUILD-SYSTEM. (json-c-0.13): New public variable. (json-c-0.12): Inherit from JSON-C-0.13. * gnu/packages/cryptsetup.scm (cryptsetup-static)[inputs]: Stick with JSON-C-0.13. * gnu/packages/linux.scm (multipath-tools)[inputs]: Likewise. * gnu/packages/security-token.scm (yubikey-personalization, libu2f-host, libu2f-server)[inputs]: Likewise. * gnu/packages/syndication.scm (newsboat)[inputs]: Likewise. --- gnu/packages/cryptsetup.scm | 4 ++-- gnu/packages/linux.scm | 2 +- gnu/packages/security-token.scm | 6 +++--- gnu/packages/syndication.scm | 2 +- gnu/packages/web.scm | 39 ++++++++++++++++++++++++++------------- 5 files changed, 33 insertions(+), 20 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index d4c039ac04..bd6e046452 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -58,7 +58,7 @@ `(("pkg-config" ,pkg-config))) (inputs `(("argon2" ,argon2) - ("json-c" ,json-c) + ("json-c" ,json-c-0.13) ;XXX update this for cryptsetup >= 2.3 ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ; device-mapper ("popt" ,popt) @@ -138,7 +138,7 @@ files). This assumes LIBRARY uses Libtool." (inherit (static-library libgcrypt)) (propagated-inputs `(("libgpg-error-host" ,(static-library libgpg-error))))))) - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3fd902e340..b45b3725d4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4243,7 +4243,7 @@ arrays when needed.") ("pkg-config" ,pkg-config) ("valgrind" ,valgrind))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libaio" ,libaio) ("liburcu" ,liburcu) ("lvm2" ,lvm2) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2ab8a85702..d742c6255c 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -357,7 +357,7 @@ and other operations. It includes a library and a command-line tool.") (assoc-ref %outputs "out") "/lib/udev/rules.d")))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libusb" ,libusb) ;; The library "libyubikey" is also known as "yubico-c". ("libyubikey" ,libyubikey))) @@ -457,7 +457,7 @@ PCSC API Python wrapper module.") "/xml/dtd/docbook/docbookx.dtd"))) #t))))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("hidapi" ,hidapi))) (native-inputs `(("help2man" ,help2man) @@ -497,7 +497,7 @@ operations.") (list "--enable-gtk-doc" "--enable-tests"))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libressl" ,libressl))) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 5bc3d19a92..658050c54d 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -57,7 +57,7 @@ ("asciidoc" ,asciidoc))) (inputs `(("curl" ,curl) - ("json-c" ,json-c) + ("json-c" ,json-c-0.13) ("libxml2" ,libxml2) ("ncurses" ,ncurses) ("stfl" ,stfl) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eabc3c0197..1ccab7777b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -768,7 +768,7 @@ data.") (define-public json-c (package (name "json-c") - (version "0.13.1") + (version "0.14") (source (origin (method url-fetch) (uri (string-append @@ -776,7 +776,29 @@ data.") version ".tar.gz")) (sha256 (base32 - "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) + "0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk")))) + (build-system cmake-build-system) + (home-page "https://github.com/json-c/json-c/wiki") + (synopsis "JSON implementation in C") + (description + "JSON-C implements a reference counting object model that allows you to +easily construct JSON objects in C, output them as JSON-formatted strings and +parse JSON-formatted strings back into the C representation of JSON objects. +It aims to conform to RFC 7159.") + (license license:x11))) + +;; TODO: Remove these old versions when all dependents have been updated. +(define-public json-c-0.13 + (package + (inherit json-c) + (version "0.13.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://s3.amazonaws.com/json-c_releases/releases/json-c-" + version ".tar.gz")) + (sha256 + (base32 "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) (modules '((guix build utils))) (snippet '(begin @@ -786,20 +808,11 @@ data.") (set-file-time "config.h.in" (stat "aclocal.m4")) #t)))) - (build-system gnu-build-system) - (home-page "https://github.com/json-c/json-c/wiki") - (synopsis "JSON implementation in C") - (description - "JSON-C implements a reference counting object model that allows you to -easily construct JSON objects in C, output them as JSON-formatted strings and -parse JSON-formatted strings back into the C representation of JSON objects. -It aims to conform to RFC 7159.") - (license license:x11))) + (build-system gnu-build-system))) -;; TODO: remove this old version when all dependents have been updated. (define-public json-c-0.12 (package - (inherit json-c) + (inherit json-c-0.13) (version "0.12.1") (source (origin (method url-fetch) -- cgit v1.2.3 From 3217140398a3f791c3c3122ec93fced47660e419 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:16 +0200 Subject: gnu: nginx: Update to 1.19.0. * gnu/packages/web.scm (nginx): Update to 1.19.0. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 66774c4a2d..392264391e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -229,14 +229,14 @@ Interface} specification.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.17.9") + (version "1.19.0") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx")))) + "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) @@ -278,7 +278,6 @@ Interface} specification.") (string-append "--crossbuild=" system ":" release ":" machine))))) (setenv "CC" "gcc") - (format #t "environment variable `CC' set to `gcc'~%") (format #t "configure flags: ~s~%" flags) (apply invoke "./configure" flags) #t))) -- cgit v1.2.3 From ffd2cfc8627c9e37451f0bb7a4ff0edd664e094b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:41 +0200 Subject: gnu: nginx-documentation: Update to 1.19.0-2549-c13a55aae487. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.0-2549-c13a55aae487. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 392264391e..169f9499fa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -359,13 +359,13 @@ documentation.") (license license:bsd-2)))) (define-public nginx-documentation - ;; This documentation should be relevant for nginx@1.15.9. - (let ((revision 2345) - (changeset "7ef11708457e")) + ;; This documentation should be relevant for the current nginx package. + (let ((version "1.19.0") + (revision 2549) + (changeset "c13a55aae487")) (package (name "nginx-documentation") - (version - (simple-format #f "2019-03-01-~A-~A" revision changeset)) + (version (simple-format #f "~A-~A-~A" version revision changeset)) (source (origin (method hg-fetch) (uri (hg-reference @@ -374,7 +374,7 @@ documentation.") (file-name (string-append name "-" version)) (sha256 (base32 - "15975jvh53mnsgi4hhgrwdwy3by23v4kxnhy2vnkziq8v7wkmy4y")))) + "0vwwvk6wf8f6c6n6yffmya9a287s6dbx1p739hdl3hwxfyh2ygc5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From 9549f0283a78fe36f2d4ff2a04ef8ad6b0c02604 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 27 May 2020 17:35:20 -0500 Subject: gnu: libnslog: Use latest version of check for tests. Test failures with latest check were fixed in most recent release. See bug report: https://bugs.netsurf-browser.org/mantis/view.php?id=2736 * gnu/packages/web.scm (libnslog)[native-inputs]: Use latest check. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 169f9499fa..64671842a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5157,7 +5157,7 @@ C. It is developed as part of the NetSurf project.") (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) ("pkg-config" ,pkg-config) - ("check" ,check-0.12) ; For tests + ("check" ,check) ; For tests ("bison" ,bison) ("flex" ,flex))) (arguments netsurf-buildsystem-arguments) -- cgit v1.2.3 From a0362fdea9369b7927704e48cfc6c578213019ce Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 28 May 2020 10:34:40 +0100 Subject: gnu: ikiwiki: Revert to standard wrapper. * gnu/packages/web.scm (ikiwiki)[arguments]: Remove unnecessary 'include-PERL5LIB-in-wrapper' phase. The PERL5LIB environment variable may be set in the user's setup file instead. --- gnu/packages/web.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 64671842a7..b020a6f16a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4850,15 +4850,6 @@ NetSurf project.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'include-PERL5LIB-in-wrapper - (lambda _ - (substitute* "IkiWiki/Wrapper.pm" - (("^@wrapper\\_hooks") - (string-append - "@wrapper_hooks\n" - " addenv(\"PERL5LIB\", \"" - (getenv "PERL5LIB") - "\");"))))) (add-after 'patch-source-shebangs 'patch-Makefiles (lambda _ (substitute* "Makefile.PL" -- cgit v1.2.3 From db144a52a3edae6374a81632f9c10281d80cba8c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 28 May 2020 15:53:43 +0100 Subject: gnu: ikiwiki: Propagate some inputs. * gnu/packages/web.scm (ikiwiki)[inputs]: Move perl-cgi-formbuilder, perl-cgi-session, perl-mail-sendmail, perl-timedate and perl-xml-simple to... [propagated-inputs]: ...here. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b020a6f16a..44fe403489 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4894,28 +4894,28 @@ NetSurf project.") (inputs `(("python" ,python-wrapper) ("perl-authen-passphrase" ,perl-authen-passphrase) - ("perl-cgi-formbuilder" ,perl-cgi-formbuilder) - ("perl-cgi-session" ,perl-cgi-session) ("perl-cgi-simple" ,perl-cgi-simple) ("perl-db-file" ,perl-db-file) ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) - ("perl-mail-sendmail" ,perl-mail-sendmail) - ("perl-timedate" ,perl-timedate) ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) - ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-twig" ,perl-xml-twig) ("po4a" ,po4a))) (propagated-inputs - `(("perl-html-parser" ,perl-html-parser) + `(("perl-cgi-formbuilder" ,perl-cgi-formbuilder) + ("perl-cgi-session" ,perl-cgi-session) + ("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) ("perl-html-template" ,perl-html-template) ("perl-json" ,perl-json) + ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-text-markdown-discount" ,perl-text-markdown-discount) + ("perl-timedate" ,perl-timedate) ("perl-uri" ,perl-uri) + ("perl-xml-simple" ,perl-xml-simple) ("perl-yaml-libyaml" ,perl-yaml-libyaml))) (home-page "https://ikiwiki.info/") (synopsis "Wiki compiler, capable of generating HTML") -- cgit v1.2.3 From e642f78f2eaf1d53d656ff3cd86d4dd186e8eb52 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 1 Jun 2020 13:12:44 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-ipc-run. [arguments]: Set PERL5LIB and CC for IPC::Run in 'pre-check' phase. --- gnu/packages/web.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 44fe403489..6e5bc81660 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4867,11 +4867,31 @@ NetSurf project.") "touch" "{}" "+") #t)) (add-before 'check 'pre-check - ;; XDG_DATA_DIRS is needed by the podcast.t test. (lambda* (#:key inputs #:allow-other-keys) + ;; Six tests use IPC::Run. For these tests the PERL5LIB + ;; variable is needed in the runtime environment and also + ;; in the search path list in the setup file. + (substitute* + '("t/aggregate-file.t" "t/git-cgi.t" "t/git-untrusted.t" + "t/passwordauth.t" "t/relativity.t" "t/wrapper-environ.t") + (("(.*)\"perl\"(.*)$" _ prefix suffix) + (string-append prefix "qw(env), 'PERL5LIB='.$ENV{PERL5LIB}" + ", qw(perl)" suffix)) + (("(.*) PERL5LIB=(.*) perl(.*)$" _ prefix middle suffix) + (string-append prefix "), 'PERL5LIB='.$ENV{PERL5LIB}.':" + middle "', qw(perl" suffix)) + (("(.*)setup(.* )getcwd(.*)$" _ prefix middle suffix) + (string-append prefix "setup" middle + "$ENV{PERL5LIB}.':'.getcwd" suffix)) + (("^ENV(.*): '(.*)$" _ middle suffix) + (string-append "ENV" middle + ": '$ENV{PERL5LIB}:" suffix))) + ;; XDG_DATA_DIRS is needed by the podcast.t test. (setenv "XDG_DATA_DIRS" (string-append (assoc-ref inputs "shared-mime-info") "/share")) + ;; CC is needed by IkiWiki/Wrapper.pm. + (setenv "CC" "gcc") #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) @@ -4899,6 +4919,7 @@ NetSurf project.") ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) + ("perl-ipc-run" ,perl-ipc-run) ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) -- cgit v1.2.3 From 8f7cf3b50cda98afab1bef89bef2d6c01aa2b626 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Jun 2020 18:27:49 +0200 Subject: gnu: guix, guix-jupyter, cuirass, hpcguix-web: Use Guile-JSON 4.0. * gnu/packages/package-management.scm (guix)[native-inputs] [propagated-inputs]: Use GUILE-JSON-4 instead of GUILE-JSON-3. * gnu/packages/ci.scm (cuirass)[inputs]: Likewise. * gnu/packages/package-management.scm (guix-jupyter)[propagated-inputs]: Likewise. * gnu/packages/web.scm (hpcguix-web)[propagated-inputs]: Likewise. --- gnu/packages/ci.scm | 2 +- gnu/packages/package-management.scm | 6 +++--- gnu/packages/web.scm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index ec05523e0d..b74e73ceea 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -123,7 +123,7 @@ `(("guile" ,guile-3.0) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3fc6fc404a..8ab0c9b746 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -322,7 +322,7 @@ $(prefix)/etc/init.d\n"))) ("guile" ,guile-3.0) ("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) @@ -373,7 +373,7 @@ $(prefix)/etc/init.d\n"))) (propagated-inputs `(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls)) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git))) @@ -982,7 +982,7 @@ environments.") `(("guix" ,guix) ("guile" ,guile-3.0))) (propagated-inputs - `(("guile-json" ,guile-json-3) + `(("guile-json" ,guile-json-4) ("guile-simple-zmq" ,guile-simple-zmq) ("guile-gcrypt" ,guile-gcrypt))) (synopsis "Guix kernel for Jupyter") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6e5bc81660..bd46ac9c2c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7346,7 +7346,7 @@ compressed JSON header blocks. (propagated-inputs `(("guile" ,guile-3.0) ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-3))) + ("guile-json" ,guile-json-4))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") (synopsis "Web interface for cluster deployments of Guix") (description "Hpcguix-web provides a web interface to the list of packages -- cgit v1.2.3 From 1860b4152360a18ac562690c1f541e53537bf262 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:45:11 +0200 Subject: gnu: websocketpp: Update to 0.8.2. * gnu/packages/web.scm (websocketpp): Update to 0.8.2. [source]: Replace patch. * gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch: Delete file. * gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 2 +- .../patches/websocketpp-fix-for-boost-1.70.patch | 103 --------------------- .../patches/websocketpp-fix-for-cmake-3.15.patch | 17 ++++ gnu/packages/web.scm | 6 +- 4 files changed, 21 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch create mode 100644 gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch (limited to 'gnu/packages/web.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 01ec893310..5dc0909efd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1588,7 +1588,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ %D%/packages/patches/webkitgtk-share-store.patch \ - %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ + %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch b/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch deleted file mode 100644 index ece414a1cb..0000000000 --- a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch +++ /dev/null @@ -1,103 +0,0 @@ -This patch for Boost >= 1.70 was made by merging two patches that -are in the 'develop' branch (c769c92 and f810ca2). - -diff -u b/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp ---- b/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -@@ -461,8 +462,7 @@ - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff -u b/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp ---- b/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -@@ -688,9 +687,7 @@ - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -854,8 +851,7 @@ - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); -unchanged: ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ protected: - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -unchanged: ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ protected: - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); -only in patch2: -unchanged: ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif () - - if (NOT Boost_USE_STATIC_LIBS) -- add_definitions (/DBOOST_TEST_DYN_LINK) -+ add_definitions (-DBOOST_TEST_DYN_LINK) - endif () - - set (Boost_FIND_REQUIRED TRUE) diff --git a/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch new file mode 100644 index 0000000000..ea759d022b --- /dev/null +++ b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch @@ -0,0 +1,17 @@ +From: Tobias Geerinckx-Rice +Date: Fri, 05 Jun 2020 18:37:51 +0200 +Subject: [PATCH] gnu: websocketpp: Fix build with CMake >= 3.15. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57ed01e78..43c772d78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bd46ac9c2c..30ef341fa3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1178,7 +1178,7 @@ other systems that want to manipulate WebAssembly files.") (define-public websocketpp (package (name "websocketpp") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -1187,8 +1187,8 @@ other systems that want to manipulate WebAssembly files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy")) - (patches (search-patches "websocketpp-fix-for-boost-1.70.patch")))) + (base32 "1ww4fhl8qf12hkv6jaild8zzsygdspxm1gqpk2f63gv1xfi31wpm")) + (patches (search-patches "websocketpp-fix-for-cmake-3.15.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("openssl" ,openssl))) -- cgit v1.2.3 From 1c32eb95af304800b65c0bdebe0ea81f70b90080 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:46:51 +0300 Subject: gnu: serf: Use a mirror URL. * gnu/packages/web.scm (serf)[source]: Use an apache mirror:// URL. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 30ef341fa3..82174c0033 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1575,7 +1575,7 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/serf/serf-" + (uri (string-append "mirror://apache/dist/serf/serf-" version ".tar.bz2")) (sha256 (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l")))) -- cgit v1.2.3 From ecf92194a55188a9c217d76617378749db063453 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jun 2020 18:54:15 +0200 Subject: gnu: nghttp2: Replace with version 1.41 [fixes CVE-2020-11080]. * gnu/packages/web.scm (nghttp2-1.41): New variable. (nghttp2)[replacement]: New field. --- gnu/packages/web.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 82174c0033..a04d755a83 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7193,6 +7193,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (package (name "nghttp2") (version "1.40.0") + (replacement nghttp2-1.41) (source (origin (method url-fetch) @@ -7272,6 +7273,20 @@ compressed JSON header blocks. @end itemize\n") (license license:expat))) +(define-public nghttp2-1.41 ;fixes CVE-2020-11080 + (package + (inherit nghttp2) + (version "1.41.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + "nghttp2-" version ".tar.xz")) + (sha256 + (base32 + "1hk77vngjmvvzb5y1gi1aqwf6qywrc7yak08zvzb7x81qs6mphmb")))))) + (define-public hpcguix-web (let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74") (revision "5")) -- cgit v1.2.3 From 9a01efa262cef9a102823122b2deee9b38402bcc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Jun 2020 18:04:01 +0300 Subject: gnu: Fix apache mirror URIs. * gnu/packages/web.scm (serf)[source]: Remove redundant part of URI. * gnu/packages/java.scm (ant-bootstrap, java-commons-httpclient, java-jakarta-oro)[source]: Same. * gnu/packages/maven.scm (maven-shared-utils, maven-plugin-annotations, maven-wagon-provider-api, maven-artifact)[source]: Same. --- gnu/packages/java.scm | 6 +++--- gnu/packages/maven.scm | 8 ++++---- gnu/packages/web.scm | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 885086fe30..d5bc713c70 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -276,7 +276,7 @@ JNI.") (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/" + (uri (string-append "mirror://apache/" "ant/source/apache-ant-" version "-src.tar.bz2")) (sha256 @@ -10832,7 +10832,7 @@ graphs, and pie charts.") (version "3.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/httpcomponents/" + (uri (string-append "mirror://apache/httpcomponents/" "commons-httpclient/source/commons-httpclient-" version "-src.tar.gz")) (sha256 @@ -10928,7 +10928,7 @@ inside a Zip archive.") (version "2.0.8") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/jakarta/oro/" + (uri (string-append "mirror://apache/jakarta/oro/" "jakarta-oro-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a62eb7469e..66c6e3adfa 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -340,7 +340,7 @@ Maven Wagon, for use in Maven."))) (version "3.2.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/shared/" + (uri (string-append "mirror://apache/maven/shared/" "maven-shared-utils-" version "-source-release.zip")) (sha256 (base32 @@ -380,7 +380,7 @@ replacement with improvements.") (version "3.5") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/" + (uri (string-append "mirror://apache/maven/" "plugin-tools/maven-plugin-tools-" version "-source-release.zip")) (sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2")))) @@ -404,7 +404,7 @@ replacement with improvements.") (version "3.1.0") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/wagon/" + (uri (string-append "mirror://apache/maven/wagon/" "wagon-" version "-source-release.zip")) (sha256 (base32 "0r07j6xdzdnrvqnv8ida7dx1m05pznh5qgmcfcfpyvg9nxbj3l1n")))) (build-system ant-build-system) @@ -691,7 +691,7 @@ gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x."))) (version "3.6.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/" + (uri (string-append "mirror://apache/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a04d755a83..f6a0fc2e44 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1575,7 +1575,7 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/serf/serf-" + (uri (string-append "mirror://apache/serf/serf-" version ".tar.bz2")) (sha256 (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l")))) -- cgit v1.2.3