Update of /cvs/debian-openoffice/neon23-deb/debian/patches In directory gluck:/tmp/cvs-serv6109/patches
Modified Files: 00list Added Files: 03_CAN-2004-0398.dpatch Log Message: update to -3 - remove suggests on libneon-doc - add CAN-2004-0398 fix Index: 00list =================================================================== RCS file: /cvs/debian-openoffice/neon23-deb/debian/patches/00list,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- 00list 1 May 2004 15:38:23 -0000 1.2 +++ 00list 19 May 2004 15:16:08 -0000 1.3 @@ -1,2 +1,3 @@ 01_CAN-2004-0179 02_no_docs +03_CAN-2004-0398 --- NEW FILE: 03_CAN-2004-0398.dpatch --- #! /bin/sh -e ## 02_CAN-2004-0398.dpatch by Rene Engelhard <[EMAIL PROTECTED]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 exit 1 fi [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" case "$1" in -patch) patch -p1 ${patch_opts} < $0;; -unpatch) patch -R -p1 ${patch_opts} < $0;; *) echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 exit 1;; esac exit 0 @DPATCH@ diff -urNad /home/rene/Debian/Pakete/neon/neon0.23-0.23.9/debian/changelog.orig neon0.23-0.23.9/debian/changelog.orig --- /home/rene/Debian/Pakete/neon/neon0.23-0.23.9/debian/changelog.orig 1970-01-01 01:00:00.000000000 +0100 +++ neon0.23-0.23.9/debian/changelog.orig 2004-05-18 12:53:42.000000000 +0200 @@ -0,0 +1,252 @@ +neon0.23 (0.23.9-6) unstable; urgency=high + + * add patch for CAN-2004-0398 + + -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 18 May 2004 12:50:18 +0200 + +neon0.23 (0.23.9-5) unstable; urgency=low + + * remove fdl statement from debian/copyright, we do not build + a -doc package which is the FDLed part... + + -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 22 Apr 2004 22:47:23 +0200 + +neon0.23 (0.23.9-4) unstable; urgency=low + + * move to dpatch + * add fix for CAN-2004-0179 + * don't use config.{sub,guess} which were put into debian/; + copy them from autotools-dev - build-depend on it + * Standards-Version: 3.6.1 + + -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 17 Apr 2004 00:49:41 +0200 + +neon0.23 (0.23.9-3) unstable; urgency=low + + * The "Come back." release. (supported and requested by the + security team...) + + * repackage as neon0.23 source package + * New maintainer (Debian OpenOffice Team) + * restrict Architectures: to i386, s390, powerpc and sparc + as we revive this package only for OOo and OOo only is available + on these archs. (if anyone needs iton other/all archs, tell us ;) ) + * Don't build -doc anymore + * s/libz-dev/zlib1g-dev | libz-dev/ in Build-Depends: + * move -dev package to Priority: extra and put both lib package into + oldlibs + + -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 29 Feb 2004 22:50:25 +0100 + +neon (0.23.9-2) unstable; urgency=low + + * libneon-dev put in section libdevel. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Tue, 3 Jun 2003 15:08:18 -0400 + +neon (0.23.9-1) unstable; urgency=low + + * New upstream release. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Tue, 3 Jun 2003 13:46:31 -0400 + +neon (0.23.8-1) unstable; urgency=low + + * New upstream release. (Closes: #183152) + * New version, with libtool 1.4.3 will hopefully fix this problem. (Closes: #178574) + * Build-depends on debhelper >= 4.0.0. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sun, 2 Mar 2003 19:51:37 -0500 + +neon (0.23.6-1) unstable; urgency=low + + * New upstream release. + * Rebuilt against libssl-dev v. 0.9.7. (Closes: #178157) + * Replaced config.sub and config.guess with most recent versions from + ftp.gnu.org. (Closes: #176240) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sat, 25 Jan 2003 22:26:43 -0500 + +neon (0.23.5-2) unstable; urgency=low + + * Really install macros/ChangeLog... + * Disable runtime debugging messages. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Thu, 17 Oct 2002 02:45:09 -0400 + +neon (0.23.5-1) unstable; urgency=low + + * New upstream release. + * Include macros/ChangeLog in the -dev package. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Thu, 17 Oct 2002 02:02:28 -0400 + +neon (0.23.4-1) unstable; urgency=low + + * New upstream release. + * libneon23-dev: suggests libneon23-doc. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sun, 22 Sep 2002 16:34:17 -0400 + +neon (0.23.2-1) unstable; urgency=low + + * New upstream release. (Closes: #158063) + * libneon23-dev: depends on libssl-dev. (Closes: #156687, #158407) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Mon, 26 Aug 2002 20:52:05 -0400 + +neon (0.21.3-4) unstable; urgency=low + + * Programmer's man page (man3) put in libneon-doc. + * libneon21-dev: also replaces libneon-dev. + * libneon21-doc: also replaces libneon-doc. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sun, 11 Aug 2002 17:55:18 -0400 + +neon (0.21.3-3) unstable; urgency=low + + * libneon21-doc: arch should be "all" instead of "any". + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Thu, 8 Aug 2002 19:30:21 -0400 + +neon (0.21.3-2) unstable; urgency=low + + * Comply with Junichi Uekawa'Debian Library Pacaking Guide + recommendations + (http://www.netfort.gr.jp/~dancer/column/libpkg-guide/libpkg-guide.html): + libneon21-dev: conflicts with and provides libneon-dev. + libneon21-doc: idem. + (Closes: #152995) + * We now use and depend on libssl. (Closes: #153287) + * libneon21-doc: description improvement. (Closes: 152458) + * Build-depends on libz-dev. + * libneon21-doc: HTML documentation now goes into .../libneon21-dev + instead of .../libneon21 since it's only useful to developers. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Thu, 8 Aug 2002 04:38:12 -0400 + +neon (0.21.3-1) unstable; urgency=low + + * New Upstream Release. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Mon, 1 Jul 2002 20:05:24 -0400 + +neon (0.21.1-1) unstable; urgency=low + + * New Upstream Release. (Closes: #149384) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Mon, 10 Jun 2002 15:15:45 -0400 + +neon (0.20.0-1) unstable; urgency=low + + * New Upstream Release. (Closes: #146805) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Wed, 15 May 2002 18:51:17 -0400 + +neon (0.19.3-2) unstable; urgency=low + + * libneon-dev now depends on libxml2-dev. (Closes: #141253) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Fri, 5 Apr 2002 12:26:42 -0500 + +neon (0.19.3-1) unstable; urgency=low + + * New Upstream Release. (Closes: #137798) + * Change description of libneon-dev to refer to the libneon19 package + instead of libneon18. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Tue, 12 Mar 2002 18:04:26 -0500 + +neon (0.19.0-1) unstable; urgency=low + + * New Upstream Release. (Closes: #128884, #133254) + * Removed conflict with libneon15 since it's not available anymore. + * Stop being verbose. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Tue, 19 Feb 2002 10:30:51 -0500 + +neon (0.18.4-1) unstable; urgency=low + + * New Upstream Release. (Closes: #128884) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Wed, 23 Jan 2002 00:25:26 -0500 + +neon (0.18.1-1) unstable; urgency=low + + * New Upstream Release. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sun, 16 Dec 2001 15:43:51 -0500 + +neon (0.18.0-2) unstable; urgency=low + + * Fix in debian/rules (package = libneon18). + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sat, 1 Dec 2001 03:19:22 -0500 + +neon (0.18.0-1) unstable; urgency=low + + * New Upstream Release. + * Better package description for libneon-dev. (Closes: #118287) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Wed, 28 Nov 2001 01:09:20 -0500 + +neon (0.17.2-1) unstable; urgency=low + + * New Upstream Release. + * Updated description in control file. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sun, 28 Oct 2001 13:35:11 -0500 + +neon (0.17.1-1) unstable; urgency=low + + * New Upstream Release. + * libneon-dev should depend on libneonXX (Closes: #115957) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Wed, 17 Oct 2001 14:36:31 -0400 + +neon (0.17.0-1) unstable; urgency=low + + * New Upstream Release. (Closes: #114526) + * Standards version set to 3.5.6. + * libneon.la moved to libneon-dev. + (libneon-dev conflicts with libneon15). + * rebuilt configure framework with libtoolize, autoheader2.50 and + autoconf2.50 because of missing ltconfig executable. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Thu, 4 Oct 2001 21:10:45 -0400 + +neon (0.15.3-4) unstable; urgency=low + + * Fix short and long description for libneon-dev. (Closes: #114132) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Thu, 4 Oct 2001 18:37:24 -0400 + +neon (0.15.3-3) unstable; urgency=low + + * fixed bulleted list. (Closes: #111814) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Mon, 17 Sep 2001 23:42:16 -0400 + +neon (0.15.3-2) unstable; urgency=low + + * changed NEON_INTERFACE_VERSION from 15:3:15 back to 15:3:0 in configure and + aclocal.m4 + * the library package name is now following Debian naming convention. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Mon, 3 Sep 2001 20:32:00 -0400 + +neon (0.15.3-1) unstable; urgency=low + + * changed NEON_INTERFACE_VERSION from 15:3:0 to 15:3:15 in configure and + aclocal.m4 + * new upstream release. + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Sat, 28 Jul 2001 00:55:24 -0400 + +neon (0.15.0-1) unstable; urgency=low + + * changed NEON_INTERFACE_VERSION from 15:0:0 to 15:0:15 in configure and + aclocal.m4 + * Initial release (closes: #99949) + + -- Wolfgang Sourdeau <[EMAIL PROTECTED]> Thu, 7 Jun 2001 20:01:24 -0400 diff -urNad /home/rene/Debian/Pakete/neon/neon0.23-0.23.9/src/ne_dates.c neon0.23-0.23.9/src/ne_dates.c --- /home/rene/Debian/Pakete/neon/neon0.23-0.23.9/src/ne_dates.c 2002-07-05 21:43:38.000000000 +0200 +++ neon0.23-0.23.9/src/ne_dates.c 2004-05-18 12:54:39.000000000 +0200 @@ -49,7 +49,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" @@ -158,7 +158,7 @@ { struct tm gmt = {0}; int n; - static char wkday[10], mon[4]; + static 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, diff -urNad /home/rene/Debian/Pakete/neon/neon0.23-0.23.9/src/ne_dates.c.orig neon0.23-0.23.9/src/ne_dates.c.orig --- /home/rene/Debian/Pakete/neon/neon0.23-0.23.9/src/ne_dates.c.orig 1970-01-01 01:00:00.000000000 +0100 +++ neon0.23-0.23.9/src/ne_dates.c.orig 2002-07-05 21:43:38.000000000 +0200 @@ -0,0 +1,253 @@ +/* + Date manipulation routines + Copyright (C) 1999-2002, Joe Orton <[EMAIL PROTECTED]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA + +*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <sys/types.h> + +#include <time.h> +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif +#include <stdio.h> + +#ifdef HAVE_STRING_H +#include <string.h> +#endif + +#include "ne_alloc.h" +#include "ne_dates.h" +#include "ne_utils.h" + +/* Generic date manipulation routines. */ + +/* ISO8601: 2001-01-01T12:30:00Z */ +#define ISO8601_FORMAT_Z "%04d-%02d-%02dT%02d:%02d:%lfZ" +#define ISO8601_FORMAT_M "%04d-%02d-%02dT%02d:%02d:%lf-%02d:%02d" +#define ISO8601_FORMAT_P "%04d-%02d-%02dT%02d:%02d:%lf+%02d:%02d" + +/* 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" +/* asctime: Wed Jun 30 21:49:08 1993 */ +#define ASCTIME_FORMAT "%3s %3s %2d %2d:%2d:%2d %4d" + +static const char *rfc1123_weekdays[7] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" +}; +static const char *short_months[12] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" +}; + +#if defined(HAVE_STRUCT_TM_TM_GMTOFF) +#define GMTOFF(t) ((t).tm_gmtoff) +#else +/* FIXME: work out the offset anyway. */ +#define GMTOFF(t) (0) +#endif + +/* Returns the time/date GMT, in RFC1123-type format: eg + * Sun, 06 Nov 1994 08:49:37 GMT. */ +char *ne_rfc1123_date(time_t anytime) { + struct tm *gmt; + char *ret; + gmt = gmtime(&anytime); + if (gmt == NULL) + return NULL; + ret = ne_malloc(29 + 1); /* dates are 29 chars long */ +/* it goes: Sun, 06 Nov 1994 08:49:37 GMT */ + ne_snprintf(ret, 30, RFC1123_FORMAT, + rfc1123_weekdays[gmt->tm_wday], gmt->tm_mday, + short_months[gmt->tm_mon], 1900 + gmt->tm_year, + gmt->tm_hour, gmt->tm_min, gmt->tm_sec); + + return ret; +} + +/* Takes an ISO-8601-formatted date string and returns the time_t. + * Returns (time_t)-1 if the parse fails. */ +time_t ne_iso8601_parse(const char *date) +{ + struct tm gmt = {0}; + int off_hour, off_min; + double sec; + off_t fix; + int n; + + /* it goes: ISO8601: 2001-01-01T12:30:00+03:30 */ + if ((n = sscanf(date, ISO8601_FORMAT_P, + &gmt.tm_year, &gmt.tm_mon, &gmt.tm_mday, + &gmt.tm_hour, &gmt.tm_min, &sec, + &off_hour, &off_min)) == 8) { + gmt.tm_sec = (int)sec; + fix = - off_hour * 3600 - off_min * 60; + } + /* it goes: ISO8601: 2001-01-01T12:30:00-03:30 */ + else if ((n = sscanf(date, ISO8601_FORMAT_M, + &gmt.tm_year, &gmt.tm_mon, &gmt.tm_mday, + &gmt.tm_hour, &gmt.tm_min, &sec, + &off_hour, &off_min)) == 8) { + gmt.tm_sec = (int)sec; + fix = off_hour * 3600 + off_min * 60; + } + /* it goes: ISO8601: 2001-01-01T12:30:00Z */ + else if ((n = sscanf(date, ISO8601_FORMAT_Z, + &gmt.tm_year, &gmt.tm_mon, &gmt.tm_mday, + &gmt.tm_hour, &gmt.tm_min, &sec)) == 6) { + gmt.tm_sec = (int)sec; + fix = 0; + } + else { + return (time_t)-1; + } + + gmt.tm_year -= 1900; + gmt.tm_isdst = -1; + gmt.tm_mon--; + + return mktime(&gmt) + fix + GMTOFF(gmt); +} + +/* Takes an RFC1123-formatted date string and returns the time_t. + * Returns (time_t)-1 if the parse fails. */ +time_t ne_rfc1123_parse(const char *date) +{ + struct tm gmt = {0}; + static char wkday[4], mon[4]; + int n; +/* it goes: Sun, 06 Nov 1994 08:49:37 GMT */ + n = sscanf(date, RFC1123_FORMAT, + wkday, &gmt.tm_mday, mon, &gmt.tm_year, &gmt.tm_hour, + &gmt.tm_min, &gmt.tm_sec); + /* Is it portable to check n==7 here? */ + gmt.tm_year -= 1900; + for (n=0; n<12; n++) + if (strcmp(mon, short_months[n]) == 0) + break; + /* tm_mon comes out as 12 if the month is corrupt, which is desired, + * since the mktime will then fail */ + gmt.tm_mon = n; + gmt.tm_isdst = -1; + return mktime(&gmt) + GMTOFF(gmt); +} + +/* Takes a string containing a RFC1036-style date and returns the time_t */ +time_t ne_rfc1036_parse(const char *date) +{ + struct tm gmt = {0}; + int n; + static char wkday[10], 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, + &gmt.tm_hour, &gmt.tm_min, &gmt.tm_sec); + if (n != 7) { + return (time_t)-1; + } + + /* portable to check n here? */ + for (n=0; n<12; n++) + if (strcmp(mon, short_months[n]) == 0) + break; + /* tm_mon comes out as 12 if the month is corrupt, which is desired, + * since the mktime will then fail */ + + /* Defeat Y2K bug. */ + if (gmt.tm_year < 50) + gmt.tm_year += 100; + + gmt.tm_mon = n; + gmt.tm_isdst = -1; + return mktime(&gmt) + GMTOFF(gmt); +} + + +/* (as)ctime dates are like: + * Wed Jun 30 21:49:08 1993 + */ +time_t ne_asctime_parse(const char *date) +{ + struct tm gmt = {0}; + int n; + static char wkday[4], mon[4]; + n = sscanf(date, ASCTIME_FORMAT, + wkday, mon, &gmt.tm_mday, + &gmt.tm_hour, &gmt.tm_min, &gmt.tm_sec, + &gmt.tm_year); + /* portable to check n here? */ + for (n=0; n<12; n++) + if (strcmp(mon, short_months[n]) == 0) + break; + /* tm_mon comes out as 12 if the month is corrupt, which is desired, + * since the mktime will then fail */ + gmt.tm_mon = n; + gmt.tm_isdst = -1; + return mktime(&gmt) + GMTOFF(gmt); +} + +/* HTTP-date parser */ +time_t ne_httpdate_parse(const char *date) +{ + time_t tmp; + tmp = ne_rfc1123_parse(date); + if (tmp == -1) { + tmp = ne_rfc1036_parse(date); + if (tmp == -1) + tmp = ne_asctime_parse(date); + } + return tmp; +} + +#undef RFC1036_FORMAT +#undef ASCTIME_FORMAT +#undef RFC1123_FORMAT + +#ifdef RFC1123_TEST + +int main(int argc, char **argv) { + time_t now, in; + char *out; + if (argc > 1) { + printf("Got: %s\n", argv[1]); + in = ne_rfc1123_parse(argv[1]); + printf("Parsed: %d\n", in); + out = ne_rfc1123_date(in); + printf("Back again: %s\n", out); + } else { + now = time(NULL); + out = ne_rfc1123_date(now); + in = ne_rfc1123_parse(out); + printf("time(NULL) = %d\n", now); + printf("RFC1123 Time: [%s]\n", out); + printf("Parsed = %d\n", in); + out = ne_rfc1123_date(in); + printf("Back again: [%s]\n", out); + } + return 0; +} + +#endif + +