]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
6 years agoFRRouting Release 3.0.3 frr-3.0.3
Martin Winter [Tue, 9 Jan 2018 10:48:03 +0000 (02:48 -0800)]
FRRouting Release 3.0.3

This version of FRR contains these fixes since the last release:
1. Fixes for GCC 7.0
2. Always enable watchfrr on new installation (req for systemd operation)
3. Add 'no password' command (with warning)
4. Added backport for Ubuntu 17.10

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoMerge pull request #1564 from donaldsharp/redhat_start_watchfrr
Russ White [Tue, 2 Jan 2018 14:23:26 +0000 (09:23 -0500)]
Merge pull request #1564 from donaldsharp/redhat_start_watchfrr

redhat: watchfrr is built by default, enable it to start at run time

6 years agoMerge pull request #1579 from bingen/ldpd-fixes-3.0
Donald Sharp [Tue, 2 Jan 2018 13:11:15 +0000 (08:11 -0500)]
Merge pull request #1579 from bingen/ldpd-fixes-3.0

ldpd: small improvements

6 years agoldpd: add a few warning messages to aid in troubleshooting
Renato Westphal [Wed, 29 Nov 2017 19:11:28 +0000 (17:11 -0200)]
ldpd: add a few warning messages to aid in troubleshooting

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agozebra, ldpd: fix display of pseudowire status
Renato Westphal [Wed, 29 Nov 2017 18:22:08 +0000 (16:22 -0200)]
zebra, ldpd: fix display of pseudowire status

In some circumstances zebra and ldpd would display a pseudowire as UP
when in reality it's not (example: MTU mismatch between the two ends). Fix
this to avoid confusion.

Reported-by: ßingen <bingen@voltanet.io>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agoMerge pull request #1545 from donaldsharp/more_1499
Jafar Al-Gharaibeh [Tue, 19 Dec 2017 16:35:56 +0000 (10:35 -0600)]
Merge pull request #1545 from donaldsharp/more_1499

More 1499

6 years agoredhat: watchfrr is built by default, enable it to start at run time
Donald Sharp [Mon, 18 Dec 2017 18:21:08 +0000 (13:21 -0500)]
redhat: watchfrr is built by default, enable it to start at run time

watchfrr has become a first class citizen of the FRR system.

Currently it's used to ensure that running daemons stay up and running
as well as to facilitate frr.conf being written.  In the future it is
going to be used to auto-start stop.  As such let's start getting
people to use it now.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Add warning to no forms of password command
Donald Sharp [Wed, 13 Dec 2017 12:43:05 +0000 (07:43 -0500)]
lib: Add warning to no forms of password command

Allow the end-user to remove the password commands that
may have been in their config, but warn them that what
they are doing might be a dangerous thing.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: added `no password` command
Juergen Werner [Wed, 22 Nov 2017 23:59:48 +0000 (00:59 +0100)]
lib: added `no password` command

Fixes: #1432
Signed-off-by: Juergen Werner <pogojotz@gmx.net>
6 years agoMerge pull request #1522 from opensourcerouting/u1710-stable3
Donald Sharp [Fri, 8 Dec 2017 00:04:44 +0000 (16:04 -0800)]
Merge pull request #1522 from opensourcerouting/u1710-stable3

Ubuntu 17.10 fixes for stable/3.0 branch

6 years agoospf6d: Fix gcc 7 warning
Martin Winter [Tue, 5 Dec 2017 04:02:49 +0000 (20:02 -0800)]
ospf6d: Fix gcc 7 warning

Originally fixed in master as part of commit 20a6c6f by David Lamparter

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoospf6d: New version of GCC with new warnings
Donald Sharp [Thu, 27 Jul 2017 22:19:31 +0000 (18:19 -0400)]
ospf6d: New version of GCC with new warnings

GCC 7.1.1 returned warnings about buffer sizes
not being big enough to handle the full string
that could be generated.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agozebra: Add missing break in option parsing of test_main.c
Martin Winter [Tue, 5 Dec 2017 03:29:20 +0000 (19:29 -0800)]
zebra: Add missing break in option parsing of test_main.c

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Update Pkg build instructions with Ubuntu 17.10 and fix errors
Martin Winter [Thu, 30 Nov 2017 03:23:20 +0000 (19:23 -0800)]
debianpkg: Update Pkg build instructions with Ubuntu 17.10 and fix errors

- plus add pointer for creating new backport
- plus add example for customizing package with WANT_* options

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add Debian backport for Ubuntu 17.10
Martin Winter [Wed, 29 Nov 2017 09:17:28 +0000 (01:17 -0800)]
debianpkg: Add Debian backport for Ubuntu 17.10

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix lintian warning "command-with-path-in-maintainer-script"
Martin Winter [Wed, 29 Nov 2017 09:05:46 +0000 (01:05 -0800)]
debianpkg: Fix lintian warning "command-with-path-in-maintainer-script"

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agolib: Fix gcc 7 warning 'error: ‘fld’ may be used uninitialized in this function'
Martin Winter [Tue, 5 Dec 2017 08:32:31 +0000 (00:32 -0800)]
lib: Fix gcc 7 warning 'error: ‘fld’ may be used uninitialized in this function'

Warning breaks Debian Package build with gcc 7 which uses -Werror=maybe-uninitialized

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years ago*: fix GCC 7 switch/case fallthrough warnings
David Lamparter [Thu, 30 Nov 2017 03:40:16 +0000 (19:40 -0800)]
*: fix GCC 7 switch/case fallthrough warnings

Need a comment on these.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobgpd: Only build json for community when needed
Donald Sharp [Fri, 17 Nov 2017 01:43:56 +0000 (20:43 -0500)]
bgpd: Only build json for community when needed

Building a communities json object every time is
both expensive and memory wasteful.  Modify
code to only build the json object when needed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: Only create json for aspath if needed
Donald Sharp [Fri, 17 Nov 2017 00:41:58 +0000 (19:41 -0500)]
bgpd: Only create json for aspath if needed

The creation of the json object for the aspath
is both memory intensive and expensive to
create.  Only create the json object when
it is needed and stash it for further usage
at that point.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1509 from qlyoung/fix-invalid-assert
Martin Winter [Sat, 2 Dec 2017 09:02:47 +0000 (01:02 -0800)]
Merge pull request #1509 from qlyoung/fix-invalid-assert

[3.0] lib: remove invalid assert

6 years agolib: remove invalid assert
Quentin Young [Fri, 1 Dec 2017 19:05:14 +0000 (14:05 -0500)]
lib: remove invalid assert

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #1459 from bingen/bug_pw_conf
Renato Westphal [Fri, 17 Nov 2017 12:02:23 +0000 (10:02 -0200)]
Merge pull request #1459 from bingen/bug_pw_conf

ldp: Fix bug configuring PW

6 years agoldp: Fix bug configuring PW
ßingen [Fri, 17 Nov 2017 09:32:36 +0000 (10:32 +0100)]
ldp: Fix bug configuring PW

With non-targeted LDP receiving a PW label mapping before configuring
the PW was causing the SET message to be sent before the ADD one, so
Zebra PW manager wouldn't find the PW on first message reception.

Signed-off-by: ßingen <bingen@voltanet.io>
6 years agoMerge pull request #1416 from pogojotz/stable/3.0-write-file-alias-fix
Donald Sharp [Sun, 12 Nov 2017 18:05:51 +0000 (13:05 -0500)]
Merge pull request #1416 from pogojotz/stable/3.0-write-file-alias-fix

lib: Fix command `copy running-config startup-config` to alias `write file`

6 years agolib: Fix command `copy running-config startup-config` to alias `write file`
pogojotz [Mon, 6 Nov 2017 21:43:32 +0000 (22:43 +0100)]
lib: Fix command `copy running-config startup-config` to alias `write file`

Fixes: #1412
Signed-off-by: Juergen Werner <pogojotz@gmx.net>
6 years agolib: Only apply prefix's to the same family
Donald Sharp [Tue, 7 Nov 2017 15:54:03 +0000 (10:54 -0500)]
lib: Only apply prefix's to the same family

When we have a v4 or v6 prefix list, only
apply it via a match when the address families
are the same.

Fixes: #1339
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1425 from JuergenKammer/stable/3.0-ospf6-interface-cost-fix
Donald Sharp [Thu, 9 Nov 2017 15:48:46 +0000 (10:48 -0500)]
Merge pull request #1425 from JuergenKammer/stable/3.0-ospf6-interface-cost-fix

ospf6d: Fix setting interface ipv6 ospf6 cost value (LSA hooks were n…

6 years agoMerge pull request #1427 from opensourcerouting/cfra/fixes/vty-split-fd-suggestion
Donald Sharp [Thu, 9 Nov 2017 14:24:27 +0000 (09:24 -0500)]
Merge pull request #1427 from opensourcerouting/cfra/fixes/vty-split-fd-suggestion

cfra/fixes/vty split fd suggestion

6 years agoFRRouting Release 3.0.2 frr-3.0.2
Martin Winter [Wed, 8 Nov 2017 00:25:34 +0000 (16:25 -0800)]
FRRouting Release 3.0.2

This version of FRR contains these fixes since the last release:
1. Some improved packaging fixes
2. Fix for miss-handling of BGP attributes in an error situation.
3. Fix for reading in of a nexthop as part of set ip nexthop ... command.
4. Fix for a memory leak in ISIS.
5. Check for per-peer outbound configuration, in addition to the peer-group config.
6. Enable '-S' usage for BGP.

(Re-Release of 3.0.1 which missed some version number and changelog updates)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoospf6d: Fix setting interface ipv6 ospf6 cost value (LSA hooks were never called)
Juergen Kammer [Tue, 7 Nov 2017 08:38:22 +0000 (09:38 +0100)]
ospf6d: Fix setting interface ipv6 ospf6 cost value (LSA hooks were never called)

Fixes: #1420
Signed-off-by: Juergen Kammer <j.kammer@eurodata.de>
If the ipv6 ospf6 cost on an interface is changed, no recalculation of routes happens, though the interface structure is updated with the new value. The new cost will be used later, when LSA hooks are called for any other reason.

Diagnosis:
The DEFUN for the config command sets oi->cost and calls ospf6_interface_recalculate_cost(oi) whenever there is a change in the supplied value. ospf6_interface_recalculate_cost then gets the new cost for the interface by calling ospf6_interface_get_cost(oi), which returns oi->cost if a cost is manually set (i.e. we get the value we just set). ospf6_interface_recalculate_cost only calls the LSA hooks if there is a change - which obviously never happens if we compare the new value with itself.

6 years agovtysh: initialize vty with split fd correctly
Christian Franke [Mon, 30 Oct 2017 02:53:22 +0000 (03:53 +0100)]
vtysh: initialize vty with split fd correctly

6 years agoMerge pull request #1418 from qlyoung/mfa-fix-3.0 FRR-3.0.1
Russ White [Tue, 7 Nov 2017 01:54:55 +0000 (20:54 -0500)]
Merge pull request #1418 from qlyoung/mfa-fix-3.0

bgpd: fix mishandled attribute length [3.0]

6 years agobgpd: fix mishandled attribute length
Quentin Young [Mon, 23 Oct 2017 20:43:32 +0000 (16:43 -0400)]
bgpd: fix mishandled attribute length

A crafted BGP UPDATE with a malformed path attribute length field causes
bgpd to dump up to 65535 bytes of application memory and send it as the
data field in a BGP NOTIFY message, which is truncated to 4075 bytes
after accounting for protocol headers. After reading a malformed length
field, a NOTIFY is generated that is supposed to contain the problematic
data, but the malformed length field is inadvertently used to compute
how much data we send.

CVE-2017-15865

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: Fix nexthop reading to work better
Donald Sharp [Mon, 6 Nov 2017 16:20:40 +0000 (11:20 -0500)]
lib: Fix nexthop reading to work better

Fixes: #1404
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #1386 from opensourcerouting/fix-1251
Donald Sharp [Mon, 30 Oct 2017 12:18:19 +0000 (08:18 -0400)]
Merge pull request #1386 from opensourcerouting/fix-1251

isisd: free-up circuit ip entries when addresses are deleted

6 years agoisisd: free-up circuit ip entries when addresses are deleted
Christian Franke [Mon, 30 Oct 2017 03:15:52 +0000 (04:15 +0100)]
isisd: free-up circuit ip entries when addresses are deleted

6 years agobgpd: Check for per-peer outbound configuration, in addition to the peer-group config
Brian Rak [Mon, 14 Aug 2017 21:22:03 +0000 (17:22 -0400)]
bgpd: Check for per-peer outbound configuration, in addition to the peer-group config

When displaying the config, bgpd only checked for the existance of a peer-group prefix-list before
deciding to not display the outbound prefix-list.  This commit updates the outbound prefix-list
logic to match the inbound.

6 years agoMerge pull request #1369 from LabNConsulting/working/3.0/cherry-pick/minusS
Lou Berger [Thu, 26 Oct 2017 13:15:15 +0000 (09:15 -0400)]
Merge pull request #1369 from LabNConsulting/working/3.0/cherry-pick/minusS

bgpd: cherry-pick -S fix from master, fix issue #1369

6 years agobgpd: skip run as option can be reused
Philippe Guibert [Mon, 25 Sep 2017 14:13:11 +0000 (16:13 +0200)]
bgpd: skip run as option can be reused

the '-S' option was not usable, whereas it was shown on the vty.
Enable the '-S' option.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
6 years agoMerge pull request #1352 from opensourcerouting/rpm-fix-3.0
Donald Sharp [Mon, 23 Oct 2017 12:32:52 +0000 (08:32 -0400)]
Merge pull request #1352 from opensourcerouting/rpm-fix-3.0

Rpm fix 3.0

6 years agoredhat: Fix doc by removing outdated package information and point to main doc/ direc...
Martin Winter [Sat, 21 Oct 2017 01:22:24 +0000 (18:22 -0700)]
redhat: Fix doc by removing outdated package information and point to main doc/ directory for it

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Add posttrans scriptlet as a temp fix for missing restart during upgrade
Martin Winter [Sat, 21 Oct 2017 01:19:36 +0000 (18:19 -0700)]
redhat: Add posttrans scriptlet as a temp fix for missing restart during upgrade

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Fix rpm scripts to correctly restart daemons on upgrade
Martin Winter [Fri, 20 Oct 2017 23:33:39 +0000 (16:33 -0700)]
redhat: Fix rpm scripts to correctly restart daemons on upgrade

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Add fix to correct watchfrr config during upgrade
Martin Winter [Fri, 20 Oct 2017 21:06:05 +0000 (14:06 -0700)]
redhat: Add fix to correct watchfrr config during upgrade

- /etc/frr/daemon is a config file and won't be replaced, do quick sed fix
- Updated changelog

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: systemd file should not be executable
Martin Winter [Fri, 20 Oct 2017 02:36:59 +0000 (19:36 -0700)]
redhat: systemd file should not be executable

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoredhat: Always reference main frr start/stop script in /usr/lib/frr
Martin Winter [Fri, 20 Oct 2017 01:02:45 +0000 (18:02 -0700)]
redhat: Always reference main frr start/stop script in /usr/lib/frr

* Fixes issue where daemon default config tried to use /etc/init.d/frr script which doesn't exist on systemd systems

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoMerge pull request #1329 from opensourcerouting/debian9-pkg
Donald Sharp [Wed, 18 Oct 2017 23:12:03 +0000 (19:12 -0400)]
Merge pull request #1329 from opensourcerouting/debian9-pkg

debianpkg: Add Debian 9 Package support

6 years agodoc: Adding Doc for building on Debian 9
Martin Winter [Wed, 18 Oct 2017 22:15:55 +0000 (15:15 -0700)]
doc: Adding Doc for building on Debian 9

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add debian9 backport to distribution tar
Martin Winter [Mon, 16 Oct 2017 11:01:48 +0000 (04:01 -0700)]
debianpkg: Add debian9 backport to distribution tar

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add Debian 9 Package support
Martin Winter [Mon, 16 Oct 2017 10:31:47 +0000 (03:31 -0700)]
debianpkg: Add Debian 9 Package support

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoRelease: FRR 3.0 frr-3.0
Martin Winter [Fri, 13 Oct 2017 23:17:26 +0000 (16:17 -0700)]
Release: FRR 3.0

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoRevert "ospfd: Free memory associated with ospf instance startup"
Martin Winter [Thu, 12 Oct 2017 00:56:17 +0000 (17:56 -0700)]
Revert "ospfd: Free memory associated with ospf instance startup"

This reverts commit 79942104bff838362cd6609485a26617492aa6f5.
The original commit causes a heap-use-after-free. See issue
https://github.com/FRRouting/frr/issues/1326

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agorelease: FRR 3.0-rc3 frr-3.0-rc3
Martin Winter [Tue, 10 Oct 2017 22:13:10 +0000 (15:13 -0700)]
release: FRR 3.0-rc3

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agoMerge pull request #1320 from opensourcerouting/Debian-Pkg-3.0
Donald Sharp [Tue, 10 Oct 2017 16:33:36 +0000 (12:33 -0400)]
Merge pull request #1320 from opensourcerouting/Debian-Pkg-3.0

Debian pkg 3.0

6 years agodebianpkg: Fix non-empty-dependency_libs-in-la-file for frr modules
Martin Winter [Tue, 10 Oct 2017 06:14:27 +0000 (23:14 -0700)]
debianpkg: Fix non-empty-dependency_libs-in-la-file for frr modules

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian-pkg: Remove hardening-wrapper and replace with dpkg-buildflags
Martin Winter [Tue, 10 Oct 2017 01:17:09 +0000 (18:17 -0700)]
debian-pkg: Remove hardening-wrapper and replace with dpkg-buildflags

* hardening-wrapper is obsolete
* Fixes Issue #967

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Always build FPM module
Martin Winter [Mon, 9 Oct 2017 09:33:11 +0000 (02:33 -0700)]
debianpkg: Always build FPM module

- FPM is a module since 3.0. Always build it and allow user choice to enable or disable it

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Remove -werror from Ubuntu 14.04 and 12.04 build to skip warnings from...
Martin Winter [Fri, 29 Sep 2017 02:59:35 +0000 (19:59 -0700)]
debianpkg: Remove -werror from Ubuntu 14.04 and 12.04 build to skip warnings from flex generated code

- Flex is too old on these releases and misses some prototypes in the generated code. Removing the
werror allows to build the package anyway

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add missing XSBC-Original-Maintainer field (fixes merge error)
Martin Winter [Fri, 29 Sep 2017 01:09:44 +0000 (18:09 -0700)]
debianpkg: Add missing XSBC-Original-Maintainer field (fixes merge error)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix leftover marking from merge
Martin Winter [Fri, 29 Sep 2017 00:35:24 +0000 (17:35 -0700)]
debianpkg: Fix leftover marking from merge

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix some old references to freerangerouting instead of frrouting
Martin Winter [Fri, 29 Sep 2017 00:08:31 +0000 (17:08 -0700)]
debianpkg: Fix some old references to freerangerouting instead of frrouting

6 years agofrr.lintian-overrides: update for current list of built libs
smccroskey [Tue, 8 Aug 2017 21:51:38 +0000 (14:51 -0700)]
frr.lintian-overrides: update for current list of built libs

Because the lintian warning no longer matched exactly due to removal
of unused protobuf libraries from the build, the warning wasn't
masked.  Update it to match the current warning string.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoubuntu trusty/precise: remove leftover debconf call
smccroskey [Tue, 8 Aug 2017 19:22:29 +0000 (12:22 -0700)]
ubuntu trusty/precise: remove leftover debconf call

Forgot to unstash this when attempting to rebase it into
1e6df754913b4218ec809742fe0fff4eb8461035.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebianpkg/Makefile.am: remove frr.config
smccroskey [Tue, 8 Aug 2017 18:36:10 +0000 (11:36 -0700)]
debianpkg/Makefile.am: remove frr.config

File was removed by 1e6df754913b4218ec809742fe0fff4eb8461035
but missed removing it from the Makefile.am.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebianpkg/Makefile.am: remove po/ directory
smccroskey [Tue, 8 Aug 2017 18:24:05 +0000 (11:24 -0700)]
debianpkg/Makefile.am: remove po/ directory

Directory was removed by 1e6df754913b4218ec809742fe0fff4eb8461035 but
missed removing it from the Makefile.am.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agofrr.service: remove explicit dependency on socket-based syslog.target
smccroskey [Sat, 29 Jul 2017 00:29:36 +0000 (17:29 -0700)]
frr.service: remove explicit dependency on socket-based syslog.target

Testing done: built and installed for all ubuntu targets

Socket-based services such as syslog need not be specified as
dependencies in service files, and doing so may slow down boot by
reducing parallelism.  All known supported systemd-based platforms
have syslog as a socket-based service.

Clears the following lintian warnings:
W: frr: systemd-service-file-refers-to-obsolete-target lib/systemd/system/frr.service syslog.target

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agopb libs: don't build if protobuf support is disabled
smccroskey [Sat, 29 Jul 2017 00:25:30 +0000 (17:25 -0700)]
pb libs: don't build if protobuf support is disabled

Testing done: built and installed for all ubuntu targets

These library targets should not be built if protobuf support is
disabled, as that is their only functionality.

Clears the following lintian warnings:
W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr_pb.so.0.0.0 usr/lib/libfrr_pb.so
W: frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrfpm_pb.so.0.0.0 usr/lib/libfrrfpm_pb.so
W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrr_pb.so.0.0.0
W: frr-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/lib/libfrrfpm_pb.so.0.0.0

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoubuntu12.04: shorten frr-dbg description
smccroskey [Sat, 29 Jul 2017 00:22:20 +0000 (17:22 -0700)]
ubuntu12.04: shorten frr-dbg description

Testing done: built and installed on all ubuntu

Fix was applied elsewhere but didn't make it into this file.

Clears the following lintian warning:
W: frr-dbg: description too long

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodeb-based-distros: clean up leftover debconf references
smccroskey [Thu, 27 Jul 2017 01:45:52 +0000 (18:45 -0700)]
deb-based-distros: clean up leftover debconf references

Testing done: built and installed on all ubuntu

Debconf was in use by this packaging a long time ago, and references to it
were never fully cleaned up when the one question it asked was deleted.

Clears the following lintian warning:
W: frr: no-debconf-templates

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agobackports: don't install frr-reload.py in frr package
smccroskey [Thu, 20 Jul 2017 18:58:43 +0000 (11:58 -0700)]
backports: don't install frr-reload.py in frr package

Testing done: built in sbuild with lintian enabled
              verified frr-reload.py still in frr-pythontools

Clean up issues missed when moving the script into a separate package.

Clears the following lintian warning:
E: frr: python-script-but-no-python-dep usr/lib/frr/frr-reload.py

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: install PNG files in /usr/share/info
smccroskey [Mon, 29 May 2017 22:34:02 +0000 (15:34 -0700)]
debian: install PNG files in /usr/share/info

Testing done: built in sbuild with lintian enabled

Clears lintian warnings of the following form:
W: frr-doc: info-document-missing-image-file

According to the documentation for the lintian warning, certain
applications (e.g.  emacs) can render images from info files inline,
and expect the images to either have their full path defined or be
installed in the same directory as the info files themselves.
Automake doesn't seem to have a primary for handling this sort of
installation (info_DATA is invalid and causes an error), so opted to
handle it in the debian install file itself.

Installing the images elsewhere (another path installed by frr-doc)
and giving a full path to their location in info files might be a
better approach.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebianpkg: Overriding lintian package-name-doesnt-match-sonames warning
Martin Winter [Sat, 8 Jul 2017 01:37:58 +0000 (18:37 -0700)]
debianpkg: Overriding lintian package-name-doesnt-match-sonames warning

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix 'make backports' warning about autopkgtest
Silas McCroskey [Fri, 7 Jul 2017 22:16:20 +0000 (15:16 -0700)]
debianpkg: Fix 'make backports' warning about autopkgtest

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Move frr-reload.py to frr-pythontools subpackage
Martin Winter [Fri, 16 Jun 2017 22:49:27 +0000 (15:49 -0700)]
debianpkg: Move frr-reload.py to frr-pythontools subpackage

- avoids python dependency on main frr package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Register/remove init script on init.d based systems
Martin Winter [Fri, 16 Jun 2017 00:30:08 +0000 (17:30 -0700)]
debianpkg: Register/remove init script on init.d based systems

- Ubuntu 12.04 and Ubuntu 14.04 need init script registered during
  install and removed at uninstall

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix description (make shorter - max 80 chars)
Martin Winter [Thu, 15 Jun 2017 21:23:09 +0000 (14:23 -0700)]
debianpkg: Fix description (make shorter - max 80 chars)

- Fixes lintian error 'description-too-long'

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Support --with-pkg-extra-version and other modifier to build custom packag...
Martin Winter [Wed, 14 Jun 2017 01:06:14 +0000 (18:06 -0700)]
debianpkg: Support --with-pkg-extra-version and other modifier to build custom package version

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Cleanup configure options
Martin Winter [Tue, 13 Jun 2017 02:32:02 +0000 (19:32 -0700)]
debianpkg: Cleanup configure options

- Make them configurable (with WANT_xxx env variables)
- Adjust defaults to generic package
- remove obsolete configure options

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Do not start package after installation
Martin Winter [Mon, 12 Jun 2017 23:14:03 +0000 (16:14 -0700)]
debianpkg: Do not start package after installation

- Remove auto-start from Ubuntu 12.04 Backport
- Update Doc to explain on how to enable startup

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agotools: Rename to FRRouting in frr.service file
Martin Winter [Sat, 10 Jun 2017 09:20:29 +0000 (02:20 -0700)]
tools: Rename to FRRouting in frr.service file

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg/Ubuntu12.04-backport: Remove accidental reference to frr_sudoers
Martin Winter [Sat, 10 Jun 2017 03:41:09 +0000 (20:41 -0700)]
debianpkg/Ubuntu12.04-backport: Remove accidental reference to frr_sudoers

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Update control to fix maintainer email
Martin Winter [Fri, 9 Jun 2017 22:57:32 +0000 (15:57 -0700)]
debianpkg: Update control to fix maintainer email

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Fix Date format in changelog and version numbering to make sure custom...
Martin Winter [Fri, 9 Jun 2017 22:30:21 +0000 (15:30 -0700)]
debianpkg: Fix Date format in changelog and version numbering to make sure custom build is newer

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add backport for Debian 8
Martin Winter [Fri, 9 Jun 2017 08:58:31 +0000 (01:58 -0700)]
debianpkg: Add backport for Debian 8

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: debian rules file needs to be executable
Martin Winter [Fri, 9 Jun 2017 06:30:09 +0000 (23:30 -0700)]
debianpkg: debian rules file needs to be executable

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Update Build-Depends to use libjson-c-dev / libjson-c2 instead of libjson0...
Martin Winter [Fri, 9 Jun 2017 06:12:02 +0000 (23:12 -0700)]
debianpkg: Update Build-Depends to use libjson-c-dev / libjson-c2 instead of libjson0 on newer debian systems

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebianpkg: Add initial README to document the steps required to build the debian...
Martin Winter [Fri, 9 Jun 2017 03:34:22 +0000 (20:34 -0700)]
debianpkg: Add initial README to document the steps required to build the debian packages with backports

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian->debianpkg: Move debian files from debian dir to debianpkg dir.
Martin Winter [Fri, 9 Jun 2017 02:14:41 +0000 (19:14 -0700)]
debian->debianpkg: Move debian files from debian dir to debianpkg dir.

Debian build systems use debian subdir for building and having a debian
dir in the source package causes issues.
Moving it to debianpkg avoids the issue and allows us to ship debian
package files in the source distribution

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobackports: minimize diffs with base debian files
smccroskey [Fri, 28 Apr 2017 07:00:53 +0000 (00:00 -0700)]
backports: minimize diffs with base debian files

minimize diffs between the base debian files and each backport to the
changes that actually matter, so that they aren't lost in the noise of
capitalization and ordering differences.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: clean up, update base debian/control
smccroskey [Fri, 28 Apr 2017 06:58:13 +0000 (23:58 -0700)]
debian: clean up, update base debian/control

this removes some cruft -- old/outdated/incorrect information,
trailing whitespace, etc., and updates the descriptions.  Some small
changes were made where appropriate to minimize the diff between the
base control file and those of the various backports.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: delete unused files out of debian/
smccroskey [Thu, 27 Apr 2017 23:42:43 +0000 (16:42 -0700)]
debian: delete unused files out of debian/

These are unused and not referenced anywhere.

debian/rules.orig: included by mistake
debian/watch: no longer applicable; url is not valid
debian/patches: stale, unused, misleading

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agoprecise/trusty: don't attempt to install pimd or ldpd manuals
smccroskey [Thu, 27 Apr 2017 21:31:29 +0000 (14:31 -0700)]
precise/trusty: don't attempt to install pimd or ldpd manuals

Neither of these daemons are installed on 14.04, leading to build
failures now that the man pages are excluded from the Makefiles when
the daemons aren't enabled for install.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agobackports: error out on upstream/downstream version mismatch
smccroskey [Thu, 27 Apr 2017 21:27:09 +0000 (14:27 -0700)]
backports: error out on upstream/downstream version mismatch

The quilt source format expects the upstream tarball's version to
correspond roughly to the debian version of the package, and errors
will be thrown (at unpack time, in our case) if it doesn't.  Do a
sanity check when we're building the source package to make sure they
match up.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
6 years agodebian: Fix some incorrect references to Quagga instead of FRR
Martin Winter [Thu, 16 Feb 2017 18:49:00 +0000 (01:49 +0700)]
debian: Fix some incorrect references to Quagga instead of FRR

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agobackports: symlink identical files
Silas McCroskey [Tue, 14 Feb 2017 17:48:57 +0000 (00:48 +0700)]
backports: symlink identical files

Testing-done: built all backports in schroots and VMs

made files identical between different backports symlinks
to the ones for the more recent distribution, and updated
relevant tar invocations to follow symlinks.

Signed-off by: Silas McCroskey <smccroskey@cumulusnetworks.com>

6 years agodebian: add pkg-config to build-depends
Silas McCroskey [Tue, 14 Feb 2017 17:34:42 +0000 (00:34 +0700)]
debian: add pkg-config to build-depends

Testing-done: `--add-depends pkg-config' sbuild

The dependency on pkg-config was introduced recently, and
missed because it's in our schroots by default. Need to add
it for other build environments (e.g. ubuntu schroots).

Signed-off by: Silas McCroskey <smccroskey@cumulusnetworks.com>

6 years agodebian: move ubuntu 16.04 files into new backports system
Silas McCroskey [Tue, 14 Feb 2017 15:48:19 +0000 (22:48 +0700)]
debian: move ubuntu 16.04 files into new backports system

Added 'debian/patches' to the exclude file, since the existing patches
interfere with the build and are unused by our build.  No other
changes were necessary.  Used '-0~ubuntu16.04+1' as the version
extention, to denote: no patches (-0), debian packaging files changed
for backport (+1).

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian: move ubuntu 14.04 files into new backports system
Silas McCroskey [Tue, 14 Feb 2017 15:44:17 +0000 (22:44 +0700)]
debian: move ubuntu 14.04 files into new backports system

`git diff'ed the main (cmaster) branch against the 14.04 branch
to determine changed debian files, then pulled them into
debian/backports via `git cat-file'. Added 'debian/patches' to
the exclude file, since the existing patches interfere with the
build and are unused by our build. Used '-0~ubuntu14.04+1' as
the version extention, to denote: no patches (-0), debian
packaging files changed for backport (+1).

Original commit by Silas with updates on fork name by Martin

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
6 years agodebian: move ubuntu 12.04 files into new backports system
Silas McCroskey [Tue, 14 Feb 2017 15:34:56 +0000 (22:34 +0700)]
debian: move ubuntu 12.04 files into new backports system

`git diff'ed the main (cmaster) branch against the 12.04 branch
to determine changed debian files, then pulled them into
debian/backports via `git cat-file'. Added 'debian/patches' to
the exclude file, since the existing patches interfere with the
build and are unused by our build. Used '-0~ubuntu12.04+1' as
the version extention, to denote: no patches (-0), debian
packaging files changed for backport (+1).

Original commit by Silas with updates on fork name by Martin

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>