[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#314289: to fix problem, reenable POSIX_THREADS (patch included)



Tags: patch

Disabling POSIX_THREADS was the problem.  Here is a patch that reenables
them (which will reopen other, less important bugs).

A wiser head than mine will have to find out what differs between the
threaded and non-threaded versions which causes this logging in problem.

Since the main bug closed by getting rid of threads was a "policy
violation", I recommend that "policy" be reconsidered.

***********************************************
--- openssh-4.1p1/debian/rules	2005-07-21 20:49:16.000000000 -0700
+++ openssh-fixed/debian/rules	2005-07-21 20:24:10.000000000 -0700
@@ -59,8 +59,11 @@

# SELinux support?
ifeq ($(DEB_HOST_ARCH_OS),linux)
SELINUX := --with-selinux
+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/[^-]*-//')
@@ -78,10 +81,12 @@
	perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h
endif
	# Debian's /var/log/btmp has inappropriate permissions.
	perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' 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 -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""'
+	$(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DUNSUPPORTED_POSIX_THREADS_HACK -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""'
	# 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'; \
	elif [ -f /usr/include/gnome-1.0/gnome.h ]; then \

**************** END OF PATCH *****************

--
It's not true unless it makes you laugh, but you don't understand it until it makes you weep.

Eukleia: Jonathan Walther
Address: 5690 Pioneer Ave, Burnaby, BC  V5H2X6 (Canada)
Contact: 604-430-4973
Website: http://reactor-core.org/
Puritan: Purity of faith, Purity of doctrine
Puritan: Sola Scriptura, Tota Scriptura

     Love is a sharp sword.  Hold it by the right end.

Attachment: signature.asc
Description: Digital signature


Reply to: