4 files changed, 18 insertions, 6 deletions

diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies
index 5113ac164..cd740a8e1 100755
--- a/debian/adjust-openssl-dependencies
+++ b/debian/adjust-openssl-dependencies
@@ -28,8 +28,12 @@ server_udeb=debian/openssh-server-udeb.substvars
 libcrypto_package="$(sed -n 's/.*[= ]\(libcrypto[0-9][a-z0-9+.-]*\).*/\1/p' "$client_udeb")"
 if [ "$libcrypto_package" ]; then
         new_dep="$libcrypto_package (>= $libssl_version)"
-        sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_udeb"
-        sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server_udeb"
+        if [ -e "$client_udeb" ]; then
+                sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_udeb"
+        fi
+        if [ -e "$server_udeb" ]; then
+                sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server_udeb"
+        fi
 fi
 
 exit 0
diff --git a/debian/changelog b/debian/changelog
index 0ac214383..f7a823c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:7.6p1-3) UNRELEASED; urgency=medium
     openssh-server will preserve existing configuration, and new
     installations should just enable GSSAPIAuthentication and
     GSSAPIKeyExchange in sshd_config (closes: #878626).
+  * Support the "noudeb" build profile.
 
   [ Anders Kaseorg ]
   * debian/systemd/ssh-agent.service: Add missing dbus dependency.
diff --git a/debian/control b/debian/control
index 19023eae3..7933738d6 100644
--- a/debian/control
+++ b/debian/control
@@ -182,6 +182,7 @@ Description: interactive X program to prompt users for a passphrase for ssh-add
  provided to add to your choice and/or confusion.
 
 Package: openssh-client-udeb
+Build-Profiles: <!noudeb>
 Package-Type: udeb
 Section: debian-installer
 Priority: optional
@@ -196,6 +197,7 @@ Description: secure shell client for the Debian installer
  This package provides the ssh client for use in debian-installer.
 
 Package: openssh-server-udeb
+Build-Profiles: <!noudeb>
 Package-Type: udeb
 Section: debian-installer
 Priority: optional
diff --git a/debian/rules b/debian/rules
index 734ab9c5b..225655612 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,17 +132,20 @@ override_dh_autoreconf-indep:
 
 override_dh_auto_configure-arch:
         dh_auto_configure -Bdebian/build-deb -- $(confflags)
+ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
         dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb)
-
-override_dh_auto_configure-indep:
-
-override_dh_auto_build-arch:
         # Avoid libnsl linkage. Ugh.
         perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status
         cd debian/build-udeb && ./config.status
+endif
 
+override_dh_auto_configure-indep:
+
+override_dh_auto_build-arch:
         $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
+ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
         $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
+endif
 
 ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),)
         $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
@@ -180,8 +183,10 @@ override_dh_install-arch:
         rm -f debian/tmp/etc/ssh/sshd_config
 
         dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
+ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
         dh_install -popenssh-client-udeb -popenssh-server-udeb \
                 --sourcedir=debian/build-udeb
+endif
 
         # Remove version control tags to avoid unnecessary conffile
         # resolution steps for administrators.