[Pkg-citadel-commit] r356 - in webcit/trunk/debian: . patches
Michael Meskes
meskes at alioth.debian.org
Thu Jun 4 07:11:59 UTC 2009
Author: meskes
Date: 2009-06-04 07:11:59 +0000 (Thu, 04 Jun 2009)
New Revision: 356
Removed:
webcit/trunk/debian/patches/750b.diff
Modified:
webcit/trunk/debian/changelog
webcit/trunk/debian/patches/series
Log:
New upstream version
Modified: webcit/trunk/debian/changelog
===================================================================
--- webcit/trunk/debian/changelog 2009-06-04 07:10:50 UTC (rev 355)
+++ webcit/trunk/debian/changelog 2009-06-04 07:11:59 UTC (rev 356)
@@ -1,3 +1,9 @@
+webcit (7.51-dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Michael Meskes <meskes at debian.org> Thu, 04 Jun 2009 09:11:25 +0200
+
webcit (7.50-dfsg-2) unstable; urgency=low
[ Michael Meskes ]
Deleted: webcit/trunk/debian/patches/750b.diff
===================================================================
--- webcit/trunk/debian/patches/750b.diff 2009-06-04 07:10:50 UTC (rev 355)
+++ webcit/trunk/debian/patches/750b.diff 2009-06-04 07:11:59 UTC (rev 356)
@@ -1,573 +0,0 @@
-diff -ruN webcit-7.50-dfsg/calendar.c webcit-7.50b-dfsg/calendar.c
---- webcit-7.50-dfsg/calendar.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/calendar.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: calendar.c 7204 2009-03-09 18:54:53Z dothebart $
-+ * $Id: calendar.c 7369 2009-04-18 12:27:01Z dothebart $
- *
- * Functions which handle calendar objects and their processing/display.
- */
-@@ -125,7 +125,7 @@
- }
- else {
- tt = icaltime_as_timet(t);
-- webcit_fmt_date(buf, tt, DATEFMT_FULL);
-+ webcit_fmt_date(buf, 256, tt, DATEFMT_FULL);
- StrBufAppendPrintf(Target, "<dt>");
- StrBufAppendPrintf(Target, _("Starting date/time:"));
- StrBufAppendPrintf(Target, "</dt><dd>%s</dd>", buf);
-@@ -136,7 +136,7 @@
- if (p != NULL) {
- t = icalproperty_get_dtend(p);
- tt = icaltime_as_timet(t);
-- webcit_fmt_date(buf, tt, DATEFMT_FULL);
-+ webcit_fmt_date(buf, 256, tt, DATEFMT_FULL);
- StrBufAppendPrintf(Target, "<dt>");
- StrBufAppendPrintf(Target, _("Ending date/time:"));
- StrBufAppendPrintf(Target, "</dt><dd>%s</dd>", buf);
-diff -ruN webcit-7.50-dfsg/calendar_view.c webcit-7.50b-dfsg/calendar_view.c
---- webcit-7.50-dfsg/calendar_view.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/calendar_view.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: calendar_view.c 7242 2009-03-20 16:20:25Z ajc $
-+ * $Id: calendar_view.c 7369 2009-04-18 12:27:01Z dothebart $
- *
- * Handles the HTML display of calendar items.
- */
-@@ -335,7 +335,7 @@
- }
- else {
- tt = icaltime_as_timet(t);
-- webcit_fmt_date(buf, tt, DATEFMT_BRIEF);
-+ webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
- if (no_end || !icaltime_compare(t, end_t)) {
- wprintf("<i>%s</i> %s<br>",
- _("Date/time:"), buf);
-@@ -344,7 +344,7 @@
- wprintf("<i>%s</i> %s<br>",
- _("Starting date/time:"), buf);
- tt = icaltime_as_timet(end_t);
-- webcit_fmt_date(buf, tt, DATEFMT_BRIEF);
-+ webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
- wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
- }
-
-@@ -946,13 +946,13 @@
- wprintf("<br />");
- }
- if (!icaltime_compare(t, end_t)) { /* one day only */
-- webcit_fmt_date(buf, event_tt, DATEFMT_LOCALEDATE);
-+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
- wprintf("<i>%s</i> %s<br>", _("Date:"), buf);
- }
- else {
-- webcit_fmt_date(buf, event_tt, DATEFMT_LOCALEDATE);
-+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
- wprintf("<i>%s</i> %s<br>", _("Starting date:"), buf);
-- webcit_fmt_date(buf, event_tte, DATEFMT_LOCALEDATE);
-+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE);
- wprintf("<i>%s</i> %s<br>", _("Ending date:"), buf);
- }
- q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
-@@ -987,9 +987,9 @@
- escputs((char *)icalproperty_get_comment(q));
- wprintf("<br />");
- }
-- webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
-+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
- wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
-- webcit_fmt_date(buf, event_tte, DATEFMT_BRIEF);
-+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
- wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
- q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
- if (q) {
-@@ -1067,13 +1067,13 @@
- wprintf("<br />");
- }
- if (!icaltime_compare(t, end_t)) { /* one day only */
-- webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
-+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
- wprintf("<i>%s</i> %s<br>", _("Date/time:"), buf);
- }
- else {
-- webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
-+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
- wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
-- webcit_fmt_date(buf, event_tte, DATEFMT_BRIEF);
-+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
- wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
- }
- q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
-@@ -1359,7 +1359,7 @@
- else {
- all_day_event = 0;
- }
-- fmt_time(timestring, event_tt);
-+ fmt_time(timestring, SIZ, event_tt);
-
- if (all_day_event) {
- gmtime_r(&event_tt, &event_tm);
-@@ -1659,7 +1659,7 @@
- due = get_task_due_date(Cal->cal, &is_date);
- wprintf("<td><span");
- if (due > 0) {
-- webcit_fmt_date(buf, due, is_date ? DATEFMT_RAWDATE : DATEFMT_FULL);
-+ webcit_fmt_date(buf, SIZ, due, is_date ? DATEFMT_RAWDATE : DATEFMT_FULL);
- wprintf(">%s",buf);
- }
- else {
-diff -ruN webcit-7.50-dfsg/downloads.c webcit-7.50b-dfsg/downloads.c
---- webcit-7.50-dfsg/downloads.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/downloads.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: downloads.c 7153 2009-02-22 16:37:00Z dothebart $
-+ * $Id: downloads.c 7393 2009-04-22 23:10:15Z dothebart $
- */
- #include "webcit.h"
- #include "webserver.h"
-@@ -436,8 +436,8 @@
-
- RegisterConditional(HKEY("COND:FILE:ISPIC"), 0, Conditional_FILE_ISPIC, CTX_FILELIST);
-
-- WebcitAddUrlHandler(HKEY("image"), output_image, 0);
-- WebcitAddUrlHandler(HKEY("display_mime_icon"), display_mime_icon , 0);
-+ WebcitAddUrlHandler(HKEY("image"), output_image, ANONYMOUS);
-+ WebcitAddUrlHandler(HKEY("display_mime_icon"), display_mime_icon , ANONYMOUS);
- WebcitAddUrlHandler(HKEY("download_file"), download_file, NEED_URL);
- WebcitAddUrlHandler(HKEY("delete_file"), delete_file, NEED_URL);
- WebcitAddUrlHandler(HKEY("upload_file"), upload_file, 0);
-diff -ruN webcit-7.50-dfsg/fmt_date.c webcit-7.50b-dfsg/fmt_date.c
---- webcit-7.50-dfsg/fmt_date.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/fmt_date.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: fmt_date.c 7227 2009-03-17 21:58:57Z dothebart $
-+ * $Id: fmt_date.c 7369 2009-04-18 12:27:01Z dothebart $
- */
-
- #include "webcit.h"
-@@ -47,7 +47,7 @@
- /*
- * Format a date/time stamp for output
- */
--void webcit_fmt_date(char *buf, time_t thetime, int Format)
-+void webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format)
- {
- struct tm tm;
- struct tm today_tm;
-@@ -76,31 +76,31 @@
- &&(tm.tm_mon == today_tm.tm_mon)
- &&(tm.tm_mday == today_tm.tm_mday)) {
- if (time_format == WC_TIMEFORMAT_24)
-- wc_strftime(buf, 32, "%k:%M", &tm);
-+ wc_strftime(buf, siz, "%k:%M", &tm);
- else
-- wc_strftime(buf, 32, "%l:%M%p", &tm);
-+ wc_strftime(buf, siz, "%l:%M%p", &tm);
- }
- else if (today_timet - thetime < 15552000) {
- if (time_format == WC_TIMEFORMAT_24)
-- wc_strftime(buf, 32, "%b %d %k:%M", &tm);
-+ wc_strftime(buf, siz, "%b %d %k:%M", &tm);
- else
-- wc_strftime(buf, 32, "%b %d %l:%M%p", &tm);
-+ wc_strftime(buf, siz, "%b %d %l:%M%p", &tm);
- }
- else {
-- wc_strftime(buf, 32, "%b %d %Y", &tm);
-+ wc_strftime(buf, siz, "%b %d %Y", &tm);
- }
- break;
- case DATEFMT_FULL:
- if (time_format == WC_TIMEFORMAT_24)
-- wc_strftime(buf, 32, "%a %b %d %Y %T %Z", &tm);
-+ wc_strftime(buf, siz, "%a %b %d %Y %T %Z", &tm);
- else
-- wc_strftime(buf, 32, "%a %b %d %Y %r %Z", &tm);
-+ wc_strftime(buf, siz, "%a %b %d %Y %r %Z", &tm);
- break;
- case DATEFMT_RAWDATE:
-- wc_strftime(buf, 32, "%a %b %d %Y", &tm);
-+ wc_strftime(buf, siz, "%a %b %d %Y", &tm);
- break;
- case DATEFMT_LOCALEDATE:
-- wc_strftime(buf, 32, "%x", &tm);
-+ wc_strftime(buf, siz, "%x", &tm);
- break;
- }
- }
-@@ -110,10 +110,10 @@
- * Try to guess whether the user will prefer 12 hour or 24 hour time based on the locale.
- */
- long guess_calhourformat(void) {
-- char buf[32];
-+ char buf[64];
- struct tm tm;
- memset(&tm, 0, sizeof tm);
-- wc_strftime(buf, 32, "%X", &tm);
-+ wc_strftime(buf, 64, "%X", &tm);
- if (buf[strlen(buf)-1] == 'M') {
- return 12;
- }
-@@ -154,7 +154,7 @@
- * buf the output buffer
- * thetime time to format into buf
- */
--void fmt_time(char *buf, time_t thetime)
-+void fmt_time(char *buf, size_t siz, time_t thetime)
- {
- struct tm *tm;
- int hour;
-@@ -170,12 +170,12 @@
- hour = hour - 12;
-
- if (time_format == WC_TIMEFORMAT_24) {
-- sprintf(buf, "%d:%02d",
-+ snprintf(buf, siz, "%d:%02d",
- tm->tm_hour, tm->tm_min
- );
- }
- else {
-- sprintf(buf, "%d:%02d%s",
-+ snprintf(buf, siz, "%d:%02d%s",
- hour, tm->tm_min, ((tm->tm_hour > 12) ? "pm" : "am")
- );
- }
-diff -ruN webcit-7.50-dfsg/html2html.c webcit-7.50b-dfsg/html2html.c
---- webcit-7.50-dfsg/html2html.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/html2html.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: html2html.c 7181 2009-03-03 03:42:29Z ajc $
-+ * $Id: html2html.c 7388 2009-04-22 02:25:02Z ajc $
- */
- /**
- * \defgroup HTML2HTML Output an HTML message, modifying it slightly to make sure it plays nice
-@@ -70,6 +70,9 @@
- strcpy(charset, "UTF-8");
- }
-
-+ /* Remove wandering punctuation */
-+ if ((ptr=strchr(charset, '\"'))) *ptr = 0;
-+ striplt(charset);
- }
- }
-
-@@ -399,11 +402,12 @@
- char *cid_start, *cid_end;
- ++brak;
-
-- if (src &&
-- (cid_start=strchr(src,':')) &&
-- (cid_end=strchr(cid_start,'"')) &&
-- (cid_end < tag_end)) {
--
-+ if (src
-+ && tag_end
-+ && (cid_start=strchr(src,':'))
-+ && (cid_end=strchr(cid_start,'"'))
-+ && (cid_end < tag_end)
-+ ) {
- /* copy tag and attributes up to src="cid: */
- StrBufAppendBufPlain(converted_msg, ptr, src - ptr, 0);
- cid_start++;
-@@ -497,23 +501,27 @@
- ptr++;
- }
-
-- /**
-- * We need to know when we're inside a tag,
-- * so we don't turn things that look like URL's into
-- * links, when they're already links - or image sources.
-- */
-- if (*(ptr-1) == '<') {
-- ++brak;
-- }
-- if (*(ptr-1) == '>') {
-- --brak;
-- if ((scriptlevel == 0) && (script_start_pos >= 0)) {
-- StrBufCutRight(converted_msg, StrLength(converted_msg) - script_start_pos);
-- script_start_pos = (-1);
-+
-+ if ((ptr >= msg) && (ptr <= msgend)) {
-+ /*
-+ * We need to know when we're inside a tag,
-+ * so we don't turn things that look like URL's into
-+ * links, when they're already links - or image sources.
-+ */
-+ if ((ptr > msg) && (*(ptr-1) == '<')) {
-+ ++brak;
-+ }
-+ if ((ptr > msg) && (*(ptr-1) == '>')) {
-+ --brak;
-+ if ((scriptlevel == 0) && (script_start_pos >= 0)) {
-+ StrBufCutRight(converted_msg, StrLength(converted_msg) - script_start_pos);
-+ script_start_pos = (-1);
-+ }
- }
-+ if (!strncasecmp(ptr, "</A>", 3)) --alevel;
- }
-- if (!strncasecmp(ptr, "</A>", 3)) --alevel;
- }
-+
- if (BodyArea != NULL) {
- StrBufAppendBufPlain(converted_msg, HKEY("</td></tr></table>"), 0);
- FreeStrBuf(&BodyArea);
-diff -ruN webcit-7.50-dfsg/msg_renderers.c webcit-7.50b-dfsg/msg_renderers.c
---- webcit-7.50-dfsg/msg_renderers.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/msg_renderers.c 2009-04-23 22:34:34.000000000 +0200
-@@ -441,7 +441,7 @@
- {
- char datebuf[64];
- message_summary *Msg = (message_summary*) CTX;
-- webcit_fmt_date(datebuf, Msg->date, DATEFMT_BRIEF);
-+ webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_BRIEF);
- StrBufAppendBufPlain(Target, datebuf, -1, 0);
- }
-
-@@ -449,7 +449,7 @@
- {
- char datebuf[64];
- message_summary *Msg = (message_summary*) CTX;
-- webcit_fmt_date(datebuf, Msg->date, DATEFMT_FULL);
-+ webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_FULL);
- StrBufAppendBufPlain(Target, datebuf, -1, 0);
- }
- void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, WCTemplputParams *TP)
-diff -ruN webcit-7.50-dfsg/po/de.po webcit-7.50b-dfsg/po/de.po
---- webcit-7.50-dfsg/po/de.po 2009-04-09 15:58:28.000000000 +0200
-+++ webcit-7.50b-dfsg/po/de.po 2009-04-23 22:34:29.000000000 +0200
-@@ -670,7 +670,7 @@
-
- #: ../event.c:608
- msgid "every "
--msgstr "jedes"
-+msgstr "jedes "
-
- #: ../event.c:609
- msgid "year on this date"
-diff -ruN webcit-7.50-dfsg/serv_func.c webcit-7.50b-dfsg/serv_func.c
---- webcit-7.50-dfsg/serv_func.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/serv_func.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: serv_func.c 7175 2009-03-01 01:27:28Z matt $
-+ * $Id: serv_func.c 7371 2009-04-18 12:45:35Z dothebart $
- */
-
- #include "webcit.h"
-@@ -607,22 +607,26 @@
- Buf = NewStrBuf();
- Line = NewStrBuf();
- serv_printf("MESG %s", TP->Tokens->Params[0]->Start);
-+
- StrBuf_ServGetln(Line);
-- while (!Done && (StrBuf_ServGetln(Line)>=0)) {
-- if ( (StrLength(Line)==3) &&
-- !strcmp(ChrPtr(Line), "000"))
-- Done = 1;
-- else
-- {
-- if (n > 0)
-- StrBufAppendBufPlain(Buf, "\n", 1, 0);
-- StrBufAppendBuf(Buf, Line, 0);
-- }
-- n++;
-- }
-- FlushStrBuf(Line);
-- FmOut(Line, "center", Buf);
-- StrBufAppendTemplate(Target, TP, Line, 1);
-+ if (GetServerStatus(Line, NULL) == 1) {
-+ while (!Done && (StrBuf_ServGetln(Line)>=0)) {
-+ if ( (StrLength(Line)==3) &&
-+ !strcmp(ChrPtr(Line), "000"))
-+ Done = 1;
-+ else
-+ {
-+ if (n > 0)
-+ StrBufAppendBufPlain(Buf, "\n", 1, 0);
-+ StrBufAppendBuf(Buf, Line, 0);
-+ }
-+ n++;
-+ }
-+
-+ FlushStrBuf(Line);
-+ FmOut(Line, "center", Buf);
-+ StrBufAppendTemplate(Target, TP, Line, 1);
-+ }
- FreeStrBuf(&Buf);
- FreeStrBuf(&Line);
- }
-diff -ruN webcit-7.50-dfsg/setup.c webcit-7.50b-dfsg/setup.c
---- webcit-7.50-dfsg/setup.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/setup.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: setup.c 7159 2009-02-25 00:03:02Z dothebart $
-+ * $Id: setup.c 7364 2009-04-17 18:34:37Z ajc $
- *
- * WebCit setup utility
- *
-@@ -172,8 +172,12 @@
- question,
- ( default_value ? "Yes" : "No" )
- );
-- fgets(buf, sizeof buf, stdin);
-- answer = tolower(buf[0]);
-+ if (fgets(buf, sizeof buf, stdin)) {
-+ answer = tolower(buf[0]);
-+ }
-+ else {
-+ answer = default_value;
-+ }
- if ((buf[0]==0) || (buf[0]==13) || (buf[0]==10))
- answer = default_value;
- else if (answer == 'y')
-diff -ruN webcit-7.50-dfsg/smtpqueue.c webcit-7.50b-dfsg/smtpqueue.c
---- webcit-7.50-dfsg/smtpqueue.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/smtpqueue.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: smtpqueue.c 7087 2009-02-10 18:50:50Z dothebart $
-+ * $Id: smtpqueue.c 7369 2009-04-18 12:27:01Z dothebart $
- *
- * Display the outbound SMTP queue
- */
-@@ -137,7 +137,7 @@
-
- wprintf("</td><td>");
- if (submitted > 0) {
-- webcit_fmt_date(buf, submitted, 1);
-+ webcit_fmt_date(buf, 1024, submitted, 1);
- wprintf("%s", buf);
- }
- else {
-@@ -146,7 +146,7 @@
-
- wprintf("</td><td>");
- if (last_attempt > 0) {
-- webcit_fmt_date(buf, last_attempt, 1);
-+ webcit_fmt_date(buf, 1024, last_attempt, 1);
- wprintf("%s", buf);
- }
- else {
-diff -ruN webcit-7.50-dfsg/static/t/aide_usermanagement.html webcit-7.50b-dfsg/static/t/aide_usermanagement.html
---- webcit-7.50-dfsg/static/t/aide_usermanagement.html 2009-04-09 15:58:30.000000000 +0200
-+++ webcit-7.50b-dfsg/static/t/aide_usermanagement.html 2009-04-23 22:34:32.000000000 +0200
-@@ -1,4 +1,4 @@
- <ul class="adminitems">
--<li><a href="select_user_to_edit"><?_("Add, change, delete user accounts")></a></li>
-+<li><a href="select_user_to_edit?SortBy=1SortOrder=1"><?_("Add, change, delete user accounts")></a></li>
- <li><a href="validate"><?_("Validate new users")></a></li>
- </ul>
-diff -ruN webcit-7.50-dfsg/static/t/section_userlist_select.html webcit-7.50b-dfsg/static/t/section_userlist_select.html
---- webcit-7.50-dfsg/static/t/section_userlist_select.html 2009-04-09 15:58:30.000000000 +0200
-+++ webcit-7.50b-dfsg/static/t/section_userlist_select.html 2009-04-23 22:34:32.000000000 +0200
-@@ -1 +1 @@
--<option "<?USERLIST:USERNAME>"<?%("COND:USERNAME", 1, 1, 1, " selected", "")>><?USERLIST:USERNAME("X")></option>
-+<option "<?USERLIST:USERNAME("U")>"<?%("COND:USERNAME", 1, 1, 1, " selected", "")>><?USERLIST:USERNAME("X")></option>
-diff -ruN webcit-7.50-dfsg/static/t/view_message_replyquote.html webcit-7.50b-dfsg/static/t/view_message_replyquote.html
---- webcit-7.50-dfsg/static/t/view_message_replyquote.html 2009-04-09 15:58:30.000000000 +0200
-+++ webcit-7.50b-dfsg/static/t/view_message_replyquote.html 2009-04-23 22:34:32.000000000 +0200
-@@ -8,5 +8,7 @@
- <?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
- <?!("COND:MAIL:SUBJ",6)><span class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></span><?!("X", 6)>
- </div><?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>
-- <div class="message_content"> <?MAIL:BODY> </div>
-+ <div class="message_content"> <?MAIL:BODY>
-+ <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
-+</div>
- </blockquote>
-diff -ruN webcit-7.50-dfsg/webcit.c webcit-7.50b-dfsg/webcit.c
---- webcit-7.50-dfsg/webcit.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/webcit.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: webcit.c 7229 2009-03-18 19:48:35Z dothebart $
-+ * $Id: webcit.c 7369 2009-04-18 12:27:01Z dothebart $
- *
- * This is the main transaction loop of the web service. It maintains a
- * persistent session to the Citadel server, handling HTTP WebCit requests as
-@@ -833,6 +833,16 @@
- }
- if (WCC->serv_info == NULL)
- WCC->serv_info = get_serv_info(browser_host, user_agent);
-+ if (WCC->serv_info == NULL){
-+ begin_burst();
-+ wprintf(_("Received unexpected answer from Citadel "
-+ "server; bailing out."));
-+ hprintf("HTTP/1.1 200 OK\r\n");
-+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
-+ end_burst();
-+ end_webcit_session();
-+ goto SKIP_ALL_THIS_CRAP;
-+ }
- if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
- begin_burst();
- wprintf(_("You are connected to a Citadel "
-diff -ruN webcit-7.50-dfsg/webcit.h webcit-7.50b-dfsg/webcit.h
---- webcit-7.50-dfsg/webcit.h 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/webcit.h 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
-
--/* $Id: webcit.h 7284 2009-04-02 21:25:22Z ajc $ */
-+/* $Id: webcit.h 7369 2009-04-18 12:27:01Z dothebart $ */
-
- #include "sysdep.h"
-
-@@ -616,7 +616,7 @@
- void worker_entry(void);
- void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *ReqType, StrBuf *ReadBuf);
- size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm);
--void fmt_time(char *buf, time_t thetime);
-+void fmt_time(char *buf, size_t siz, time_t thetime);
- void httpdate(char *buf, time_t thetime);
- time_t httpdate_to_timestamp(StrBuf *buf);
- void end_webcit_session(void);
-@@ -636,8 +636,6 @@
- void MimeLoadData(wc_mime_attachment *Mime);
- int pattern2(char *search, char *patn);
- void do_edit_vcard(long, char *, char *, const char *);
--void striplt(char *);
--void stripltlen(char *, int *);
- void select_user_to_edit(char *message, char *preselect);
- void delete_user(char *);
- void do_change_view(int);
-@@ -726,7 +724,7 @@
- #define DATEFMT_BRIEF 1
- #define DATEFMT_RAWDATE 2
- #define DATEFMT_LOCALEDATE 3
--void webcit_fmt_date(char *buf, time_t thetime, int Format);
-+void webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format);
- int fetch_http(char *url, char *target_buf, int maxbytes);
- void free_attachments(wcsession *sess);
- void summary(void);
-diff -ruN webcit-7.50-dfsg/webserver.c webcit-7.50b-dfsg/webserver.c
---- webcit-7.50-dfsg/webserver.c 2009-04-09 15:58:32.000000000 +0200
-+++ webcit-7.50b-dfsg/webserver.c 2009-04-23 22:34:34.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * $Id: webserver.c 7166 2009-02-26 20:07:30Z dothebart $
-+ * $Id: webserver.c 7336 2009-04-11 22:26:39Z dothebart $
- *
- * This contains a simple multithreaded TCP server manager. It sits around
- * waiting on the specified port for incoming HTTP connections. When a
-@@ -394,6 +394,7 @@
- const char *Error, *pch, *pchs;
- int rlen, len, retval = 0;
-
-+#ifdef HAVE_OPENSSL
- if (is_https) {
- int ntries = 0;
- if (StrLength(CLineBuf) > 0) {
-@@ -441,6 +442,7 @@
- return -1;
- }
- else
-+#endif
- return StrBufTCP_read_buffered_line(Target,
- CLineBuf,
- sock,
Modified: webcit/trunk/debian/patches/series
===================================================================
--- webcit/trunk/debian/patches/series 2009-06-04 07:10:50 UTC (rev 355)
+++ webcit/trunk/debian/patches/series 2009-06-04 07:11:59 UTC (rev 356)
@@ -1 +0,0 @@
-750b.diff
More information about the Pkg-citadel-commit
mailing list