From 5939188e7257e522f7eb1e7eef78399a25afd599 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Jul 2018 18:14:01 +0200 Subject: gnu: rapidjson: Remove non-free code. * gnu/packages/web.scm (rapidjson)[source](snippet, modules): New fields. --- gnu/packages/web.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 06d0fec0b0..7e6b65d550 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -719,7 +719,14 @@ current version of any major web browser.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13nrpvw8f1wx0ga7svbzld7pgrv8l172nangpipnj7jaf0lysz5z")))) + "13nrpvw8f1wx0ga7svbzld7pgrv8l172nangpipnj7jaf0lysz5z")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove code using the problematic JSON license (see + ;; ). + (delete-file-recursively "bin/jsonchecker") + #t)))) (build-system cmake-build-system) (arguments `(,@(if (string-prefix? "aarch64" (or (%current-target-system) -- cgit v1.2.3 From 16c09025878b9148fc091b828d1f016d0e1f46bf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Jul 2018 13:33:18 -0400 Subject: gnu: httpd: Update to 2.4.34 [fixes CVE-2018-{1333,8011}]. * gnu/packages/web.scm (httpd): Update to 2.4.34. --- 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 7e6b65d550..b76f111954 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -122,14 +122,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.33") + (version "2.4.34") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "01bghiq4pbgjbgd6gic0nb8bbk6mfpwx3gcsbf21f3dhb4c520ny")))) + "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) -- cgit v1.2.3 From 4b472f6a062203fe14f5cda7b6379c9599afedf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Sat, 21 Jul 2018 10:24:25 +0200 Subject: gnu: java: Use java-javaee-servletapi instead of java-tomcat. * gnu/packages/java.scm(java-eclipse-sisu-inject)[inputs]: Remove java-tomcat, add java-javaee-servletapi. (logback-core)[inputs]: Likewise. * gnu/packages/maven.scm (maven-wagon-provider-test)[inputs]: Likewise. * gnu/packages/web.scm (java-eclipse-jetty-webapp)[inputs]: Likewise. (java-eclipse-jetty-server)[inputs]: Likewise. (java-eclipse-jetty-http)[inputs]: Likewise. (java-eclipse-jetty-jmx)[inputs]: Likewise. (java-eclipse-jetty-io)[inputs]: Likewise. Signed-off-by: Julien Lepiller --- 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 b76f111954..44300d3091 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5938,7 +5938,7 @@ or embedded instantiation. This package provides utility classes.") #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("util" ,java-eclipse-jetty-util))) (synopsis "Jetty :: IO Utility") (description "The Jetty Web Server provides an HTTP server and Servlet @@ -5981,7 +5981,7 @@ or embedded instantiation. This package provides IO-related utility classes.")) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("io" ,java-eclipse-jetty-io) ("util" ,java-eclipse-jetty-util))) (synopsis "Jetty :: Http Utility") @@ -6016,7 +6016,7 @@ or embedded instantiation. This package provides HTTP-related utility classes." #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("util" ,java-eclipse-jetty-util))) (synopsis "Jetty :: JMX Management") (description "The Jetty Web Server provides an HTTP server and Servlet @@ -6097,7 +6097,7 @@ or embedded instantiation. This package provides the JMX management."))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("io" ,java-eclipse-jetty-io) ("jmx" ,java-eclipse-jetty-jmx) @@ -6293,7 +6293,7 @@ container."))) ("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet) ("java-eclipse-jetty-security" ,java-eclipse-jetty-security) ("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml) - ("java-tomcat" ,java-tomcat))) + ("java-javaee-servletapi" ,java-javaee-servletapi))) (native-inputs `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io) ,@(package-native-inputs java-eclipse-jetty-util))))) -- cgit v1.2.3 From 6a86d3576c96f39146ce31271b5fe568beb1a9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Sat, 21 Jul 2018 10:24:49 +0200 Subject: gnu: java-tomcat: Update to 8.5.32. * gnu/packages/web.scm (java-tomcat): Update to 8.5.32. Signed-off-by: Julien Lepiller --- 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 44300d3091..079d53032c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5712,14 +5712,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.28") + (version "8.5.32") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "0q2bc3sajrmcx3z3vhhwp78y47ryc2ky8ssbdmfk24zvqdb76hvl")))) + "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6")))) (build-system ant-build-system) (inputs `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core))) -- cgit v1.2.3 From 8dae9c92b660f421b78ba79d643288a09c35eafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Sat, 21 Jul 2018 10:25:10 +0200 Subject: gnu: java-tomcat: Remove bundled jars. * gnu/packages/web.scm (java-tomcat)[source]: Add snippet to remove bundled jars. Signed-off-by: Julien Lepiller --- gnu/packages/web.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 079d53032c..de6b118a59 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5719,7 +5719,13 @@ encoder/decoder based on the draft-12 specification for UBJSON.") version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6")))) + "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6")) + (modules '((guix build utils))) + ;; Delete bundled jars. + (snippet + '(begin + (for-each delete-file (find-files "." "\\.jar$")) + #t)))) (build-system ant-build-system) (inputs `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core))) -- cgit v1.2.3 From 49a8684d9f20656aaa9094c02164cbf2f67b290b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Sat, 21 Jul 2018 10:25:32 +0200 Subject: gnu: java-tomcat: Strip timestamps * gnu/package/web.scm (java-tomcat)[arguments]: Add phase 'strip timestamps. Makes build deterministic. Signed-off-by: Julien Lepiller --- 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 de6b118a59..c4b78d0b64 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5747,6 +5747,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (("depends=\"validate\"") "depends=\"build-prepare\"") ((",download-validate") "")) #t)) + (add-after 'unpack 'strip-timestamps + (lambda _ + (substitute* "build.xml" + (("") + (("")) + #t)) (add-after 'unpack 'generate-properties (lambda _ ;; This could have been passed to make-flags, but getcwd returns -- cgit v1.2.3