diff options
| -rw-r--r-- | debian/README.Debian | 65 | ||||
| -rw-r--r-- | debian/README.Maintainer | 32 | ||||
| -rw-r--r-- | debian/changelog | 25 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/frr.install | 1 | ||||
| -rw-r--r-- | debian/frr.postinst | 2 | ||||
| -rw-r--r-- | debian/not-installed | 1 | ||||
| -rwxr-xr-x | debian/rules | 9 |
8 files changed, 41 insertions, 95 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index 53fb6c9..1d61ca9 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,5 +1,5 @@ -* SAFETY MEASURES: -================== +SAFETY MEASURES +=============== Please consider setting this package "on hold" by typing echo "frr hold" | dpkg --set-selections @@ -11,19 +11,19 @@ Instead apt-get only displays a warning saying that a new version would be available forcing you to explicitly type "apt-get install frr" to upgrade it. -* What is frr? -================= +What is frr? +============ http://www.frrouting.org/ FRR is a routing software suite, providing implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPng, ISIS, PIM, BGP and LDP for Unix platforms, particularly FreeBSD and Linux and also NetBSD, to mention a few. FRR is a fork of Quagga -which itself is a fork of Zebra. +which itself is a fork of Zebra. Zebra was developed by Kunihiro Ishiguro. -* Build Profiles used in the upstream debian/ -============================================= +Build Profiles used in the upstream debian/ +=========================================== The following Build Profiles have been added: @@ -40,8 +40,8 @@ The main frr package has the exact same contents regardless of rtrlib or snmp choices. The options only control frr-snmp and frr-rpki-rtrlib packages. -* Debian Policy compliance notes -================================ +Debian Policy compliance notes +============================== - 4.15 Reproducibility FRR build is reproducible as outlined in version 4.2.1 of the Policy, but @@ -50,51 +50,8 @@ choices. The options only control frr-snmp and frr-rpki-rtrlib packages. like -fdebug-prefix-map=/build/directory/... -* Daemon selection: -=================== - -The Debian package uses /etc/frr/daemons to tell the -initscript which daemons to start. It's in the format -<daemon>=<yes|no|priority> -with no spaces (it's simply source-d into the initscript). -Default is not to start anything, since it can hose your -system's routing table if not set up properly. - -Priorities were suggested by Dancer <dancer@zeor.simegen.com>. -They're used to start the FRR daemons in more than one step -(for example start one or two at network initialization and the -rest later). The number of FRR daemons being small, priorities -must be between 1 and 9, inclusive (or the initscript has to be -changed). /etc/init.d/frr then can be started as - -/etc/init.d/frr <start|stop|restart|<priority>> - -where priority 0 is the same as 'stop', priority 10 or 'start' -means 'start all' - - -* Error message "privs_init: initial cap_set_proc failed": -========================================================== - -This error message means that "capability support" has to be built -into the kernel. - - -* Error message "netlink-listen: overrun: No buffer space available": -===================================================================== - -If this message occurs the receive buffer should be increased by adding the -following to /etc/sysctl.conf and "--nl-bufsize" to /etc/frr/daemons. -> net.core.rmem_default = 262144 -> net.core.rmem_max = 262144 -See message #4525 from 2005-05-09 in the quagga-users mailing list. - - -* vtysh immediately exists: -=========================== +vtysh immediately exists +======================== Check /etc/pam.d/frr, it probably denies access to your user. The passwords configured in /etc/frr/frr.conf are only for telnet access. - - - -- Ondřej Surý <Ondřej Surý <ondrej@debian.org>>, Fri, 3 Jul 2020 12:39:42 +0200 diff --git a/debian/README.Maintainer b/debian/README.Maintainer deleted file mode 100644 index 9030022..0000000 --- a/debian/README.Maintainer +++ /dev/null @@ -1,32 +0,0 @@ -# -# TODO -# - -- check that tests/{control,daemons} actually do something useful and sensible -- /usr/share/doc/frr-doc should be named just frr? -- debian/watch pgpsigurlmangle / signing-key -- multiarch for DSOs? -- frr try-restart - -# -# To check if the patches still apply on new upstream versions: -# -for i in debian/patches/*.diff; do echo -e "#\n# $i\n#"; patch --fuzz=3 --dry-run -p1 < $i; done - -# -# Filename transition from zebra to frr -# - -Files that keep their names - /usr/bin/vtysh - -Files that got an -pj suffix - /etc/default/zebra -> /etc/frr/daemons.conf - /etc/init.d/zebra -> /etc/init.d/frr - /etc/zebra/ -> /etc/frr/ - /usr/share/doc/zebra/ -> /usr/share/doc/frr/ - /var/log/zebra/ -> /var/log/frr/ - /var/run/ -> /var/run/frr/ - -Files that were moved - /usr/sbin/* -> /usr/lib/frr/ diff --git a/debian/changelog b/debian/changelog index 3fdc74e..d631eec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +frr (10.0-1) unstable; urgency=medium + + * IRDP module is no longer packaged (slated to be removed upstream) + * added mkdir+chown /var/lib/frr which is now used by FRR + * sysconfdir and localstatedir configure args are no longer needed + * NB: refer to never-released 8.5.2-1 changes below! + * Link libatomic unconditionally (closes: #1067077) + * known to not build on hppa due to struct.calcsize python exception + + -- David Lamparter <equinox-debian@diac24.net> Tue, 30 Apr 2024 19:36:44 +0200 + frr (10.0-0.2) unstable; urgency=medium * Non-maintainer upload. @@ -63,6 +74,20 @@ frr (9.1-0.1) unstable; urgency=high -- Daniel Baumann <daniel.baumann@progress-linux.org> Fri, 08 Mar 2024 23:21:21 +0100 +frr (8.5.2-1) UNRELEASED; urgency=medium + + * new upstream release FRR 8.5.2 + * cleaned up outdated debian/README files + * build against libunwind. Results in better backtraces captured for both + crashes and non-crash deviations from expected operations. + (libunwind is used automatically if present, this also fixes an + uncontrolled build environment influence on the result binaries by always + requiring it.) + * this version was never uploaded to Debian, the changelog entry is here for + reference. + + -- David Lamparter <equinox-debian@diac24.net> Sat, 15 Jul 2023 08:33:59 -0700 + frr (8.4.4-1.1) unstable; urgency=high * Non-maintainer upload by the Security Team. diff --git a/debian/control b/debian/control index 94cbf05..0e7c277 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: bison, librtr-dev (>= 0.8.0~) <!pkg.frr.nortrlib>, libsnmp-dev, libssh-dev <!pkg.frr.nortrlib>, + libunwind-dev, libyang2-dev (>= 2.1.128), pkgconf | pkg-config, protobuf-c-compiler, diff --git a/debian/frr.install b/debian/frr.install index e33ddab..977534d 100644 --- a/debian/frr.install +++ b/debian/frr.install @@ -11,7 +11,6 @@ usr/lib/*/frr/modules/bgpd_bmp.so usr/lib/*/frr/modules/dplane_fpm_nl.so usr/lib/*/frr/modules/zebra_cumulus_mlag.so usr/lib/*/frr/modules/zebra_fpm.so -usr/lib/*/frr/modules/zebra_irdp.so usr/lib/*/frr/modules/pathd_pcep.so usr/lib/frr/*.sh usr/lib/frr/*d diff --git a/debian/frr.postinst b/debian/frr.postinst index eb9ec67..9c9b4a8 100644 --- a/debian/frr.postinst +++ b/debian/frr.postinst @@ -17,8 +17,10 @@ adduser \ usermod -a -G frrvty frr mkdir -m 0755 -p /var/log/frr +mkdir -m 0700 -p /var/lib/frr mkdir -p /etc/frr +chown frr: /var/lib/frr # only change ownership of files when they were previously owned by root or # quagga; this is to ensure we don't trample over some custom user setup. diff --git a/debian/not-installed b/debian/not-installed index 1a89f35..8999dd9 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,3 +1,4 @@ usr/include usr/lib/frr/ospfclient usr/lib/frr/rfptest +usr/lib/*/frr/modules/dplane_sample_plugin.so diff --git a/debian/rules b/debian/rules index d18f144..fa0e7be 100755 --- a/debian/rules +++ b/debian/rules @@ -4,10 +4,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mipsel powerpc sh4)) - export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed -endif - ifneq (,$(filter terse,$(DEB_BUILD_OPTIONS))) MAKE_SILENT="V=0" export DH_VERBOSE=0 @@ -43,11 +39,9 @@ export PYTHON=python3 dh $@ -Bbuild --with=sphinxdoc override_dh_auto_configure: - $(shell dpkg-buildflags --export=sh); \ + $(shell dpkg-buildflags --export=sh); export LIBS="$$LIBS -latomic"; \ dh_auto_configure -- \ - --localstatedir=/var/run/frr \ --sbindir=/usr/lib/frr \ - --sysconfdir=/etc/frr \ --with-vtysh-pager=/usr/bin/pager \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr \ --with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr/modules \ @@ -60,7 +54,6 @@ override_dh_auto_configure: --with-libpam \ --enable-doc \ --enable-doc-html \ - --enable-irdp \ --enable-snmp \ --enable-fpm \ --disable-protobuf \ |