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 openpkg$ Date: 09-Oct-2003 10:03:13
Branch: HEAD Handle: 2003100909031102
Modified files:
openpkg-re/vcheck vc.openssh
openpkg-src/openssh openssh.spec
openpkg-web news.txt
Log:
add optional watchdog/heartbeat patch
Summary:
Revision Changes Path
1.22 +4 -4 openpkg-re/vcheck/vc.openssh
1.113 +16 -9 openpkg-src/openssh/openssh.spec
1.6926 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.openssh
============================================================================
$ cvs diff -u -r1.21 -r1.22 vc.openssh
--- openpkg-re/vcheck/vc.openssh 27 Sep 2003 06:37:06 -0000 1.21
+++ openpkg-re/vcheck/vc.openssh 9 Oct 2003 08:03:11 -0000 1.22
@@ -6,9 +6,9 @@
url = ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/
regex = openssh-(__VER__)\.tar\.gz
}
-prog openssh:chroot = {
- version = 3.7.1p2
- url = http://chrootssh.sourceforge.net/download/
- regex = osshChroot-(__VER__).diff
+prog openssh:watchdog = {
+ version = 3.7.1p1
+ url = http://www.sc.isc.tohoku.ac.jp/~hgot/sources/openssh-watchdog.html
+ regex = HREF=.openssh-(__VER__)-watchdog\.patch\.tgz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.112 -r1.113 openssh.spec
--- openpkg-src/openssh/openssh.spec 27 Sep 2003 11:14:43 -0000 1.112
+++ openpkg-src/openssh/openssh.spec 9 Oct 2003 08:03:13 -0000 1.113
@@ -24,8 +24,9 @@
##
# package versions
-%define V_base 3.7.1
-%define V_portable p2
+%define V_base 3.7.1
+%define V_portable p2
+%define V_watchdog 3.7.1p1
# package information
Name: openssh
@@ -37,15 +38,16 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20030927
+Release: 20031009
# package options
-%option with_fsl yes
-%option with_pam no
-%option with_pcre no
-%option with_skey no
-%option with_x11 no
-%option with_chroot no
+%option with_fsl yes
+%option with_pam no
+%option with_pcre no
+%option with_skey no
+%option with_x11 no
+%option with_chroot no
+%option with_watchdog no
# list of sources
Source0:
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -58,6 +60,7 @@
Source7: ssh-keyman.1
Source8: ssh-keyman.pod
Patch0: openssh.patch
+Patch1:
http://www.sc.isc.tohoku.ac.jp/~hgot/sources/openssh-%{V_watchdog}-watchdog.patch.tgz
# build information
Prefix: %{l_prefix}
@@ -107,6 +110,10 @@
%{l_shtool} subst \
-e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%s"};' \
version.h
+%if "%{with_watchdog}" == "yes"
+ %{l_gzip} -d -c %{SOURCE openssh-%{V_watchdog}-watchdog.patch.tgz} | %{l_tar}
xf -
+ %{l_patch} -p0 <openssh-%{V_watchdog}-watchdog.patch
+%endif
%build
# configure package
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6925 -r1.6926 news.txt
--- openpkg-web/news.txt 8 Oct 2003 18:26:43 -0000 1.6925
+++ openpkg-web/news.txt 9 Oct 2003 08:03:11 -0000 1.6926
@@ -1,3 +1,4 @@
+09-Oct-2003: Upgraded package: P<openssh-3.7.1p2-20031009>
08-Oct-2003: Upgraded package: P<quagga-0.96.3-20031008>
08-Oct-2003: Upgraded package: P<fetchmail-6.2.4-20031008>
08-Oct-2003: Upgraded package: P<mplayer-1.0pre2-20031008>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
