From 1a265842e634656411bc7304c4648273f174f65e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 17 Mar 2021 03:42:12 -0400 Subject: gnu: Use PACKAGE/INHERIT in more places. * gnu/packages/algebra.scm (fftwf, fftw-openmpi), gnu/packages/audio.scm (ztoolkit-rsvg), gnu/packages/bioinformatics.scm (python2-dendropy), gnu/packages/boost.scm (boost-with-python2), gnu/packages/check.scm (python2-mock, python2-pytest-mock), gnu/packages/cups.scm (hplip-minimal), gnu/packages/freedesktop.scm (libinput-minimal), gnu/packages/gettext.scm (gnu-gettext), gnu/packages/glib.scm (python2-pygobject), gnu/packages/gnome.scm (gdl-minimal, libsoup-minimal, python2-pyatspi), gnu/packages/groff.scm (groff-minimal), gnu/packages/jami.scm (ffmpeg-jami), gnu/packages/libcanberra.scm (libcanberra/gtk+-2), gnu/packages/lirc.scm (python2-lirc), gnu/packages/llvm.scm (clang-runtime-3.5), gnu/packages/mpi.scm (java-openmpi, openmpi-thread-multiple), gnu/packages/node.scm (libnode), gnu/packages/onc-rpc.scm (libtirpc/hurd), gnu/packages/python-compression.scm (bitshuffle-for-snappy), gnu/packages/python-crypto.scm (python2-pycrypto, python2-cryptography) (python2-cryptography, python2-m2crypto), gnu/packages/python-web.scm (python2-html2text, python2-tornado) (python2-terminado, python2-ndg-httpsclient, python2-websocket-client) (python2-rauth, python2-url, python2-s3transfer), gnu/packages/python-xyz.scm (python2-psutil, python2-serpent) (python2-humanfriendly, python2-empy, python2-parse-type, python2-polib) (python2-jsonschema, python2-pystache, python2-cython, python2-numpydoc) (python2-ipyparallel, python2-traitlets, python2-dbus) (python2-beautifulsoup4, python2-pep517, python2-flake8, python2-llfuse) (python2-tlsh, python-file, python2-notebook, python-jupyter-console-minimal) (python2-contextlib2, python2-promise, python2-anyjson, python2-amqp) (python2-kombu, python2-billiard, python2-celery, python2-whoosh) (python2-jellyfish, python-rope, ptpython-2, python2-binaryornot) (python2-setproctitle, python2-argcomplete, python2-xopen, python2-isort) (python2-radon, python2-rfc6555, python2-activepapers, python2-send2trash) (python2-cloudpickle, python2-reparser), gnu/packages/python.scm (python2-called-python), gnu/packages/qt.scm (python2-sip, python-pyqt-without-qtwebkit, python2-pyqt) (python-qscintilla, python-pyqt+qscintilla), gnu/packages/scanner.scm (sane-backends), gnu/packages/sdl.scm (guile3.0-sdl2), gnu/packages/selinux.scm (checkpolicy, libselinux, libsemanage, secilc) (python-sepolgen, policycoreutils), gnu/packages/serialization.scm (lua5.1-libmpack, lua5.2-libmpack), gnu/packages/simulation.scm (fenics), gnu/packages/statistics.scm (python2-statsmodels), gnu/packages/texinfo.scm (info-reader), gnu/packages/wxwidgets.scm (wxwidgets-gtk2, wxwidgets-gtk2-3.1), gnu/packages/xml.scm (xmlsec-nss), gnu/packages/xorg.scm (uim-gtk, uim-qt), guix/build-system/python.scm (package-with-explicit-python) (strip-python2-variant): Use PACKAGE/INHERIT. --- gnu/packages/xml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index f10a982294..2a72fc6ad2 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1193,8 +1193,7 @@ Libxml2).") "See 'COPYING' in the distribution.")))) (define-public xmlsec-nss - (package - (inherit xmlsec) + (package/inherit xmlsec (name "xmlsec-nss") (native-inputs ;; For tests. -- cgit v1.2.3 From 4490dff98c6979a77f3982716239b526e0ef1337 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 23 Mar 2021 23:13:23 +0100 Subject: gnu: Add java-xmlpull-api-v1. * gnu/packages/xml.scm (java-xmlpull-api-v1): New variable. --- gnu/packages/xml.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 2a72fc6ad2..b0b159c5aa 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2021 Michael Rohleder ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -2008,6 +2009,60 @@ efficiently all input elements (for example in SOAP processors). This package is in maintenance mode.") (license (license:non-copyleft "file:///LICENSE.txt")))) +(define-public java-xmlpull-api-v1 + (package + (name "java-xmlpull-api-v1") + (version "1.1.3.4b") + (source (origin + ;; The package is originally from Extreme! Lab, but the website + ;; is now gone. This repositories contains the sources of the + ;; latest version. + (method git-fetch) + (uri (git-reference + (url "https://github.com/aslom/xmlpull-api-v1") + ;; No releases, this is the latest commit + (commit "abeaa4aa87b2625af70c32f658f44e11355fe568"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15bdqxfncnakskna4m9gsh4f9iczxy83qxn2anqiqd15z406a5ih")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "lib") + (mkdir-p "lib") + ;; prevents a failure in "dist_lite" + (substitute* "build.xml" + (("README.html") "README.md")))))) + (build-system ant-build-system) + (arguments + `(#:test-target "junit" + #:build-target "dist" + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (java (string-append out "/share/java")) + (project (string-append + "xmlpull_" + ,(string-join (string-split version #\.) "_")))) + (mkdir-p doc) + (copy-recursively (string-append "build/dist/" project "/doc/") + doc) + (mkdir-p java) + (copy-file (string-append "build/dist/" project "/" project ".jar") + (string-append java "/" project ".jar"))) + ))))) + (home-page "https://github.com/aslom/xmlpull-api-v1") + (synopsis "XML pull parsing API") + (description "XmlPull v1 API is a simple to use XML pull parsing API. XML +pull parsing allows incremental (sometimes called streaming) parsing of XML +where application is in control - the parsing can be interrupted at any given +moment and resumed when application is ready to consume more input.") + (license license:public-domain))) + (define-public java-dom4j (package (name "java-dom4j") -- cgit v1.2.3 From 08b9e0ca0be309a732f0784ceee7e436bfd70f15 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 23 Mar 2021 15:38:39 +0100 Subject: gnu: Add java-mxparser. * gnu/packages/xml.scm (java-mxparser): New variable. Co-Authored-By: Julien Lepiller Signed-off-by: Julien Lepiller --- gnu/packages/xml.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b0b159c5aa..808a847eaf 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2311,6 +2311,48 @@ outputting XML data from Java code.") and back again.") (license license:bsd-3))) +(define-public java-mxparser + (package + (name "java-mxparser") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/x-stream/mxparser") + (commit (string-append "v-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i3jrjbz4hgf62fm1ix7nlcmhi4kcv4flqsfvh7a3l2v7nsp5ryb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "mxparser.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + #t))))) + (propagated-inputs + `(("java-xmlpull-api-v1" ,java-xmlpull-api-v1))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/x-stream/mxparser") + (synopsis "Streaming pull XML parser forked from @code{java-xpp3}") + (description "Xml Pull Parser (in short XPP) is a streaming pull XML +parser and should be used when there is a need to process quickly and +efficiently all input elements (for example in SOAP processors). This +package is a stable XmlPull parsing engine that is based on ideas from XPP +and in particular XPP2 but completely revised and rewritten to take the best +advantage of JIT JVMs. + +MXParser is a fork of xpp3_min 1.1.7 containing only the parser with merged +changes of the Plexus fork. It is an implementation of the XMLPULL V1 API +(parser only).") + (license (license:non-copyleft "file://LICENSE.txt")))) + (define-public xmlrpc-c (package (name "xmlrpc-c") -- cgit v1.2.3 From 8b2b5463963d5d4dee480b0cf73fa4a9eca414ba Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 23 Mar 2021 15:38:40 +0100 Subject: gnu: java-xstream: Update to 1.4.16 [security fixes]. Fixes CVE-2021-21341, CVE-2021-21342, CVE-2021-21343, CVE-2021-21344, CVE-2021-21345, CVE-2021-21346, CVE-2021-21347, CVE-2021-21348, CVE-2021-21349, CVE-2021-21350 and CVE-2021-21351. * gnu/packages/xml.scm (java-xstream): Update to 1.4.16. [inputs]: Add java-mxparser, a fork of java-xpp3 made by upstream. Java-xpp3 is still needed. Signed-off-by: Julien Lepiller --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 808a847eaf..d05d326f5b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2272,7 +2272,7 @@ outputting XML data from Java code.") (define-public java-xstream (package (name "java-xstream") - (version "1.4.15") + (version "1.4.16") (source (origin (method git-fetch) @@ -2284,7 +2284,7 @@ outputting XML data from Java code.") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1178qryrjwjp44439pi5dxzd32896r5zs429z1qhlc09951r7mi9")))) + (base32 "16k2mc63h2fw7lxv74qmhg4p8q9hfrw114daa6nxwnpv08cnq755")))) (build-system ant-build-system) (arguments `(#:jar-name "xstream.jar" @@ -2299,6 +2299,7 @@ outputting XML data from Java code.") ("java-joda-time" ,java-joda-time) ("java-jettison" ,java-jettison) ("java-xom" ,java-xom) + ("java-mxparser" ,java-mxparser) ("java-xpp3" ,java-xpp3) ("java-dom4j" ,java-dom4j) ("java-stax2-api" ,java-stax2-api) -- cgit v1.2.3