head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.4.2.3 OPENPKG_E1_FP:1.4.2.3 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.4.2.2 OPENPKG_2_STABLE:1.4.0.2; locks; strict; comment @# @; 1.10 date 2008.01.26.09.31.30; author rse; state Exp; branches; next 1.9; commitid LM82acO7nwRLeUOs; 1.9 date 2007.05.21.17.42.46; author rse; state Exp; branches; next 1.8; commitid Pod4HJF3ivVwZOis; 1.8 date 2007.04.27.14.58.28; author cs; state Exp; branches; next 1.7; commitid PdqGHo4iyme0RIfs; 1.7 date 2006.11.30.07.29.52; author rse; state Exp; branches; next 1.6; commitid Y4SZlIsAlAz38FWr; 1.6 date 2006.11.29.08.07.40; author rse; state Exp; branches; next 1.5; commitid z1VfqDemX1j1nxWr; 1.5 date 2006.10.20.17.54.57; author rse; state Exp; branches; next 1.4; commitid bb885VstnyDcUrRr; 1.4 date 2006.10.12.09.01.12; author rse; state Exp; branches 1.4.2.1; next 1.3; commitid JYzSgP9SmeY1dnQr; 1.3 date 2006.03.15.20.52.37; author rse; state Exp; branches; next 1.2; commitid 9gyKY2P2VxFBVjpr; 1.2 date 2005.11.18.07.21.03; author rse; state Exp; branches; next 1.1; commitid tGIHWYjzAs9mcdar; 1.1 date 2005.10.14.19.16.19; author rse; state Exp; branches; next ; 1.4.2.1 date 2006.10.12.09.01.12; author rse; state dead; branches; next 1.4.2.2; commitid iZxwRSmmWscPXUQr; 1.4.2.2 date 2006.10.16.14.49.07; author rse; state Exp; branches; next 1.4.2.3; commitid iZxwRSmmWscPXUQr; 1.4.2.3 date 2006.10.22.11.16.51; author rse; state Exp; branches; next ; commitid u3APmTRZ4jCDDFRr; desc @@ 1.10 log @upgrading package: crossroads 1.71 -> 1.75 @ text @Index: src/crossroads.h --- src/crossroads.h.orig 2008-01-26 01:24:46 +0100 +++ src/crossroads.h 2008-01-26 10:23:23 +0100 @@@@ -14,9 +14,6 @@@@ #include #include #include -#if HAVE_MALLOC_H == 1 -#include -#endif #include #include #include Index: src/lib/thruputlog.c --- src/lib/thruputlog.c.orig 2008-01-26 01:24:46 +0100 +++ src/lib/thruputlog.c 2008-01-26 10:29:27 +0100 @@@@ -41,7 +41,7 @@@@ /* Report the activity. */ fprintf (f, "%7.7d %15f %c %8d ", - getpid(), + (int)getpid(), d_now - d_start, dir == dir_client_to_server ? 'C' : 'B', len); @ 1.9 log @upgrading package: crossroads 1.39 -> 1.42 @ text @d2 3 a4 3 --- 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 @@@@ d13 1 a13 1 #include d15 3 a17 3 --- 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 @@@@ d20 1 a20 1 fprintf (f, "%7.7d %15f %c ", d23 3 a25 3 (d_now - d_start) / 1000000, dir == dir_client_to_server ? 'C' : 'B'); for (i = 0; i < 100 && i < len; i++) @ 1.8 log @upgrading package: crossroads 1.37 -> 1.38 @ text @d2 2 a3 2 --- src/crossroads.h 2007-04-27 11:07:03 +0200 +++ src/crossroads.h 2007-04-27 16:49:02 +0200 d14 12 @ 1.7 log @upgrading package: crossroads 1.17 -> 1.18 @ text @d2 3 a4 3 --- src/crossroads.h.orig 2006-11-29 04:00:04 +0100 +++ src/crossroads.h 2006-11-29 09:03:01 +0100 @@@@ -4,9 +4,7 @@@@ d8 1 a8 1 -#ifdef HAVE_MALLOC_H a10 1 +#include @ 1.6 log @upgrading package: crossroads 1.16 -> 1.17 @ text @a0 12 Index: etc/Makefile.def --- etc/Makefile.def.orig 2006-11-29 04:00:04 +0100 +++ etc/Makefile.def 2006-11-29 09:05:18 +0100 @@@@ -3,7 +3,7 @@@@ # Versioning. This defines the overall version ID and must match the topmost # entry in the ChangeLog. -VER = 1.16 +VER = 1.17 # Default config DEFAULT_CONF = /etc/crossroads.conf @ 1.5 log @upgrading package: crossroads 1.12 -> 1.14 @ text @d1 12 d14 2 a15 2 --- src/crossroads.h.orig 2006-10-20 04:00:03 +0200 +++ src/crossroads.h 2006-10-20 19:52:23 +0200 @ 1.4 log @make more portable by removing unportable aspects of time fiddling @ text @a0 18 Index: src/ansistamp.c --- src/ansistamp.c.orig 2006-09-27 04:00:04.000000000 +0200 +++ src/ansistamp.c 2006-10-12 10:59:54.002333735 +0200 @@@@ -9,12 +9,12 @@@@ time (&now); if (t == tm_localtime) { tmp = localtime (&now); - hrs_off = tmp->tm_gmtoff / 3600; + hrs_off = 0; snprintf (buf, sizeof(buf), "%4.4d-%2.2d-%2.2d/%2.2d:%2.2d:%2.2d(%.1f,%s)", tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday, tmp->tm_hour, tmp->tm_min, tmp->tm_sec, - hrs_off, tmp->tm_zone ? tmp->tm_zone : "UNK"); + hrs_off, "UTC"); } else { tmp = gmtime (&now); snprintf (buf, sizeof(buf), "%4.4d-%2.2d-%2.2d/%2.2d:%2.2d:%2.2d", d2 2 a3 2 --- src/crossroads.h.orig 2006-09-27 04:00:04.000000000 +0200 +++ src/crossroads.h 2006-10-12 10:56:21.114143535 +0200 @ 1.4.2.1 log @file crossroads.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:07 +0000 @ text @d1 32 @ 1.4.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 32 Index: src/ansistamp.c --- src/ansistamp.c.orig 2006-09-27 04:00:04.000000000 +0200 +++ src/ansistamp.c 2006-10-12 10:59:54.002333735 +0200 @@@@ -9,12 +9,12 @@@@ time (&now); if (t == tm_localtime) { tmp = localtime (&now); - hrs_off = tmp->tm_gmtoff / 3600; + hrs_off = 0; snprintf (buf, sizeof(buf), "%4.4d-%2.2d-%2.2d/%2.2d:%2.2d:%2.2d(%.1f,%s)", tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday, tmp->tm_hour, tmp->tm_min, tmp->tm_sec, - hrs_off, tmp->tm_zone ? tmp->tm_zone : "UNK"); + hrs_off, "UTC"); } else { tmp = gmtime (&now); snprintf (buf, sizeof(buf), "%4.4d-%2.2d-%2.2d/%2.2d:%2.2d:%2.2d", Index: src/crossroads.h --- src/crossroads.h.orig 2006-09-27 04:00:04.000000000 +0200 +++ src/crossroads.h 2006-10-12 10:56:21.114143535 +0200 @@@@ -4,9 +4,7 @@@@ #include #include #include -#ifdef HAVE_MALLOC_H -#include -#endif +#include #include #include #include @ 1.4.2.3 log @MFC: latest fixed version @ text @d1 18 d20 2 a21 2 --- src/crossroads.h.orig 2006-10-20 04:00:03 +0200 +++ src/crossroads.h 2006-10-20 19:52:23 +0200 @ 1.3 log @upgrading package: crossroads 0.18 -> 0.29 @ text @d1 18 d20 2 a21 2 --- src/crossroads.h.orig 2006-03-15 12:24:11 +0100 +++ src/crossroads.h 2006-03-15 21:48:27 +0100 @ 1.2 log @upgrading package: crossroads 0.11 -> 0.15 @ text @a0 12 Index: src/Makefile --- src/Makefile.orig 2005-11-17 19:11:27 +0100 +++ src/Makefile 2005-11-18 08:20:07 +0100 @@@@ -55,7 +55,7 @@@@ $(CC) $(DEFS) -c -g -Wall $< crossroads: libcrossroads.a - $(CC) -g -L. -lcrossroads $(LIBS) -o $@@ + $(CC) -g -L. -lcrossroads $(LDFLAGS) $(LIBS) -o $@@ libcrossroads.a: $(OBJ) ar rs libcrossroads.a $(OBJ) d2 2 a3 2 --- src/crossroads.h.orig 2005-11-17 19:11:27 +0100 +++ src/crossroads.h 2005-11-18 08:19:44 +0100 @ 1.1 log @new package: crossroads 0.08 (Load Balancing Daemon) @ text @d2 3 a4 3 --- src/Makefile.orig 2005-10-13 15:16:04 +0200 +++ src/Makefile 2005-10-14 20:36:39 +0200 @@@@ -49,7 +49,7 @@@@ d8 2 a9 2 - $(CC) -g -L. -lcrossroads -o $@@ + $(CC) -g -L. -lcrossroads -o $@@ $(LDFLAGS) $(LIBS) d14 2 a15 2 --- src/crossroads.h.orig 2005-10-13 15:16:04 +0200 +++ src/crossroads.h 2005-10-14 20:22:04 +0200 @