OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-May-2007 19:42:46
Branch: HEAD Handle: 2007052118424600
Modified files:
openpkg-src/crossroads crossroads.patch crossroads.spec
Log:
upgrading package: crossroads 1.39 -> 1.42
Summary:
Revision Changes Path
1.9 +14 -2 openpkg-src/crossroads/crossroads.patch
1.44 +9 -6 openpkg-src/crossroads/crossroads.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/crossroads/crossroads.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 crossroads.patch
--- openpkg-src/crossroads/crossroads.patch 27 Apr 2007 14:58:28 -0000
1.8
+++ openpkg-src/crossroads/crossroads.patch 21 May 2007 17:42:46 -0000
1.9
@@ -1,6 +1,6 @@
Index: src/crossroads.h
---- src/crossroads.h 2007-04-27 11:07:03 +0200
-+++ src/crossroads.h 2007-04-27 16:49:02 +0200
+--- src/crossroads.h.orig 2007-05-21 12:02:32 +0200
++++ src/crossroads.h 2007-05-21 19:39:33 +0200
@@ -10,9 +10,6 @@
#include <errno.h>
#include <fcntl.h>
@@ -11,3 +11,15 @@
#include <math.h>
#include <pwd.h>
#include <setjmp.h>
+Index: src/lib/thruputlog.c
+--- src/lib/thruputlog.c.orig 2007-05-21 12:02:32 +0200
++++ src/lib/thruputlog.c 2007-05-21 19:40:19 +0200
+@@ -47,7 +47,7 @@
+
+ /* Report the activity. */
+ fprintf (f, "%7.7d %15f %c ",
+- getpid(),
++ (int)getpid(),
+ (d_now - d_start) / 1000000,
+ dir == dir_client_to_server ? 'C' : 'B');
+ for (i = 0; i < 100 && i < len; i++)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/crossroads/crossroads.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 crossroads.spec
--- openpkg-src/crossroads/crossroads.spec 7 May 2007 08:26:22 -0000
1.43
+++ openpkg-src/crossroads/crossroads.spec 21 May 2007 17:42:46 -0000
1.44
@@ -32,8 +32,8 @@
Class: EVAL
Group: Network
License: Open Source
-Version: 1.39
-Release: 20070507
+Version: 1.42
+Release: 20070521
# package options
%option with_fsl yes
@@ -79,13 +79,14 @@
%build
%{l_shtool} subst \
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
- tools/*
+ 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}"
+ LIBS="%{l_fsl_ldflags} %{l_fsl_libs} -lm" \
+ BASE="`pwd`/.."
%install
rm -rf $RPM_BUILD_ROOT
@@ -97,9 +98,11 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/crossroads \
$RPM_BUILD_ROOT%{l_prefix}/var/crossroads
%{l_shtool} install -c -s -m 755 \
- src/crossroads $RPM_BUILD_ROOT%{l_prefix}/sbin/
+ src/crossroads/crossroads \
+ src/crossroads-daemon/crossroads-daemon \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 644 \
- doc/crossroads.man $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+ doc/crossroads.man $RPM_BUILD_ROOT%{l_prefix}/man/man8/crossroads.8
l_shmkey=`%{l_uuid} -v3 ns:URL "file://%{l_prefix}" | sed -e
's;^.*\(........\)$;\1;'`
%{l_shtool} install -c -m 644 %{l_value -s -a} \
-e "s;@l_shmkey@;$l_shmkey;" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
