OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jun-2003 22:50:56
Branch: HEAD Handle: 2003062321505501
Modified files:
openpkg-src/openssh openssh.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.85 +20 -13 openpkg-src/openssh/openssh.spec
1.4961 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 openssh.spec
--- openpkg-src/openssh/openssh.spec 30 May 2003 19:43:41 -0000 1.84
+++ openpkg-src/openssh/openssh.spec 23 Jun 2003 20:50:56 -0000 1.85
@@ -38,9 +38,10 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20030530
+Release: 20030623
# package options
+%option with_fsl yes
%option with_pam no
%option with_pcre no
%option with_skey no
@@ -62,12 +63,16 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, fsl, perl, openssl, zlib
-PreReq: OpenPKG, openpkg >= 20030103, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, perl, openssl, zlib
+PreReq: OpenPKG, openpkg >= 20030415
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
%endif
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_pcre}" == "yes"
BuildPreReq: pcre
%endif
@@ -116,8 +121,8 @@
%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} $inc" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags` $lib" \
- LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags} $lib" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--sbindir=%{l_prefix}/bin \
@@ -196,11 +201,6 @@
-e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
%{SOURCE rc.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # install fsl configuration file
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
- %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE fsl.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
# install reasonable ssh server and client configuration files
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/openssh
%{l_shtool} install -c -m 644 \
@@ -210,14 +210,21 @@
%{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE ssh_config} $RPM_BUILD_ROOT%{l_prefix}/etc/openssh/
+ # OSSP fake syslog library
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
'%config %{l_prefix}/etc/openssh/*' \
'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/openssh/ssh-keysign' \
- '%dir %attr(700,%{l_susr},%{l_sgrp}) %{l_prefix}/var/openssh/empty' \
- '%config %{l_prefix}/etc/fsl/fsl.openssh' \
- '%not %dir %{l_prefix}/etc/fsl'
+ '%dir %attr(700,%{l_susr},%{l_sgrp}) %{l_prefix}/var/openssh/empty'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4960 -r1.4961 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:50:44 -0000 1.4960
+++ openpkg-web/news.txt 23 Jun 2003 20:50:55 -0000 1.4961
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<openssh-3.6.1p2-20030623>
23-Jun-2003: Upgraded package: P<nsd-1.1.0b-20030623>
23-Jun-2003: Upgraded package: P<inn-2.4.0-20030623>
23-Jun-2003: Upgraded package: P<imapd-2.1.13-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
