[Pkg-citadel-commit] r200 - citadel/trunk/debian citadel/trunk/debian/patches libcitadel/trunk/debian webcit/trunk/debian webcit/trunk/debian/patches
dothebart-guest at alioth.debian.org
dothebart-guest at alioth.debian.org
Sat Feb 14 12:30:48 UTC 2009
Author: dothebart-guest
Date: 2009-02-14 12:30:48 +0000 (Sat, 14 Feb 2009)
New Revision: 200
Added:
citadel/trunk/debian/patches/r6951_empty_user.diff
webcit/trunk/debian/patches/r6795_remove_all_calendar_recipient_crapola_in_parentheses.diff
webcit/trunk/debian/patches/r7104..7107_remove_unneeded_parameters.diff
Removed:
webcit/trunk/debian/patches/r6951_empty_user.diff
Modified:
citadel/trunk/debian/changelog
citadel/trunk/debian/patches/series
libcitadel/trunk/debian/changelog
webcit/trunk/debian/changelog
webcit/trunk/debian/patches/series
Log:
* move patch from webcit to citadel, this went into the wrong pipe.
* add upstream patch to webcit removing unneded parameters
* add upstream patch to remove all parantesis on calendar attendees, not just the first
Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog 2009-02-12 12:10:15 UTC (rev 199)
+++ citadel/trunk/debian/changelog 2009-02-14 12:30:48 UTC (rev 200)
@@ -1,8 +1,12 @@
citadel (7.38-2) unstable; urgency=low
+ [ Michael Meskes ]
+ * [r6951] added upstream patch to make citadel authenticate even if no real
+ name is given, closes: #507871
+
[ Wilfried Goesgens ]
* [r7073] add upstream prepatch; msg4 would output invalid lines if to
- many recipients are there, which causes wecit to show spurious to: lines
+ many recipients are there, which causes webcit to show spurious to: lines
-- Michael Meskes <meskes at debian.org> Sat, 07 Feb 2009 17:04:55 +0100
Copied: citadel/trunk/debian/patches/r6951_empty_user.diff (from rev 199, webcit/trunk/debian/patches/r6951_empty_user.diff)
===================================================================
--- citadel/trunk/debian/patches/r6951_empty_user.diff (rev 0)
+++ citadel/trunk/debian/patches/r6951_empty_user.diff 2009-02-14 12:30:48 UTC (rev 200)
@@ -0,0 +1,36 @@
+Index: citadel-7.38/modules/vcard/serv_vcard.c
+===================================================================
+--- citadel-7.38/modules/vcard/serv_vcard.c (Revision 6950)
++++ citadel-7.38/modules/vcard/serv_vcard.c (Revision 6951)
+@@ -997,8 +997,9 @@
+ #ifdef SOLARIS_GETPWUID
+ if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) {
+ #else // SOLARIS_GETPWUID
+- struct passwd **result = NULL;
+- if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, result) == 0) {
++ struct passwd *result = NULL;
++ CtdlLogPrintf(CTDL_DEBUG, "Searching for uid %d\n", usbuf->uid);
++ if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) {
+ #endif // HAVE_GETPWUID_R
+ snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn);
+ vcard_add_prop(v, "email;internet", buf);
+Index: citadel-7.38/user_ops.c
+===================================================================
+--- citadel-7.38/user_ops.c (Revision 6950)
++++ citadel-7.38/user_ops.c (Revision 6951)
+@@ -1062,14 +1062,7 @@
+ uid = pd.pw_uid;
+ if (IsEmptyStr (username))
+ {
+- CtdlLogPrintf (CTDL_EMERG,
+- "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n",
+- newusername, pd.pw_uid);
+- snprintf(buf, SIZ,
+- "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n",
+- newusername, pd.pw_uid);
+- aide_message(buf, "User Creation Failure Notice");
+-
++ safestrncpy(username, pd.pw_name, sizeof username);
+ }
+ }
+ else {
Property changes on: citadel/trunk/debian/patches/r6951_empty_user.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series 2009-02-12 12:10:15 UTC (rev 199)
+++ citadel/trunk/debian/patches/series 2009-02-14 12:30:48 UTC (rev 200)
@@ -1,3 +1,4 @@
r6612_fixes.diff
r6718_fix_sieve_header_hickup.diff
r7073_msg4_long_lines.diff
+r6951_empty_user.diff
Modified: libcitadel/trunk/debian/changelog
===================================================================
--- libcitadel/trunk/debian/changelog 2009-02-12 12:10:15 UTC (rev 199)
+++ libcitadel/trunk/debian/changelog 2009-02-14 12:30:48 UTC (rev 200)
@@ -8,6 +8,13 @@
libcitadel (7.37-4) unstable; urgency=low
[Wilfried Goesgens]
+ * [r6615] change vcard version to 2.1
+
+ -- Michael Meskes <meskes at debian.org> Tue, 23 Sep 2008 19:08:29 +0200
+
+libcitadel (7.37-4) unstable; urgency=low
+
+ [Wilfried Goesgens]
* [r6580] add upstream prepatch to not violate vcard
standard, closes: #497948
Modified: webcit/trunk/debian/changelog
===================================================================
--- webcit/trunk/debian/changelog 2009-02-12 12:10:15 UTC (rev 199)
+++ webcit/trunk/debian/changelog 2009-02-14 12:30:48 UTC (rev 200)
@@ -1,7 +1,7 @@
webcit (7.38b-dfsg-2) unstable; urgency=low
- * [r6951] added upstream patch to make webcit authenticate even if no real
- name is given, closes: #507871
+ * r6795 remove all parantesis in calendar attendees, not just the first
+ * r7104..7107 remove unneeded parameters to embeddable calendar
-- Michael Meskes <meskes at debian.org> Thu, 12 Feb 2009 13:09:24 +0100
Added: webcit/trunk/debian/patches/r6795_remove_all_calendar_recipient_crapola_in_parentheses.diff
===================================================================
--- webcit/trunk/debian/patches/r6795_remove_all_calendar_recipient_crapola_in_parentheses.diff (rev 0)
+++ webcit/trunk/debian/patches/r6795_remove_all_calendar_recipient_crapola_in_parentheses.diff 2009-02-14 12:30:48 UTC (rev 200)
@@ -0,0 +1,17 @@
+Index: event.c
+===================================================================
+--- webcit-7.38/event.c (revision 6794)
++++ webcit-7.38/event.c (revision 6795)
+@@ -1018,7 +1018,11 @@
+
+ /* First, strip out the parenthesized partstats. */
+ strcpy(form_attendees, bstr("attendees"));
+- stripout(form_attendees, '(', ')');
++ do {
++ i = strlen(form_attendees);
++ stripout(form_attendees, '(', ')');
++ j = strlen(form_attendees);
++ } while (i != j);
+
+ /* Next, change any commas to newlines, because we want newline-separated attendees. */
+ j = strlen(form_attendees);
Deleted: webcit/trunk/debian/patches/r6951_empty_user.diff
===================================================================
--- webcit/trunk/debian/patches/r6951_empty_user.diff 2009-02-12 12:10:15 UTC (rev 199)
+++ webcit/trunk/debian/patches/r6951_empty_user.diff 2009-02-14 12:30:48 UTC (rev 200)
@@ -1,36 +0,0 @@
-Index: citadel-7.38/modules/vcard/serv_vcard.c
-===================================================================
---- citadel-7.38/modules/vcard/serv_vcard.c (Revision 6950)
-+++ citadel-7.38/modules/vcard/serv_vcard.c (Revision 6951)
-@@ -997,8 +997,9 @@
- #ifdef SOLARIS_GETPWUID
- if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) {
- #else // SOLARIS_GETPWUID
-- struct passwd **result = NULL;
-- if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, result) == 0) {
-+ struct passwd *result = NULL;
-+ CtdlLogPrintf(CTDL_DEBUG, "Searching for uid %d\n", usbuf->uid);
-+ if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) {
- #endif // HAVE_GETPWUID_R
- snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn);
- vcard_add_prop(v, "email;internet", buf);
-Index: citadel-7.38/user_ops.c
-===================================================================
---- citadel-7.38/user_ops.c (Revision 6950)
-+++ citadel-7.38/user_ops.c (Revision 6951)
-@@ -1062,14 +1062,7 @@
- uid = pd.pw_uid;
- if (IsEmptyStr (username))
- {
-- CtdlLogPrintf (CTDL_EMERG,
-- "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n",
-- newusername, pd.pw_uid);
-- snprintf(buf, SIZ,
-- "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n",
-- newusername, pd.pw_uid);
-- aide_message(buf, "User Creation Failure Notice");
--
-+ safestrncpy(username, pd.pw_name, sizeof username);
- }
- }
- else {
Added: webcit/trunk/debian/patches/r7104..7107_remove_unneeded_parameters.diff
===================================================================
--- webcit/trunk/debian/patches/r7104..7107_remove_unneeded_parameters.diff (rev 0)
+++ webcit/trunk/debian/patches/r7104..7107_remove_unneeded_parameters.diff 2009-02-14 12:30:48 UTC (rev 200)
@@ -0,0 +1,92 @@
+Index: calendar_view.c
+===================================================================
+--- webcit-7.38/calendar_view.c (revision 7107)
++++ webcit-7.38/calendar_view.c (revision 7108)
+@@ -8,12 +8,12 @@
+ #include "webserver.h"
+
+
+-void embeddable_mini_calendar(int year, int month, char *urlformat)
++void embeddable_mini_calendar(int year, int month)
+ {
+ struct tm starting_tm;
+ struct tm tm;
+ time_t thetime;
+- int i, len;
++ int i;
+ time_t previous_month;
+ time_t next_month;
+ time_t colheader_time;
+@@ -23,8 +23,7 @@
+ char weekstart_buf[16];
+ char url[256];
+ char div_id[256];
+- char escaped_urlformat[256];
+-
++
+ snprintf(div_id, sizeof div_id, "mini_calendar_%d", rand() );
+
+ /* Determine what day to start.
+@@ -103,7 +102,7 @@
+ }
+
+ if (tm.tm_mon == month-1) {
+- snprintf(url, sizeof url, urlformat,
++ snprintf(url, sizeof url, "readfwd?calview=day&year=%d&month=%d&day=%d",
+ tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday);
+ wprintf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
+ }
+@@ -124,22 +123,16 @@
+ wprintf("</table>" /** end of inner table */
+ "</div>\n");
+
+- /* javascript for previous and next month */
+- len = strlen(urlformat);
+- for (i=0; i<len; ++i) {
+- sprintf(&escaped_urlformat[i*2], "%02X", urlformat[i]);
+- }
+-
+ wprintf("<script type=\"text/javascript\"> "
+ " function minical_change_month(year, month) { "
+ " p = 'year=' + year + '&month=' + month "
+- " + '&urlformat=%s&r=' + CtdlRandomString(); "
++ " + '&r=' + CtdlRandomString(); "
+ " new Ajax.Updater('%s', 'mini_calendar', "
+ " { method: 'get', parameters: p, evalScripts: true } ); "
+ " } "
+ "</script>\n"
+ ,
+- escaped_urlformat, div_id
++ div_id
+ );
+
+ }
+@@ -148,18 +141,7 @@
+ * \brief ajax embedder for the above mini calendar
+ */
+ void ajax_mini_calendar(void) {
+- char urlformat[256];
+- int i, len;
+- char *escaped_urlformat;
+-
+- escaped_urlformat = bstr("urlformat");
+- len = strlen(escaped_urlformat) * 2 ;
+- for (i=0; i<len; ++i) {
+- urlformat[i] = xtoi(&escaped_urlformat[i*2], 2);
+- urlformat[i+1] = 0;
+- }
+-
+- embeddable_mini_calendar( ibstr("year"), ibstr("month"), urlformat );
++ embeddable_mini_calendar( ibstr("year"), ibstr("month"));
+ }
+
+
+@@ -1254,7 +1236,7 @@
+
+ /** Embed a mini month calendar in this space */
+ wprintf("<br />\n");
+- embeddable_mini_calendar(year, month, "readfwd?calview=day&year=%d&month=%d&day=%d");
++ embeddable_mini_calendar(year, month);
+
+ wprintf("</font></center>\n");
+
Modified: webcit/trunk/debian/patches/series
===================================================================
--- webcit/trunk/debian/patches/series 2009-02-12 12:10:15 UTC (rev 199)
+++ webcit/trunk/debian/patches/series 2009-02-14 12:30:48 UTC (rev 200)
@@ -1 +1,2 @@
-r6951_empty_user.diff
+r6795_remove_all_calendar_recipient_crapola_in_parentheses.diff
+r7104..7107_remove_unneeded_parameters.diff
More information about the Pkg-citadel-commit
mailing list