[bug#45408] i2pd: Update to 2.35.0

[bug#45408] i2pd: Update to 2.35.0

[Amar M. Singh via Guix-patches via]

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

https://github.com/PurpleI2P/i2pd/releases/tag/2.35.0

thakns,

[-- Attachment #2: 0001-gnu-i2pd-Update-to-2.33.0.patch --]
[-- Type: application/octet-stream, Size: 2932 bytes --]

From 01597384c9f33990dd09ea420e18e96e4f308888 Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 24 Dec 2020 21:28:06 +0530
Subject: [PATCH 1/2] gnu: i2pd: Update to 2.33.0.

* gnu/packages/i2p.scm (i2pd): Update to 2.33.0.

Signed-off-by: Amar Singh <nly@disroot.org>
---
 gnu/packages/i2p.scm | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm
index 537aeaf76c..7502033274 100644
--- a/gnu/packages/i2p.scm
+++ b/gnu/packages/i2p.scm
@@ -30,7 +30,7 @@
 (define-public i2pd
   (package
     (name "i2pd")
-    (version "2.31.0")
+    (version "2.33.0")
     (source
      (origin
        (method git-fetch)
@@ -39,7 +39,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1q2gxz041ha9n5lfn91iy11sdf3z7d806vcq4z43m7lf92m7i4nn"))))
+        (base32 "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk"))))
     (build-system cmake-build-system)
     (inputs `(("boost" ,boost)
               ("miniupnpc" ,miniupnpc)
@@ -77,28 +77,7 @@
                                           `("-j" ,(number->string
                                                     (parallel-job-count)))
                                           '())
-                                    ,@make-flags))))))
-                   (add-after 'install 'install-headers
-                     (lambda* (#:key outputs #:allow-other-keys)
-                       (let* ((install-dir (assoc-ref outputs "out"))
-                              (src-dir (string-append install-dir "/src"))
-                              (include-dir
-                               (string-append install-dir "/include")))
-                         (mkdir-p include-dir)
-                         ;; This is the only header file that's relevant to the
-                         ;; public interface.
-                         ;; <https://github.com/PurpleI2P/i2pd/issues/1378>
-                         (install-file (string-append src-dir "/api.h")
-                                       include-dir)
-                         #t)))
-                   (add-after 'install-headers 'remove-source
-                     (lambda* (#:key outputs #:allow-other-keys)
-                       (let* ((install-dir (assoc-ref outputs "out"))
-                              (src-dir (string-append install-dir "/src")))
-                         (delete-file-recursively src-dir)
-                         (delete-file (string-append install-dir
-                                                     "/LICENSE"))
-                         #t))))))
+                                    ,@make-flags)))))))))
     (home-page "https://i2pd.website/")
     (synopsis "Router for an end-to-end encrypted and anonymous internet")
     (description "i2pd is a client for the anonymous I2P network, upon which
-- 
2.29.2


[-- Attachment #3: 0002-gnu-i2pd-Update-to-2.35.0.patch --]
[-- Type: application/octet-stream, Size: 1084 bytes --]

From 7365472f55ab2a025f2b3f1dbead3ec7f08eb50e Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 24 Dec 2020 21:26:00 +0530
Subject: [PATCH 2/2] gnu: i2pd: Update to 2.35.0.

* gnu/packages/i2p.scm (i2pd): Update to 2.35.0.

Signed-off-by: Amar Singh <nly@disroot.org>
---
 gnu/packages/i2p.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm
index 7502033274..468e5e4500 100644
--- a/gnu/packages/i2p.scm
+++ b/gnu/packages/i2p.scm
@@ -30,7 +30,7 @@
 (define-public i2pd
   (package
     (name "i2pd")
-    (version "2.33.0")
+    (version "2.35.0")
     (source
      (origin
        (method git-fetch)
@@ -39,7 +39,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk"))))
+        (base32 "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc"))))
     (build-system cmake-build-system)
     (inputs `(("boost" ,boost)
               ("miniupnpc" ,miniupnpc)
-- 
2.29.2

[bug#45408] i2pd: Update to 2.35.0

[Leo Famulari]

Thanks for the patches!

Can you combine them into a single patch?

The commit message didn't mention the removal of the 'install-headers'
and 'remove-source' phases. Is their removal intentional? Are they not
needed anymore?

[bug#45408] i2pd: Update to 2.35.0

[Amar Singh via Guix-patches via]

i have no clue about headers. The old phases are obsolete because the source code has changed no much.

tree of output: http://cyka.cf/i2p235.txt
Thanks,
Amar

bug#45408: i2pd: Update to 2.35.0

[宋文武]

Hello, I applied the patches and also update it to 2.35.6.


Leo Famulari <leo@famulari.name> writes:

> Thanks for the patches!
>
> Can you combine them into a single patch?
>
> The commit message didn't mention the removal of the 'install-headers'
> and 'remove-source' phases. Is their removal intentional? Are they not
> needed anymore?

I think they don't work anymore, unless we install all headers files (as
api.h will include other headers).  As upstream doesn't provide a
install target for headers, I'd leave them out.