Skip to content

Commit b6a7edc

Browse files
committed
Proofread upstream-packages.rst
1 parent 155ddbd commit b6a7edc

File tree

1 file changed

+56
-54
lines changed

1 file changed

+56
-54
lines changed
Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,88 @@
1+
:lastproofread: 2025-11-30
2+
13
.. _upstream_packages:
24

3-
Upstream packages
4-
-----------------
5+
#################
6+
Upstream Packages
7+
#################
58

6-
Many base system packages are pulled straight from Debian's main and contrib
7-
repositories, but there are exceptions.
9+
Many base system packages are pulled straight from Debian's ``main`` and
10+
``contrib`` repositories, but there are exceptions.
811

9-
This chapter lists those exceptions and gives you a brief overview what we
10-
have done on those packages. If you only want to build yourself a fresh ISO
11-
you can completely skip this chapter. It may become interesting once you have
12-
a VyOS deep dive.
12+
This page lists those exceptions and briefly describes changes made to
13+
these packages. If you only want to build a fresh ISO image, you can skip
14+
this section. This information may be useful for a deeper dive into VyOS.
1315

14-
vyos-netplug
15-
^^^^^^^^^^^^
16+
``vyos-netplug``
17+
----------------
1618

17-
Due to issues in the upstream version that sometimes set interfaces down, a
18-
modified version is used.
19+
VyOS uses a modified version because the upstream release sometimes causes
20+
network interfaces to go down.
1921

20-
The source is located at https://github.com/vyos/vyos-netplug
22+
Source: https://github.com/vyos/vyos-netplug.
2123

22-
In the future, we may switch to using systemd infrastructure instead. Building
23-
it doesn't require a special procedure.
24+
VyOS may switch to ``systemd`` in the future. Building the package does not
25+
require a special procedure.
2426

25-
keepalived
26-
^^^^^^^^^^
27+
``keepalived``
28+
--------------
2729

28-
Keepalived normally isn't updated to newer feature releases between Debian
29-
versions, so we are building it from source.
30+
``keepalived`` is not updated to newer feature releases between Debian releases.
31+
VyoS builds it from source.
3032

31-
Debian does keep their package in git, but it's upstream tarball imported into
32-
git without its original commit history. To be able to merge new tags in, we
33-
keep a fork of the upstream repository with packaging files imported from
34-
Debian at https://github.com/vyos/keepalived-upstream
33+
Debian maintains the package in git, but the upstream tarball was imported
34+
without its original commit history. To allow merging new tags, we maintain
35+
a fork with packaging files imported from Debian: https://github.com/vyos/keepalived-upstream.
3536

36-
strongswan
37-
^^^^^^^^^^
37+
``strongswan``
38+
--------------
3839

39-
Our StrongSWAN build differs from the upstream:
40+
VyOS's StrongSWAN build differs from upstream:
4041

41-
- strongswan-nm package build is disabled since we don't use NetworkManager
42-
- Patches for DMVPN are merged in
42+
- We disable the ``strongswan-nm`` package build because VyOS does not use
43+
NetworkManager.
44+
- We merged patches for DMVPN.
4345

44-
The source is at https://github.com/vyos/vyos-strongswan
46+
Source: https://github.com/vyos/vyos-strongswan
4547

46-
DMVPN patches are added by this commit:
48+
DMVPN patches were added in this commit:
4749
https://github.com/vyos/vyos-strongswan/commit/1cf12b0f2f921bfc51affa3b81226
4850

49-
Our op mode scripts use the python-vici module, which is not included in
50-
Debian's build, and isn't quite easy to integrate in that build. For this
51-
reason we debianize that module by hand now, using this procedure:
51+
VyOS's op-mode scripts use the ``python-vici`` module, which is not included
52+
in Debian's build and is difficult to integrate. VyOS debianizes the module
53+
manually:
5254

53-
0. Install https://pypi.org/project/stdeb/
54-
1. `cd vyos-strongswan`
55-
2. `./configure --enable-python-eggs`
56-
3. `cd src/libcharon/plugins/vici/python`
57-
4. `make`
58-
5. `python3 setup.py --command-packages=stdeb.command bdist_deb`
55+
1. Install ``stdeb`` from PyPI (for example: ``pip3 install stdeb``).
56+
2. ``cd vyos-strongswan``
57+
3. ``./configure --enable-python-eggs``
58+
4. ``cd src/libcharon/plugins/vici/python``
59+
5. ``make``
60+
6. ``python3 setup.py --command-packages=stdeb.command bdist_deb``
5961

60-
The package ends up in deb_dist dir.
62+
The package is created in the ``deb_dist`` directory.
6163

62-
mdns-repeater
63-
^^^^^^^^^^^^^
64+
``mdns-repeater``
65+
-----------------
6466

65-
This package doesn't exist in Debian. A debianized fork is kept at
66-
https://github.com/vyos/mdns-repeater
67+
This package does not exist in Debian. VyOS maintains a debianized fork at
68+
https://github.com/vyos/mdns-repeater.
6769

6870
No special build procedure is required.
6971

70-
udp-broadcast-relay
71-
^^^^^^^^^^^^^^^^^^^
72+
``udp-broadcast-relay``
73+
-----------------------
7274

73-
This package doesn't exist in Debian. A debianized fork is kept at
74-
https://github.com/vyos/udp-broadcast-relay
75+
This package does not exist in Debian. VyOS maintain a debianized fork at
76+
https://github.com/vyos/udp-broadcast-relay.
7577

7678
No special build procedure is required.
7779

78-
hvinfo
79-
^^^^^^
80+
``hvinfo``
81+
----------
8082

81-
A fork with packaging changes for VyOS is kept at https://github.com/vyos/hvinfo
83+
A fork with packaging changes for VyOS is available at https://github.com/vyos/hvinfo.
8284

83-
The original repo is at https://github.com/dmbaturin/hvinfo
85+
The original repository is at https://github.com/dmbaturin/hvinfo.
8486

85-
It's an Ada program and requires GNAT and gprbuild for building, dependencies
86-
are properly specified so just follow debuild's suggestions.
87+
It is an Ada program and requires GNAT and ``gprbuild``. Dependencies are
88+
properly specified; follow the suggestions from ``debuild``.

0 commit comments

Comments
 (0)