diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:21:32 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:21:32 +0000 |
| commit | f6202465947cc7b307729aa1dec7f81fa41c7ea6 (patch) | |
| tree | a6a6132df95f51c8480c59b75da314bcebece0a8 | |
| parent | Releasing progress-linux version 1:9.7p1-1~progress7.99u1. (diff) | |
| download | openssh-f6202465947cc7b307729aa1dec7f81fa41c7ea6.tar.xz openssh-f6202465947cc7b307729aa1dec7f81fa41c7ea6.zip | |
Merging debian version 1:9.7p1-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e025dc7..a794180 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openssh (1:9.7p1-2) unstable; urgency=medium + + [ Simon McVittie ] + * d/control, d/rules: Disable ssh-askpass-gnome on 32-bit, except i386 + (closes: #1066847). + + -- Colin Watson <cjwatson@debian.org> Thu, 14 Mar 2024 11:45:12 +0000 + openssh (1:9.7p1-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index c21abfb..3d4f16f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 13.1~), libaudit-dev [linux-any], libedit-dev, libfido2-dev (>= 1.5.0) [linux-any], - libgtk-3-dev <!pkg.openssh.nognome>, + libgtk-3-dev [!armel !armhf !hppa !m68k !powerpc !sh4] <!pkg.openssh.nognome>, libkrb5-dev | heimdal-dev, libpam0g-dev | libpam-dev, libselinux1-dev [linux-any], diff --git a/debian/rules b/debian/rules index 6184bef..f3fa87f 100755 --- a/debian/rules +++ b/debian/rules @@ -108,6 +108,10 @@ ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) BUILD_PACKAGES += -Nopenssh-tests endif +ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) + BUILD_PACKAGES += -Nssh-askpass-gnome +endif + %: dh $@ --with=runit $(BUILD_PACKAGES) @@ -132,9 +136,11 @@ 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 +ifneq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) 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) endif +endif override_dh_auto_build-indep: |