OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 30-Dec-2002 19:03:19
Branch: HEAD Handle: 2002123018031701
Modified files:
openpkg-src/openssh openssh.spec
openpkg-web news.txt
Log:
switch to %option(s) and modernize flags
Summary:
Revision Changes Path
1.66 +11 -26 openpkg-src/openssh/openssh.spec
1.2442 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 openssh.spec
--- openpkg-src/openssh/openssh.spec 19 Dec 2002 13:09:42 -0000 1.65
+++ openpkg-src/openssh/openssh.spec 30 Dec 2002 18:03:18 -0000 1.66
@@ -29,21 +29,11 @@
%define V_chroot 3.5
# package options
-%ifndef with_pam
-%define with_pam no
-%endif
-%ifndef with_pcre
-%define with_pcre no
-%endif
-%ifndef with_skey
-%define with_skey no
-%endif
-%ifndef with_x11
-%define with_x11 %{l_test -p x11}
-%endif
-%ifndef with_chroot
-%define with_chroot no
-%endif
+%option with_pam no
+%option with_pcre no
+%option with_skey no
+%option with_x11 %{l_test -p x11}
+%option with_chroot no
# package information
Name: openssh
@@ -55,7 +45,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20021219
+Release: 20021230
# list of sources
Source0:
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -72,8 +62,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021002, fsl, perl, openssl, zlib
-PreReq: OpenPKG, openpkg >= 20021002, fsl
+BuildPreReq: OpenPKG, openpkg >= 20021230, fsl, perl, openssl, zlib
+PreReq: OpenPKG, openpkg >= 20021230, fsl
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -102,12 +92,7 @@
terms of security and features, as well as removing all patented
algorithms to separate libraries (OpenSSL).
- Options:
- --define 'with_pam %{with_pam}'
- --define 'with_pcre %{with_pcre}'
- --define 'with_skey %{with_skey}'
- --define 'with_x11 %{with_x11}'
- --define 'with_chroot %{with_chroot}'
+ %options -p11
%prep
%setup0 -q
@@ -118,8 +103,8 @@
%build
# build OpenSSH
- inc="-I%{l_prefix}/include"
- lib="-L%{l_prefix}/lib"
+ inc="%{l_cppflags}"
+ lib="%{l_ldflags}"
%if "%{with_pam}" == "yes"
inc="$inc -I`%{l_prefix}/etc/rc --query pam_incdir`"
lib="$lib -L`%{l_prefix}/etc/rc --query pam_libdir`"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2441 -r1.2442 news.txt
--- openpkg-web/news.txt 30 Dec 2002 17:56:16 -0000 1.2441
+++ openpkg-web/news.txt 30 Dec 2002 18:03:17 -0000 1.2442
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<openssh-3.5p1-20021230>
30-Dec-2002: Upgraded package: P<gcc33-3.3s20021223-20021230>
30-Dec-2002: Upgraded package: P<mutt-1.4i-20021230>
30-Dec-2002: Upgraded package: P<imagemagick-5.5.3.1-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
