* [PATCH] gnu: Add dnsmasq.
@ 2015-01-31 20:54 "Taylan Ulrich Bayırlı/Kammer"
2015-02-01 6:18 ` Mark H Weaver
0 siblings, 1 reply; 4+ messages in thread
From: "Taylan Ulrich Bayırlı/Kammer" @ 2015-01-31 20:54 UTC (permalink / raw)
To: guix-devel
===File /home/tub/media/src/guix/0002-gnu-Add-dnsmasq.patch===
From f943afbfcdbe78a91064844609391373c845b498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 31 Jan 2015 21:51:08 +0100
Subject: [PATCH 2/2] gnu: Add dnsmasq.
* gnu-system.am (GNU_SYSTEM_MODULES): Add dnsmasq.scm.
* gnu/packages/dnsmasq.scm: New file.
---
gnu-system.am | 1 +
gnu/packages/dnsmasq.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
create mode 100644 gnu/packages/dnsmasq.scm
diff --git a/gnu-system.am b/gnu-system.am
index 706ad57..b81a42f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -79,6 +79,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/dejagnu.scm \
gnu/packages/dictionaries.scm \
gnu/packages/disk.scm \
+ gnu/packages/dnsmasq.scm \
gnu/packages/docbook.scm \
gnu/packages/doxygen.scm \
gnu/packages/dwm.scm \
diff --git a/gnu/packages/dnsmasq.scm b/gnu/packages/dnsmasq.scm
new file mode 100644
index 0000000..7303b9f
--- /dev/null
+++ b/gnu/packages/dnsmasq.scm
@@ -0,0 +1,58 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU 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.
+;;;
+;;; GNU 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages dnsmasq)
+ #:use-module (guix licenses)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu))
+
+(define-public dnsmasq
+ (package
+ (name "dnsmasq")
+ (version "2.72")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (alist-replace
+ 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("/usr/local") (assoc-ref outputs "out")))
+ (setenv "CC" "gcc"))
+ %standard-phases)
+ #:tests? #f))
+ (home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html")
+ (synopsis "Small caching DNS proxy and DHCP/TFTP server")
+ (description
+ "Dnsmasq is a lightweight DNS forwarder and DHCP server. It is designed
+to provide DNS and optionally, DHCP, to a small network. It can serve the
+names of local machines which are not in the global DNS. The DHCP server
+integrates with the DNS server and allows machines with DHCP-allocated
+addresses to appear in the DNS with names configured either in each host or in
+a central configuration file. Dnsmasq supports static and dynamic DHCP leases
+and BOOTP/TFTP for network booting of diskless machines.")
+ (license gpl3)))
--
2.2.1
============================================================
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: Add dnsmasq.
2015-01-31 20:54 [PATCH] gnu: Add dnsmasq "Taylan Ulrich Bayırlı/Kammer"
@ 2015-02-01 6:18 ` Mark H Weaver
2015-02-01 13:24 ` Taylan Ulrich Bayırlı/Kammer
0 siblings, 1 reply; 4+ messages in thread
From: Mark H Weaver @ 2015-02-01 6:18 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
taylanbayirli@gmail.com ("Taylan Ulrich "Bayırlı/Kammer\"") writes:
> From f943afbfcdbe78a91064844609391373c845b498 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
> <taylanbayirli@gmail.com>
> Date: Sat, 31 Jan 2015 21:51:08 +0100
> Subject: [PATCH 2/2] gnu: Add dnsmasq.
>
> * gnu-system.am (GNU_SYSTEM_MODULES): Add dnsmasq.scm.
> * gnu/packages/dnsmasq.scm: New file.
> ---
> gnu-system.am | 1 +
> gnu/packages/dnsmasq.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 59 insertions(+)
> create mode 100644 gnu/packages/dnsmasq.scm
>
> diff --git a/gnu-system.am b/gnu-system.am
> index 706ad57..b81a42f 100644
> --- a/gnu-system.am
> +++ b/gnu-system.am
> @@ -79,6 +79,7 @@ GNU_SYSTEM_MODULES = \
> gnu/packages/dejagnu.scm \
> gnu/packages/dictionaries.scm \
> gnu/packages/disk.scm \
> + gnu/packages/dnsmasq.scm \
> gnu/packages/docbook.scm \
> gnu/packages/doxygen.scm \
> gnu/packages/dwm.scm \
> diff --git a/gnu/packages/dnsmasq.scm b/gnu/packages/dnsmasq.scm
> new file mode 100644
> index 0000000..7303b9f
> --- /dev/null
> +++ b/gnu/packages/dnsmasq.scm
> @@ -0,0 +1,58 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
It's 2015 now :)
The same mistake is present in your other recent submissions.
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU 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.
> +;;;
> +;;; GNU 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (gnu packages dnsmasq)
> + #:use-module (guix licenses)
> + #:use-module (guix packages)
> + #:use-module (guix download)
> + #:use-module (guix build-system gnu))
> +
> +(define-public dnsmasq
> + (package
> + (name "dnsmasq")
> + (version "2.72")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-"
> + version ".tar.xz"))
> + (sha256
> + (base32
> + "1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx"))))
> + (build-system gnu-build-system)
> + (arguments
> + `(#:phases
> + (alist-replace
> + 'configure
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (substitute* "Makefile"
> + (("/usr/local") (assoc-ref outputs "out")))
> + (setenv "CC" "gcc"))
> + %standard-phases)
How about passing these as arguments to 'make' instead, like this?
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc")
#:phases (alist-delete 'configure %standard-phases)
> + #:tests? #f))
Please add a comment explaining why this is needed. In this case "no
check target" would be sufficient.
> + (home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html")
> + (synopsis "Small caching DNS proxy and DHCP/TFTP server")
> + (description
> + "Dnsmasq is a lightweight DNS forwarder and DHCP server. It is designed
> +to provide DNS and optionally, DHCP, to a small network. It can serve the
> +names of local machines which are not in the global DNS. The DHCP server
> +integrates with the DNS server and allows machines with DHCP-allocated
> +addresses to appear in the DNS with names configured either in each host or in
> +a central configuration file. Dnsmasq supports static and dynamic DHCP leases
> +and BOOTP/TFTP for network booting of diskless machines.")
> + (license gpl3)))
The source files say that the user has the option of either GPLv2 or
GPLv3. Therefore, please write (license gpl2 gpl3) with a comment to
make it clear what this means.
Can you post an updated patch?
Thanks!
Mark
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: Add dnsmasq.
2015-02-01 6:18 ` Mark H Weaver
@ 2015-02-01 13:24 ` Taylan Ulrich Bayırlı/Kammer
2015-02-01 22:54 ` Mark H Weaver
0 siblings, 1 reply; 4+ messages in thread
From: Taylan Ulrich Bayırlı/Kammer @ 2015-02-01 13:24 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 95 bytes --]
Thanks for the feedback!
It seems `license' must be one value, which may be a list, correct?
[-- Attachment #2: gnu: Add dnsmasq. --]
[-- Type: text/x-diff, Size: 3650 bytes --]
From 68fa9b1b3f5fff6aaac594b78290c184ccab46d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Sat, 31 Jan 2015 21:51:08 +0100
Subject: [PATCH] gnu: Add dnsmasq.
* gnu-system.am (GNU_SYSTEM_MODULES): Add dnsmasq.scm.
* gnu/packages/dnsmasq.scm: New file.
---
gnu-system.am | 1 +
gnu/packages/dnsmasq.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
create mode 100644 gnu/packages/dnsmasq.scm
diff --git a/gnu-system.am b/gnu-system.am
index 706ad57..b81a42f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -79,6 +79,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/dejagnu.scm \
gnu/packages/dictionaries.scm \
gnu/packages/disk.scm \
+ gnu/packages/dnsmasq.scm \
gnu/packages/docbook.scm \
gnu/packages/doxygen.scm \
gnu/packages/dwm.scm \
diff --git a/gnu/packages/dnsmasq.scm b/gnu/packages/dnsmasq.scm
new file mode 100644
index 0000000..f342f81
--- /dev/null
+++ b/gnu/packages/dnsmasq.scm
@@ -0,0 +1,56 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU 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.
+;;;
+;;; GNU 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages dnsmasq)
+ #:use-module (guix licenses)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu))
+
+(define-public dnsmasq
+ (package
+ (name "dnsmasq")
+ (version "2.72")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (alist-delete 'configure %standard-phases)
+ #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+ "CC=gcc")
+ ;; No 'check' target.
+ #:tests? #f))
+ (home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html")
+ (synopsis "Small caching DNS proxy and DHCP/TFTP server")
+ (description
+ "Dnsmasq is a lightweight DNS forwarder and DHCP server. It is designed
+to provide DNS and optionally, DHCP, to a small network. It can serve the
+names of local machines which are not in the global DNS. The DHCP server
+integrates with the DNS server and allows machines with DHCP-allocated
+addresses to appear in the DNS with names configured either in each host or in
+a central configuration file. Dnsmasq supports static and dynamic DHCP leases
+and BOOTP/TFTP for network booting of diskless machines.")
+ ;; Source files only say GPL2 and GPL3 are allowed.
+ (license (list gpl2 gpl3))))
--
2.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: Add dnsmasq.
2015-02-01 13:24 ` Taylan Ulrich Bayırlı/Kammer
@ 2015-02-01 22:54 ` Mark H Weaver
0 siblings, 0 replies; 4+ messages in thread
From: Mark H Weaver @ 2015-02-01 22:54 UTC (permalink / raw)
To: Taylan Ulrich "Bayırlı/Kammer"; +Cc: guix-devel
Applied, thanks!
Mark
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-01 22:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-31 20:54 [PATCH] gnu: Add dnsmasq "Taylan Ulrich Bayırlı/Kammer"
2015-02-01 6:18 ` Mark H Weaver
2015-02-01 13:24 ` Taylan Ulrich Bayırlı/Kammer
2015-02-01 22:54 ` Mark H Weaver
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).