Re: [PATCH] Add Tor client only package definition

[André Batista]

Hi Ludo,

ter 26 mai 2020 às 11:56:21 (1590504981), nandre@riseup.net enviou:
> dom 24 mai 2020 às 22:51:16 (1590371476), ludo@gnu.org enviou:
> > It looks good to me overall!  Some nitpicking:
> >
> > We’d rather use ‘substitute-keyword-arguments’ to augment
> > #:configure-flags without touching the other keyword arguments (there
> > are several examples in the source).
> > ....
> >
> > We generally avoid concatenating text like this, for the reasons
> > explained at:
> > 
> >   https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html
> > ....
> >
> > Regarding the format of patches, you can take a look at this:
> > 
> >   https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html
> 
> I'll send a new patch taking your warnings into account.

I'm a little bit short on time, so I couldn't do everything I was supposed
to. I'm sending the attached patch for your consideration, just in case
someone wants to try it out, though I still need to clone the git repo, try
to build it on a pre-inst-env, and try to compile on archs other than i686
and x86_64.

I've run './etc/indent-code.el', guix lint and there where no errors.

It might take me some time to properly set up everything here and complete
the remaining steps, so please do tell me if you think the reasoning on the
previous email does not hold up or is not worth the trouble.

This diff was taken upon commit 018cffc9c9e5a5855733f5f45a1c4d396bb6a321.

--- a/gnu/packages/tor.scm      2020-05-31 00:45:08.246476629 -0300
+++ b/gnu/packages/tor.scm      2020-05-31 16:36:57.355970253 -0300
@@ -27,6 +27,7 @@
 (define-module (gnu packages tor)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
@@ -85,11 +86,36 @@
 web browsers, instant messaging clients, remote login, and other
 applications based on the TCP protocol.
 
+This package is the full featured @code{tor} which is needed for running
+relays, bridges or directory authorities. If you just want to access the Tor
+Network or to setup an onion service you may install @code{tor-client}
+instead.")
+    (license license:bsd-3)))
+
+(define-public tor-client
+  (package
+    (inherit tor)
+    (name "tor-client")
+    (arguments
+     (substitute-keyword-arguments (package-arguments tor)
+                                   ((#:configure-flags flags)
+                                    `(list ,@(cdr flags)
+                                          "--disable-module-relay"))))
+    (synopsis "Client to the anonymous Tor network")
+    (description
+     "Tor protects you by bouncing your communications around a distributed
+network of relays run by volunteers all around the world: it prevents
+somebody watching your Internet connection from learning what sites you
+visit, and it prevents the sites you visit from learning your physical
+location.  Tor works with many of your existing applications, including
+web browsers, instant messaging clients, remote login, and other
+applications based on the TCP protocol.
+
 To @code{torify} applications (to take measures to ensure that an application,
 which has not been designed for use with Tor such as ssh, will use only Tor for
 internet connectivity, and also ensures that there are no leaks from DNS, UDP 
or
-the application layer) you need to install @code{torsocks}.")
-    (license license:bsd-3)))
+the application layer) you need to install @code{torsocks}.  This package only
+provides a client to the Tor Network.")))
 
 (define-public torsocks
   (package

signature.asc
Description: PGP signature