diff -Naur openssh-4.1p1.debian/Makefile.in openssh-4.1p1/Makefile.in --- openssh-4.1p1.debian/Makefile.in 2005-07-15 15:08:08.999595656 +1000 +++ openssh-4.1p1/Makefile.in 2005-07-15 15:01:38.637321776 +1000 @@ -121,13 +121,14 @@ $(SSHDOBJS): Makefile.in config.h .c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + $(CC) $(PICFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< LIBCOMPAT=openbsd-compat/libopenbsd-compat.a $(LIBCOMPAT): always (cd openbsd-compat && $(MAKE)) always: +libssh.a: PICFLAGS=-fPIC libssh.a: $(LIBSSH_OBJS) $(AR) rv $@ $(LIBSSH_OBJS) $(RANLIB) $@ diff -Naur openssh-4.1p1.debian/debian/changelog openssh-4.1p1/debian/changelog --- openssh-4.1p1.debian/debian/changelog 2005-07-15 15:08:09.123573935 +1000 +++ openssh-4.1p1/debian/changelog 2005-07-15 14:43:50.519811349 +1000 @@ -1,3 +1,11 @@ +openssh (1:4.1p1-6.1) unstable; urgency=low + + * Add smartcard support. + * Add libssh-dev, for libpam-opensc + * Remove gnome, udeb cruft to simplify local build. + + -- Brendan O'Dea Fri, 15 Jul 2005 13:10:12 +1000 + openssh (1:4.1p1-6) unstable; urgency=low * Fix one-character typo that meant the binaries in openssh-client and diff -Naur openssh-4.1p1.debian/debian/control openssh-4.1p1/debian/control --- openssh-4.1p1.debian/debian/control 2005-07-15 15:08:09.127573234 +1000 +++ openssh-4.1p1/debian/control 2005-07-15 14:43:50.522810831 +1000 @@ -2,7 +2,7 @@ Section: net Priority: standard Maintainer: Matthew Vernon -Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc] +Build-Depends: libwrap0-dev, zlib1g-dev, libssl-dev, libpam0g-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libopensc1-dev Standards-Version: 3.6.1 Uploaders: Colin Watson @@ -63,52 +63,11 @@ In some countries it may be illegal to use any encryption at all without a special permit. -Package: ssh -Priority: extra -Architecture: all -Depends: openssh-client, openssh-server -Description: Secure shell client and server (transitional package) - This is a transitional package depending on both the OpenSSH client and - the OpenSSH server, which are now in separate packages. You may remove - it once the upgrade is complete and nothing depends on it. - -Package: ssh-askpass-gnome -Section: gnome -Priority: optional -Architecture: any -Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5 -Replaces: ssh (<< 1:3.5p1-3) -Provides: ssh-askpass -Description: under X, asks user for a passphrase for ssh-add - This has been split out of the main ssh package, so that the ssh will - not need to depend upon the Gnome libraries. - . - You probably want the ssh-askpass package instead, but this is - provided to add to your choice and/or confusion. - -Package: openssh-client-udeb -Section: debian-installer -Priority: optional -Architecture: any -Depends: ${shlibs:Depends}, libnss-files-udeb -XB-Installer-Menu-Item: 999 -Description: Secure shell client for the Debian installer - This is the portable version of OpenSSH, a free implementation of - the Secure Shell protocol as specified by the IETF secsh working - group. - . - This package provides the ssh client for use in debian-installer. - -Package: openssh-server-udeb -Section: debian-installer +Package: libssh-dev Priority: optional +Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, libnss-files-udeb -Description: Secure shell server for the Debian installer - This is the portable version of OpenSSH, a free implementation of - the Secure Shell protocol as specified by the IETF secsh working - group. - . - This package provides the sshd server for use in debian-installer. - Since it is expected to be used in specialized situations (e.g. S/390 - installs with no console), it does not provide any configuration. +Description: Secure shell library + Static library containing routines for openssh. Currently the only + header file included are authfd.h, key.h and buffer.h which are used + by applications that communicate with ssh-agent. diff -Naur openssh-4.1p1.debian/debian/gnome-ssh-askpass.1 openssh-4.1p1/debian/gnome-ssh-askpass.1 --- openssh-4.1p1.debian/debian/gnome-ssh-askpass.1 2005-07-15 15:08:09.171565526 +1000 +++ openssh-4.1p1/debian/gnome-ssh-askpass.1 1970-01-01 10:00:00.000000000 +1000 @@ -1,51 +0,0 @@ -.TH GNOME-SSH-ASKPASS 1 -.SH NAME -gnome\-ssh\-askpass \- prompts a user for a passphrase using GNOME -.SH SYNOPSIS -.B gnome\-ssh\-askpass -.SH DESCRIPTION -.B gnome\-ssh\-askpass -is a GNOME-based passphrase dialog for use with OpenSSH. -It is intended to be called by the -.BR ssh\-add (1) -program and not invoked directly. -It allows -.BR ssh\-add (1) -to obtain a passphrase from a user, even if not connected to a terminal -(assuming that an X display is available). -This happens automatically in the case where -.B ssh\-add -is invoked from one's -.B ~/.xsession -or as one of the GNOME startup programs, for example. -.PP -In order to be called automatically by -.BR ssh\-add , -.B gnome\-ssh\-askpass -should be installed as -.IR /usr/bin/ssh\-askpass . -.SH "ENVIRONMENT VARIABLES" -The following environment variables are recognized: -.TP -.I GNOME_SSH_ASKPASS_GRAB_SERVER -Causes -.B gnome\-ssh\-askpass -to grab the X server before asking for a passphrase. -.TP -.I GNOME_SSH_ASKPASS_GRAB_POINTER -Causes -.B gnome\-ssh\-askpass -to grab the mouse pointer using -.IR gdk_pointer_grab () -before asking for a passphrase. -.PP -Regardless of whether either of these environment variables is set, -.B gnome\-ssh\-askpass -will grab the keyboard using -.IR gdk_keyboard_grab (). -.SH AUTHOR -This manual page was written by Colin Watson -for the Debian system (but may be used by others). -It was based on that for -.B x11\-ssh\-askpass -by Philip Hands. diff -Naur openssh-4.1p1.debian/debian/libssh-dev.dirs openssh-4.1p1/debian/libssh-dev.dirs --- openssh-4.1p1.debian/debian/libssh-dev.dirs 1970-01-01 10:00:00.000000000 +1000 +++ openssh-4.1p1/debian/libssh-dev.dirs 2005-07-15 14:43:50.500814625 +1000 @@ -0,0 +1,2 @@ +usr/include/ssh +usr/lib diff -Naur openssh-4.1p1.debian/debian/libssh-dev.links openssh-4.1p1/debian/libssh-dev.links --- openssh-4.1p1.debian/debian/libssh-dev.links 1970-01-01 10:00:00.000000000 +1000 +++ openssh-4.1p1/debian/libssh-dev.links 2005-07-15 14:43:50.499814798 +1000 @@ -0,0 +1 @@ +usr/share/doc/openssh-client usr/share/doc/libssh-dev diff -Naur openssh-4.1p1.debian/debian/openssh-client-udeb.dirs openssh-4.1p1/debian/openssh-client-udeb.dirs --- openssh-4.1p1.debian/debian/openssh-client-udeb.dirs 2005-07-15 15:08:09.098578314 +1000 +++ openssh-4.1p1/debian/openssh-client-udeb.dirs 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -usr/bin diff -Naur openssh-4.1p1.debian/debian/openssh-client-udeb.isinstallable openssh-4.1p1/debian/openssh-client-udeb.isinstallable --- openssh-4.1p1.debian/debian/openssh-client-udeb.isinstallable 2005-07-15 15:08:09.180563950 +1000 +++ openssh-4.1p1/debian/openssh-client-udeb.isinstallable 1970-01-01 10:00:00.000000000 +1000 @@ -1,10 +0,0 @@ -#! /bin/sh - -# This is a hack to arrange for openssh-client-udeb to show up as a -# retrievable debian-installer component in expert mode (due to the -# Installer-Menu-Item: control field) while not actually appearing on the -# d-i main menu. See: -# -# http://lists.debian.org/debian-boot/2004/07/msg01207.html - -exit 1 diff -Naur openssh-4.1p1.debian/debian/openssh-server-udeb.dirs openssh-4.1p1/debian/openssh-server-udeb.dirs --- openssh-4.1p1.debian/debian/openssh-server-udeb.dirs 2005-07-15 15:08:09.097578489 +1000 +++ openssh-4.1p1/debian/openssh-server-udeb.dirs 1970-01-01 10:00:00.000000000 +1000 @@ -1,3 +0,0 @@ -usr/bin -usr/sbin -var/run/sshd diff -Naur openssh-4.1p1.debian/debian/rules openssh-4.1p1/debian/rules --- openssh-4.1p1.debian/debian/rules 2005-07-15 15:08:09.103577438 +1000 +++ openssh-4.1p1/debian/rules 2005-07-15 14:55:04.863542459 +1000 @@ -27,9 +27,6 @@ endif endif -CLIENT_UDEB := openssh-client-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb -SERVER_UDEB := openssh-server-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb - ifeq (,$(wildcard /usr/bin/po2debconf)) PO2DEBCONF := no MINDEBCONFVER := 0.5 @@ -57,21 +54,16 @@ FORCE_LIBS := LIBS=-lcrypt endif -# SELinux support? -ifeq ($(DEB_HOST_ARCH_OS),linux) -SELINUX := --with-selinux -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/[^-]*-//') -build: build-deb build-udeb +build: build-deb build-deb: build-deb-stamp build-deb-stamp: dh_testdir mkdir -p build-deb - cd build-deb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit $(SELINUX) + cd build-deb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-opensc ifeq ($(DEB_HOST_ARCH_OS),linux) # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). @@ -81,32 +73,13 @@ perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h $(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)\""' - # 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 \ - $(MAKE) -C contrib gnome-ssh-askpass1 CC='gcc $(OPTFLAGS) -g -Wall'; \ - fi touch build-deb-stamp -build-udeb: build-udeb-stamp -build-udeb-stamp: - dh_testdir - mkdir -p build-udeb - cd build-udeb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --without-xauth --with-default-path=/usr/local/bin:/bin:/usr/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper - # Debian's /var/log/btmp has inappropriate permissions. - perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h - # Avoid libnsl linkage. Ugh. - perl -pi -e 's/ +-lnsl//' build-udeb/config.status - cd build-udeb && ./config.status - $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' ssh scp sftp sshd ssh-keygen - touch build-udeb-stamp - clean: dh_testdir - rm -f build-deb-stamp build-udeb-stamp - rm -rf build-deb build-udeb + rm -f build-deb-stamp + rm -rf build-deb -$(MAKE) -C contrib clean rm -f config.log ifeq ($(PO2DEBCONF),yes) @@ -125,7 +98,6 @@ mv debian/ssh.pam.new-style debian/ssh.pam; \ fi endif - rm -f debian/ssh-askpass-gnome.png dh_clean install: DH_OPTIONS=-a @@ -153,33 +125,17 @@ install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1 install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5 - if [ -f contrib/gnome-ssh-askpass2 ]; then \ - install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass; \ - elif [ -f contrib/gnome-ssh-askpass1 ]; then \ - install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass; \ - fi - install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1 - uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue - install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0 install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1 install -o root -g root debian/openssh-server.init debian/openssh-server/etc/init.d/ssh install -o root -g root -m 644 debian/openssh-server.default debian/openssh-server/etc/default/ssh - install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh - install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp - install -m 755 build-udeb/sftp debian/openssh-client-udeb/usr/bin/sftp - install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd - install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen - # Build architecture-independent files here. -binary-indep: binary-ssh +binary-indep: # Build architecture-dependent files here. -binary-arch: binary-openssh-client binary-openssh-server -binary-arch: binary-ssh-askpass-gnome -binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb +binary-arch: binary-openssh-client binary-openssh-server binary-libssh-dev binary-openssh-client: DH_OPTIONS=-popenssh-client binary-openssh-client: build install @@ -237,14 +193,13 @@ dh_md5sums dh_builddeb -binary-ssh: DH_OPTIONS=-pssh -binary-ssh: build install +binary-libssh-dev: DH_OPTIONS=-plibssh-dev +binary-libssh-dev: build install dh_testdir dh_testroot - dh_installdocs - mv debian/ssh/usr/share/doc/ssh debian/ssh/usr/share/doc/openssh-client - rm -f debian/ssh/usr/share/doc/openssh-client/copyright dh_link + cp build-deb/libssh.a build-deb/openbsd-compat/libopenbsd-compat.a debian/libssh-dev/usr/lib + cp key.h buffer.h authfd.h debian/libssh-dev/usr/include/ssh dh_compress dh_fixperms dh_installdeb @@ -252,53 +207,8 @@ dh_md5sums dh_builddeb -binary-ssh-askpass-gnome: DH_OPTIONS=-pssh-askpass-gnome -binary-ssh-askpass-gnome: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples debian/ssh-askpass-gnome.desktop - dh_installchangelogs ChangeLog - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-openssh-client-udeb: DH_OPTIONS=-popenssh-client-udeb -binary-openssh-client-udeb: build install - dh_testdir - dh_testroot - dh_strip - dh_compress - dh_fixperms - dh_installdeb - install -p -o root -g root -m 755 debian/openssh-client-udeb.isinstallable debian/openssh-client-udeb/DEBIAN/isinstallable - dh_shlibdeps - dh_gencontrol -- -fdebian/files~ - dpkg-distaddfile $(CLIENT_UDEB) debian-installer optional - dh_builddeb --filename=$(CLIENT_UDEB) - -binary-openssh-server-udeb: DH_OPTIONS=-popenssh-server-udeb -binary-openssh-server-udeb: build install - dh_testdir - dh_testroot - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol -- -fdebian/files~ - dpkg-distaddfile $(SERVER_UDEB) debian-installer optional - dh_builddeb --filename=$(SERVER_UDEB) - binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install -.PHONY: build-deb build-udeb -.PHONY: binary-openssh-client binary-openssh-server binary-ssh -.PHONY: binary-ssh-askpass-gnome -.PHONY: binary-openssh-client-udeb binary-openssh-server-udeb +.PHONY: build-deb +.PHONY: binary-openssh-client binary-openssh-server binary-libssh-dev diff -Naur openssh-4.1p1.debian/debian/ssh-askpass-gnome.copyright openssh-4.1p1/debian/ssh-askpass-gnome.copyright --- openssh-4.1p1.debian/debian/ssh-askpass-gnome.copyright 2005-07-15 15:08:09.099578139 +1000 +++ openssh-4.1p1/debian/ssh-askpass-gnome.copyright 1970-01-01 10:00:00.000000000 +1000 @@ -1,44 +0,0 @@ -This package contains a Gnome based implementation of ssh-askpass -written by Damien Miller. - -It is split out from the main package to isolate the dependency on the -Gnome and X11 libraries. - -It was packaged for Debian by Philip Hands . - -Copyright: - -/* -** -** GNOME ssh passphrase requestor -** -** Damien Miller -** -** Copyright 1999 Internet Business Solutions -** -** Permission is hereby granted, free of charge, to any person -** obtaining a copy of this software and associated documentation -** files (the "Software"), to deal in the Software without -** restriction, including without limitation the rights to use, copy, -** modify, merge, publish, distribute, sublicense, and/or sell copies -** of the Software, and to permit persons to whom the Software is -** furnished to do so, subject to the following conditions: -** -** The above copyright notice and this permission notice shall be -** included in all copies or substantial portions of the Software. -** -** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -** KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -** WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE -** AND NONINFRINGEMENT. IN NO EVENT SHALL DAMIEN MILLER OR INTERNET -** BUSINESS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -** OR OTHER DEALINGS IN THE SOFTWARE. -** -** Except as contained in this notice, the name of Internet Business -** Solutions shall not be used in advertising or otherwise to promote -** the sale, use or other dealings in this Software without prior -** written authorization from Internet Business Solutions. -** -*/ diff -Naur openssh-4.1p1.debian/debian/ssh-askpass-gnome.desktop openssh-4.1p1/debian/ssh-askpass-gnome.desktop --- openssh-4.1p1.debian/debian/ssh-askpass-gnome.desktop 2005-07-15 15:08:09.104577263 +1000 +++ openssh-4.1p1/debian/ssh-askpass-gnome.desktop 1970-01-01 10:00:00.000000000 +1000 @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=SSH AskPass -GenericName=ssh-add -Comment=Enter passphrase to authenticate to the ssh agent -Exec=/usr/bin/ssh-add -TryExec=ssh-add -Terminal=false -Type=Application -Icon=ssh-askpass-gnome.png -Categories=Application;Network; diff -Naur openssh-4.1p1.debian/debian/ssh-askpass-gnome.dirs openssh-4.1p1/debian/ssh-askpass-gnome.dirs --- openssh-4.1p1.debian/debian/ssh-askpass-gnome.dirs 2005-07-15 15:08:09.100577964 +1000 +++ openssh-4.1p1/debian/ssh-askpass-gnome.dirs 1970-01-01 10:00:00.000000000 +1000 @@ -1,4 +0,0 @@ -usr/lib/openssh -usr/share/man/man1 -usr/share/applications -usr/share/pixmaps diff -Naur openssh-4.1p1.debian/debian/ssh-askpass-gnome.png.uue openssh-4.1p1/debian/ssh-askpass-gnome.png.uue --- openssh-4.1p1.debian/debian/ssh-askpass-gnome.png.uue 2005-07-15 15:08:09.132572358 +1000 +++ openssh-4.1p1/debian/ssh-askpass-gnome.png.uue 1970-01-01 10:00:00.000000000 +1000 @@ -1,158 +0,0 @@ -begin 644 ssh-askpass-gnome.png -MB5!.1PT*&@H````-24A$4@```(0```!S"`,```!N#5HT```#`%!,5$7_____ -M__\("`@0$!`8&!@A(2$Y.3E"0D)*2DI24E):6EIC8V-K:VMSWN$A(2, -MC(R4E)2QH3OUHSGSH2,>TI".2&M -MC#%*.0A",0!:0@!:4CE22C&QGNEE%HQ*1",M0#GO0#W -MQ@#_S@#_[YQ[SH36QGMS:T+GUH1K8SE:4BES8QAK6@@Q*0!:2@!C -M4@!K6@",P"]G`#&I0#OQ@#WS@#_U@",A%)*0A!S8P@Y,0!S8P#GQ@#O -MS@#_YTI:4AA22A#_W@#.QH3W[YS6SH3_YP"4E(P8&!#__Z4I*1@A(1`0$``8 -M&``A(0`I*0!SA!!SA`![C"%[C#%SC!![E#E[E$I[G%(Q.2F$G&N$I7.$I7M* -M4DHI,2F$K92,K9R$K9R,M:6$C(SO__]C:VM26EI:8V-"2DJ$E)0Q0D(0&!@` -M"`B, -MQM[6Y^^]SM:4I:TY2E)KC)QCA)2EWO>4QMXQ0DI"8W/&UMZ,O=9:>XQ2 -M[_\Y -M0DH8(2D8*3FMM;VEK;6,E)QKY_<0(4((&#D`"!@($"$0&#&,C)1SMW3W6K)&[BUO#N[??L\,6"-)D;^]V;V9<+^TF -M6X"5K-OU7_^H_K1VV]`_#"F&8""`)(`N(,D1!(%R#$.R4P-M0K=%:3E.X"22 -M4/&F[\SN'6F)LDA:18H.0-[R;F_WF7?>]WF?]YUEK?;_;;SSRP8@!G]C<^?_ -MVL>O_\25!W%\4Z=__.IMSRUON\(8#O'%39T_<>UW_^LWEW]EJW=;^\>)\=%Q -M_OZF+C/\NQ]^]Y7KG]DBB.4C:_[@RZ.CO>JQ35UFXM]^]K-7]E^]11`O\H-K -M0$R,CMZ=?;+6R^T?`PCX^\`0"1![($3F^5JW.?G2)2ZSN,RW -MA.&P],,#Q5_*UZ5]M=J/&N?!)Y<%,ER\6=MWS8NUUZ_.U_(6OQ2(+8Z#?+Z\ -M;BR7_]C)6NU[L_>\#%YR\O!P*I@]5UL$(YP,]9/BY/([^R -M3H:H^/G!V@)__Z5CMWK#I3,\G/*"@+8:X>#,VT-G(``LR6^\JQS\L`MN9;SV -MN'887@XIR.VLG!UR?J8P2*[V^QZE`0DH\=PDXGX.2W!P`CRF]G*:7FD,M1.[ -MK1!>#BH^)I[5;-JNJ;&NRG!0#4I9+R0Y/[>XO[BG'CW"3C:8>33%/LUA`W1:L1T"P']IS2H-Z!A].\#:.@;QJAQ;6 -MO?">9__^I\\<6?>C"\>^^2KJCP/%OG'&C3GO`08B;AG0-,%!PP@H-KO2%#AN -MH$R9I0%#/R*^'UKWRGO_\X0__8V)CCKO(3Y8'RS"A -MM,`![G<2S`Q-@B(-!S-U5K@'9I@DV[\-3'&P=GA=$-?]])5_FECWHXO'.Q6* -MDWSOX6T%F/>IC`F($8J=0G$$58!A"-.> -MQ@%U4@?^H)G?N69;_OH5`'%8,?5SI]_37,9Z;4+]R,%D.Z^348S`ZAB:6!D1 -M(0&;[=``I6$9M!@IG=T?Y>9\VUOEP3G+:W2:/GAA`K?&R/*SV8(G5(8(_,K2 -M;EMGI$1!?2^@==[-Q)^8I`WS%Q#H^U_8*@@S*N72BP.,"8.I84\3MZ&(346Z -M-C(%I?E4GQ,:E&]@2BV>`WN`:Z*TYX<[3N_=MF7]T?^1<)Q2X>G7DCD -MG;"M-15+SAQ,X_(^'L3"!RKCY+GN@=V8I<:TE;=T7@H8OA4=LQ`B]]%30DG` -M)2F&'^*7D\>^YG8&(Y?H:0B;83;B,*8J5@'G]XV>%Y">-F;\)D(B/Q!(930;O -MP%!ZR6`+&&HGSJ4^LW-%\$'0YA:M(@"2A)%@3XDQ]6SJ6_)SR"`IK`FS>1Q$ -MMV:5F5#J@@6M-(H)FMA"X;?G2.W$V=3#I*VT/4)=G<>DQ"`LT0+_]('`X2:T -MC!)L*3;#KN%BU.FRRF:^,B=9'&.:7[\50^SGBR\,4X\RTL@;"8;DU?:K\/=Z -M,H,'%.;-2O-07\W[,&L((PE"#H)2>40)[FU*;R[S/179+XJU-("16>:Z`8XX -M5UL$BUCTW:+[]%6?5NSOGNS87'6R$089(0QEA&TJB* -M3:!`00P!B5*MW1>P?`A`QZT(&SBRM!EEJ*'$2R]]6"87[HX$S(J5RM0SI/<1#7D.D4=;B -MC]T^/?/@-E/HP&CBADVA.+'`)[B(<*"Z$13LZH57L@.VFE@FU4+-@BIY`M)F -M8?1+TV!'!6>$]'KO[=.3D],/[A`&M/G5F^3M$]<(;4]]34U(97#6XXI-1JLO -MWC5[,=``]5QIBEA%,LD)K["-+*!(^=KT].`,[]UY[\9TS7'.;Q$]F2,&*\4T[BKA=GV@#-ID -M+M)8YH^#(9!I@<6)[X[-(^5?J7BGBCNF)Z?EF+EMV"1!>._,?8]L",1+\[>V -MM0<67AZV"5"5"*W,Y':&?*!(["M^@-<&I80R9\6>3,]-WWG'' -M']QQQYTSNT()8F:#IJB]&\:)J>E:IV.:T@-`&3E,,E(&]449(./;TG%GH'P/ -M2@(=DBFA5+_WP?N_^A1;:\ -M(>OFK/0WR\6ER*.LI&CJ.X15@*@`RLPH$GF5HN+F;?S\?\OQ[/N@[L`2.V]ZE@G/4^JPPRI-APZ[$ -M?R=NE7;HZTW!IY@BZ9F$V,KR",15-^@DT/GYO_E"?@F?V'?HT*'Q=D79%C[X -M/%>K=9?$C$#$@7"C*.P@Z8QVY)K!*IX/ -M@#*5:V\$QSQK!>2>YZZZ\3-AOKI!(0428DK7T$<@#9V+XOF_Y -MZ4"-H;KPIXK<&EU^='UJ"_&$^U+]@[A_'[%+-6WJ!T#*-B=!DPL=08 -M?B[R)H0M-0NV=HTP4I]]E@M%UAJ^'P+/L)YR<7]SD?N99%X(`KV,XB/_U^7X;]K<^?.C74P!(4>YVP -MDO`CER1RUI0V(U0B0FL^)=C.(<$7=NZ@BG77 -MVSQ<4DG5HL;$#-/VDX7'@C@MRN(*'+/DP("Y/3EO,W5`+U"WX^+2#C)<6*]P -ML<_[:^-4KF0O];+9':!P(*OO_`SH&YPO70RB]EY];#WL(9PUG)[*E9AELG_O -M12489J>)7&]D)7+M'&$%UG2J)%Y/$3C`JO(M^S8"!&KQ/P($=SVX<^?#WP+? -MBBX.$.&<4%M5:D3$G6\6J:H6H2S#LZ@B!!;GAM3\E,D\&:I]P)3I[3)BB*$1 -M%NL?8$XQLD;DY%\%?777%W???=N=#X&_===Q"E'L.&ZR^G7JN^"ICB'4+DRN -MDHZ4N#9X)*V$)/$<47O2_BB-:`:`&*S&1?F;TD[!OW;G],R?[BKL>Q[YRJ-@ -M"7/XG75`[#NK.8Y#5_&+7BE%+H+0&J35U4IU3UI)Y7I5<(QT)6OK/FYQ%'P0 -M!O72W[]M??/KCW$')-U9$-6`-UVV[GQSTG`2-OSVF:%!(.BH#TR]#PE-M -MO.8VX\@!XL\31J"(_P!-@,+(AW=_\9;?_JT;5$9OOP&Q9*"Q1T&" -MAADC&85ABBHGU[J5M*N<1Y[I)8A6KDA]O0V5>TK70H"W&\///3:X_L:;%`=C -M1TE]DLPJG*^[1_?ZT!E/@%D-(.(."`@_#)$/BJUK85OKXU6?HTBJ&FQ)RL!& -M#S(QZH`Y&SS&JRE&5,(Z!W%Y_^`9G4#YT#9RR-$6B=9'\;;Z1#`B.P)E0AN< -M,BG@6UP9Y)KI:_%HRT?&72<%!S2E&H^8`G=(US!3W.OW;[Y,R= -MO*/U?+7#>D9@Z0$Q^'JMYN\,03Z6N9!2C?@JQF[!\T+K]7&6T4[JM-S5'$T* -MV[;&7$DS['F^AUB6L?ZM8/=@W.ASP[IV]UU0"^Z`1)Q8AC\7/XTU"V)N>1T0 -MM;=3UW/+]@H*O:B/L:VV$Y9),K4&>@':3E9>6#17HU2+1U'2;[9$]8'+OD@V -MR_V17U#2T>;BIWYG>OIV'F=!7[6@G,G=GL56PGEG9'2=DA@`W -M>:0:'4%[?KCN,M@:B -MN4L]1RHP%@^_-#E]&R]Z),.^*XHCA@I^B0?$]G,?M6`UGJG53H5BUR^WF>A3 -MP91SM9)Q)-7U=)2\^P"2(&Q)9;@=!UD]44./"9B&.^ZE*J))&Q2:7.;8'\EI-E6E..JK/-4=/6D8G0XSN8:J:,GJ -M/$KYW5^Z;_)+MVP7G1_.)S[DX3`.^<)63HO#?;RN<,42P4@3(.0\)M+`IF0. -M9CBF5^V,H8%5S1A0*#R''P7.+X3O^APXS(]U/Q8'8-.MS -MBV%;"!7"?-O"U+SLAO%1KJ=\:5]Y"*,M=Y%8J#J5#J9618HL]L`NKNF+O([+ -M$L6'J4/RR`3/0P$-Z@QAHJ4,.Z(FJ4,%Q=S.\/1E,.R#4OA<%3CS?/GTKEAT -MZ@AVF-0XJQ9^9G -M+O>@X(F]RWM&SQ+L7X%$>QCH1UXN,*TR3S"AJA@;JY\>!*34F8Y:1^W9T4Y4 -MJ<2($^F=?A/RB$AN;2?6^?R)#T4@EV!\M+@LNIE'Y]ME'Y%T1B5=#NHHCD6%F;K-C9\;PI3<6 -MEB]OB@O&J[J62TGGB,)#;&P@C@P-,>DI,@NEJXK2$?6!;.EV&VQ$9`%JB*V/ -M)SNY6A<%S^*1#P_/B\?QZ`FC@+3+5.$263_!MF+H3V"YX#*#$3MFHQT9XKB8 -M=45Y$'AVH<)LCA,Q(9SV;ZF01X+ -M12J5>-G1Q;)B''1P8.M9E31,09IFC+,F!^;9E$=4X_L%:>E+"[RO%>#@5N'@ -M3!550TD43076I"U:BTPT?JDOB0VCL(.]`:MJC[XIO0-[ROK/&%U^[-_N++TA -MVC:\C:F5BW[JP)1[3M+UE23P):7B1'&#P)9]"8+]P2R2TDF:0I?((#*V^F!- -M;OY(OAX`W6IQD'24@+Y&U18T,]K4?%JVFS-P3U(7:T"D6ND9-B-2$P<1N`X( -MHD>_/-BL0Y9CD8^>0"J8S77)6T(;JG)?FN(X)7HI=,!I$A+5LXI+((N;6=*P -MA?=8!JQ,G?_>7WW]_)9`3(Q*I+>FW)RG3Y8,14A7[CQ[@LP(:[71 -M$UR/L%L&AL==U99-/>J;@<6!/7#65A-,&HWV\)V#>\_=_/5+R;D/!?%J=?#B -M/9T?@.@ZEUM4N"12>Z"!C3YE.>_[#2E`$=,[H=<7U3IMZ9B$N?#,.2V'&H?/ -M?U]IGYWE8B#W(G4KJ,M=NP]F&.D>DP4$[;?7.0^WY'B'I7 -MHT&BB$?TL,,ARVJC=O714Q_AV;.5JK5SB',]=C.+-S)/@WC%YA0+K(X(&N[Y -M//=9K'J4Q758H+8D;@:*,G97!>WQS?W7P=JQ4'WUS6\U"Z6H#WACKBT>E(#B -M`"8K>K1)@7`.*T`[4Q14A/A(1.:KI&LHZ71+88I,TTTS:4@4XYAK*M@/B:XOA]HN;R%L>;YE)+N;TM\V& -MJ&(2H2ZIEPZ2N:))RBT7%NN>T-<@M%;[00OI/2]>.1!3LBBJ/14_\&+MA16N -M1%!XN2$42;D;5&3I@+CF<0313RG+&_I7AXV,?]3+[?9=4S\1+]N$ -M'$\UA7<]W07MCPA"Q%(,G`]7GE?B.7/0!A^??@@Y6WK([3+CQ-65?U55Y`_"S..0#UX.9V\^ -M=>H,+_2-VX)K"%H\E>?TIZ# -MWQ"A20$$_58GEA[YK]_S;U@'+B0[E:H(?:)CAZ1_S9PC94E\I^/)EJE -MI=Y\8->5!W'1.$,462J=EO])]/$B.A0````!)14Y$KD)@@@`` -` -end diff -Naur openssh-4.1p1.debian/debian/ssh-askpass-gnome.postinst openssh-4.1p1/debian/ssh-askpass-gnome.postinst --- openssh-4.1p1.debian/debian/ssh-askpass-gnome.postinst 2005-07-15 15:08:09.100577964 +1000 +++ openssh-4.1p1/debian/ssh-askpass-gnome.postinst 1970-01-01 10:00:00.000000000 +1000 @@ -1,58 +0,0 @@ -#! /bin/sh -# postinst script for ssh-askpass-gnome -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see /usr/share/doc/packaging-manual/ -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - if dpkg --compare-versions "$2" lt-nl 1:4.1p1-1; then - # libexecdir changed, so remove the obsolete alternative. - update-alternatives --quiet --remove ssh-askpass \ - /usr/lib/ssh/gnome-ssh-askpass - fi - update-alternatives --quiet \ - --install /usr/bin/ssh-askpass ssh-askpass \ - /usr/lib/openssh/gnome-ssh-askpass 30 \ - --slave /usr/share/man/man1/ssh-askpass.1.gz \ - ssh-askpass.1.gz /usr/share/man/man1/gnome-ssh-askpass.1.gz - - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Naur openssh-4.1p1.debian/debian/ssh-askpass-gnome.prerm openssh-4.1p1/debian/ssh-askpass-gnome.prerm --- openssh-4.1p1.debian/debian/ssh-askpass-gnome.prerm 2005-07-15 15:08:09.105577088 +1000 +++ openssh-4.1p1/debian/ssh-askpass-gnome.prerm 1970-01-01 10:00:00.000000000 +1000 @@ -1,41 +0,0 @@ -#! /bin/sh -# prerm script for ssh-askpass-gnome -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see /usr/share/doc/packaging-manual/ - -case "$1" in - remove|deconfigure) - update-alternatives --quiet --remove ssh-askpass /usr/lib/openssh/gnome-ssh-askpass -# install-info --quiet --remove /usr/info/ssh-askpass.info.gz - ;; - upgrade) -# install-info --quiet --remove /usr/info/ssh-askpass.info.gz - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Naur openssh-4.1p1.debian/debian/ssh.links openssh-4.1p1/debian/ssh.links --- openssh-4.1p1.debian/debian/ssh.links 2005-07-15 15:08:09.125573584 +1000 +++ openssh-4.1p1/debian/ssh.links 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -usr/share/doc/openssh-client usr/share/doc/ssh diff -Naur openssh-4.1p1.debian/debian/ssh.postinst openssh-4.1p1/debian/ssh.postinst --- openssh-4.1p1.debian/debian/ssh.postinst 2005-07-15 15:08:09.129572884 +1000 +++ openssh-4.1p1/debian/ssh.postinst 1970-01-01 10:00:00.000000000 +1000 @@ -1,18 +0,0 @@ -#!/bin/sh -e - -action="$1" -oldversion="$2" - -if [ "$action" != configure ]; then - exit 0 -fi - -if [ ! -L /usr/share/doc/ssh ] && \ - dpkg --compare-versions "$oldversion" lt-nl 1:4.1p1-5; then - rm -rf /usr/share/doc/ssh - ln -s openssh-client /usr/share/doc/ssh -fi - -#DEBHELPER# - -exit 0 diff -Naur openssh-4.1p1.debian/debian/ssh.prerm openssh-4.1p1/debian/ssh.prerm --- openssh-4.1p1.debian/debian/ssh.prerm 2005-07-15 15:08:09.112575861 +1000 +++ openssh-4.1p1/debian/ssh.prerm 1970-01-01 10:00:00.000000000 +1000 @@ -1,14 +0,0 @@ -#!/bin/sh -e - -case $1 in - upgrade) - if [ -L /usr/share/doc/ssh ] && \ - dpkg --compare-versions "$2" lt-nl 1:4.1p1-5; then - rm -f /usr/share/doc/ssh - fi - ;; -esac - -#DEBHELPER# - -exit 0 diff -Naur openssh-4.1p1.debian/openbsd-compat/Makefile.in openssh-4.1p1/openbsd-compat/Makefile.in --- openssh-4.1p1.debian/openbsd-compat/Makefile.in 2004-08-15 18:41:00.000000000 +1000 +++ openssh-4.1p1/openbsd-compat/Makefile.in 2005-07-15 15:02:07.221291139 +1000 @@ -23,7 +23,7 @@ PORTS=port-irix.o port-aix.o .c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + $(CC) $(PICFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< all: libopenbsd-compat.a @@ -31,7 +31,8 @@ $(OPENBSD): ../config.h $(PORTS): ../config.h -libopenbsd-compat.a: $(COMPAT) $(OPENBSD) $(PORTS) +libopenbsd-compat.a: PICFLAGS=-fPIC +libopenbsd-compat.a: $(COMPAT) $(OPENBSD) $(PORTS) $(AR) rv $@ $(COMPAT) $(OPENBSD) $(PORTS) $(RANLIB) $@