[CVS] OpenPKG: openpkg-src/openssh/ openssh.spec rc.openssh openpkg-we...

2003-07-17 Thread Michael van Elst 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael van Elst
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   17-Jul-2003 12:14:05
  Branch: HEAD Handle: 2003071711140301

  Modified files:
openpkg-src/openssh openssh.spec rc.openssh
openpkg-web news.txt

  Log:
%status and pidfile handling

  Summary:
RevisionChanges Path
1.96+3  -3  openpkg-src/openssh/openssh.spec
1.13+13 -3  openpkg-src/openssh/rc.openssh
1.5608  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/openssh/openssh.spec
  
  $ cvs diff -u -r1.95 -r1.96 openssh.spec
  --- openpkg-src/openssh/openssh.spec  15 Jul 2003 10:01:24 -  1.95
  +++ openpkg-src/openssh/openssh.spec  17 Jul 2003 10:14:04 -  1.96
  @@ -38,7 +38,7 @@
   Group:Security
   License:  BSD
   Version:  %{V_base}%{V_portable}
  -Release:  20030715
  +Release:  20030717
   
   #   package options
   %option   with_fsl yes
  @@ -63,8 +63,8 @@
   #   build information
   Prefix:   %{l_prefix}
   BuildRoot:%{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg = 20030710, perl
  -PreReq:   OpenPKG, openpkg = 20030710
  +BuildPreReq:  OpenPKG, openpkg = 20030716, perl
  +PreReq:   OpenPKG, openpkg = 20030716
   BuildPreReq:  openssl, zlib
   PreReq:   openssl, zlib
   %if %{with_pam} == yes
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/openssh/rc.openssh
  
  $ cvs diff -u -r1.12 -r1.13 rc.openssh
  --- openpkg-src/openssh/rc.openssh15 Jul 2003 10:01:24 -  1.12
  +++ openpkg-src/openssh/rc.openssh17 Jul 2003 10:14:04 -  1.13
  @@ -13,11 +13,19 @@
   
   %common
   openssh_signal () {
  -if [ -f @l_prefix@/var/openssh/sshd.pid ]; then
  -kill -$1 `cat @l_prefix@/var/openssh/sshd.pid`
  -fi
  +openssh_pidfile=@l_prefix@/var/openssh/sshd.pid
  +[ -f $openssh_pidfile ]  kill -$1 `cat $openssh_pidfile`
   }
   
  +%status -p 200 -u @l_susr@ -o
  +openssh_usable=unknown
  +openssh_active=no
  +opServiceEnabled openssh  \
  +openssh_signal 0  openssh_active=yes
  +echo openssh_enable=\$openssh_enable\
  +echo openssh_usable=\$openssh_usable\
  +echo openssh_active=\$openssh_active\
  +
   %start -p 200 -u @l_susr@
   opServiceEnabled openssh || exit 0
   @l_prefix@/bin/sshd
  @@ -25,6 +33,8 @@
   %stop -p 200 -u @l_susr@
   opServiceEnabled openssh || exit 0
   openssh_signal TERM
  +#   sshd removes the pidfile itself
  +#   rm -f $openssh_pidfile 2/dev/null || true
   
   %restart -u @l_susr@
   opServiceEnabled openssh || exit 0
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.5607 -r1.5608 news.txt
  --- openpkg-web/news.txt  17 Jul 2003 09:49:09 -  1.5607
  +++ openpkg-web/news.txt  17 Jul 2003 10:14:03 -  1.5608
  @@ -1,3 +1,4 @@
  +17-Jul-2003: Upgraded package: Popenssh-3.6.1p2-20030717
   17-Jul-2003: Upgraded package: Pntp-4.1.1c-20030717
   17-Jul-2003: Upgraded package: Popenpkg-20030717-20030717
   17-Jul-2003: Upgraded package: Puvscan-4.1.6.4277-20030717
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

Re: [CVS] OpenPKG: openpkg-src/openssh/ openssh.spec rc.openssh openpkg-we...

2003-07-17 Thread Ralf S. Engelschall 
On Thu, Jul 17, 2003, Michael van Elst wrote:

 [...]
 %status and pidfile handling
 [...]
%stop -p 200 -u @l_susr@
opServiceEnabled openssh || exit 0
openssh_signal TERM
   +#   sshd removes the pidfile itself
   +#   rm -f $openssh_pidfile 2/dev/null || true
 [...]

Sure, and 95% of all daemons do the same, too. And we really don't want
such comment blocks in all those packages, don't we? So, let us not add
those out-commented stuff, just remove the above two lines here and
just leave them out for similar packages who also remove the PID file
theirself.
   Ralf S. Engelschall
   [EMAIL PROTECTED]
   www.engelschall.com

__
The OpenPKG Projectwww.openpkg.org
Developer Communication List   [EMAIL PROTECTED]

Re: [CVS] OpenPKG: openpkg-src/openssh/ openssh.spec rc.openssh openpkg-we...

2003-07-17 Thread Michael van Elst 
On Thu, Jul 17, 2003, Ralf S. Engelschall wrote:

+#   sshd removes the pidfile itself
+#   rm -f $openssh_pidfile 2/dev/null || true
  [...]
 
 Sure, and 95% of all daemons do the same, too.

95% of all daemons do and 95% of all daemons don't :-)

Please find a better way to ensure that nobody silently adds
the missing rm command.


-- 
,eM=.a-. Michael van Elst
   dWWMWM -  :GM==;[EMAIL PROTECTED]
  :WWMWMw=--.  W='  cable  wireless
   9WWMm==-.
-Wmw-  CABLE  WIRELESS
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List   [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openssh/ openssh.spec rc.openssh openpkg-we...

2003-06-28 Thread Ralf S. Engelschall 
  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:   28-Jun-2003 16:07:03
  Branch: HEAD Handle: 2003062815070201

  Modified files:
openpkg-src/openssh openssh.spec rc.openssh
openpkg-web news.txt

  Log:
fix introduced logfile path and do some cosmetics

  Summary:
RevisionChanges Path
1.88+1  -1  openpkg-src/openssh/openssh.spec
1.10+1  -6  openpkg-src/openssh/rc.openssh
1.5051  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/openssh/openssh.spec
  
  $ cvs diff -u -r1.87 -r1.88 openssh.spec
  --- openpkg-src/openssh/openssh.spec  24 Jun 2003 16:27:28 -  1.87
  +++ openpkg-src/openssh/openssh.spec  28 Jun 2003 14:07:03 -  1.88
  @@ -38,7 +38,7 @@
   Group:Security
   License:  BSD
   Version:  %{V_base}%{V_portable}
  -Release:  20030624
  +Release:  20030628
   
   #   package options
   %option   with_fsl yes
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/openssh/rc.openssh
  
  $ cvs diff -u -r1.9 -r1.10 rc.openssh
  --- openpkg-src/openssh/rc.openssh24 Jun 2003 16:27:28 -  1.9
  +++ openpkg-src/openssh/rc.openssh28 Jun 2003 14:07:03 -  1.10
  @@ -34,7 +34,6 @@
   
   %daily -u @l_susr@
   opServiceEnabled openssh || exit 0
  -
   opTmpDirGen openssh
   opTmpDirFile openssh hint hintfile
   prolog=true
  @@ -45,20 +44,16 @@
   if [ .$openssh_log_epilog != . ]; then
   epilog=$epilog; $openssh_log_epilog
   fi
  -
  -#   rotate logfile
   shtool rotate -f \
   -n${openssh_log_numfiles} -s${openssh_log_minsize} -d \
   -z${openssh_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
   -P ${openssh_log_prolog} \
   -E ${openssh_log_epilog} \
  -@l_prefix@/var/openssh/log/sshd.log
  -
  +@l_prefix@/var/openssh/sshd.log
   if [ .`cat $hintfile` = .epilog ]; then
   openssh_signal TERM
   sleep 2
   @l_prefix@/bin/sshd
   fi
   opTmpDirDel openssh
  -
   
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.5050 -r1.5051 news.txt
  --- openpkg-web/news.txt  28 Jun 2003 13:59:30 -  1.5050
  +++ openpkg-web/news.txt  28 Jun 2003 14:07:02 -  1.5051
  @@ -1,3 +1,4 @@
  +28-Jun-2003: Upgraded package: Popenssh-3.6.1p2-20030628
   28-Jun-2003: Upgraded package: Pnsd-1.1.0b-20030628
   28-Jun-2003: Upgraded package: Phoneyd-0.6-20030628
   28-Jun-2003: Upgraded package: Parpd-0.2-20030628
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openssh/ openssh.spec rc.openssh openpkg-we...

2003-06-24 Thread Thomas Lotterer 
  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:   24-Jun-2003 15:27:28
  Branch: HEAD Handle: 2003062414272701

  Modified files:
openpkg-src/openssh openssh.spec rc.openssh
openpkg-web news.txt

  Log:
add/unify log file trimming

  Summary:
RevisionChanges Path
1.86+1  -1  openpkg-src/openssh/openssh.spec
1.8 +10 -6  openpkg-src/openssh/rc.openssh
1.4989  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/openssh/openssh.spec
  
  $ cvs diff -u -r1.85 -r1.86 openssh.spec
  --- openpkg-src/openssh/openssh.spec  23 Jun 2003 20:50:56 -  1.85
  +++ openpkg-src/openssh/openssh.spec  24 Jun 2003 13:27:28 -  1.86
  @@ -38,7 +38,7 @@
   Group:Security
   License:  BSD
   Version:  %{V_base}%{V_portable}
  -Release:  20030623
  +Release:  20030624
   
   #   package options
   %option   with_fsl yes
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/openssh/rc.openssh
  
  $ cvs diff -u -r1.7 -r1.8 rc.openssh
  --- openpkg-src/openssh/rc.openssh24 Jun 2003 12:07:56 -  1.7
  +++ openpkg-src/openssh/rc.openssh24 Jun 2003 13:27:28 -  1.8
  @@ -34,6 +34,7 @@
   
   %daily -u @l_susr@
   opServiceEnabled openssh || exit 0
  +
   opTmpDirGen openssh
   opTmpDirFile openssh hint hintfile
   prolog=true
  @@ -44,17 +45,20 @@
   if [ .$openssh_log_epilog != . ]; then
   epilog=$epilog; $openssh_log_epilog
   fi
  +
  +#   rotate logfile
   shtool rotate -f \
  --n${openssh_log_numfiles} -s${openssh_log_minsize} \
  --d -z${openssh_log_complevel} \
  -[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  --P $prolog \
  --E $epilog \
  -@l_prefix@/var/openssh/sshd.log
  +-n${openssh_log_numfiles} -s${openssh_log_minsize} -d \
  +-z${openssh_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  +-P ${openssh_log_prolog} \
  +-E ${openssh_log_epilog} \
  +@l_prefix@/var/openssh/log/sshd.log
  +
   if [ .`cat $hintfile` = .epilog ]; then
   openssh_signal TERM
   sleep 2
   @l_prefix@/bin/sshd
   fi
   opTmpDirDel openssh
  +
   
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.4988 -r1.4989 news.txt
  --- openpkg-web/news.txt  24 Jun 2003 13:27:18 -  1.4988
  +++ openpkg-web/news.txt  24 Jun 2003 13:27:27 -  1.4989
  @@ -1,3 +1,4 @@
  +24-Jun-2003: Upgraded package: Popenssh-3.6.1p2-20030624
   24-Jun-2003: Upgraded package: Pnsd-1.1.0b-20030624
   24-Jun-2003: Upgraded package: Pmonit-3.2-20030624
   24-Jun-2003: Upgraded package: Pimapd-2.1.13-20030624
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/openssh/ openssh.spec rc.openssh openpkg-we...

2003-03-28 Thread Christoph Schug 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Christoph Schug
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   28-Mar-2003 13:11:41
  Branch: HEAD Handle: 2003032812113902

  Modified files:
openpkg-src/openssh openssh.spec rc.openssh
openpkg-web news.txt

  Log:
rc script clean up

  Summary:
RevisionChanges Path
1.74+2  -1  openpkg-src/openssh/openssh.spec
1.6 +4  -4  openpkg-src/openssh/rc.openssh
1.3860  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/openssh/openssh.spec
  
  $ cvs diff -u -r1.73 -r1.74 openssh.spec
  --- openpkg-src/openssh/openssh.spec  19 Feb 2003 16:10:42 -  1.73
  +++ openpkg-src/openssh/openssh.spec  28 Mar 2003 12:11:41 -  1.74
  @@ -38,7 +38,7 @@
   Group:Security
   License:  BSD
   Version:  %{V_base}%{V_portable}
  -Release:  20030219
  +Release:  20030328
   
   #   package options
   %option   with_pam no
  @@ -192,6 +192,7 @@
   #   install run-command script
   %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
   %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
  +-e 's;@l_susr@;%{l_susr};g' \
   -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/
   
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/openssh/rc.openssh
  
  $ cvs diff -u -r1.5 -r1.6 rc.openssh
  --- openpkg-src/openssh/rc.openssh7 Feb 2002 14:21:04 -   1.5
  +++ openpkg-src/openssh/rc.openssh28 Mar 2003 12:11:41 -  1.6
  @@ -18,21 +18,21 @@
   fi
   }
   
  -%start -p 200 -u root
  +%start -p 200 -u @l_susr@
   opServiceEnabled openssh || exit 0
   @l_prefix@/bin/sshd
   
  -%stop -p 200 -u root
  +%stop -p 200 -u @l_susr@
   opServiceEnabled openssh || exit 0
   openssh_signal TERM
   
  -%restart -u root
  +%restart -u @l_susr@
   opServiceEnabled openssh || exit 0
   openssh_signal TERM
   sleep 2
   @l_prefix@/bin/sshd
   
  -%daily -u root
  +%daily -u @l_susr@
   opServiceEnabled openssh || exit 0
   opTmpDirGen openssh
   opTmpDirFile openssh hint hintfile
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.3859 -r1.3860 news.txt
  --- openpkg-web/news.txt  28 Mar 2003 12:06:19 -  1.3859
  +++ openpkg-web/news.txt  28 Mar 2003 12:11:39 -  1.3860
  @@ -1,3 +1,4 @@
  +28-Mar-2003: Upgraded package: Popenssh-3.5p1-20030328
   28-Mar-2003: Upgraded package: Pntp-4.1.1b-20030328
   28-Mar-2003: Upgraded package: Pbind8-8.3.4-20030328
   28-Mar-2003: Upgraded package: Pbind-9.2.2-20030328
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]