summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-04-08 15:41:08 +0100
committerColin Watson <cjwatson@debian.org>2017-04-08 15:41:08 +0100
commit50a7f434b3dbf64265ba8ba28b49ef01e346fb8a (patch)
tree71266e7429726e418ba2c5e2570c8195d1b9f554
parent4a1f57fc5a6c8acd1dcd20efb866b623ff403ff9 (diff)
Adjust OpenSSL dependencies for openssh-client-ssh1 too.
-rwxr-xr-xdebian/adjust-openssl-dependencies2
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies
index 5113ac164..b9799c410 100755
--- a/debian/adjust-openssl-dependencies
+++ b/debian/adjust-openssl-dependencies
@@ -3,6 +3,7 @@
3# Must be run after dpkg-shlibdeps. 3# Must be run after dpkg-shlibdeps.
4 4
5client=debian/openssh-client.substvars 5client=debian/openssh-client.substvars
6client_ssh1=debian/openssh-client-ssh1.substvars
6server=debian/openssh-server.substvars 7server=debian/openssh-server.substvars
7 8
8libssl_version="$(dpkg-query -W libssl1.0-dev 2>/dev/null | cut -f2)" 9libssl_version="$(dpkg-query -W libssl1.0-dev 2>/dev/null | cut -f2)"
@@ -19,6 +20,7 @@ libssl_package="$(sed -n 's/.*[= ]\(libssl[0-9][a-z0-9+.-]*\).*/\1/p' "$client")
19if [ "$libssl_package" ]; then 20if [ "$libssl_package" ]; then
20 new_dep="$libssl_package (>= $libssl_version)" 21 new_dep="$libssl_package (>= $libssl_version)"
21 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client" 22 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client"
23 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_ssh1"
22 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server" 24 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server"
23fi 25fi
24 26
diff --git a/debian/changelog b/debian/changelog
index c40a80c02..ee74a80d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:7.5p1-3) UNRELEASED; urgency=medium
2 2
3 * Fix debian/adjust-openssl-dependencies to account for preferring 3 * Fix debian/adjust-openssl-dependencies to account for preferring
4 libssl1.0-dev. 4 libssl1.0-dev.
5 * Adjust OpenSSL dependencies for openssh-client-ssh1 too.
5 6
6 -- Colin Watson <cjwatson@debian.org> Sat, 08 Apr 2017 15:39:13 +0100 7 -- Colin Watson <cjwatson@debian.org> Sat, 08 Apr 2017 15:39:13 +0100
7 8