diff -Nru gce-compute-image-packages-20171129+dfsg1/debian/changelog gce-compute-image-packages-20180129+dfsg1/debian/changelog --- gce-compute-image-packages-20171129+dfsg1/debian/changelog 2017-12-05 13:16:22.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/debian/changelog 2018-01-31 19:14:23.000000000 +0000 @@ -1,3 +1,24 @@ +gce-compute-image-packages (20180129+dfsg1-0ubuntu1~14.04.0) trusty; urgency=medium + + [ Balint Reczey ] + * Override false positive maintainer-script-empty Lintian warning + * Suggest libpam-cracklib instead of recommending it + libpam-cracklib was not installed on cloud images before due to using + --no-install-recommends when installing gce-compute-image-packages, but this + state could have been surprising for users. (LP: #1741989) + * New upstream version 20180129+dfsg1 (LP: #1746588) + - Close socket connections when requesting metadata. + - Change the OS Login uid restriction to allow uid 1000. + - Improve hostname setting, including restarting rsyslog + * Backport to Trusty + + [ Zach Marano from Google Cloud Team ] + * Update symlink to shared library with updated revision + * Depend on rsyslog + * Force IPv4 for Debian apt configs + + -- Balint Reczey Wed, 31 Jan 2018 20:14:23 +0100 + gce-compute-image-packages (20171129+dfsg1-0ubuntu1~14.04.0) trusty; urgency=medium [ Balint Reczey ] diff -Nru gce-compute-image-packages-20171129+dfsg1/debian/control gce-compute-image-packages-20180129+dfsg1/debian/control --- gce-compute-image-packages-20171129+dfsg1/debian/control 2017-12-05 13:16:22.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/debian/control 2018-01-31 19:14:23.000000000 +0000 @@ -28,9 +28,10 @@ google-compute-engine-oslogin, python-google-compute-engine (= ${source:Version}), chrony | ntp | time-daemon, + rsyslog, cloud-init Recommends: google-cloud-sdk, - libpam-cracklib +Suggests: libpam-cracklib Conflicts: gce-cloud-config, gce-daemon, gce-startup-scripts diff -Nru gce-compute-image-packages-20171129+dfsg1/debian/gce-compute-image-packages.install gce-compute-image-packages-20180129+dfsg1/debian/gce-compute-image-packages.install --- gce-compute-image-packages-20171129+dfsg1/debian/gce-compute-image-packages.install 2017-12-05 13:16:22.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/debian/gce-compute-image-packages.install 2018-01-31 19:14:23.000000000 +0000 @@ -6,6 +6,7 @@ google_config/udev/* lib/udev/rules.d google_compute_engine_init/systemd/90-google-compute-engine.preset lib/systemd/system-preset google_config/apt/01autoremove-gce etc/apt/apt.conf.d +google_config/apt/99ipv4-only etc/apt/apt.conf.d google_config/bin/google_set_hostname etc/dhcp/dhclient-exit-hooks.d # Ubuntu-specific configuration diff -Nru gce-compute-image-packages-20171129+dfsg1/debian/google-compute-engine-oslogin.links gce-compute-image-packages-20180129+dfsg1/debian/google-compute-engine-oslogin.links --- gce-compute-image-packages-20171129+dfsg1/debian/google-compute-engine-oslogin.links 2017-12-05 13:16:22.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/debian/google-compute-engine-oslogin.links 2018-01-31 19:14:23.000000000 +0000 @@ -1 +1 @@ -lib/libnss_google-compute-engine-oslogin-1.1.2.so lib/libnss_oslogin.so.2 +lib/libnss_google-compute-engine-oslogin-1.1.4.so lib/libnss_oslogin.so.2 diff -Nru gce-compute-image-packages-20171129+dfsg1/debian/google-compute-engine-oslogin.lintian-overrides gce-compute-image-packages-20180129+dfsg1/debian/google-compute-engine-oslogin.lintian-overrides --- gce-compute-image-packages-20171129+dfsg1/debian/google-compute-engine-oslogin.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/debian/google-compute-engine-oslogin.lintian-overrides 2018-01-31 19:14:23.000000000 +0000 @@ -0,0 +1,2 @@ +# prerm is not exactly empty, it always succeed fixing broken old ones +google-compute-engine-oslogin: maintainer-script-empty prerm \ No newline at end of file diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/bin/google_oslogin_control 2018-01-30 01:41:05.000000000 +0000 @@ -85,9 +85,22 @@ add_to_pam_config() { remove_from_config ${pam_config} - sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new - sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new - sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new + if grep -q -s "ID=cos" /etc/os-release; then + # For COS simply prepend the new config. + added_config="\ +${added_comment} +${pam_admin} +${added_comment} +${pam_login} +${added_comment} +${pam_homedir} +" + echo "${added_config}$(cat ${pam_config}.new)" > ${pam_config}.new + else + sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new + sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new + sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new + fi } restart_service() { diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/Makefile gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/Makefile --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/Makefile 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/Makefile 2018-01-30 01:41:05.000000000 +0000 @@ -4,7 +4,7 @@ NAME = google-compute-engine-$(BASENAME) MAJOR = 1 MINOR = 1 -REVISION = 2 +REVISION = 4 NSS_LIBRARY_NAME = libnss_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so NSS_LIBRARY_SONAME = libnss_$(BASENAME).so.2 diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian8/changelog 2018-01-30 01:41:05.000000000 +0000 @@ -1,3 +1,15 @@ +google-compute-engine-oslogin (1.1.4-1+deb8) unstable; urgency=low + + * Close socket connections when requesting metadata. + + -- Google Cloud Team Mon, 29 Jan 2018 12:00:00 -0700 + +google-compute-engine-oslogin (1.1.3-1+deb8) unstable; urgency=low + + * Change the OS Login uid restriction to allow uid 1000. + + -- Google Cloud Team Thu, 25 Jan 2018 12:00:00 -0700 + google-compute-engine-oslogin (1.1.2-1+deb8) unstable; urgency=low * Fix parsing logic for expiration time on SSH public keys. diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian8/google-compute-engine-oslogin.links 2018-01-30 01:41:05.000000000 +0000 @@ -1 +1 @@ -/lib/libnss_google-compute-engine-oslogin-1.1.2.so /lib/libnss_oslogin.so.2 +/lib/libnss_google-compute-engine-oslogin-1.1.3.so /lib/libnss_oslogin.so.2 diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian9/changelog 2018-01-30 01:41:05.000000000 +0000 @@ -1,3 +1,15 @@ +google-compute-engine-oslogin (1.1.4-1+deb9) unstable; urgency=low + + * Close socket connections when requesting metadata. + + -- Google Cloud Team Mon, 29 Jan 2018 12:00:00 -0700 + +google-compute-engine-oslogin (1.1.3-1+deb9) unstable; urgency=low + + * Change the OS Login uid restriction to allow uid 1000. + + -- Google Cloud Team Thu, 25 Jan 2018 12:00:00 -0700 + google-compute-engine-oslogin (1.1.2-1+deb9) unstable; urgency=low * Fix parsing logic for expiration time on SSH public keys. diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/debian9/google-compute-engine-oslogin.links 2018-01-30 01:41:05.000000000 +0000 @@ -1 +1 @@ -/lib/libnss_google-compute-engine-oslogin-1.1.2.so /lib/libnss_oslogin.so.2 +/lib/libnss_google-compute-engine-oslogin-1.1.4.so /lib/libnss_oslogin.so.2 diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec 2018-01-30 01:41:05.000000000 +0000 @@ -13,7 +13,7 @@ # limitations under the License. Name: google-compute-engine-oslogin -Version: 1.1.2 +Version: 1.1.4 Release: 1%{?dist} Summary: OS Login Functionality for Google Compute Engine diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/setup_deb.sh 2018-01-30 01:41:05.000000000 +0000 @@ -20,7 +20,7 @@ # Run from the top of the source directory. NAME="google-compute-engine-oslogin" -VERSION="1.1.2" +VERSION="1.1.4" working_dir=${PWD} diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/packaging/setup_rpm.sh 2018-01-30 01:41:05.000000000 +0000 @@ -20,7 +20,7 @@ # Run from the top of the source directory. NAME="google-compute-engine-oslogin" -VERSION="1.1.2" +VERSION="1.1.4" working_dir=${PWD} rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION} diff -Nru gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/utils/oslogin_utils.cc gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/utils/oslogin_utils.cc --- gce-compute-image-packages-20171129+dfsg1/google_compute_engine_oslogin/utils/oslogin_utils.cc 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_compute_engine_oslogin/utils/oslogin_utils.cc 2018-01-30 01:41:05.000000000 +0000 @@ -157,6 +157,7 @@ struct curl_slist* header_list = NULL; header_list = curl_slist_append(header_list, "Metadata-Flavor: Google"); if (header_list == NULL) { + curl_easy_cleanup(curl); curl_global_cleanup(); return false; } @@ -171,14 +172,17 @@ code = curl_easy_perform(curl); if (code != CURLE_OK) { + curl_easy_cleanup(curl); + curl_global_cleanup(); return false; } curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, http_code); } while (retry_count++ < kMaxRetries && *http_code == 500); curl_slist_free_all(header_list); - curl_global_cleanup(); } *response = response_stream.str(); + curl_easy_cleanup(curl); + curl_global_cleanup(); return true; } @@ -197,8 +201,8 @@ bool ValidatePasswd(struct passwd* result, BufferManager* buf, int* errnop) { - // OS Login disallows uids less than or equal to 1000 - if (result->pw_uid <= 1000) { + // OS Login disallows uids less than 1000. + if (result->pw_uid < 1000) { *errnop = EINVAL; return false; } diff -Nru gce-compute-image-packages-20171129+dfsg1/google_config/apt/99ipv4-only gce-compute-image-packages-20180129+dfsg1/google_config/apt/99ipv4-only --- gce-compute-image-packages-20171129+dfsg1/google_config/apt/99ipv4-only 1970-01-01 00:00:00.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_config/apt/99ipv4-only 2018-01-30 01:41:05.000000000 +0000 @@ -0,0 +1,2 @@ +# Force IPv4 for Apt. +Acquire::ForceIPv4 "true"; diff -Nru gce-compute-image-packages-20171129+dfsg1/google_config/bin/google_set_hostname gce-compute-image-packages-20180129+dfsg1/google_config/bin/google_set_hostname --- gce-compute-image-packages-20171129+dfsg1/google_config/bin/google_set_hostname 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/google_config/bin/google_set_hostname 2018-01-30 01:41:05.000000000 +0000 @@ -42,14 +42,19 @@ # If NetworkManager is installed set the hostname with nmcli. # to resolve issues with NetworkManager resetting the hostname # to the FQDN on DHCP renew. - if [ -x /bin/nmcli ]; then + nmcli=$(which nmcli 2> /dev/null) + if [ -x "$nmcli" ]; then nmcli general hostname "${new_host_name%%.*}" fi - # Restart syslog to update the hostname if we're not using systemd. - # systemd rsyslog jobs wait for networking to finish starting and consequently - # syslog or rsyslog is running with the correct hostname. - if [ ! -f /bin/systemctl ]; then - pkill -HUP syslogd + # Restart rsyslog to update the hostname. + systemctl=$(which systemctl 2> /dev/null) + if [ -f /etc/init.d/rsyslog ]; then + /etc/init.d/rsyslog restart + elif [ -x "$systemctl" ]; then + hasrsyslog=$($systemctl | grep rsyslog | cut -f1 -d' ') + if [ ! -z "$hasrsyslog" ]; then + $systemctl -q --no-block restart "$hasrsyslog" + fi fi fi diff -Nru gce-compute-image-packages-20171129+dfsg1/LICENSE gce-compute-image-packages-20180129+dfsg1/LICENSE --- gce-compute-image-packages-20171129+dfsg1/LICENSE 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/LICENSE 2018-01-30 01:41:05.000000000 +0000 @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2013 Google Inc. + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff -Nru gce-compute-image-packages-20171129+dfsg1/setup.py gce-compute-image-packages-20180129+dfsg1/setup.py --- gce-compute-image-packages-20171129+dfsg1/setup.py 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/setup.py 2018-01-30 01:41:05.000000000 +0000 @@ -32,7 +32,7 @@ packages=setuptools.find_packages(), scripts=glob.glob('scripts/*'), url='https://github.com/GoogleCloudPlatform/compute-image-packages', - version='2.7.2', + version='2.7.5', # Entry points create scripts in /usr/bin that call a function. entry_points={ 'console_scripts': [ diff -Nru gce-compute-image-packages-20171129+dfsg1/specs/google-compute-engine.spec gce-compute-image-packages-20180129+dfsg1/specs/google-compute-engine.spec --- gce-compute-image-packages-20171129+dfsg1/specs/google-compute-engine.spec 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/specs/google-compute-engine.spec 2018-01-30 01:41:05.000000000 +0000 @@ -18,7 +18,7 @@ %endif Name: google-compute-engine -Version: 2.7.2 +Version: 2.7.5 Release: 1%{?dist} Summary: Google Compute Engine guest environment. License: ASL 2.0 diff -Nru gce-compute-image-packages-20171129+dfsg1/specs/python-google-compute-engine.spec gce-compute-image-packages-20180129+dfsg1/specs/python-google-compute-engine.spec --- gce-compute-image-packages-20171129+dfsg1/specs/python-google-compute-engine.spec 2017-11-29 19:17:58.000000000 +0000 +++ gce-compute-image-packages-20180129+dfsg1/specs/python-google-compute-engine.spec 2018-01-30 01:41:05.000000000 +0000 @@ -18,7 +18,7 @@ %endif Name: python-google-compute-engine -Version: 2.7.2 +Version: 2.7.5 Release: 1%{?dist} Summary: Google Compute Engine python library License: ASL 2.0