head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4.2.2 OPENPKG_E1_FP:1.4.2.2 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.4.2.2 OPENPKG_2_STABLE:1.4.0.2; locks; strict; comment @# @; 1.8 date 2008.03.04.06.31.35; author rse; state Exp; branches; next 1.7; commitid FgKghoHMuPMj1MTs; 1.7 date 2008.02.13.19.26.20; author rse; state Exp; branches; next 1.6; commitid igWxQQA0UVgYWgRs; 1.6 date 2007.03.09.06.42.55; author rse; state Exp; branches; next 1.5; commitid LGKIU3X0KiHEGn9s; 1.5 date 2007.02.26.06.35.35; author rse; state Exp; branches; next 1.4; commitid RqRfbOOUYqM30Y7s; 1.4 date 2005.11.16.08.02.41; author tho; state Exp; branches 1.4.2.1; next 1.3; commitid av2lygm2kYGBuX9r; 1.3 date 2005.09.15.06.11.52; author mk; state Exp; branches; next 1.2; 1.2 date 2004.05.21.08.03.12; author rse; state dead; branches; next 1.1; 1.1 date 2004.04.02.21.44.57; author thl; state Exp; branches; next ; 1.4.2.1 date 2005.11.16.08.02.41; author rse; state dead; branches; next 1.4.2.2; commitid iZxwRSmmWscPXUQr; 1.4.2.2 date 2006.10.16.14.48.58; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.8 log @upgrading package: citadel 7.32 -> 7.33 @ text @Index: libcitadel-1.08/lib/hash.c --- libcitadel-1.08/lib/hash.c.orig 2008-01-31 20:09:42 +0100 +++ libcitadel-1.08/lib/hash.c 2008-02-13 20:08:10 +0100 @@@@ -3,6 +3,7 @@@@ #include //dbg #include +#include #include "libcitadel.h" #include "lookup3.h" Index: sysdep.c --- sysdep.c.orig 2008-02-12 18:31:58 +0100 +++ sysdep.c 2008-02-13 19:25:36 +0100 @@@@ -271,6 +271,9 @@@@ memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_port = htons((u_short)port_number); +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif if (ip_addr == NULL) { sin.sin_addr.s_addr = INADDR_ANY; } @ 1.7 log @upgrading package: citadel 7.24 -> 7.31 @ text @d1 3 a3 3 Index: libcitadel-1.05/lib/hash.c --- libcitadel-1.05/lib/hash.c.orig 2008-01-31 20:09:42 +0100 +++ libcitadel-1.05/lib/hash.c 2008-02-13 20:08:10 +0100 @ 1.6 log @upgrading package: citadel 7.05 -> 7.06 @ text @d1 11 d13 3 a15 3 --- sysdep.c.orig 2007-03-08 04:09:26 +0100 +++ sysdep.c 2007-03-09 07:39:23 +0100 @@@@ -284,6 +284,9 @@@@ @ 1.5 log @upgrading package: citadel 7.03 -> 7.05 @ text @d2 6 a7 8 --- sysdep.c.orig 2007-02-22 19:26:35 +0100 +++ sysdep.c 2007-02-26 07:30:42 +0100 @@@@ -289,7 +289,10 @@@@ else { sin.sin_addr.s_addr = inet_addr(ip_addr); } - + d11 1 a11 1 if (sin.sin_addr.s_addr == INADDR_NONE) { @ 1.4 log @upgrading package: citadel 6.61 -> 6.62 @ text @a0 13 Index: server_main.c --- server_main.c.orig 2005-09-13 16:00:14.000000000 +0200 +++ server_main.c 2005-09-15 07:07:33.070467000 +0200 @@@@ -145,6 +145,9 @@@@ openlog("citadel", LOG_NDELAY, 0); } else { +#ifndef LOG_PERROR +#define LOG_PERROR 0 +#endif openlog("citadel", LOG_PERROR|LOG_NDELAY, 0); } setlogmask(LOG_UPTO(verbosity)); d2 3 a4 3 --- sysdep.c.orig 2005-11-16 03:18:42 +0100 +++ sysdep.c 2005-11-16 08:57:42 +0100 @@@@ -286,7 +286,10 @@@@ @ 1.4.2.1 log @file citadel.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:48:58 +0000 @ text @d1 28 @ 1.4.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 28 Index: server_main.c --- server_main.c.orig 2005-09-13 16:00:14.000000000 +0200 +++ server_main.c 2005-09-15 07:07:33.070467000 +0200 @@@@ -145,6 +145,9 @@@@ openlog("citadel", LOG_NDELAY, 0); } else { +#ifndef LOG_PERROR +#define LOG_PERROR 0 +#endif openlog("citadel", LOG_PERROR|LOG_NDELAY, 0); } setlogmask(LOG_UPTO(verbosity)); Index: sysdep.c --- sysdep.c.orig 2005-11-16 03:18:42 +0100 +++ sysdep.c 2005-11-16 08:57:42 +0100 @@@@ -286,7 +286,10 @@@@ else { sin.sin_addr.s_addr = inet_addr(ip_addr); } - + +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif if (sin.sin_addr.s_addr == INADDR_NONE) { sin.sin_addr.s_addr = INADDR_ANY; } @ 1.3 log @added patch to cvs @ text @d5 1 a5 1 openlog("citadel", LOG_NDELAY, syslog_facility); d11 1 a11 2 openlog("citadel", LOG_PERROR|LOG_NDELAY, syslog_facility); d13 1 d15 3 a17 3 --- sysdep.c.orig 2005-09-13 16:00:14.000000000 +0200 +++ sysdep.c 2005-09-15 07:07:48.206598000 +0200 @@@@ -290,7 +290,10 @@@@ @ 1.2 log @upgrading package: citadel 6.20p1 -> 6.21 @ text @d1 28 a28 11 Index: stress.c --- stress.c.orig 2004-03-27 03:33:34.000000000 +0100 +++ stress.c 2004-04-02 22:26:16.000000000 +0200 @@@@ -61,6 +61,7 @@@@ */ #include +#include /* needed to get RAND_MAX */ #include #include #include @ 1.1 log @new package: citadel 6.20p1 (Messaging and collaboration platform for BBS and groupware applications) @ text @@