[Bug 1852591] [NEW] typo in debian/patches/lp1668771-resolved-switch-cache-option-to-a-tri-state-option-s.patch

[Dan Streetman]

Public bug reported:

[impact]

the patch contains a typo, or mis-backport, including both the function
definition line as well as a function definition macro, i.e.:

 int config_parse_resolve_support(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_dnssec_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+int config_parse_dns_cache_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
+CONFIG_PARSER_PROTOTYPE(config_parse_resolve_support);
+CONFIG_PARSER_PROTOTYPE(config_parse_dnssec_mode);
+CONFIG_PARSER_PROTOTYPE(config_parse_dns_cache_mode);

The macro isn't defined until later versions of systemd, so including
the macro here just results in a build-time warning:

In file included from ../src/shared/resolve-util.c:22:0:
../src/shared/resolve-util.h:68:1: warning: data definition has no type or storage class
 CONFIG_PARSER_PROTOTYPE(config_parse_resolve_support);
 ^~~~~~~~~~~~~~~~~~~~~~~
../src/shared/resolve-util.h:68:1: warning: type defaults to ‘int’ in declaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wimplicit-int]
../src/shared/resolve-util.h:68:1: warning: parameter names (without types) in function declaration
../src/shared/resolve-util.h:69:1: warning: data definition has no type or storage class
 CONFIG_PARSER_PROTOTYPE(config_parse_dnssec_mode);
 ^~~~~~~~~~~~~~~~~~~~~~~
../src/shared/resolve-util.h:69:1: warning: type defaults to ‘int’ in declaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wimplicit-int]
../src/shared/resolve-util.h:69:1: warning: parameter names (without types) in function declaration
../src/shared/resolve-util.h:69:1: warning: redundant redeclaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wredundant-decls]
../src/shared/resolve-util.h:68:1: note: previous declaration of ‘CONFIG_PARSER_PROTOTYPE’ was here
 CONFIG_PARSER_PROTOTYPE(config_parse_resolve_support);
 ^~~~~~~~~~~~~~~~~~~~~~~
../src/shared/resolve-util.h:70:1: warning: data definition has no type or storage class
 CONFIG_PARSER_PROTOTYPE(config_parse_dns_cache_mode);
 ^~~~~~~~~~~~~~~~~~~~~~~
../src/shared/resolve-util.h:70:1: warning: type defaults to ‘int’ in declaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wimplicit-int]
../src/shared/resolve-util.h:70:1: warning: parameter names (without types) in function declaration
../src/shared/resolve-util.h:70:1: warning: redundant redeclaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wredundant-decls]
../src/shared/resolve-util.h:69:1: note: previous declaration of ‘CONFIG_PARSER_PROTOTYPE’ was here
 CONFIG_PARSER_PROTOTYPE(config_parse_dnssec_mode);
 ^~~~~~~~~~~~~~~~~~~~~~~

[test case]

look at build logs, e.g.:
https://launchpadlibrarian.net/444833135/buildlog_ubuntu-bionic-amd64.systemd_237-3ubuntu10.31_BUILDING.txt.gz

[regression potential]

any regression would likely cause the build to fail.  it's unlikely this
would cause any runtime regression.

[other info]

typo introduced in the patch for bug 1668771

** Affects: systemd (Ubuntu)
     Importance: Undecided
         Status: Fix Released

** Affects: systemd (Ubuntu Bionic)
     Importance: Low
     Assignee: Dan Streetman (ddstreet)
         Status: In Progress

** Also affects: systemd (Ubuntu Bionic)
   Importance: Undecided
       Status: New

** Changed in: systemd (Ubuntu)
       Status: New => Fix Released

** Changed in: systemd (Ubuntu Bionic)
       Status: New => In Progress

** Changed in: systemd (Ubuntu Bionic)
   Importance: Undecided => Low

** Changed in: systemd (Ubuntu Bionic)
     Assignee: (unassigned) => Dan Streetman (ddstreet)

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to systemd in Ubuntu.
https://bugs.launchpad.net/bugs/1852591

Title:
  typo in debian/patches/lp1668771-resolved-switch-cache-option-to-a
  -tri-state-option-s.patch

Status in systemd package in Ubuntu:
  Fix Released
Status in systemd source package in Bionic:
  In Progress

Bug description:
  [impact]

  the patch contains a typo, or mis-backport, including both the
  function definition line as well as a function definition macro, i.e.:

   int config_parse_resolve_support(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
   int config_parse_dnssec_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
  +int config_parse_dns_cache_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
  +
  +CONFIG_PARSER_PROTOTYPE(config_parse_resolve_support);
  +CONFIG_PARSER_PROTOTYPE(config_parse_dnssec_mode);
  +CONFIG_PARSER_PROTOTYPE(config_parse_dns_cache_mode);

  The macro isn't defined until later versions of systemd, so including
  the macro here just results in a build-time warning:

  In file included from ../src/shared/resolve-util.c:22:0:
  ../src/shared/resolve-util.h:68:1: warning: data definition has no type or storage class
   CONFIG_PARSER_PROTOTYPE(config_parse_resolve_support);
   ^~~~~~~~~~~~~~~~~~~~~~~
  ../src/shared/resolve-util.h:68:1: warning: type defaults to ‘int’ in declaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wimplicit-int]
  ../src/shared/resolve-util.h:68:1: warning: parameter names (without types) in function declaration
  ../src/shared/resolve-util.h:69:1: warning: data definition has no type or storage class
   CONFIG_PARSER_PROTOTYPE(config_parse_dnssec_mode);
   ^~~~~~~~~~~~~~~~~~~~~~~
  ../src/shared/resolve-util.h:69:1: warning: type defaults to ‘int’ in declaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wimplicit-int]
  ../src/shared/resolve-util.h:69:1: warning: parameter names (without types) in function declaration
  ../src/shared/resolve-util.h:69:1: warning: redundant redeclaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wredundant-decls]
  ../src/shared/resolve-util.h:68:1: note: previous declaration of ‘CONFIG_PARSER_PROTOTYPE’ was here
   CONFIG_PARSER_PROTOTYPE(config_parse_resolve_support);
   ^~~~~~~~~~~~~~~~~~~~~~~
  ../src/shared/resolve-util.h:70:1: warning: data definition has no type or storage class
   CONFIG_PARSER_PROTOTYPE(config_parse_dns_cache_mode);
   ^~~~~~~~~~~~~~~~~~~~~~~
  ../src/shared/resolve-util.h:70:1: warning: type defaults to ‘int’ in declaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wimplicit-int]
  ../src/shared/resolve-util.h:70:1: warning: parameter names (without types) in function declaration
  ../src/shared/resolve-util.h:70:1: warning: redundant redeclaration of ‘CONFIG_PARSER_PROTOTYPE’ [-Wredundant-decls]
  ../src/shared/resolve-util.h:69:1: note: previous declaration of ‘CONFIG_PARSER_PROTOTYPE’ was here
   CONFIG_PARSER_PROTOTYPE(config_parse_dnssec_mode);
   ^~~~~~~~~~~~~~~~~~~~~~~

  [test case]

  look at build logs, e.g.:
  https://launchpadlibrarian.net/444833135/buildlog_ubuntu-bionic-amd64.systemd_237-3ubuntu10.31_BUILDING.txt.gz

  [regression potential]

  any regression would likely cause the build to fail.  it's unlikely
  this would cause any runtime regression.

  [other info]

  typo introduced in the patch for bug 1668771

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1852591/+subscriptions