Bug 249984

Summary:

sysutils/syslog-ng329: update rc.d script and patch for SO_REUSEPORT_LB

Product:

Ports & Packages

Reporter:

Boris Korzun <drtr0jan>

Component:

Individual Port(s)

Assignee:

Cy Schubert <cy>

Status:

Closed FIXED

Severity:

Affects Some People

CC:

peter

Priority:

---

Keywords:

patch

Version:

Latest

Flags:

bugzilla: maintainer-feedback? (cy)

Hardware:

Any

OS:

Any

See Also:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247956
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248029

Attachments:

Description	Flags
syslog-ng.diff	none
syslog-ng.diff	none
syslog-ng.diff	none

Description Boris Korzun 2020-09-29 11:00:19 UTC

Created attachment 218403 [details]
syslog-ng.diff

1) syslog-ng.in has been refactored to compatibility with "Practical rc.d scripting in BSD":
* syslog_ng_config option renamed to syslog_ng_flags with backwards compatibility;
* syslog_ng_pid option renamed to syslog_ng_pidfile with backwards compatibility;
* syslog_ng_config is used for pointing to syslog-ng.conf;
* and some small codestyle fixes.

Should use:
* syslog_ng_flags instead syslog_ng_config (but legacy syslog_ng_config still works);
* syslog_ng_pidfile instead syslog_ng_pid (but syslog_ng_pid still works).

2) Added patch for modules/afsocket/socket-options.c - support SO_REUSEPORT_LB option (https://github.com/syslog-ng/syslog-ng/pull/3438).

Comment 1 Cy Schubert freebsd_committer

2020-09-29 14:39:51 UTC

#2 has been accepted by our upstream.

#1 should be applied to previous versions of syslog-ng in the tree as well. Can  you provide a patch for syslog-ng327 and syslog-ng328 too, please. The inconsistency is a POLA violation because we aim to support N-2.

We will also need an UPDATING entry. I will reword your pkg-message.in update and write an UPDATING entry.

Otherwise this is ok.

Comment 2 Boris Korzun 2020-09-29 15:13:24 UTC

Created attachment 218408 [details]
syslog-ng.diff

A patch for syslog-ng327 and syslog-ng328 in the attachment too.

Comment 3 Cy Schubert freebsd_committer

2020-09-29 15:16:55 UTC

Thank you. Peter, our upstream, tells me the SO_REUSEPORT_LB has already been accepted and committed upstream so 330 will include that patch.

Comment 4 Boris Korzun 2020-09-29 15:17:28 UTC

Created attachment 218409 [details]
syslog-ng.diff

Comment 5 Cy Schubert freebsd_committer

2020-09-29 15:38:50 UTC

pkg-message will say,

When upgrading from before 3.29.1 these variables, if used, should be replaced:
* syslog_ng_flags replaces syslog_ng_config (syslog_ng_config still works),
* syslog_ng_pidfile replaces syslog_ng_pid (syslog_ng_pid still works).

I'll write up an UPDATING entry.

Peter, should we consider removing the old variables in 331 or 332?

Comment 6 commit-hook freebsd_committer

2020-09-29 17:05:01 UTC

A commit references this bug:

Author: cy
Date: Tue Sep 29 17:04:52 UTC 2020
New revision: 550534
URL: https://svnweb.freebsd.org/changeset/ports/550534

Log:
  Rename rc.conf variables syslog_ng_config and syslog_ng_pid to
  syslog_ng_flags and syslog_ng_pidfile respecively, making them
  consistent with the rest of the ports tree.

  PR:		249984
  Submitted by:	Boris Korzun <drtr0jan@yandex.ru>
  Reviewed by:	Peter Czanik (syslog-ng upstream)

Changes:
  head/UPDATING
  head/sysutils/syslog-ng327/Makefile
  head/sysutils/syslog-ng327/files/pkg-message.in
  head/sysutils/syslog-ng327/files/syslog-ng.in
  head/sysutils/syslog-ng328/Makefile
  head/sysutils/syslog-ng328/files/pkg-message.in
  head/sysutils/syslog-ng328/files/syslog-ng.in
  head/sysutils/syslog-ng329/Makefile
  head/sysutils/syslog-ng329/files/pkg-message.in
  head/sysutils/syslog-ng329/files/syslog-ng.in

Comment 7 Cy Schubert freebsd_committer

2020-11-14 04:38:27 UTC

Fixed.