GNU bug report logs -
#27469
[PATCH] gnu: Add quagga.
Previous Next
Reported by: Gábor Boskovits <boskovits <at> gmail.com>
Date: Sat, 24 Jun 2017 00:40:01 UTC
Severity: normal
Tags: patch
Done: Marius Bakke <mbakke <at> fastmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 27469 in the body.
You can then email your comments to 27469 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#27469; Package
guix-patches.
(Sat, 24 Jun 2017 00:40:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Gábor Boskovits <boskovits <at> gmail.com>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Sat, 24 Jun 2017 00:40:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* 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 <at> famulari.name>
;;; Copyright © 2017 Efraim Flashner <efraim <at> flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling <at> mykolab.com>
+;;; Copyright © 2017 Gábor Boskovits <boskovits <at> 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
Information forwarded
to
guix-patches <at> gnu.org:
bug#27469; Package
guix-patches.
(Sun, 25 Jun 2017 13:06:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 27469 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Gábor Boskovits <boskovits <at> 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!
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#27469; Package
guix-patches.
(Mon, 26 Jun 2017 16:22:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 27469 <at> debbugs.gnu.org (full text, mbox):
* 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 <at> tobias.gr>
# Copyright © 2017 Clément Lassieur <clement <at> lassieur.org>
# Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
+# Copyright © 2017 Gábor Boskovits <boskovits <at> 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 <at> famulari.name>
;;; Copyright © 2017 Efraim Flashner <efraim <at> flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling <at> mykolab.com>
+;;; Copyright © 2017 Gábor Boskovits <boskovits <at> 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
Reply sent
to
Marius Bakke <mbakke <at> fastmail.com>:
You have taken responsibility.
(Mon, 26 Jun 2017 18:45:01 GMT)
Full text and
rfc822 format available.
Notification sent
to
Gábor Boskovits <boskovits <at> gmail.com>:
bug acknowledged by developer.
(Mon, 26 Jun 2017 18:45:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 27469-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Gábor Boskovits <boskovits <at> 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.
[signature.asc (application/pgp-signature, inline)]
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Tue, 25 Jul 2017 11:24:04 GMT)
Full text and
rfc822 format available.
This bug report was last modified 8 years and 22 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.