diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-04-04 18:34:08 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-04-04 19:01:47 +0200 |
| commit | 3e7c8d040ce092d42b485cb45461af575a99e39e (patch) | |
| tree | 20ddb4bf5d39b348041af75b7102623e4f0d29c2 /redhat | |
| parent | Merge pull request #322 from qlyoung/fix-distance-commands (diff) | |
| parent | Release: FRR-2.0 (diff) | |
| download | frr-3e7c8d040ce092d42b485cb45461af575a99e39e.tar.xz frr-3e7c8d040ce092d42b485cb45461af575a99e39e.zip | |
Merge branch 'stable/2.0'
Fixed minor conflicts from "defaults" change on stable.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/README.rpm_build.md | 4 | ||||
| -rw-r--r-- | redhat/frr.spec.in | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/redhat/README.rpm_build.md b/redhat/README.rpm_build.md index db3c7d45c..6bec5d65c 100644 --- a/redhat/README.rpm_build.md +++ b/redhat/README.rpm_build.md @@ -1,4 +1,4 @@ -Building your own FreeRangeRouting RPM +Building your own FRRouting RPM ====================================== (Tested on CentOS 6, CentOS 7 and Fedora 22.) @@ -12,7 +12,7 @@ Building your own FreeRangeRouting RPM 2. Checkout FRR under a **unpriviledged** user account - git clone https://github.com/freerangerouting/frr.git frr + git clone https://github.com/frrouting/frr.git frr 3. Run Bootstrap and make distribution tar.gz diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index b86d11550..c32e3e3af 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -8,7 +8,7 @@ # rpms again and again on the same day, so the newer rpms can be installed. # bumping the number each time. -####################### FreeRangeRouting (FRR) configure options ######################### +####################### FRRouting (FRR) configure options ######################### # with-feature options %{!?with_tcp_zebra: %global with_tcp_zebra 0 } %{!?with_pam: %global with_pam 0 } @@ -107,8 +107,8 @@ Version: %{rpmversion} Release: @CONFDATE@%{release_rev}%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source0: http://www.freerangerouting.org/releases/frr/%{name}-%{frrversion}.tar.gz -URL: http://www.freerangerouting.org +Source0: http://www.frrouting.org/releases/frr/%{name}-%{frrversion}.tar.gz +URL: http://www.frrouting.org Requires: ncurses json-c Requires(pre): /sbin/install-info Requires(preun): /sbin/install-info @@ -135,14 +135,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: bird gated mrt zebra frr-sysvinit %description -FreeRangeRouting is a free software that manages TCP/IP based routing +FRRouting is a free software that manages TCP/IP based routing protocol. It takes multi-server and multi-thread approach to resolve the current complexity of the Internet. -FreeRangeRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, -LDP and NHRP. +FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP +and NHRP. -FreeRangeRouting is a fork of Quagga. +FRRouting is a fork of Quagga. %package contrib Summary: contrib tools for frr @@ -315,7 +315,7 @@ if getent group %frr_user >/dev/null; then : ; else \ fi if getent passwd %frr_user >/dev/null ; then : ; else \ /usr/sbin/useradd -u %frr_uid -g %frr_gid \ - -M -r -s /sbin/nologin -c "FreeRangeRouting suite" \ + -M -r -s /sbin/nologin -c "FRRouting suite" \ -d %_localstatedir %frr_user 2> /dev/null || : ; \ fi %if 0%{?vty_group:1} @@ -594,8 +594,8 @@ rm -rf %{buildroot} * Tue Feb 14 2017 Timo Teräs <timo.teras@iki.fi> - %{version} - add nhrpd -* Fri Jan 6 2017 Martin Winter <mwinter@opensourcerouting.org> -- Renamed to frr for FreeRangeRouting fork of Quagga +* Fri Jan 6 2017 Martin Winter <mwinter@opensourcerouting.org> - %{version} +- Renamed to frr for FRRouting fork of Quagga * Thu Feb 11 2016 Paul Jakma <paul@jakma.org> - remove with_ipv6 conditionals, always build v6 |