Merge ~daxtens/ubuntu/+source/gce-compute-image-packages:trusty-pam-ldflags-1798706 into ubuntu/+source/gce-compute-image-packages:ubuntu/trusty-devel

[Daniel Axtens]

Set LDFLAGS for PAM

 * debian/patches/set-LDFLAGS-for-PAM.patch: Fix missing symbols
   when using oslogin due to misording of the boost regex library
   in linking the PAM modules. (LP: #1798706)

All the details are in the LP bug.

[Balint Reczey (rbalint)]

review: Approve

[Andreas Hasenack (ahasenack)]

Balint, I believe this needs sponsorship.

[Andreas Hasenack (ahasenack)]

review: Abstain

[Balint Reczey (rbalint)]

@daxtens, @ahasenack: I've forwarded Daniel's change in https://github.com/GoogleCloudPlatform/compute-image-packages/pull/657

[Balint Reczey (rbalint)]

Please mark this as merged.

[Balint Reczey (rbalint)]

review: Abstain

[Balint Reczey (rbalint)]

@ahasenack Please mark this as merged because I can't and this review keeps showing up on my open reviews page.

review: Approve

[Balint Reczey (rbalint)]

review: Abstain

[Balint Reczey (rbalint)]

review: Approve

[Thomas Ward (teward)]

Already merged.

review: Approve

Unmerged commits

4ceecbf... by Daniel Axtens on 2018-10-19

Update changelog

Signed-off-by: Daniel Axtens <email address hidden>

fc1ab28... by Daniel Axtens on 2018-10-19

Set LDFLAGS for PAM

  * debian/patches/set-LDFLAGS-for-PAM.patch: Fix missing symbols
    when using oslogin due to misording of the boost regex library
    in linking the PAM modules. (LP: #1798706)

Signed-off-by: Daniel Axtens <email address hidden>

ce7d5f7... by Balint Reczey on 2018-09-16

Import patches-unapplied version 20180905+dfsg1-0ubuntu1~14.04.0 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 541505e2cb33738939a38c9b08e34bb1bd36549c

New changelog entries:
  * Backport to Trusty
    - Revert ordering shutdown scripts after snapd.service.
    - Revert adding /snap/bin to PATH for startup/shutdown scripts
    - Revert to using dh-systemd because Xenial does not have the debhelper
  * Revert "Build depend on debhelper (>= 9.20160709) instead of on dh-systemd"
    This reverts commit 1afdbde3f27ab4d1712b1a0d4cc14df3a0528bdc.
    Xenial does not have that debhelper version thus dh-systemd is needed there.
  * Build-depend on libboost-regex-dev for regex support
  * Choose std:: or boost:: regex based on support for C++11
  * Set LDFLAGS at the end of the the c++ command line right before libs.
    This fixes passig additional libs to make, namely -lboost_regex
  * Link with boost for regex support
  * Free tests from C++11 constructs to let them being compiled without C++11 support

541505e... by Balint Reczey on 2018-09-13

Import patches-unapplied version 20180905+dfsg1-0ubuntu1 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: d85ea586d2556a4a9089e0e1b585598b9a3f4f93

New changelog entries:
  [ Balint Reczey ]
  * New upstream version 20180905+dfsg1 (LP: #1792466)
    - Restart the network daemon if networking is restarted.
    - Prevent setup of the default ethernet interface.
    - Accounts daemon can now verify username is 32 characters or less.
    - Prevent IP forwarding daemon log spam.
    - Make default shell configurable when executing metadata scripts.
    - Rename distro directory to distro_lib.
  * debian/control: Update Vcs-* fields to point to the new packaging repository
  * Update shared library symlinks
  * Drop 0001-Adjust-tests-to-changed-LoadJsonArrayToCache-behavio.patch,
    it is integrated upstream
  * Build depend on debhelper (>= 9.20160709) instead of on dh-systemd
    to keep Lintian happy.
  [ Google Cloud Team ]
  * Remove NTP dependency from packaging

d85ea58... by Balint Reczey on 2018-07-04

Import patches-unapplied version 20180510+dfsg1-0ubuntu5 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 262a376f99906720025af0539ac530c48583d8f2

New changelog entries:
  * Depend on the same version of google-compute-engine-oslogin
  * Only Recommend rsyslog | system-log-daemon (LP: #1780109)

262a376... by Dan Watkins on 2018-05-17

Import patches-unapplied version 20180510+dfsg1-0ubuntu4 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 36c686adad2561121decef12e15a009f3e8b3502

New changelog entries:
  * debian/patches/0004-order-shutdown-scripts-after-snapd.patch: Order
    shutdown scripts after snapd.service.
  * debian/patches/0005-add-snap-bin-to-path.patch: Add /snap/bin to
    PATH for startup/shutdown scripts.

36c686a... by Balint Reczey on 2018-05-16

Import patches-unapplied version 20180510+dfsg1-0ubuntu3 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 1ed40fca7824ebf210a2493671abb309d3eb1946

New changelog entries:
  * Update prerm to stop google-network-daemon.service rather than the removed ones
  * Only Provide irqbalance without Breaks and Replaces to ensure smooth upgrades

1ed40fc... by Dan Watkins on 2018-05-15

Import patches-unapplied version 20180510+dfsg1-0ubuntu2 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: eb84ed36417a0be7ef663f87984ad50b2a5b7f93

New changelog entries:
  * debian/patches/0003-order-startup-scripts-after-snap-
    seeding.service: Ensure that snaps have been seeded before startup
    scripts run.

eb84ed3... by Balint Reczey on 2018-05-15

Import patches-unapplied version 20180510+dfsg1-0ubuntu1 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: a859f7f4299a3efedaf280337364bb71329ee95b

New changelog entries:
  [ Balint Reczey ]
  * Break, Replace and Provide irqbalance.
    Optimization scripts are conflicting with irqbalance and the set
    relationships ensure removal of irqbalance when it was accidentally
    installed.
  * Depend on virtual system-log-daemon as an alternative of rsyslog
  * Update copyrights
  * New upstream version 20180510 (LP: #1770650)
  * Refresh patches
  * Adjust tests to changed behaviour
  * Update symlink to shared library with updated revision
  * debian/gce-compute-image-packages.preinst: Add debhelper token
  * Update Lintian overrides
  [ Google Cloud Team ]
  * Add module blacklist for GCE
  * Fix Debian install when migrating to new network daemon

a859f7f... by Steve Langasek on 2018-04-12

Import patches-unapplied version 20180129+dfsg1-0ubuntu3 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 369ed15b2a57d3851547946bc220b66cf458fd86

New changelog entries:
  * Drop the Recommends: on google-cloud-sdk; this is moving to be a snap
    for 18.04 and we don't want to continue pulling in a deprecated deb.

diff --git a/debian/changelog b/debian/changelog
index a195591..8789f16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gce-compute-image-packages (20180905+dfsg1-0ubuntu1~14.04.1) trusty; urgency=medium
+
+  * debian/patches/set-LDFLAGS-for-PAM.patch: Fix missing symbols
+    when using oslogin due to misording of the boost regex library
+    in linking the PAM modules. (LP: #1798706)
+
+ -- Daniel Axtens <[e-mail]>  Fri, 19 Oct 2018 12:41:42 +1100
+
 gce-compute-image-packages (20180905+dfsg1-0ubuntu1~14.04.0) trusty; urgency=medium
 
   * Backport to Trusty
diff --git a/debian/patches/series b/debian/patches/series
index e9d793d..e450e6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-startup-script-ordering.patch
 #0003-order-startup-scripts-after-snap-seeding.service
 #0004-order-shutdown-scripts-after-snapd.patch
 #0005-add-snap-bin-to-path.patch
+set-LDFLAGS-for-PAM.patch
diff --git a/debian/patches/set-LDFLAGS-for-PAM.patch b/debian/patches/set-LDFLAGS-for-PAM.patch
new file mode 100644
index 0000000..db034a6
--- /dev/null
+++ b/debian/patches/set-LDFLAGS-for-PAM.patch
@@ -0,0 +1,20 @@
+This fixes 0002-Set-LDFLAGS-at-the-end-of-the-c-command-line-right-b.patch
+to also 
+
+---
+
+--- a/google_compute_engine_oslogin/Makefile
++++ b/google_compute_engine_oslogin/Makefile
+@@ -110,10 +110,10 @@
+ $(PAM): $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD)
+ 
+ $(PAM_LOGIN_MOD): $(PAM_LOGIN_OBJ) $(UTILS)
+-	$(CXX) $(PAMFLAGS) -o $(PAM_LOGIN_MOD) $(PAM_LOGIN_OBJ) $(UTILS) $(PAM_LIBS)
++	$(CXX) -o $(PAM_LOGIN_MOD) $(PAM_LOGIN_OBJ) $(UTILS) $(PAMFLAGS) $(PAM_LIBS)
+ 
+ $(PAM_ADMIN_MOD): $(PAM_ADMIN_OBJ) $(UTILS)
+-	$(CXX) $(PAMFLAGS) -o $(PAM_ADMIN_MOD) $(PAM_ADMIN_OBJ) $(UTILS) $(PAM_LIBS)
++	$(CXX) -o $(PAM_ADMIN_MOD) $(PAM_ADMIN_OBJ) $(UTILS) $(PAMFLAGS) $(PAM_LIBS)
+ 
+ $(PAM_LOGIN_OBJ): $(PAM_LOGIN_SRC)
+ 	$(CXX) $(CXXFLAGS) -c $(PAM_LOGIN_SRC) -o $(PAM_LOGIN_OBJ)