OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Jul-2007 09:06:25
Branch: HEAD Handle: 2007071008062500
Modified files:
openpkg-src/crossroads crossroads.conf crossroads.spec rc.crossroads
Log:
modifying package: crossroads-1.50 20070710 again
Summary:
Revision Changes Path
1.4 +3 -3 openpkg-src/crossroads/crossroads.conf
1.53 +72 -26 openpkg-src/crossroads/crossroads.spec
1.4 +4 -4 openpkg-src/crossroads/rc.crossroads
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/crossroads/crossroads.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 crossroads.conf
--- openpkg-src/crossroads/crossroads.conf 22 Mar 2007 10:37:56 -0000
1.3
+++ openpkg-src/crossroads/crossroads.conf 10 Jul 2007 07:06:25 -0000
1.4
@@ -1,6 +1,6 @@
-##
-## crossroads.conf -- Crossroads Daemon Configuration
-##
+//
+// crossroads.conf -- Crossroads Daemon Configuration
+//
service example {
verbosity on;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/crossroads/crossroads.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 crossroads.spec
--- openpkg-src/crossroads/crossroads.spec 10 Jul 2007 07:03:03 -0000
1.52
+++ openpkg-src/crossroads/crossroads.spec 10 Jul 2007 07:06:25 -0000
1.53
@@ -22,6 +22,9 @@
## SUCH DAMAGE.
##
+# FIXME: 20070710: cs: regarding crossroads-mgr(1), provide start/stop
+# logic, fix paths, logging and log rotation
+
# package information
Name: crossroads
Summary: Load Balancing Daemon
@@ -48,8 +51,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, make, bison, flex, perl
+BuildPreReq: OpenPKG, openpkg >= 20060823, make, bison, flex
PreReq: OpenPKG, openpkg >= 20060823
+BuildPreReq: perl
+PreReq: perl
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -75,42 +80,83 @@
%prep
%setup -q
%patch -p0
-
-%build
%{l_shtool} subst \
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
- etc/svnrev tools/*
- cd src
- %{l_make} %{l_mflags} \
- DEFAULT_CONF="%{l_prefix}/etc/crossroads/crossroads.conf" \
- CC="%{l_cc} %{l_cflags -O}" \
- LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
- LIBS="%{l_fsl_ldflags} %{l_fsl_libs} -lm" \
- BASE="`pwd`/.."
+ etc/svnrev \
+ src/crossroads-mgr/crossroads-mgr.in \
+ tools/*
+ %{l_shtool} subst \
+ -e 's;^\(REVVER =\).*$;\1 %{l_openpkg_release -F "OpenPKG-%%t"};' \
+ -e 's;^\(PREFIX =\).*$;\1 %{l_prefix};' \
+ -e 's;^\(DEFAULT_CONF =\).*$;\1
%{l_prefix}/etc/crossroads/crossroads.conf;' \
+ etc/Makefile.def
+ %{l_shtool} subst \
+ -e 's;/etc/\(crossroads\\.\.conf\);%{l_prefix}/etc/crossroads/\1;g' \
+ doc/*.[1-9]
+
+ # man page regarding crossroads.conf shall rather go to section 5
+ # instead of section 7
+ ( cd doc
+ mv crossroads.conf.{7,5}
+ %{l_shtool} subst \
+ -e 's;\("crossroads\\.\.conf" \)"7";\1"5";g' \
+ crossroads.conf.5
+ %{l_shtool} subst \
+ -e 's;\(crossroads\\.\.conf \)(7);\1(5);g' \
+ crossroads.1
+ %{l_shtool} subst \
+ -e 's;\(crossroads\.conf\)\.7;\1.5;g' \
+ Makefile
+ ) || exit $?
+
+%build
+ # build package
+ ( cd src
+ %{l_make} %{l_mflags} \
+ CC="%{l_cc} %{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_ldflags} %{l_fsl_libs} -lm" \
+ BASE="`pwd`/.."
+ ) || exit $?
%install
rm -rf $RPM_BUILD_ROOT
+
+ # create directories
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
- $RPM_BUILD_ROOT%{l_prefix}/etc/crossroads \
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man5 \
$RPM_BUILD_ROOT%{l_prefix}/var/crossroads
- %{l_shtool} install -c -s -m 755 \
- src/crossroads/crossroads \
- src/crossroads-daemon/crossroads-daemon \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/
- %{l_shtool} install -c -m 644 \
- doc/crossroads.1 $RPM_BUILD_ROOT%{l_prefix}/man/man8/crossroads.8
- l_shmkey=`%{l_uuid} -v3 ns:URL "file://%{l_prefix}" | sed -e
's;^.*\(........\)$;\1;'`
+
+ # perform standard installation procedure
+ %{l_make} %{l_mflags} PREFIX=$RPM_BUILD_ROOT%{l_prefix} install
+
+ # install configuration file
+ l_shmkey=`%{l_uuid} -v3 ns:URL "file://%{l_prefix}" |\
+ sed -e 's;^.*\(........\)$;\1;'`
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/crossroads
%{l_shtool} install -c -m 644 %{l_value -s -a} \
-e "s;@l_shmkey@;$l_shmkey;" \
- %{SOURCE crossroads.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/crossroads/
+ %{SOURCE crossroads.conf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/crossroads/
+
+ # 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 %{l_value -s -a} \
- %{SOURCE rc.crossroads} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{SOURCE rc.crossroads} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE fsl.crossroads} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ %{SOURCE fsl.crossroads} \
+ $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' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/crossroads/rc.crossroads
============================================================================
$ cvs diff -u -r1.3 -r1.4 rc.crossroads
--- openpkg-src/crossroads/rc.crossroads 22 Mar 2007 10:37:56 -0000
1.3
+++ openpkg-src/crossroads/rc.crossroads 10 Jul 2007 07:06:25 -0000
1.4
@@ -17,10 +17,10 @@
%status -u @l_susr@ -o
crossroads_usable="no"
crossroads_active="no"
- @l_prefix@/sbin/crossroads configtest >/dev/null 2>&1 && \
+ @l_prefix@/bin/crossroads configtest >/dev/null 2>&1 && \
crossroads_usable="yes"
rcService crossroads enable yes && \
- @l_prefix@/sbin/crossroads status >/dev/null 2>&1 && \
+ @l_prefix@/bin/crossroads status >/dev/null 2>&1 && \
crossroads_active="yes"
echo "crossroads_enable=\"$crossroads_enable\""
echo "crossroads_usable=\"$crossroads_usable\""
@@ -29,12 +29,12 @@
%start -u @l_susr@
rcService crossroads enable yes || exit 0
rcService crossroads active yes && exit 0
- @l_prefix@/sbin/crossroads start
+ @l_prefix@/bin/crossroads start
%stop -u @l_susr@
rcService crossroads enable yes || exit 0
rcService crossroads active no && exit 0
- @l_prefix@/sbin/crossroads stop
+ @l_prefix@/bin/crossroads stop
%restart -u @l_susr@
rcService crossroads enable yes || exit 0
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
