GitLab

This upgrade is needed to fix #12485

fixes CVE-2021-22930

See https://github.com/WayneD/rsync/issues/192

(cherry picked from commit 277716a1)

mkgitver by default uses the version returned by `git describe`. Because
the package is built in the aports tree, it uses the aports version
rather than the version included in the archive in version.h.

Override mkgitver to only use that version, rather than the output of
`git describe`.

(cherry picked from commit e34ba444)

From logrotate(8):

	Values are separated from directives by whitespace and/or an
	optional =. Numbers must be specified in a format understood by
	strtoul(3).

Since logrotate 3.18.1, logrotate emits a warning if the keyword is not
properly separated from the value [1]. This causes error messages such
as:

	rsyncd:5 keyword 'size' not properly separated, found 0x3d

During log rotation. This commit fixes the syntax error in the logrotate
script for rsyncd.

[1]: https://github.com/logrotate/logrotate/commit/2b588b5ec2e5c27bee857c4abeddafa6a9602ebc#diff-74eb92dd55d0dc52d3107aedbba99f2d7d68ba12b8ecdf9132c7ba3385b3e405

(cherry picked from commit c11dbe86)

CVE-2021-36159

CVE-2021-36222

- CVE-2021-22922
- CVE-2021-22923
- CVE-2021-22924
- CVE-2021-22925

2.9.11 lacked fuzz.h, which broke the test suite. Upgrade to 2.9.12 to
fix that again.

Fixes ftbfs, fuzz.h is missing from source.

See #12859

- use rtpproxy r flag to force RTP to follow SDP
- add ptime support

We must include config files before the standard rules or else
the standard logs will be full with data the user have configured
filters for.

This problem was introduced in:
 5364bae3 main/rsyslog: move config loading behind module loading to allow module directives in config files

* add -s to CFLAGS and CPPFLAGS so does not run out of space when building

See: #12811