head 1.7; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.3 OPENPKG_E1_FP:1.3 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.3 OPENPKG_2_STABLE_20060622:1.3 OPENPKG_2_STABLE:1.3.0.2 OPENPKG_2_STABLE_BP:1.3 OPENPKG_2_5_RELEASE:1.2 OPENPKG_2_5_SOLID:1.2.0.4 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.2 OPENPKG_2_4_SOLID_BP:1.2 OPENPKG_2_3_RELEASE:1.1 OPENPKG_2_3_SOLID:1.1.0.8 OPENPKG_2_3_SOLID_BP:1.1 OPENPKG_2_2_RELEASE:1.1 OPENPKG_2_2_SOLID:1.1.0.6 OPENPKG_2_2_SOLID_BP:1.1 OPENPKG_2_1_RELEASE:1.1 OPENPKG_2_1_SOLID:1.1.0.4 OPENPKG_2_1_SOLID_BP:1.1 OPENPKG_2_0_SOLID:1.1.0.2; locks; strict; comment @# @; 1.7 date 2009.12.16.18.57.50; author rse; state Exp; branches; next 1.6; commitid nKTHRxS7z98YbDfu; 1.6 date 2009.01.25.13.10.19; author rse; state Exp; branches; next 1.5; commitid fQe5N8do4otrIPzt; 1.5 date 2008.02.11.18.58.20; author rse; state Exp; branches; next 1.4; commitid 3gT1eHmlQfFlR0Rs; 1.4 date 2006.12.29.07.51.25; author cs; state Exp; branches; next 1.3; commitid gdINMZhUkc3Ejo0s; 1.3 date 2006.06.06.10.46.52; author rse; state Exp; branches 1.3.2.1; next 1.2; commitid MJNJHPaB8H3nUVzr; 1.2 date 2005.04.25.07.32.41; author rse; state Exp; branches; next 1.1; 1.1 date 2004.04.16.16.24.39; author rse; state dead; branches 1.1.2.1; next ; 1.3.2.1 date 2007.01.06.13.49.34; author thl; state Exp; branches; next ; commitid 64YWMfcnWvBu2s1s; 1.1.2.1 date 2004.04.16.16.24.39; author rse; state Exp; branches; next 1.1.2.2; 1.1.2.2 date 2004.05.19.20.07.30; author rse; state Exp; branches; next ; desc @@ 1.7 log @upgrading package: cadaver 0.23.2 -> 0.23.3 @ text @Index: Makefile.in --- Makefile.in.orig 2008-02-11 11:29:53 +0100 +++ Makefile.in 2009-12-16 19:48:05 +0100 @@@@ -34,7 +34,7 @@@@ CFLAGS = @@CFLAGS@@ ALL_CFLAGS = $(CPPFLAGS) $(INCLUDES) $(CFLAGS) LDFLAGS = @@LDFLAGS@@ -LIBS = @@LIBS@@ @@NEON_LIBS@@ +LIBS = @@NEON_LIBS@@ @@LIBS@@ TARGET = $(PACKAGE) SUBDIRS = lib/neon lib/intl @@@@ -56,7 +56,7 @@@@ .PHONY: subdirs install clean distclean $(TARGET): $(ALLOBJS) subdirs - $(CC) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) + $(CC) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) .c.o: $(CC) $(ALL_CFLAGS) -o $@@ -c $< Index: src/cadaver.c --- src/cadaver.c.orig 2008-10-29 10:35:33 +0100 +++ src/cadaver.c 2009-12-16 19:48:05 +0100 @@@@ -855,7 +855,7 @@@@ progname = argv[0]; -#ifdef HAVE_SETLOCALE +#if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H) setlocale(LC_ALL, ""); #endif @ 1.6 log @apply vendor fix for Digest auth related segfaults @ text @d3 1 a3 1 +++ Makefile.in 2009-01-25 14:05:31 +0100 a21 11 Index: lib/neon/ne_auth.c --- lib/neon/ne_auth.c.orig 2007-12-05 17:39:58 +0100 +++ lib/neon/ne_auth.c 2009-01-25 14:07:16 +0100 @@@@ -645,6 +645,7 @@@@ if (ne_uri_parse(token, &rel) == 0) { /* Resolve relative to the Request-URI. */ + base.path = "/"; ne_uri_resolve(&base, &rel, &absolute); base.path = absolute.path; d23 3 a25 3 --- src/cadaver.c.orig 2007-08-22 14:17:27 +0200 +++ src/cadaver.c 2009-01-25 14:05:31 +0100 @@@@ -838,7 +838,7 @@@@ @ 1.5 log @upgrading package: cadaver 0.23.0 -> 0.23.1 @ text @d2 3 a4 3 --- Makefile.in.orig 2007-08-22 14:26:55 +0200 +++ Makefile.in 2008-02-11 19:52:49 +0100 @@@@ -33,7 +33,7 @@@@ d13 1 a13 1 @@@@ -55,7 +55,7 @@@@ d22 11 d35 1 a35 1 +++ src/cadaver.c 2008-02-11 19:56:16 +0100 @ 1.4 log @upgrading package: cadaver 0.22.3 -> 0.22.4 @ text @d2 2 a3 2 --- Makefile.in 2006-12-28 22:34:36 +0100 +++ Makefile.in 2006-12-29 08:43:16 +0100 d14 1 a14 1 .PHONY: subdirs install again clean d22 12 @ 1.3 log @as of 0.22.3 Cadaver is not compatible with Neon 0.26.0 so change to building against the local copy of Neon 0.25.4 @ text @d2 5 a6 5 --- Makefile.in.orig 2004-04-13 21:35:26 +0200 +++ Makefile.in 2005-04-25 09:31:02 +0200 @@@@ -31,7 +31,7 @@@@ CPPFLAGS = @@DEFS@@ @@CPPFLAGS@@ -I$(top_srcdir)/src CFLAGS = @@CFLAGS@@ @@SDEFS@@ d12 2 a13 2 SUBDIRS = libneon @@SUBDIRS@@ @@@@ -53,7 +53,7 @@@@ d21 1 a21 22 $(CC) $(CPPFLAGS) $(CFLAGS) -o $@@ -c $< Index: configure --- configure.orig 2005-12-31 14:18:31 +0100 +++ configure 2006-05-16 08:51:44 +0200 @@@@ -8732,7 +8732,7 @@@@ echo "${ECHO_T}$ne_cv_lib_neon" >&6 if test "$ne_cv_lib_neon" = "yes"; then ne_cv_lib_neonver=no - for v in 24 25; do + for v in 24 25 26; do case $ne_libver in 0.$v.*) ne_cv_lib_neonver=yes ;; esac @@@@ -8988,7 +8988,7 @@@@ echo "${ECHO_T}$ne_cv_lib_neon" >&6 if test "$ne_cv_lib_neon" = "yes"; then ne_cv_lib_neonver=no - for v in 24 25; do + for v in 24 25 26; do case $ne_libver in 0.$v.*) ne_cv_lib_neonver=yes ;; esac @ 1.3.2.1 log @MFC: make up leeway for 2_STABLE by virtue of build-time results @ text @d2 5 a6 5 --- Makefile.in 2006-12-28 22:34:36 +0100 +++ Makefile.in 2006-12-29 08:43:16 +0100 @@@@ -33,7 +33,7 @@@@ CFLAGS = @@CFLAGS@@ ALL_CFLAGS = $(CPPFLAGS) $(INCLUDES) $(CFLAGS) d12 2 a13 2 SUBDIRS = lib/neon lib/intl @@@@ -55,7 +55,7 @@@@ d21 22 a42 1 $(CC) $(ALL_CFLAGS) -o $@@ -c $< @ 1.2 log @fix building @ text @d22 21 @ 1.1 log @file cadaver.patch was initially added on branch OPENPKG_2_0_SOLID. @ text @d1 21 @ 1.1.2.1 log @apply security fix (OpenPKG-SA-2004.016-neon; CAN-2004-0179) @ text @a0 75 Index: libneon/ne_207.c --- libneon/ne_207.c.orig 2003-07-23 23:48:21.000000000 +0200 +++ libneon/ne_207.c 2004-04-16 18:22:32.000000000 +0200 @@@@ -320,12 +320,12 @@@@ if (ne_get_status(req)->code == 207) { if (!ne_xml_valid(p)) { /* The parse was invalid */ - ne_set_error(sess, ne_xml_get_error(p)); + ne_set_error(sess, "%s", ne_xml_get_error(p)); ret = NE_ERROR; } else if (ctx.is_error) { /* If we've actually got any error information * from the 207, then set that as the error */ - ne_set_error(sess, ctx.buf->data); + ne_set_error(sess, "%s", ctx.buf->data); ret = NE_ERROR; } } else if (ne_get_status(req)->klass != 2) { Index: libneon/ne_auth.c --- libneon/ne_auth.c.orig 2003-09-02 21:21:26.000000000 +0200 +++ libneon/ne_auth.c 2004-04-16 18:22:32.000000000 +0200 @@@@ -1060,7 +1060,7 @@@@ if (areq->auth_info_hdr != NULL && verify_response(areq, sess, areq->auth_info_hdr)) { NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n"); - ne_set_error(sess->sess, _(sess->spec->fail_msg)); + ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg)); ret = NE_ERROR; } else if (status->code == sess->spec->status_code && areq->auth_hdr != NULL) { Index: libneon/ne_locks.c --- libneon/ne_locks.c.orig 2003-06-19 00:10:58.000000000 +0200 +++ libneon/ne_locks.c 2004-04-16 18:22:32.000000000 +0200 @@@@ -734,7 +734,7 @@@@ } else if (parse_failed) { ret = NE_ERROR; - ne_set_error(sess, ne_xml_get_error(parser)); + ne_set_error(sess, "%s", ne_xml_get_error(parser)); } else if (ne_get_status(req)->code == 207) { ret = NE_ERROR; @@@@ -802,7 +802,7 @@@@ if (ret == NE_OK && ne_get_status(req)->klass == 2) { if (parse_failed) { ret = NE_ERROR; - ne_set_error(sess, ne_xml_get_error(parser)); + ne_set_error(sess, "%s", ne_xml_get_error(parser)); } else if (ne_get_status(req)->code == 207) { ret = NE_ERROR; Index: libneon/ne_props.c --- libneon/ne_props.c.orig 2003-06-19 00:10:58.000000000 +0200 +++ libneon/ne_props.c 2004-04-16 18:22:32.000000000 +0200 @@@@ -142,7 +142,7 @@@@ if (ret == NE_OK && ne_get_status(req)->klass != 2) { ret = NE_ERROR; } else if (!ne_xml_valid(handler->parser)) { - ne_set_error(handler->sess, ne_xml_get_error(handler->parser)); + ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser)); ret = NE_ERROR; } Index: libneon/ne_xml.c --- libneon/ne_xml.c.orig 2003-05-10 18:05:59.000000000 +0200 +++ libneon/ne_xml.c 2004-04-16 18:22:32.000000000 +0200 @@@@ -538,7 +538,7 @@@@ void ne_xml_set_error(ne_xml_parser *p, const char *msg) { - ne_snprintf(p->error, ERR_SIZE, msg); + ne_snprintf(p->error, ERR_SIZE, "%s", msg); } #ifdef HAVE_LIBXML @ 1.1.2.2 log @apply security fix (OpenPKG-SA-2004.024-neon, CAN-2004-0398) @ text @a75 45 ----------------------------------------------------------------------------- Security Fix OpenPKG-SA-2004.024-neon, CAN-2004-0398 Index: libneon/ne_dates.c --- libneon/ne_dates.c.orig 2003-04-07 21:01:46.000000000 +0200 +++ libneon/ne_dates.c 2004-05-19 21:55:14.000000000 +0200 @@@@ -47,7 +47,7 @@@@ /* RFC1123: Sun, 06 Nov 1994 08:49:37 GMT */ #define RFC1123_FORMAT "%3s, %02d %3s %4d %02d:%02d:%02d GMT" /* RFC850: Sunday, 06-Nov-94 08:49:37 GMT */ -#define RFC1036_FORMAT "%s %2d-%3s-%2d %2d:%2d:%2d GMT" +#define RFC1036_FORMAT "%10s %2d-%3s-%2d %2d:%2d:%2d GMT" /* asctime: Wed Jun 30 21:49:08 1993 */ #define ASCTIME_FORMAT "%3s %3s %2d %2d:%2d:%2d %4d" @@@@ -133,7 +133,7 @@@@ time_t ne_rfc1123_parse(const char *date) { struct tm gmt = {0}; - static char wkday[4], mon[4]; + char wkday[4], mon[4]; int n; /* it goes: Sun, 06 Nov 1994 08:49:37 GMT */ n = sscanf(date, RFC1123_FORMAT, @@@@ -156,7 +156,7 @@@@ { struct tm gmt = {0}; int n; - static char wkday[10], mon[4]; + char wkday[11], mon[4]; /* RFC850/1036 style dates: Sunday, 06-Nov-94 08:49:37 GMT */ n = sscanf(date, RFC1036_FORMAT, wkday, &gmt.tm_mday, mon, &gmt.tm_year, @@@@ -189,7 +189,7 @@@@ { struct tm gmt = {0}; int n; - static char wkday[4], mon[4]; + char wkday[4], mon[4]; n = sscanf(date, ASCTIME_FORMAT, wkday, mon, &gmt.tm_mday, &gmt.tm_hour, &gmt.tm_min, &gmt.tm_sec, @