From 6103443e4a6e83a929fcd35d110caa0f54bc4329 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 May 2005 22:31:57 +0000 Subject: Take upstream's hint and disable the unsupported USE_POSIX_THREADS (closes: #295757, #308868, and possibly others; may open other bugs). Use PAM password authentication to avoid #278394. In future I may provide two sets of binaries built with and without this option, since it seems I can't win. --- debian/changelog | 5 +++++ debian/rules | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9cd51fc9a..427728b50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ openssh (1:4.1p1-1) UNRELEASED; urgency=low * New upstream release. - Normalise socket addresses returned by get_remote_hostname(), fixing 4-in-6 mapping issues with AllowUsers et al (closes: #192234). + * Take upstream's hint and disable the unsupported USE_POSIX_THREADS + (closes: #295757, #308868, and possibly others; may open other bugs). + Use PAM password authentication to avoid #278394. In future I may + provide two sets of binaries built with and without this option, since + it seems I can't win. * openssh-server Suggests: rssh (closes: #233012). -- Colin Watson Thu, 26 May 2005 13:51:50 +0100 diff --git a/debian/rules b/debian/rules index b5014be02..cbad70815 100755 --- a/debian/rules +++ b/debian/rules @@ -49,12 +49,6 @@ ifeq ($(DEB_HOST_ARCH_OS),gnu) FORCE_LIBS := LIBS=-lcrypt endif -ifeq ($(DEB_HOST_ARCH_OS),linux) -LINK_PTHREAD := -pthread -else -LINK_PTHREAD := -lpthread -endif - # Change the version string to include the Debian version SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') @@ -68,10 +62,8 @@ build-deb-stamp: # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h - # Supply pthread linkage for just those binaries linked to PAM. - perl -pi -e 's/^(LIBPAM=.*)/$$1 $(LINK_PTHREAD)/' build-deb/Makefile - $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DUSE_POSIX_THREADS -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' SSH_KEYSIGN='/usr/lib/ssh-keysign' + $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' SSH_KEYSIGN='/usr/lib/ssh-keysign' # Support building on Debian 3.0 (with GNOME 1.4) and later. if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \ $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall'; \ -- cgit v1.2.3