bug#49510: [PATCH] gnu: Add PuTTY.

bug#49510: [PATCH] gnu: Add PuTTY.

[terramorpha]

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 19b58501e9..af3082b954 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4100,3 +4100,37 @@ on hub/switched networks.  It is based on 
@acronym{ARP} packets, it will send
  @acronym{ARP} requests and sniff for replies.")
     (home-page "https://github.com/netdiscover-scanner/netdiscover")
     (license license:gpl3+)))
+
+(define-public putty
+  (package
+    (name "putty")
+    (version "0.74.0")
+    (source (origin
+             ;; (method url-fetch)
+             (method url-fetch)
+             (uri "http://www.putty.be/0.74/putty-0.74.tar.gz")
+             (sha256 (base32 
"0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx"))))
+    (arguments
+     `(#:tests?
+       #f
+       #:phases (modify-phases %standard-phases
+                 (add-before 'configure 'go-into-unix/
+                   (lambda _ (begin
+                          (chdir "unix")
+                          #t))))))
+    (build-system gnu-build-system)
+    (inputs `(("perl" ,perl)
+             ("python" ,python)
+             ("python2" ,python-2.7)
+             ("pkg-config" ,pkg-config)
+              ("gtk+" ,gtk+)))
+    (synopsis "A graphical @acronym{SSH} and telnet client")
+    (description
+     "Putty is a powerful terminal client.  It supports @acronym{SSH}, 
telnet,
+and raw socket connections with good terminal emulation. It supports 
public
+key authentication and Kerberos single-sign-on. It also includes 
command-line
+@acronym{SFTP} and @acronym{SCP} implementations.")
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/")
+    (license  (license:non-copyleft
+              
"https://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html"
+              "The putty license"))))

bug#49510: [PATCH] gnu: Add PuTTY.

[Leo Prikler]

Hi terramorpha,

your patch is missing the ChangeLog part of the commit message,
see `info '(guix)Submitting Patches'` for more information.

Am Samstag, den 10.07.2021, 15:31 -0400 schrieb terramorpha@cock.li:
> diff --git a/gnu/packages/networking.scm
> b/gnu/packages/networking.scm
> index 19b58501e9..af3082b954 100644
> --- a/gnu/packages/networking.scm
> +++ b/gnu/packages/networking.scm
> @@ -4100,3 +4100,37 @@ on hub/switched networks.  It is based on 
> @acronym{ARP} packets, it will send
>   @acronym{ARP} requests and sniff for replies.")
>      (home-page "https://github.com/netdiscover-scanner/netdiscover")
>      (license license:gpl3+)))
> +
> +(define-public putty
> +  (package
> +    (name "putty")
> +    (version "0.74.0")
> +    (source (origin
> +             ;; (method url-fetch)
> +             (method url-fetch)
> +             (uri "http://www.putty.be/0.74/putty-0.74.tar.gz")
You ought to reuse version here, so that people don't need to rewrite
it when the version changes.  You can use "version-major+minor" to
access the "0.74" part, but I assume this is one of the versions, that
gets patch added to the tarball if it exists.  Such packages too exist
somewhere in Guix, but I haven't found an example in the quick time I'm
typing this reply.
> +             (sha256 (base32 
> "0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx"))))
Please watch your line length, it normally shouldn't exceed 80
characters.
> +    (arguments
> +     `(#:tests?
> +       #f
Never let #tests? #f stay uncommented.
> +       #:phases (modify-phases %standard-phases
> +                 (add-before 'configure 'go-into-unix/
> +                   (lambda _ (begin
> +                          (chdir "unix")
> +                          #t))))))
> +    (build-system gnu-build-system)
> +    (inputs `(("perl" ,perl)
> +             ("python" ,python)
> +             ("python2" ,python-2.7)
> +             ("pkg-config" ,pkg-config)
> +              ("gtk+" ,gtk+)))
Your formatting generally looks a bit off.  #:phases should go to an
extra line, as should inputs.  #:tests? #f OTOH is okay in one line
with the aforementioned comment.
> +    (synopsis "A graphical @acronym{SSH} and telnet client")
> +    (description
> +     "Putty is a powerful terminal client.  It supports
> @acronym{SSH}, 
> telnet,
> +and raw socket connections with good terminal emulation. It
> supports 
> public
> +key authentication and Kerberos single-sign-on. It also includes 
> command-line
> +@acronym{SFTP} and @acronym{SCP} implementations.")
> +    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/"
> )
> +    (license  (license:non-copyleft
> +              
> "https://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html"
> +              "The putty license"))))
Putty claims, that this is license:expat and it does look like one.

Regards,
Leo

bug#49510: [PATCH] gnu: Add PuTTY.

[terramorpha]

Hi, thank you for the review.

I corrected the version of the package (putty doesn't use 
major.minor.patch, only major.minor),
I fixed the lines that were over the 80 character limit, re added the 
check phase, corrected the
formatting and put in the expat license. However, I do not know what you 
mean by the "ChangeLog
part of the commit message", I thought that standalone patch didn't have 
a commit message attached.
Could you elaborate?

Here is the modified patch.
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 19b58501e9..ce00a016e6 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4100,3 +4100,38 @@ on hub/switched networks.  It is based on 
@acronym{ARP} packets, it will send
  @acronym{ARP} requests and sniff for replies.")
     (home-page "https://github.com/netdiscover-scanner/netdiscover")
     (license license:gpl3+)))
+
+(define-public putty
+  (package
+    (name "putty")
+    (version "0.75")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.putty.be/" version
+                           "/putty-" version ".tar.gz"))
+       (sha256
+        (base32 
"1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'go-into-unix/
+           (lambda _ (begin
+                  (chdir "unix")
+                  #t))))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("perl" ,perl)
+       ("python" ,python)
+       ("python2" ,python-2.7)))
+    (synopsis "Graphical @acronym{SSH} and telnet client")
+    (description
+     "Putty is a powerful terminal client.  It supports @acronym{SSH}, 
telnet,
+and raw socket connections with good terminal emulation.  It supports 
public key
+authentication and Kerberos single-sign-on.  It also includes 
command-line
+@acronym{SFTP} and @acronym{SCP} implementations.")
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/")
+    (license license:expat)))

bug#49510: [PATCH] gnu: Add PuTTY.

[Leo Prikler]

Am Dienstag, den 13.07.2021, 13:25 -0400 schrieb terramorpha@cock.li:
> Hi, thank you for the review.
> 
> I corrected the version of the package (putty doesn't use 
> major.minor.patch, only major.minor), I fixed the lines that were
> over the 80 character limit, re added the check phase, corrected the
> formatting and put in the expat license. However, I do not know what
> you mean by the "ChangeLog part of the commit message", I thought
> that standalone patch didn't have a commit message attached.
> Could you elaborate?
> 
> Here is the modified patch.
Please don't send raw diffs and more importantly don't copypaste them
into your mail client (unless you know exactly, that your mail client
behaves in a correct manner, which most don't).  Mail clients have a
tendency to mess up whitespace and line lengths, which can and does
break diffs.  Instead, use `git format-patch` and attach the generated
patch file or (the following way is preferred) use `git send-email`. 
When using format-patch/send-email, the full commit message and
name/email of the committer will be transmitted as well, not just a raw
diff.

Your second patch LGTM, perhaps with a few fixable formatting stuffs,
but I'll have to ask you to resend it, since I can't `git am` it.

Thanks,
Leo

> diff --git a/gnu/packages/networking.scm
> b/gnu/packages/networking.scm
> index 19b58501e9..ce00a016e6 100644
> --- a/gnu/packages/networking.scm
> +++ b/gnu/packages/networking.scm
> @@ -4100,3 +4100,38 @@ on hub/switched networks.  It is based on 
> @acronym{ARP} packets, it will send
>   @acronym{ARP} requests and sniff for replies.")
>      (home-page "https://github.com/netdiscover-scanner/netdiscover")
>      (license license:gpl3+)))
> +
> +(define-public putty
> +  (package
> +    (name "putty")
> +    (version "0.75")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "http://www.putty.be/" version
> +                           "/putty-" version ".tar.gz"))
> +       (sha256
> +        (base32 
> "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"))))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'go-into-unix/
> +           (lambda _ (begin
> +                  (chdir "unix")
> +                  #t))))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("gtk+" ,gtk+)
> +       ("perl" ,perl)
> +       ("python" ,python)
> +       ("python2" ,python-2.7)))
> +    (synopsis "Graphical @acronym{SSH} and telnet client")
> +    (description
> +     "Putty is a powerful terminal client.  It supports
> @acronym{SSH}, 
> telnet,
> +and raw socket connections with good terminal emulation.  It
> supports 
> public key
> +authentication and Kerberos single-sign-on.  It also includes 
> command-line
> +@acronym{SFTP} and @acronym{SCP} implementations.")
> +    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/"
> )
> +    (license license:expat)))

bug#49510: [PATCH] gnu: Add PuTTY.

[terramorpha]

Thank you for the quick response! I attached a patched created by
`git format-patch`. Hopefully, this one will work.

bug#49510: [PATCH] gnu: Add PuTTY.

[terramorpha]

Sorry for wasting your time, there seems to be a problem with my 
client's attachments.

bug#49510: [PATCH]

[Justin Veilleux]

[-- Attachment #1.1: Type: text/plain, Size: 21 bytes --]

from another address

[-- Attachment #1.2: Type: text/html, Size: 42 bytes --]

[-- Attachment #2: file.patch --]
[-- Type: text/x-patch, Size: 2019 bytes --]

From aae47588a9efc24d68a1df34b05c0a85a00c4d1e Mon Sep 17 00:00:00 2001
From: terramorpha <terramorpha@cock.li>
Date: Mon, 12 Jul 2021 12:38:57 -0400
Subject: [PATCH] gnu: Add putty.

* gnu/packages/networking.scm (putty): New variable.
---
 gnu/packages/networking.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 19b58501e9..ce00a016e6 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4100,3 +4100,38 @@ on hub/switched networks.  It is based on @acronym{ARP} packets, it will send
 @acronym{ARP} requests and sniff for replies.")
    (home-page "https://github.com/netdiscover-scanner/netdiscover")
    (license license:gpl3+)))
+
+(define-public putty
+  (package
+    (name "putty")
+    (version "0.75")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.putty.be/" version
+                           "/putty-" version ".tar.gz"))
+       (sha256
+        (base32 "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'go-into-unix/
+           (lambda _ (begin
+                  (chdir "unix")
+                  #t))))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("perl" ,perl)
+       ("python" ,python)
+       ("python2" ,python-2.7)))
+    (synopsis "Graphical @acronym{SSH} and telnet client")
+    (description
+     "Putty is a powerful terminal client.  It supports @acronym{SSH}, telnet,
+and raw socket connections with good terminal emulation.  It supports public key
+authentication and Kerberos single-sign-on.  It also includes command-line
+@acronym{SFTP} and @acronym{SCP} implementations.")
+    (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/")
+    (license license:expat)))
-- 
2.32.0

bug#49510: [PATCH]

[Leo Prikler]

Hi,

I've cleaned up the patch and pushed it.

Thanks,
Leo