[bug#64510] [PATCH v1] gnu: Add simtrace-1

[bug#64510] [PATCH v1] gnu: Add simtrace-1

[Denis 'GNUtoo' Carikli]

* gnu/packages/telephony.scm (simtrace-1): New variable.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/telephony.scm | 72 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index aa65c4eaad..b00a2971c7 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -87,6 +87,7 @@ (define-module (gnu packages telephony)
   #:use-module (gnu packages security-token)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages speech)
+  #:use-module (gnu packages tex)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages upnp)
   #:use-module (gnu packages video)
@@ -989,6 +990,77 @@ (define-public libosmocore
     (home-page "https://osmocom.org/projects/libosmocore/wiki/Libosmocore")
     (license license:gpl2+)))
 
+(define-public simtrace-1
+  (package
+    (name "simtrace-1")
+    (version "1.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitea.osmocom.org/sim-card/simtrace")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "03wjdavp7fbr7jzzhqx6di9v87yvfi19i3kpn798vlpbw7iwkjry"))))
+    (arguments
+     (list #:tests? #f ;no tests
+           #:make-flags #~(list (string-append "CC="
+                                               #$(cc-for-target))
+                                (string-append "DESTDIR="
+                                               #$output))
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'chdir
+                          (lambda _
+                            (chdir "host")))
+                        (add-after 'chdir 'fix-makefile
+                          (lambda _
+                            (substitute* "Makefile"
+                              (("/usr")
+                               ""))))
+                        (delete 'configure)
+                        (add-after 'build 'build-usermanual
+                          (lambda* (#:key inputs native-inputs
+                                    #:allow-other-keys)
+                            (substitute* "../docs/usermanual.xml"
+                              (("http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd")
+                               (string-append (assoc-ref inputs "docbook-xml")
+                                              "/xml/dtd/docbook/docbookx.dtd")))
+                            ;; At the beginning of the document, a table is
+                            ;; constructed with the build time in it. This
+                            ;; comes from '\newcommand{\DBKdate}{\today}' in
+                            ;; share/dblatex/latex/contrib/db2latex/db2latex.sty
+                            ;; in /gnu/store/[...]-dblatex-[...]. We used the
+                            ;; commit time for the date instead.
+                            (invoke (which "faketime") "2019-10-01"
+                                    (which "dblatex") "../docs/usermanual.xml")))
+                        (add-after 'build-usermanual 'install-usermanual
+                          (lambda _
+                            (install-file "../docs/usermanual.pdf"
+                                          (string-append #$output
+                                           "/share/doc/simtrace-1/"))))
+                        (add-after 'install 'install-man
+                          (lambda _
+                            (install-file "simtrace.1"
+                                          (string-append #$output "/man/man1/")))))))
+    (build-system gnu-build-system)
+    (native-inputs (list dblatex docbook-xml-4.2 libfaketime pkg-config
+                         texlive))
+    (inputs (list libosmocore libusb lksctp-tools talloc))
+    (synopsis
+     "Sniff the communication between phones and SIM cards with SIMtrace 1")
+    (description
+     "This contains the simtrace utility.
+It is compatible with the SIMtrace 1 hardware that contains an Atmel AT91SAM7S
+micro-controller.  It is not compatible with the SIMtrace 2 hardware that uses
+an Atmel ATSAM3S micro-controller instead.  The simtrace utility can display
+the SIM PDUs directly and/or send them to a given IP address to enable users
+to view SIM PDUs in Wireshark.  It also contains a complete user manual for
+the SIMtrace 1 hardware.")
+    (home-page "https://osmocom.org/projects/simtrace/wiki/SIMtrace")
+    ;; The utility is GPLv2-only according to the source files headers, and the
+    ;; manual is under the cc-by-sa 3.0
+    (license (list license:gpl2 license:cc-by-sa3.0))))
+
 (define-public xgoldmon
   ;; There are no releases nor tags.
   (let ((revision "1")

base-commit: 961ffca1c75141cbb351d143b22b673638e9659d
-- 
2.40.1

[bug#64510] [PATCH v1] gnu: Add simtrace-1

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]


Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> writes:

> * gnu/packages/telephony.scm (simtrace-1): New variable.
>
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
> ---
>  gnu/packages/telephony.scm | 72 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 72 insertions(+)
>

...

> +    (build-system gnu-build-system)
> +    (native-inputs (list dblatex docbook-xml-4.2 libfaketime pkg-config
> +                         texlive))

./pre-inst-env guix build simtrace-1
gnu/packages/telephony.scm:1035:25: In procedure native-inputs:
error: texlive: unbound variable
hint: Did you forget `(use-modules (gnu packages texlive))'?

Maybe this broke with some of the texlive changes being made, would you
be able to take a look?

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#64510] [PATCH v1] gnu: Add simtrace-1

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 844 bytes --]

Hi,

On Thu, 05 Oct 2023 11:12:26 +0100
Christopher Baines <mail@cbaines.net> wrote:

> ./pre-inst-env guix build simtrace-1
> gnu/packages/telephony.scm:1035:25: In procedure native-inputs:
> error: texlive: unbound variable
> hint: Did you forget `(use-modules (gnu packages texlive))'?

Thanks for spotting that. This issue is really interesting.

When I tested the package it worked fine and the texlive package came
from the tex module (and telephony.scm had and still has '#:use-module
(gnu packages tex)').

But since that time the following commit made it in Guix:
> 0421160f4a350de72422f4a51d7fd101b3764376 ("gnu:
>     texlive: Reinstate the monolithic texlive package.")
and that moved texlive package from tex.scm to texlive.scm.

So we need to add '#:use-module (gnu packages texlive)' to fix that.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#64510] [PATCH v1] gnu: Add simtrace-1

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

On Fri, 6 Oct 2023 14:53:23 +0200
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:

> So we need to add '#:use-module (gnu packages texlive)' to fix that.
Sorry my patch added '#:use-module (gnu packages texlive)', so we need
to change tex in texlive.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#64510] [PATCH v2] gnu: Add simtrace-1

[Denis 'GNUtoo' Carikli]

* gnu/packages/telephony.scm (simtrace-1): New variable.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
ChangeLog:
- change #:use-module (gnu packages tex)
  in #:use-module (gnu packages texlive) as texlive moved file.
---
 gnu/packages/telephony.scm | 72 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 42158784ca..0865ab5fe1 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -78,6 +78,7 @@ (define-module (gnu packages telephony)
   #:use-module (gnu packages samba)
   #:use-module (gnu packages security-token)
   #:use-module (gnu packages speech)
+  #:use-module (gnu packages texlive)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xorg)
@@ -977,6 +978,77 @@ (define-public libosmocore
     (home-page "https://osmocom.org/projects/libosmocore/wiki/Libosmocore")
     (license license:gpl2+)))
 
+(define-public simtrace-1
+  (package
+    (name "simtrace-1")
+    (version "1.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitea.osmocom.org/sim-card/simtrace")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "03wjdavp7fbr7jzzhqx6di9v87yvfi19i3kpn798vlpbw7iwkjry"))))
+    (arguments
+     (list #:tests? #f ;no tests
+           #:make-flags #~(list (string-append "CC="
+                                               #$(cc-for-target))
+                                (string-append "DESTDIR="
+                                               #$output))
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'chdir
+                          (lambda _
+                            (chdir "host")))
+                        (add-after 'chdir 'fix-makefile
+                          (lambda _
+                            (substitute* "Makefile"
+                              (("/usr")
+                               ""))))
+                        (delete 'configure)
+                        (add-after 'build 'build-usermanual
+                          (lambda* (#:key inputs native-inputs
+                                    #:allow-other-keys)
+                            (substitute* "../docs/usermanual.xml"
+                              (("http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd")
+                               (string-append (assoc-ref inputs "docbook-xml")
+                                              "/xml/dtd/docbook/docbookx.dtd")))
+                            ;; At the beginning of the document, a table is
+                            ;; constructed with the build time in it. This
+                            ;; comes from '\newcommand{\DBKdate}{\today}' in
+                            ;; share/dblatex/latex/contrib/db2latex/db2latex.sty
+                            ;; in /gnu/store/[...]-dblatex-[...]. We used the
+                            ;; commit time for the date instead.
+                            (invoke (which "faketime") "2019-10-01"
+                                    (which "dblatex") "../docs/usermanual.xml")))
+                        (add-after 'build-usermanual 'install-usermanual
+                          (lambda _
+                            (install-file "../docs/usermanual.pdf"
+                                          (string-append #$output
+                                           "/share/doc/simtrace-1/"))))
+                        (add-after 'install 'install-man
+                          (lambda _
+                            (install-file "simtrace.1"
+                                          (string-append #$output "/man/man1/")))))))
+    (build-system gnu-build-system)
+    (native-inputs (list dblatex docbook-xml-4.2 libfaketime pkg-config
+                         texlive))
+    (inputs (list libosmocore libusb lksctp-tools talloc))
+    (synopsis
+     "Sniff the communication between phones and SIM cards with SIMtrace 1")
+    (description
+     "This contains the simtrace utility.
+It is compatible with the SIMtrace 1 hardware that contains an Atmel AT91SAM7S
+micro-controller.  It is not compatible with the SIMtrace 2 hardware that uses
+an Atmel ATSAM3S micro-controller instead.  The simtrace utility can display
+the SIM PDUs directly and/or send them to a given IP address to enable users
+to view SIM PDUs in Wireshark.  It also contains a complete user manual for
+the SIMtrace 1 hardware.")
+    (home-page "https://osmocom.org/projects/simtrace/wiki/SIMtrace")
+    ;; The utility is GPLv2-only according to the source files headers, and the
+    ;; manual is under the cc-by-sa 3.0
+    (license (list license:gpl2 license:cc-by-sa3.0))))
+
 (define-public xgoldmon
   ;; There are no releases nor tags.
   (let ((revision "1")

base-commit: 8d27ef1ed34a0a7fe14fd76f31541b62d0125498
-- 
2.41.0

[bug#64510] [PATCH v1] gnu: Add simtrace-1

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

Hi,

Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> skribis:

> * gnu/packages/telephony.scm (simtrace-1): New variable.

Applied with the change below, suggested by ‘guix lint’.

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 564 bytes --]

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 0865ab5fe1..6974cfcadb 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -987,6 +987,7 @@ (define-public simtrace-1
               (uri (git-reference
                     (url "https://gitea.osmocom.org/sim-card/simtrace")
                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "03wjdavp7fbr7jzzhqx6di9v87yvfi19i3kpn798vlpbw7iwkjry"))))

[bug#64510] [PATCH v1] gnu: Add simtrace-1

[Ludovic Courtès]

Hi,

Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> skribis:

> * gnu/packages/telephony.scm (simtrace-1): New variable.

[...]

> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://gitea.osmocom.org/sim-card/simtrace")
> +                    (commit (string-append "v" version))))

Please add (git-file-name name version), as suggested by ‘guix lint’.

> +    (native-inputs (list dblatex docbook-xml-4.2 libfaketime pkg-config
> +                         texlive))

Could you replace the dependency on ‘texlive’ (the monolithic package,
more than 4 GiB) by a dependency on the relevant set of texlive-*
packages (info "(guix) Using TeX and LaTeX")?

There are examples you can borrow from under gnu/packages/….

Thanks,
Ludo’.

[bug#64510] [PATCH v3] gnu: Add simtrace-1

[Denis 'GNUtoo' Carikli]

* gnu/packages/telephony.scm (simtrace-1): New variable.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Change-Id: I7e415cd43ea1df5d5ea4ea7cfb814951aa570313
---
ChangeLog v2->v3:
- Replaced texlive by texlive-* packages.
---
 gnu/packages/telephony.scm | 92 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 41e83384ec..9771bdbb67 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -78,6 +78,7 @@ (define-module (gnu packages telephony)
   #:use-module (gnu packages samba)
   #:use-module (gnu packages security-token)
   #:use-module (gnu packages speech)
+  #:use-module (gnu packages tex)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xorg)
@@ -1046,6 +1047,97 @@ (define-public libosmocore
     (home-page "https://osmocom.org/projects/libosmocore/wiki/Libosmocore")
     (license license:gpl2+)))
 
+(define-public simtrace-1
+  (package
+    (name "simtrace-1")
+    (version "1.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitea.osmocom.org/sim-card/simtrace")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "03wjdavp7fbr7jzzhqx6di9v87yvfi19i3kpn798vlpbw7iwkjry"))))
+    (arguments
+     (list
+      #:tests? #f ;no tests
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              (string-append "DESTDIR=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _ (chdir "host")))
+          (add-after 'chdir 'fix-makefile
+            (lambda _ (substitute* "Makefile" (("/usr") ""))))
+          (delete 'configure)
+          (add-after 'build 'build-usermanual
+            (lambda* (#:key inputs native-inputs #:allow-other-keys)
+              (substitute* "../docs/usermanual.xml"
+                (("http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd")
+                 (string-append (assoc-ref inputs "docbook-xml")
+                                "/xml/dtd/docbook/docbookx.dtd")))
+              ;; At the beginning of the document, a table is
+              ;; constructed with the build time in it. This
+              ;; comes from '\newcommand{\DBKdate}{\today}' in
+              ;; share/dblatex/latex/contrib/db2latex/db2latex.sty
+              ;; in /gnu/store/[...]-dblatex-[...]. We used the
+              ;; commit time for the date instead.
+              (invoke
+               (which "faketime") "2019-10-01"
+               (which "dblatex")
+               "../docs/usermanual.xml")))
+          (add-after 'build-usermanual 'install-usermanual
+            (lambda _
+              (install-file
+               "../docs/usermanual.pdf"
+               (string-append #$output "/share/doc/simtrace-1/"))))
+          (add-after 'install 'install-man
+            (lambda _
+              (install-file
+               "simtrace.1"
+               (string-append #$output "/man/man1/")))))))
+    (build-system gnu-build-system)
+    (native-inputs
+     (list dblatex docbook-xml-4.2 libfaketime pkg-config
+           (texlive-updmap.cfg
+            (list texlive-appendix
+                  texlive-changebar
+                  texlive-courier
+                  texlive-eepic
+                  texlive-fancybox
+                  texlive-fancyvrb
+                  texlive-float
+                  texlive-footmisc
+                  texlive-helvetic
+                  texlive-jknapltx
+                  texlive-listings
+                  texlive-multirow
+                  texlive-overpic
+                  texlive-pdflscape
+                  texlive-pdfpages
+                  texlive-rsfs
+                  texlive-subfigure
+                  texlive-times
+                  texlive-titlesec))))
+    (inputs (list libosmocore libusb lksctp-tools talloc))
+    (synopsis
+     "Sniff the communication between phones and SIM cards with SIMtrace 1")
+    (description
+     "This contains the simtrace utility.
+It is compatible with the SIMtrace 1 hardware that contains an Atmel AT91SAM7S
+micro-controller.  It is not compatible with the SIMtrace 2 hardware that uses
+an Atmel ATSAM3S micro-controller instead.  The simtrace utility can display
+the SIM PDUs directly and/or send them to a given IP address to enable users
+to view SIM PDUs in Wireshark.  It also contains a complete user manual for
+the SIMtrace 1 hardware.")
+    (home-page "https://osmocom.org/projects/simtrace/wiki/SIMtrace")
+    ;; The utility is GPLv2-only according to the source files headers, and the
+    ;; manual is under the cc-by-sa 3.0
+    (license (list license:gpl2 license:cc-by-sa3.0))))
+
 (define-public xgoldmon
   ;; There are no releases nor tags.
   (let ((revision "1")

base-commit: 40f5a3ce437083e4f259878735c2c55f41708e81
-- 
2.41.0

[bug#64510] [PATCH v3] gnu: Add simtrace-1

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

On Fri, 12 Jan 2024 06:47:53 +0100
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:

> * gnu/packages/telephony.scm (simtrace-1): New variable.
> 
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
> Change-Id: I7e415cd43ea1df5d5ea4ea7cfb814951aa570313
> ---
> ChangeLog v2->v3:
> - Replaced texlive by texlive-* packages.

Ping. 

All concerns should now be fixed in the v3.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]