diff options
-rwxr-xr-x | debian/adjust-openssl-dependencies | 8 | ||||
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 13 |
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 | |||
28 | libcrypto_package="$(sed -n 's/.*[= ]\(libcrypto[0-9][a-z0-9+.-]*\).*/\1/p' "$client_udeb")" | 28 | libcrypto_package="$(sed -n 's/.*[= ]\(libcrypto[0-9][a-z0-9+.-]*\).*/\1/p' "$client_udeb")" |
29 | if [ "$libcrypto_package" ]; then | 29 | if [ "$libcrypto_package" ]; then |
30 | new_dep="$libcrypto_package (>= $libssl_version)" | 30 | new_dep="$libcrypto_package (>= $libssl_version)" |
31 | sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_udeb" | 31 | if [ -e "$client_udeb" ]; then |
32 | sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server_udeb" | 32 | sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_udeb" |
33 | fi | ||
34 | if [ -e "$server_udeb" ]; then | ||
35 | sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server_udeb" | ||
36 | fi | ||
33 | fi | 37 | fi |
34 | 38 | ||
35 | exit 0 | 39 | 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 | |||
5 | openssh-server will preserve existing configuration, and new | 5 | openssh-server will preserve existing configuration, and new |
6 | installations should just enable GSSAPIAuthentication and | 6 | installations should just enable GSSAPIAuthentication and |
7 | GSSAPIKeyExchange in sshd_config (closes: #878626). | 7 | GSSAPIKeyExchange in sshd_config (closes: #878626). |
8 | * Support the "noudeb" build profile. | ||
8 | 9 | ||
9 | [ Anders Kaseorg ] | 10 | [ Anders Kaseorg ] |
10 | * debian/systemd/ssh-agent.service: Add missing dbus dependency. | 11 | * 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 | |||
182 | provided to add to your choice and/or confusion. | 182 | provided to add to your choice and/or confusion. |
183 | 183 | ||
184 | Package: openssh-client-udeb | 184 | Package: openssh-client-udeb |
185 | Build-Profiles: <!noudeb> | ||
185 | Package-Type: udeb | 186 | Package-Type: udeb |
186 | Section: debian-installer | 187 | Section: debian-installer |
187 | Priority: optional | 188 | Priority: optional |
@@ -196,6 +197,7 @@ Description: secure shell client for the Debian installer | |||
196 | This package provides the ssh client for use in debian-installer. | 197 | This package provides the ssh client for use in debian-installer. |
197 | 198 | ||
198 | Package: openssh-server-udeb | 199 | Package: openssh-server-udeb |
200 | Build-Profiles: <!noudeb> | ||
199 | Package-Type: udeb | 201 | Package-Type: udeb |
200 | Section: debian-installer | 202 | Section: debian-installer |
201 | Priority: optional | 203 | 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: | |||
132 | 132 | ||
133 | override_dh_auto_configure-arch: | 133 | override_dh_auto_configure-arch: |
134 | dh_auto_configure -Bdebian/build-deb -- $(confflags) | 134 | dh_auto_configure -Bdebian/build-deb -- $(confflags) |
135 | ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) | ||
135 | dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb) | 136 | dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb) |
136 | |||
137 | override_dh_auto_configure-indep: | ||
138 | |||
139 | override_dh_auto_build-arch: | ||
140 | # Avoid libnsl linkage. Ugh. | 137 | # Avoid libnsl linkage. Ugh. |
141 | perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status | 138 | perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status |
142 | cd debian/build-udeb && ./config.status | 139 | cd debian/build-udeb && ./config.status |
140 | endif | ||
143 | 141 | ||
142 | override_dh_auto_configure-indep: | ||
143 | |||
144 | override_dh_auto_build-arch: | ||
144 | $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' | 145 | $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' |
146 | ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) | ||
145 | $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen | 147 | $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen |
148 | endif | ||
146 | 149 | ||
147 | ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),) | 150 | ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),) |
148 | $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) | 151 | $(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: | |||
180 | rm -f debian/tmp/etc/ssh/sshd_config | 183 | rm -f debian/tmp/etc/ssh/sshd_config |
181 | 184 | ||
182 | dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing | 185 | dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing |
186 | ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) | ||
183 | dh_install -popenssh-client-udeb -popenssh-server-udeb \ | 187 | dh_install -popenssh-client-udeb -popenssh-server-udeb \ |
184 | --sourcedir=debian/build-udeb | 188 | --sourcedir=debian/build-udeb |
189 | endif | ||
185 | 190 | ||
186 | # Remove version control tags to avoid unnecessary conffile | 191 | # Remove version control tags to avoid unnecessary conffile |
187 | # resolution steps for administrators. | 192 | # resolution steps for administrators. |