Merge ~paelzer/ubuntu/+source/collectd:lp1971093-bring-collectd-back-to-JAMMY-v2 into ubuntu/+source/collectd:ubuntu/jammy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/jammy-get-collectd-back/+packages

[Andreas Hasenack (ahasenack)]

Since nut is being disabled again in 14e10db2ce218eb58e2e4e85800c949943aceb08, isn't the minimal fix just these two:

      * [343f857] Don't use local variables in global pointers
        Closes: #1016187

and

      * [15098cc] Also fix local variables issue in write_prometheus

What were your considerations when pondering the above? That it's simpler and less error-prone to grab the -10 debian package and disable nut, like is done in -11?

From an SRU perspective, I would prefer the minimal fixes, but then again, this package does not exist in jammy, so there is technically no regression case, other then new rebuilds of other packages down the line which link to libcollectdclient1.

review: Needs Information

[Christian Ehrhardt  (paelzer)]

The consideration was to use something that really was built and used for a while (in Debian in this case) instead of manually selecting what I consider nice.

And since nothing is in Jammy right now that seemed to give our users the most, but at the same time avoiding to be -11 itself.

[Andreas Hasenack (ahasenack)]

Ok, thanks for the explanation.

+1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, ahasenack
Uploaders: paelzer, ahasenack
MP auto-approved

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks!

FYI - Now Uploaded

[Trent Lloyd (lathiat)]

Already merged but adding my feedback anyway. LGTM and also performed some basic testing including upgrade from focal with a few plugins enabled. Working OK.

review: Approve

Unmerged commits

4b3006f... by Christian Ehrhardt  on 2023-01-16

changelog: add FTBFS fix for nut

Signed-off-by: Christian Ehrhardt <email address hidden>

14e10db... by Bernd Zeimetz on 2022-08-22

Disable nut plugin again.

Various RC bugs for a longer time, not waiting for that.

227c432... by Christian Ehrhardt  on 2023-01-16

changelog: no change rebuild to add back to the archive (LP: #1971093)

Signed-off-by: Christian Ehrhardt <email address hidden>

69a0ef1... by Christian Ehrhardt  on 2023-01-16

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 34b79fd..3ef1ef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+collectd (5.12.0-10ubuntu0.1) jammy; urgency=medium
+
+  * Rebuild to get it back into the Archive as it was removed as
+    rdep for (LP: 1960612) but not added back. Yet despite being in
+    universe it is used by many monitoring components and should be
+    available (LP: #1971093).
+    - use 5.12.0-10 which has some useful fixes and is before 5.12.0-11
+      that is in kinetic.
+    - cherry-pick "[e1c67e5] Disable nut plugin again." from 5.12.0-11
+      Various RC bugs for a longer time, not waiting for that.
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 16 Jan 2023 10:33:01 +0100
+
+collectd (5.12.0-10) unstable; urgency=medium
+
+  * [343f857] Don't use local variables in global pointers
+    Closes: #1016187
+  * [254a859] Fix building with current nut version.
+  * [15098cc] Also fix local variables issue in write_prometheus
+
+ -- Bernd Zeimetz <[e-mail]>  Sat, 20 Aug 2022 22:38:49 +0200
+
 collectd (5.12.0-9) unstable; urgency=medium
 
   * [577cd1f] Don't build mysql plugin on kfreebsd*
diff --git a/debian/control b/debian/control
index dad17df..5427a5f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: collectd
 Section: utils
 Priority: optional
-Maintainer: Collectd Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Collectd Packaging Team <[e-mail]>
 Uploaders: Sebastian Harl <[e-mail]>, Marc Fournier <[e-mail]>, Bernd Zeimetz <[e-mail]>
 Build-Depends: debhelper-compat (= 10), dpkg-dev (>= 1.14.10), po-debconf, dh-strip-nondeterminism, dh-autoreconf,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
@@ -49,7 +50,6 @@ Build-Depends: debhelper-compat (= 10), dpkg-dev (>= 1.14.10), po-debconf, dh-st
  libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
  libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
  libudev-dev [linux-any],
- libupsclient-dev | libupsclient1-dev,
  libvarnishapi-dev,
  libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64 !sh4 !ia64 !alpha],
  libxen-dev [amd64 arm64 armhf],
@@ -82,7 +82,7 @@ Suggests: collectd-dev,
 # services providing data that may be collected by collectd
  apache2, apcupsd, bind9, ceph, chrony, default-mysql-server, gpsd,
  iptables, ipvsadm, lm-sensors, mbmon, memcached, nginx, notification-daemon,
- nut, openvpn, olsrd, pdns-server, postgresql, redis-server, slapd,
+ openvpn, olsrd, pdns-server, postgresql, redis-server, slapd,
  time-daemon, varnish, zookeeper,
  ${shlibs:Suggests}, default-jre-headless
 Replaces: collectd (<< 4.8.2-1~)
@@ -172,7 +172,6 @@ Description: statistics collection and monitoring daemon (core system)
    * send notification E-mails: notify_email
    * send notifications to nagios: notify_nagios
    * NTP daemon's local clock drift, offset to peers, etc.: ntpd
-   * UPS information: nut
    * Optimized Link State Routing daemon statistics: olsrd
    * OpenLDAP's cn=Monitor statistics: openldap
    * OpenVPN traffic and compression statistics: openvpn
diff --git a/debian/patches/fix-nut-integer-sizes b/debian/patches/fix-nut-integer-sizes
new file mode 100644
index 0000000..bc5308b
--- /dev/null
+++ b/debian/patches/fix-nut-integer-sizes
@@ -0,0 +1,22 @@
+Index: collectd/src/nut.c
+===================================================================
+--- collectd.orig/src/nut.c
++++ collectd/src/nut.c
+@@ -46,7 +46,7 @@ struct nut_ups_s {
+   collectd_upsconn_t *conn;
+   char *upsname;
+   char *hostname;
+-  int port;
++  uint16_t port;
+   nut_ups_t *next;
+ };
+ 
+@@ -250,7 +250,7 @@ static int nut_read(user_data_t *user_da
+   const char *query[3] = {"VAR", ups->upsname, NULL};
+   unsigned int query_num = 2;
+   char **answer;
+-  unsigned int answer_num;
++  size_t answer_num;
+   int status;
+ 
+   /* (Re-)Connect if we have no connection */
diff --git a/debian/patches/fix-storing-local-variables b/debian/patches/fix-storing-local-variables
new file mode 100644
index 0000000..9060ab7
--- /dev/null
+++ b/debian/patches/fix-storing-local-variables
@@ -0,0 +1,43 @@
+Index: collectd/src/capabilities.c
+===================================================================
+--- collectd.orig/src/capabilities.c
++++ collectd/src/capabilities.c
+@@ -56,6 +56,8 @@ static char *httpd_host = NULL;
+ static unsigned short httpd_port = 9104;
+ static struct MHD_Daemon *httpd;
+ 
++static int mhd_cls = 44;
++
+ static dmi_type_name_t types_list[] = {
+     {BIOS, "BIOS"},
+     {SYSTEM, "SYSTEM"},
+@@ -206,7 +208,7 @@ static MHD_RESULT cap_http_handler(void
+    * round. The docs are not very specific on the issue. */
+   if (*connection_state == NULL) {
+     /* set to a random non-NULL pointer. */
+-    *connection_state = &(int){44};
++    *connection_state = &mhd_cls;
+     return MHD_YES;
+   }
+   DEBUG(CAP_PLUGIN ": formatted response: %s", g_cap_json);
+Index: collectd/src/write_prometheus.c
+===================================================================
+--- collectd.orig/src/write_prometheus.c
++++ collectd/src/write_prometheus.c
+@@ -63,6 +63,7 @@ static pthread_mutex_t metrics_lock = PT
+ static char *httpd_host = NULL;
+ static unsigned short httpd_port = 9103;
+ static struct MHD_Daemon *httpd;
++static int mhd_cls = 42;
+ 
+ static cdtime_t staleness_delta = PROMETHEUS_DEFAULT_STALENESS_DELTA;
+ 
+@@ -247,7 +248,7 @@ static MHD_RESULT http_handler(void *cls
+    * very specific on the issue. */
+   if (*connection_state == NULL) {
+     /* set to a random non-NULL pointer. */
+-    *connection_state = &(int){42};
++    *connection_state = &mhd_cls;
+     return MHD_YES;
+   }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2d8aa9f..ef0e085 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+fix-nut-integer-sizes
+fix-storing-local-variables
 rrd_filter_path.patch
 collection_conf_path.patch
 myplugin_includes.patch
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 4220a4c..b4739ec 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: collectd\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2022-02-22 01:18+0100\n"
+"POT-Creation-Date: 2022-08-20 22:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
diff --git a/debian/rules b/debian/rules
index db2a690..08dace3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,7 +113,8 @@ confflags += --disable-sigrok
 # libnvidia-ml is non-free
 confflags += --disable-gpu_nvidia
 
-
+# disable nut plugin for now.
+confflags += --disable-nut
 
 # ganglia FTBS, disable it for now
 # see #964399