* [bug#27469] [PATCH] gnu: Add quagga.
@ 2017-06-24 0:10 Gábor Boskovits
2017-06-25 13:05 ` Marius Bakke
2017-06-26 15:51 ` Gábor Boskovits
0 siblings, 2 replies; 4+ messages in thread
From: Gábor Boskovits @ 2017-06-24 0:10 UTC (permalink / raw)
To: 27469; +Cc: Gábor Boskovits
* gnu/packages/networking.scm (quagga): New variable.
* gnu/packages/patches/quagga-reproducible-build.patch: New file.
---
gnu/packages/networking.scm | 29 ++++++++++++++++++++++
.../patches/quagga-reproducible-build.patch | 22 ++++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 gnu/packages/patches/quagga-reproducible-build.patch
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 06a2c8be6..1aa8dfef4 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,6 +52,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages dejagnu)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
@@ -64,6 +66,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages readline)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
@@ -1308,3 +1311,29 @@ transparently have a connection established to another address (e.g., a UNIX
socket on a different system). This is similar to 'ssh -L' functionality, but
does not use SSH and requires a pre-shared symmetric key.")
(license license:bsd-2)))
+
+(define-public quagga
+ (package
+ (name "quagga")
+ (version "1.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://savannah/quagga/quagga-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda"))
+ (patches
+ (search-patches "quagga-reproducible-build.patch"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config",pkg-config)))
+ (inputs `(("readline",readline)
+ ("c-ares",c-ares)
+ ("perl",perl)
+ ("dejagnu",dejagnu)))
+ (synopsis "Routing Software Suite")
+ (description "Quagga is a routing software suite, providing implementations
+of OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4 for Unix platforms, particularly
+FreeBSD, Linux, Solaris and NetBSD.")
+ (home-page "http://www.nongnu.org/quagga/")
+ (license license:gpl2)))
diff --git a/gnu/packages/patches/quagga-reproducible-build.patch b/gnu/packages/patches/quagga-reproducible-build.patch
new file mode 100644
index 000000000..80efe4bf6
--- /dev/null
+++ b/gnu/packages/patches/quagga-reproducible-build.patch
@@ -0,0 +1,22 @@
+Make sure, that vtysh_cmd.c is deterministically generated.
+
+--- a/vtysh/extract.pl.in 2017-03-10 13:55:06.000000000 +0100
++++ b/vtysh/extract.pl.in 2017-06-24 00:51:56.460000000 +0200
+@@ -214,7 +214,7 @@
+ }
+
+ # Output DEFSH
+-foreach (keys %live) {
++foreach (sort keys %live) {
+ my ($proto);
+ my ($key);
+ $key = $live{$_};
+@@ -229,7 +229,7 @@
+ {
+ EOF
+
+-foreach (keys %odefun) {
++foreach (sort keys %odefun) {
+ my ($node, $str) = (split (/,/));
+ $cmd = $ocmd{$_};
+ $cmd =~ s/_cmd/_cmd_vtysh/;
--
2.13.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#27469] [PATCH] gnu: Add quagga.
2017-06-24 0:10 [bug#27469] [PATCH] gnu: Add quagga Gábor Boskovits
@ 2017-06-25 13:05 ` Marius Bakke
2017-06-26 15:51 ` Gábor Boskovits
1 sibling, 0 replies; 4+ messages in thread
From: Marius Bakke @ 2017-06-25 13:05 UTC (permalink / raw)
To: Gábor Boskovits, 27469
[-- Attachment #1: Type: text/plain, Size: 2164 bytes --]
Gábor Boskovits <boskovits@gmail.com> writes:
> * gnu/packages/networking.scm (quagga): New variable.
> * gnu/packages/patches/quagga-reproducible-build.patch: New file.
Thanks for this!
[...]
> +(define-public quagga
> + (package
> + (name "quagga")
> + (version "1.2.1")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "mirror://savannah/quagga/quagga-"
> + version ".tar.gz"))
> + (sha256
> + (base32
> + "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda"))
> + (patches
> + (search-patches "quagga-reproducible-build.patch"))))
> + (build-system gnu-build-system)
> + (native-inputs `(("pkg-config",pkg-config)))
> + (inputs `(("readline",readline)
> + ("c-ares",c-ares)
> + ("perl",perl)
> + ("dejagnu",dejagnu)))
Dejagnu is a software test framework and should probably be a
"native-input", e.g. it's a build-time dependency only.
`guix gc -R (./pre-inst-env guix build quagga)` also lists no references
to perl, so it should likely also be a native-input. What do you think?
> + (synopsis "Routing Software Suite")
> + (description "Quagga is a routing software suite, providing implementations
> +of OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4 for Unix platforms, particularly
> +FreeBSD, Linux, Solaris and NetBSD.")
> + (home-page "http://www.nongnu.org/quagga/")
> + (license license:gpl2)))
The license is GPL2+ as listed in the source comment headers.
> diff --git a/gnu/packages/patches/quagga-reproducible-build.patch b/gnu/packages/patches/quagga-reproducible-build.patch
> new file mode 100644
> index 000000000..80efe4bf6
> --- /dev/null
> +++ b/gnu/packages/patches/quagga-reproducible-build.patch
> @@ -0,0 +1,22 @@
> +Make sure, that vtysh_cmd.c is deterministically generated.
Good catch! LGTM. Could you submit this fix upstream too?
Also, please add this patch to the relevant section in "gnu/local.mk".
See the commit log for examples.
Can you send an updated patch? Thanks in advance!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#27469] [PATCH] gnu: Add quagga.
2017-06-24 0:10 [bug#27469] [PATCH] gnu: Add quagga Gábor Boskovits
2017-06-25 13:05 ` Marius Bakke
@ 2017-06-26 15:51 ` Gábor Boskovits
2017-06-26 18:44 ` bug#27469: " Marius Bakke
1 sibling, 1 reply; 4+ messages in thread
From: Gábor Boskovits @ 2017-06-26 15:51 UTC (permalink / raw)
To: 27469; +Cc: Gábor Boskovits
* gnu/packages/networking.scm (quagga): New variable.
* gnu/packages/patches/quagga-reproducible-build.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 2 ++
gnu/packages/networking.scm | 29 ++++++++++++++++++++++
.../patches/quagga-reproducible-build.patch | 22 ++++++++++++++++
3 files changed, 53 insertions(+)
create mode 100644 gnu/packages/patches/quagga-reproducible-build.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 5d024de07..b3dd1953a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -14,6 +14,7 @@
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+# Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
#
# This file is part of GNU Guix.
#
@@ -961,6 +962,7 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-CVE-2017-9524.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
+ %D%/packages/patches/quagga-reproducible-build.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch \
%D%/packages/patches/raptor2-heap-overflow.patch \
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 06a2c8be6..1c5ba39cd 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,6 +52,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages dejagnu)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
@@ -64,6 +66,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages readline)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
@@ -1308,3 +1311,29 @@ transparently have a connection established to another address (e.g., a UNIX
socket on a different system). This is similar to 'ssh -L' functionality, but
does not use SSH and requires a pre-shared symmetric key.")
(license license:bsd-2)))
+
+(define-public quagga
+ (package
+ (name "quagga")
+ (version "1.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://savannah/quagga/quagga-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda"))
+ (patches
+ (search-patches "quagga-reproducible-build.patch"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config",pkg-config)
+ ("perl",perl)
+ ("dejagnu",dejagnu)))
+ (inputs `(("readline",readline)
+ ("c-ares",c-ares)))
+ (synopsis "Routing Software Suite")
+ (description "Quagga is a routing software suite, providing implementations
+of OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4 for Unix platforms, particularly
+FreeBSD, Linux, Solaris and NetBSD.")
+ (home-page "http://www.nongnu.org/quagga/")
+ (license license:gpl2+)))
diff --git a/gnu/packages/patches/quagga-reproducible-build.patch b/gnu/packages/patches/quagga-reproducible-build.patch
new file mode 100644
index 000000000..80efe4bf6
--- /dev/null
+++ b/gnu/packages/patches/quagga-reproducible-build.patch
@@ -0,0 +1,22 @@
+Make sure, that vtysh_cmd.c is deterministically generated.
+
+--- a/vtysh/extract.pl.in 2017-03-10 13:55:06.000000000 +0100
++++ b/vtysh/extract.pl.in 2017-06-24 00:51:56.460000000 +0200
+@@ -214,7 +214,7 @@
+ }
+
+ # Output DEFSH
+-foreach (keys %live) {
++foreach (sort keys %live) {
+ my ($proto);
+ my ($key);
+ $key = $live{$_};
+@@ -229,7 +229,7 @@
+ {
+ EOF
+
+-foreach (keys %odefun) {
++foreach (sort keys %odefun) {
+ my ($node, $str) = (split (/,/));
+ $cmd = $ocmd{$_};
+ $cmd =~ s/_cmd/_cmd_vtysh/;
--
2.13.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#27469: [PATCH] gnu: Add quagga.
2017-06-26 15:51 ` Gábor Boskovits
@ 2017-06-26 18:44 ` Marius Bakke
0 siblings, 0 replies; 4+ messages in thread
From: Marius Bakke @ 2017-06-26 18:44 UTC (permalink / raw)
To: Gábor Boskovits, 27469-done
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
Gábor Boskovits <boskovits@gmail.com> writes:
> * gnu/packages/networking.scm (quagga): New variable.
> * gnu/packages/patches/quagga-reproducible-build.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
Thanks! I ran the indentation through emacs and added another paragraph
to the description, taken from the home page. Hope it's still good!
Pushed as c2700e785b3048f5ebe0ade82a475c47d00d3642.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-26 18:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-24 0:10 [bug#27469] [PATCH] gnu: Add quagga Gábor Boskovits
2017-06-25 13:05 ` Marius Bakke
2017-06-26 15:51 ` Gábor Boskovits
2017-06-26 18:44 ` bug#27469: " Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.