[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] CVS commit in packages/cvs on 2005/09/26 08:28:15
From:       cvsrep () annvix ! org
Date:       2005-09-26 8:28:22
Message-ID: E1EJoLW-0008A6-Rk () build ! annvix ! org
[Download RAW message or body]

Module name:   packages/cvs
Changes by:    vdanen
Date:          2005/09/26 08:28:15

Commit log:
- use execlineb for run script, and created an envdir.
- fix requires (vdanen)
- supplied default env files (vdanen)
- pre-compile a peers.cdb in %post (vdanen)

Index: cvs.run
===================================================================
RCS file: /work/annvix/cvsroot/packages/cvs/cvs.run,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- cvs.run	29 Mar 2005 03:50:19 -0000	1.3
+++ cvs.run	26 Sep 2005 08:28:15 -0000	1.3.4.1
@@ -1,8 +1,17 @@
-#!/bin/sh
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+#!/bin/execlineb
 
-# this runs cvspserver and limits the server to a maximum of 30 simultaneous
-# connections (-c) using the ipsvd-instruct(5) directory ./peers for instructions,
-# and listening to all IPs on port 2401 (cvspserver)
+/bin/fdmove -c 2 1
 
-exec /sbin/tcpsvd -c30 -v -llocalhost -i./peers 0 2401 /usr/sbin/cvspserver 2>&1
+/sbin/chpst -e ./env/
+
+/bin/multisubstitute {
+    import -D "localhost" HOSTNAME
+    import -D 0 IP
+    import -D 2401 PORT
+    import -D 20 MAX_CONN
+    import -D 5 MAX_PER_HOST
+    import -D 20 MAX_BACKLOG
+}
+
+/sbin/tcpsvd -v -l $HOSTNAME -x peers.cdb -c $MAX_CONN -C "$MAX_PER_HOST" -b $MAX_BACKLOG $IP $PORT
+    /usr/sbin/cvspserver

Index: cvs.spec
===================================================================
RCS file: /work/annvix/cvsroot/packages/cvs/cvs.spec,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -r1.3.4.5 -r1.3.4.6
--- cvs.spec	4 Sep 2005 00:33:27 -0000	1.3.4.5
+++ cvs.spec	26 Sep 2005 08:28:15 -0000	1.3.4.6
@@ -9,7 +9,7 @@
 
 %define name		cvs
 %define version		1.11.20
-%define release		1avx
+%define release		2avx
 
 %define _requires_exceptions tcsh
 
@@ -38,7 +38,9 @@
 BuildRequires:	autoconf2.5, texinfo, zlib-devel, krb5-devel
 
 Requires:	ipsvd
-Prereq:		info-install afterboot
+Requires(post):	info-install, afterboot, rpm-helper, ipsvd
+Requires(preun): info-install, rpm-helper
+Requires(postun): afterboot
 
 %description
 CVS means Concurrent Version System; it is a version control
@@ -95,12 +97,19 @@
 # get rid of "no -f" so we don't have a Dep on this nonexistant interpretter
 perl -pi -e 's/no -f/\/bin\/sh/g' %{buildroot}%{_datadir}/cvs/contrib/sccs2rcs
 
-mkdir -p %{buildroot}%{_srvdir}/cvspserver/{log,peers}
+mkdir -p %{buildroot}%{_srvdir}/cvspserver/{log,peers,env}
 install -m 0740 %{SOURCE4} %{buildroot}%{_srvdir}/cvspserver/run
 install -m 0740 %{SOURCE5} %{buildroot}%{_srvdir}/cvspserver/log/run
 touch %{buildroot}%{_srvdir}/cvspserver/peers/0
 chmod 0640 %{buildroot}%{_srvdir}/cvspserver/peers/0
 
+echo "localhost" >%{buildroot}%{_srvdir}/cvspserver/env/HOSTNAME
+echo "0" >%{buildroot}%{_srvdir}/cvspserver/env/IP
+echo "2401" >%{buildroot}%{_srvdir}/cvspserver/env/PORT
+echo "20" >%{buildroot}%{_srvdir}/cvspserver/env/MAX_CONN
+echo "5" >%{buildroot}%{_srvdir}/cvspserver/env/MAX_PER_HOST
+echo "20" >%{buildroot}%{_srvdir}/cvspserver/env/MAX_BACKLOG
+
 mkdir -p %{buildroot}%{_datadir}/afterboot
 install -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/afterboot/06_cvspserver
 
@@ -117,6 +126,10 @@
 %_install_info %{name}.info
 %_install_info cvsclient.info
 %_mkafterboot
+pushd %{_srvdir}/cvspserver >/dev/null 2>&1
+    ipsvd-cdb peers.cdb peers.cdb.tmp peers/
+popd >/dev/null 2>&1
+
 
 %preun
 %_preun_srv cvspserver
@@ -144,13 +157,26 @@
 %dir %attr(0750,root,admin) %{_srvdir}/cvspserver
 %dir %attr(0750,root,admin) %{_srvdir}/cvspserver/log
 %dir %attr(0750,root,admin) %{_srvdir}/cvspserver/peers
+%dir %attr(0750,root,admin) %{_srvdir}/cvspserver/env
 %attr(0740,root,admin) %{_srvdir}/cvspserver/run
 %attr(0740,root,admin) %{_srvdir}/cvspserver/log/run
 %attr(0640,root,admin) %{_srvdir}/cvspserver/peers/0
+%attr(0640,root,admin) %{_srvdir}/cvspserver/env/HOSTNAME
+%attr(0640,root,admin) %{_srvdir}/cvspserver/env/IP
+%attr(0640,root,admin) %{_srvdir}/cvspserver/env/PORT
+%attr(0640,root,admin) %{_srvdir}/cvspserver/env/MAX_CONN
+%attr(0640,root,admin) %{_srvdir}/cvspserver/env/MAX_PER_HOST
+%attr(0640,root,admin) %{_srvdir}/cvspserver/env/MAX_BACKLOG
 %{_datadir}/afterboot/06_cvspserver
 
 
 %changelog
+* Sun Sep 25 2005 Sean P. Thomas <spt@annvix.org> 1.11.20-2avx
+- use execlineb for run script, and created an envdir.
+- fix requires (vdanen)
+- supplied default env files (vdanen)
+- pre-compile a peers.cdb in %%post (vdanen)
+
 * Sat Sep 03 2005 Vincent Danen <vdanen@annvix.org> 1.11.20-1avx
 - 1.11.20
 - use execlineb for run scripts


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs

[prev in list] [next in list] [prev in thread] [next in thread]