* [PATCH] distro: Add rsync
@ 2012-12-21 10:47 Andreas Enge
2012-12-21 12:28 ` Nikita Karetnikov
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Enge @ 2012-12-21 10:47 UTC (permalink / raw
To: bug-guix
[-- Attachment #1.1: Type: text/plain, Size: 25 bytes --]
Patch attached.
Andreas
[-- Attachment #1.2: Type: text/html, Size: 946 bytes --]
[-- Attachment #2: 0001-distro-Add-rsync.patch --]
[-- Type: text/x-patch, Size: 3213 bytes --]
From 3a89e4c0463ad031a0c3bfd216f5ce75845359b1 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Fri, 21 Dec 2012 11:37:46 +0100
Subject: [PATCH] distro: Add rsync.
* distro/packages/rsync.scm: New file.
* Makefile.am (MODULES): Add it.
---
Makefile.am | 1 +
distro/packages/rsync.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 distro/packages/rsync.scm
diff --git a/Makefile.am b/Makefile.am
index 7a9bc1c..774c585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,7 @@ MODULES = \
distro/packages/pth.scm \
distro/packages/readline.scm \
distro/packages/recutils.scm \
+ distro/packages/rsync.scm \
distro/packages/shishi.scm \
distro/packages/system.scm \
distro/packages/texinfo.scm \
diff --git a/distro/packages/rsync.scm b/distro/packages/rsync.scm
new file mode 100644
index 0000000..d5390bd
--- /dev/null
+++ b/distro/packages/rsync.scm
@@ -0,0 +1,52 @@
+;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
+;;; Copyright (C) 2012 Andreas Enge <andreas@enge.fr>
+;;;
+;;; This file is part of Guix.
+;;;
+;;; Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages rsync)
+ #:use-module (distro)
+ #:use-module (distro packages perl)
+ #:use-module (distro packages acl)
+ #:use-module (guix licenses)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu))
+
+
+(define-public rsync
+ (package
+ (name "rsync")
+ (version "3.0.9")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://rsync.samba.org/ftp/rsync/rsync-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h"))))
+ (build-system gnu-build-system)
+ (inputs `(("perl" ,perl)
+ ("acl" ,acl)))
+ (synopsis "rsync, a remote (and local) file copying tool")
+ (description
+ "rsync is a fast and versatile file copying tool. It can copy locally,
+to/from another host over any remote shell, or to/from a remote rsync daemon.
+Its delta-transfer algorithm reduces the amount of data sent over the network
+by sending only the differences between the source files and the existing
+files in the destination.")
+ (license gpl3+) ;; and others for certain files
+ (home-page "http://rsync.samba.org/")))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] distro: Add rsync
2012-12-21 10:47 [PATCH] distro: Add rsync Andreas Enge
@ 2012-12-21 12:28 ` Nikita Karetnikov
2012-12-21 13:17 ` Andreas Enge
0 siblings, 1 reply; 6+ messages in thread
From: Nikita Karetnikov @ 2012-12-21 12:28 UTC (permalink / raw
To: Andreas Enge; +Cc: bug-guix
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
Hi,
Could you fix the following?
1. Change 'uri' according to this [1] example.
2. Use a single semicolon after expression. [2]
3. It's probably better to say what licenses are used for the other
files.
Nikita
[1] https://lists.gnu.org/archive/html/bug-guix/2012-11/msg00032.html
[2] https://www.gnu.org/software/guile/manual/html_node/Comments.html#Comments
[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] distro: Add rsync
2012-12-21 12:28 ` Nikita Karetnikov
@ 2012-12-21 13:17 ` Andreas Enge
2012-12-21 16:54 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Enge @ 2012-12-21 13:17 UTC (permalink / raw
To: Nikita Karetnikov, bug-guix
[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]
Am Freitag, 21. Dezember 2012 schrieb Nikita Karetnikov:
> 1. Change 'uri' according to this [1] example.
What does this change? Especially as it is not done systematically
for the files already in the distribution.
> 2. Use a single semicolon after expression. [2]
Okay, thanks.
> 3. It's probably better to say what licenses are used for the other
> files.
Actually, what is one expected to do concerning licenses?
README says:
"Rsync may be used, modified and redistributed only under the terms of
the GNU General Public License, found in the file COPYING in this
distribution"
COPYING is GPLv3. So I checked a few files whether this means
gpl3 or gpl3+.
rsync.c states gpl3+, for example.
Some other files have different license statements. There is a subdirectory
popt containing a different COPYING (looks like X11 license).
The file snprintf.c in the subdirectory lib has:
/*
* Copyright Patrick Powell 1995
* This code is based on code written by Patrick Powell
(papowell@astart.com)
* It may be used for any purpose as long as this notice remains intact
* on all source code distributions
*/
There may potentially be as many licenses as files in the distribution
(208), that is why I went with only the main statement from the README
file.
What would good practice be?
Andreas
[-- Attachment #2: Type: text/html, Size: 8055 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] distro: Add rsync
2012-12-21 13:17 ` Andreas Enge
@ 2012-12-21 16:54 ` Ludovic Courtès
2012-12-21 19:13 ` Andreas Enge
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2012-12-21 16:54 UTC (permalink / raw
To: Andreas Enge; +Cc: bug-guix
Andreas Enge <andreas@enge.fr> skribis:
> Am Freitag, 21. Dezember 2012 schrieb Nikita Karetnikov:
>> 1. Change 'uri' according to this [1] example.
>
> What does this change? Especially as it is not done systematically
> for the files already in the distribution.
Yeah, this is a minor issue, just a formatting convention that we should
try to follow.
>> 3. It's probably better to say what licenses are used for the other
>> files.
>
> Actually, what is one expected to do concerning licenses?
> README says:
> "Rsync may be used, modified and redistributed only under the terms of
> the GNU General Public License, found in the file COPYING in this
> distribution"
>
> COPYING is GPLv3. So I checked a few files whether this means
> gpl3 or gpl3+.
>
> rsync.c states gpl3+, for example.
>
> Some other files have different license statements. There is a subdirectory
> popt containing a different COPYING (looks like X11 license).
The combined work is GPLv3+ anyway, so I guess you were right in
choosing gpl3+ as the license.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] distro: Add rsync
2012-12-21 16:54 ` Ludovic Courtès
@ 2012-12-21 19:13 ` Andreas Enge
2012-12-21 21:40 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Enge @ 2012-12-21 19:13 UTC (permalink / raw
To: Ludovic Courtès; +Cc: bug-guix
[-- Attachment #1.1: Type: text/plain, Size: 52 bytes --]
Okay, new patch attached.
Happy holidays!
Andreas
[-- Attachment #1.2: Type: text/html, Size: 1269 bytes --]
[-- Attachment #2: 0001-distro-Add-rsync.patch --]
[-- Type: text/x-patch, Size: 3175 bytes --]
From e48443061df42ac71cfab8781978bc1e5cfbf91b Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Fri, 21 Dec 2012 11:37:46 +0100
Subject: [PATCH] distro: Add rsync.
* distro/packages/rsync.scm: New file.
* Makefile.am (MODULES): Add it.
---
Makefile.am | 1 +
distro/packages/rsync.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)
create mode 100644 distro/packages/rsync.scm
diff --git a/Makefile.am b/Makefile.am
index 7a9bc1c..774c585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,7 @@ MODULES = \
distro/packages/pth.scm \
distro/packages/readline.scm \
distro/packages/recutils.scm \
+ distro/packages/rsync.scm \
distro/packages/shishi.scm \
distro/packages/system.scm \
distro/packages/texinfo.scm \
diff --git a/distro/packages/rsync.scm b/distro/packages/rsync.scm
new file mode 100644
index 0000000..a94cc17
--- /dev/null
+++ b/distro/packages/rsync.scm
@@ -0,0 +1,51 @@
+;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
+;;; Copyright (C) 2012 Andreas Enge <andreas@enge.fr>
+;;;
+;;; This file is part of Guix.
+;;;
+;;; Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages rsync)
+ #:use-module (distro)
+ #:use-module (distro packages perl)
+ #:use-module (distro packages acl)
+ #:use-module (guix licenses)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu))
+
+
+(define-public rsync
+ (package
+ (name "rsync")
+ (version "3.0.9")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://rsync.samba.org/ftp/rsync/rsync-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h"))))
+ (build-system gnu-build-system)
+ (inputs `(("perl" ,perl)
+ ("acl" ,acl)))
+ (synopsis "rsync, a remote (and local) file copying tool")
+ (description
+ "rsync is a fast and versatile file copying tool. It can copy locally,
+to/from another host over any remote shell, or to/from a remote rsync daemon.
+Its delta-transfer algorithm reduces the amount of data sent over the network
+by sending only the differences between the source files and the existing
+files in the destination.")
+ (license gpl3+)
+ (home-page "http://rsync.samba.org/")))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] distro: Add rsync
2012-12-21 19:13 ` Andreas Enge
@ 2012-12-21 21:40 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2012-12-21 21:40 UTC (permalink / raw
To: Andreas Enge; +Cc: bug-guix
Andreas Enge <andreas@enge.fr> skribis:
> Okay, new patch attached.
Works for me, so I pushed it, thanks!
> Happy holidays!
Thanks, you too. :-)
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-12-21 21:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-21 10:47 [PATCH] distro: Add rsync Andreas Enge
2012-12-21 12:28 ` Nikita Karetnikov
2012-12-21 13:17 ` Andreas Enge
2012-12-21 16:54 ` Ludovic Courtès
2012-12-21 19:13 ` Andreas Enge
2012-12-21 21:40 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).