Merge remote-tracking branch 'origin/master' into core-updates

1 files changed, 66 insertions, 21 deletions

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index af7bca0703..d7c9f9f142 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
+;;; Copyright © 2021 Gerd Heber <gerd.heber@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -127,7 +128,7 @@
 (define-public librecad
   (package
     (name "librecad")
-    (version "2.1.3")
+    (version "2.2.0-rc2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -136,7 +137,7 @@
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "01nvc1g3si05r5np1pzn62ah9w84p8nxa32wqrjh6gdi17jfvi3l"))))
+                "0a7fzhxkkn2s3hkgqrw3s3wyspzfla3c5lgbsjyqzvlnrp3anxnm"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -2458,7 +2459,7 @@ engineers for reverse engineers.")
 (define-public lib3mf
   (package
     (name "lib3mf")
-    (version "1.8.1")
+    (version "2.1.1")
     (source
      (origin
       (method git-fetch)
@@ -2467,20 +2468,21 @@ engineers for reverse engineers.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-        "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd"))))
+        "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"))))
     (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags (list "-DUSE_INCLUDED_ZLIB=0"
+                               "-DUSE_INCLUDED_LIBZIP=0"
+                               "-DUSE_INCLUDED_GTEST=0"
+                               "-DUSE_INCLUDED_SSL=0")))
     (native-inputs
-     `(("googletest-source" ,(package-source googletest))))
+     `(("googletest" ,googletest)
+       ("pkg-config" ,pkg-config)))
     (inputs
-     `(("libuuid" ,util-linux "lib")))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'unpack-googletest
-           (lambda* (#:key inputs #:allow-other-keys)
-             (copy-recursively (assoc-ref inputs "googletest-source")
-                               "UnitTests/googletest")
-             #t)))))
+     `(("libuuid" ,util-linux "lib")
+       ("libzip" ,libzip)
+       ("libressl" ,libressl)
+       ("zlib" ,zlib)))
     (synopsis "Implementation of the 3D Manufacturing Format (3MF) file standard")
     (description
      "Lib3MF is a C++ implementation of the 3D Manufacturing Format (3MF) file
@@ -2553,7 +2555,18 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
                          "echotest_allexpressions"
                          "lazyunion-*"
                          "pdfexporttest_centered"
-                         "pdfexporttest_simple-pdf")
+                         "pdfexporttest_simple-pdf"
+
+                         ;; Broken due since cgal@5.2 +
+                         ;; https://github.com/CGAL/cgal/pull/5371 (security)
+                         ;; FIXME: Investigate or wait for future releases to
+                         ;; fix it.
+                         ;; Unsure if wrong test-suite or wrong security
+                         ;; patch.
+                         "cgalpngtest_nef3_broken"
+                         "opencsgtest_nef3_broken"
+                         "csgpngtest_nef3_broken"
+                         "throwntogethertest_nef3_broken")
                         "|")))
              ;; strip python test files since lib dir ends up in out/share
              (for-each delete-file
@@ -2949,18 +2962,14 @@ GUI.")
 (define-public poke
   (package
     (name "poke")
-    (version "1.0")
+    (version "1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/poke/poke-" version
                                   ".tar.gz"))
               (sha256
                (base32
-                "02jvla69xd0nnlg2bil2vxxxglqgylswml6h5hy2nxy0023hp4yy"))))
-
-    ;; XXX: Version 1.0 only supports 64-bit systems.
-    (supported-systems '("x86_64-linux" "aarch64-linux"))
-
+                "1mkaq19a8d951n9l6d3f8rwq45a7gkr05snb285idd21qxixys6d"))))
     (build-system gnu-build-system)
     ;; The GUI, which we elide, requires tcl and tk.
     (native-inputs `(("bison" ,bison)
@@ -3024,3 +3033,39 @@ and drilling of PCBs.  It takes Gerber files as input and outputs G-code files
 for the milling of PCBs.  It also includes an autoleveller for the automatic
 dynamic calibration of the milling depth.")
      (license license:gpl3+)))
+
+(define-public syscall-intercept
+  ;; Upstream provides no tag. Also, last version update is 4 years old.
+  (let ((commit "304404581c57d43478438d175099d20260bae74e")
+        (revision "0"))
+    (package
+      (name "syscall-intercept")
+      (version (git-version "0.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/pmem/syscall_intercept/")
+           (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "17sw78xp5wjzv25adpbq3khl8fi0avj7bgpi57q3jnvl3c68xy5z"))))
+      (native-inputs
+       `(("perl" ,perl)
+         ("pkg-config" ,pkg-config)))
+      (inputs
+       `(("capstone" ,capstone)))
+      (build-system cmake-build-system)
+      (arguments
+       `(#:build-type "Release"
+         ;; FIXME: "syscall_format_logging" test fails.
+         #:tests? #f))
+      (home-page "https://github.com/pmem/syscall_intercept")
+      (synopsis "System call intercepting library")
+      (description
+       "The system call intercepting library provides a low-level interface
+for hooking Linux system calls in user space.  This is achieved by
+hot-patching the machine code of the standard C library in the memory of
+a process.")
+      (license license:bsd-2))))