OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Aug-2003 14:59:53
Branch: OPENPKG_1_2_SOLID Handle: 2003080613595300
Modified files: (Branch: OPENPKG_1_2_SOLID)
openpkg-src/openssh openssh.spec
Log:
MFC: CI#9550, CI#10855=PR#160, CI#10855
Summary:
Revision Changes Path
1.70.2.1.2.3+14 -3 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.70.2.1.2.2 -r1.70.2.1.2.3 openssh.spec
--- openpkg-src/openssh/openssh.spec 19 Feb 2003 16:20:50 -0000 1.70.2.1.2.2
+++ openpkg-src/openssh/openssh.spec 6 Aug 2003 12:59:53 -0000 1.70.2.1.2.3
@@ -101,6 +101,13 @@
%{l_patch} -p1 <%{SOURCE osshChroot-%{V_chroot}.diff}
%endif
+ # enforce "openssh" and the PAM identification string
+%if "%{with_pam}" == "yes"
+ %{l_shtool} subst \
+ -e 's;\(define *SSHD_PAM_SERVICE\).*;\1 "openssh";' \
+ auth-pam.h
+%endif
+
# prevent in advance "make install" from running sshd
%{l_shtool} subst \
-e 's;^\(install:.*\)check-config\(.*\)$;\1 \2;' \
@@ -115,7 +122,7 @@
lib="$lib -L`%{l_prefix}/etc/rc --query pam_libdir`"
%endif
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/fsl-config --all --cflags` $inc" \
+ CFLAGS="%{l_cflags -O} $inc" \
LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags` $lib" \
LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
./configure \
@@ -250,12 +257,16 @@
# add PAM configuration entry
%if "%{with_pam}" == "yes"
- $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=openssh
+ if [ $1 -eq 1 ]; then
+ $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=openssh
+ fi
%endif
%preun
# remove PAM configuration entry
%if "%{with_pam}" == "yes"
- $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=openssh
+ if [ $1 -eq 0 ]; then
+ $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=openssh
+ fi
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
