Merge ~paelzer/ubuntu/+source/nut:artful-bug-1540008-udevd-name-changed into ~usd-import-team/ubuntu/+source/nut:ubuntu/devel

[ChristianEhrhardt]

This got some follow on fixes after our discussion.
Please pick up the tags and content from this branch to fix those.

[Nish Aravamudan (nacc)]

review: Approve

[Nish Aravamudan (nacc)]

Upload tagged and sponsored.

[Nish Aravamudan (nacc)]

Note this failed to build in Artful. I think it is probably unrelated to your change, but related to gcc changes? Can you check it out?

[ChristianEhrhardt (paelzer)]

Yeah since it is a postinst only change I doubt we affected the compilation with the upload.
Also it was building a week ago, so likely gcc7 as you expect, taking a look ...

View might first fall on:
al175.c:400:28: warning: ‘%2X’ directive output may be truncated writing between 2 and 4 bytes into a region of size between 3 and 5 [-Wformat-truncation=]

But that is only a warning due to:
-Wformat-truncation being default on -Wall now [1]

But the actual "break" are errors like:
/usr/bin/ld: al175.o: relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC

Actually -fPIC was used on parts of the build pre and post gcc-7 as seen in the buildlogs [2] [3].
The root cause seems in a change that dropped the former:
"-fPIE"
options and replaced them with
-specs=/usr/share/dpkg/no-pie-compile.specs

Since no change was made to nut this likely is from the toolchain upgrade.
This is kind of inverse to what I knew - like [4] where it is about enabling pie.
Did we intentionally drop that - I don't think so?

When analyzing the build it seems there are two times hardning options.
- The first one got the no-pie spec
- And the second lost the -fPIE

--- old 2017-08-16 09:14:46.667114832 +0200
+++ new 2017-08-16 09:14:47.275115931 +0200
@@ -1,15 +1,15 @@
 gcc -DHAVE_CONFIG_H -I. -I../include -Wdate-time -D_FORTIFY_SOURCE=2 -I../include -DNETSNMP_ENABLE_IPV6 -fno-strict-aliasing -g -O2 -fdebug-prefix-map=/build/net-snmp=.
-
+-specs=/usr/share/dpkg/no-pie-compile.specs
 -fstack-protector-strong -Wformat -Werror=format-security -DNETSNMP_USE_INLINE -Ulinux -Dlinux=linux -D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/x86_64-linux-gnu/perl/5.2 -Wdate-time -D_FORTIFY_SOURCE=2 -I/usr/include -I/usr/include/neon -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=.
--fPIE
--fstack-protector-strong -Wformat -Werror=format-security -Wall -Wsign-compare -c -o al175.o al175.c
-/bin/bash ../libtool --tag=CC --mode=link gcc -I../include -DNETSNMP_ENABLE_IPV6 -fno-strict-aliasing -g -O2 -fdebug-prefix-map=/build/net-snmp=.

It almost seems to have two hardening entries one behaving one and one the other way.
I've found the source (form nut's POV) of both changes:
1. loosing -fPIE is the actual configure call changing from
CFLAGS="-g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fPIE -fstack-protector-strong [...]
to
CFLAGS="-g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong [...]
This can be checked when comparing zesty with artful calling:
$ DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS
(Lets assume for now it is dropped because it is considered default anyway?)

2. gaining the no-pie spec is from net-snmp by configure
checking for Net-SNMP cflags... [...] -specs=/usr/share/dpkg/no-pie-compile.specs [...]
checking for Net-SNMP libs... [...] -specs=/usr/share/dpkg/no-pie-compile.specs [...]
While in the past this was without pie reference at all.

The options of #2 come later than #1 and so even if #1 would have -fPIE it would be disabled again.
The real source for the change ...

[ChristianEhrhardt (paelzer)]

Ok, I rechecked an all arch build on top of all I did and it is good now.
@nacc - please review the extra changes and upload the new version if you agree.

[ChristianEhrhardt (paelzer)]

Ah I see you merged this already - do you want/need a new MP or should we operate on this one reopening it?

[Nish Aravamudan (nacc)]

If you send a new one, based upon your current one, the history will work correctly (as I've already pushed your ubuntu3 as a upload tag and dputted). So propose a new ubuntu4, please.

[Nish Aravamudan (nacc)]

review: Approve

[Nish Aravamudan (nacc)]

Upload tagged and sponsored.

diff --git a/debian/changelog b/debian/changelog
index 2cbaf23..e92c04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+nut (2.7.4-5ubuntu4) artful; urgency=medium
+
+  * d/p/fix-snmp-driver-compile-options.patch: fix cflags/ldflags
+    mismatch (LP: #1711092).
+  * d/libnutclient0.symbols: fix symbols in regard to gcc-7 (LP: #1711091).
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 16 Aug 2017 12:44:26 +0200
+
+nut (2.7.4-5ubuntu3) artful; urgency=medium
+
+  * debian/nut-server.postinst: The udevd process is called systemd-udevd
+    for quite sometimes already, properly detect whether it's running or not,
+    this should fix the devices permissions for USB UPS's (LP: #1540008).
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 09 Aug 2017 10:16:38 +0200
+
 nut (2.7.4-5ubuntu2) zesty; urgency=medium
 
   * debian/libnutclient0.symbols: Correct symbols file for ppc64el.
diff --git a/debian/libnutclient0.symbols b/debian/libnutclient0.symbols
index 48a4c4b..bc4dc8f 100644
--- a/debian/libnutclient0.symbols
+++ b/debian/libnutclient0.symbols
@@ -187,8 +187,8 @@ libnutclient.so.0 libnutclient0 #MINVER#
  (c++)"typeinfo name for nut::TcpClient@Base" 2.7.3
  (c++)"typeinfo name for nut::TimeoutException@Base" 2.7.3
  (c++)"typeinfo name for nut::UnknownHostException@Base" 2.7.3
- (c++)"void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_emplace_back_aux<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
- (c++)"void std::vector<std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::allocator<std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >::_M_emplace_back_aux<std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&&)@Base" 2.7.3
+ _ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.7.4
+ _ZNSt6vectorIS_INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.7.4
  (c++)"vtable for nut::Client@Base" 2.7.3
  (c++)"vtable for nut::IOException@Base" 2.7.3
  (c++)"vtable for nut::NotConnectedException@Base" 2.7.3
diff --git a/debian/nut-server.postinst b/debian/nut-server.postinst
index 7af7af9..8a152d2 100644
--- a/debian/nut-server.postinst
+++ b/debian/nut-server.postinst
@@ -62,7 +62,7 @@ case "$1" in
     fi
 
     # ask udev to check for new udev rules
-    [ -x /etc/init.d/udev ] && pidof udevd > /dev/null \
+    [ -x /etc/init.d/udev ] && pidof systemd-udevd > /dev/null \
       && udevadm trigger --subsystem-match=usb --action=change
 
     # 557178  udevadm trigger --subsystem-match=usb
diff --git a/debian/patches/fix-snmp-driver-compile-options.patch b/debian/patches/fix-snmp-driver-compile-options.patch
new file mode 100644
index 0000000..4a97f7e
--- /dev/null
+++ b/debian/patches/fix-snmp-driver-compile-options.patch
@@ -0,0 +1,45 @@
+Description: fix snmp driver cflags/ldflags mismatch
+
+There are a few cflags/ldflags which need to be symetric and -fPIE
+is one of them.
+Due to the change of PIE now being default it is no more generated
+into CFLAGS. Instead if disabled it adds a spec file to disable
+ -specs=/usr/share/dpkg/no-pie-compile.specs, but that needs to go
+in sync with no-pie-link.specs on the link step which it doesn't.
+
+This was due to
+"# Avoid per-target CFLAGS, because this will preventre-use of object
+# files. In any case, CFLAGS are only -I options, so there is no harm,
+# but only add them if we really use the target.
+AM_CFLAGS = -I$(top_srcdir)/include $(am__append_1) $(am__append_2) \
+        $(am__append_3) $(am__append_4) $(am__append_5)"
+
+But obviously that now is an issue and a fix was created to only add
+the snmp cflags to the right target (as it was already done for other
+drivers like nutdrv_qx)
+
+Forwarded: yes (https://github.com/networkupstools/nut/issues/463)
+Author: Christian Ehrhardt <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1711092
+Last-Update: 2017-08-16
+--- a/drivers/Makefile.am
++++ b/drivers/Makefile.am
+@@ -16,9 +16,6 @@
+ if WITH_USB
+   AM_CFLAGS += $(LIBUSB_CFLAGS)
+ endif
+-if WITH_SNMP
+-  AM_CFLAGS += $(LIBNETSNMP_CFLAGS)
+-endif
+ if WITH_NEON
+   AM_CFLAGS += $(LIBNEON_CFLAGS)
+ endif
+@@ -202,6 +199,8 @@
+  ietf-mib.c mge-mib.c netvision-mib.c powerware-mib.c raritan-pdu-mib.c \
+  bestpower-mib.c cyberpower-mib.c delta_ups-mib.c xppc-mib.c huawei-mib.c \
+  eaton-ats-mib.c apc-ats-mib.c
++snmp_ups_CFLAGS = $(AM_CFLAGS)
++snmp_ups_CFLAGS += $(LIBNETSNMP_CFLAGS)
+ snmp_ups_LDADD = $(LDADD_DRIVERS) $(LIBNETSNMP_LIBS)
+ 
+ # NEON XML/HTTP
diff --git a/debian/patches/series b/debian/patches/series
index 0b7915d..e8f1403 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0006-ups-conf-maxretry.patch
 0008-drop-w3c-icons.patch
 0009-fix-nutshutdown-install.patch
+fix-snmp-driver-compile-options.patch