From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 27 Dec 2003 21:08:03 +0000 (+0000)
Subject: - -lselinux moved to proper place (only server needs it)
X-Git-Tag: auto/ac/openssh-3_7_1p2-4_5~3
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fopenssh.git;a=commitdiff_plain;h=2ab7e7f695c986a6dcc75483e2761e55a67ddadb

- -lselinux moved to proper place (only server needs it)

Changed files:
    openssh-selinux.patch -> 1.3
---

diff --git a/openssh-selinux.patch b/openssh-selinux.patch
index a8cf4b7..3fe1320 100644
--- a/openssh-selinux.patch
+++ b/openssh-selinux.patch
@@ -10,15 +10,15 @@ diff -urN openssh-3.7.1p2.org/Makefile.in openssh-3.7.1p2/Makefile.in
  CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
  LIBS=@LIBS@
  LIBPAM=@LIBPAM@
-@@ -53,7 +53,7 @@
- SED=@SED@
- ENT=@ENT@
- XAUTH_PATH=@XAUTH_PATH@
--LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
-+LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ -lselinux 
- EXEEXT=@EXEEXT@
+@@ -134,7 +134,7 @@
+ 	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  
- INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
+ sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
+-	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS)
++	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS) -lselinux
+ 
+ scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
+ 	$(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 diff -urN openssh-3.7.1p2.org/session.c openssh-3.7.1p2/session.c
 --- openssh-3.7.1p2.org/session.c	2003-12-26 20:14:53.000000000 +0100
 +++ openssh-3.7.1p2/session.c	2003-12-26 20:15:50.000000000 +0100