[Pkg-citadel-commit] r186 - in webcit/trunk/debian: . patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Sun Nov 30 16:33:44 UTC 2008
Author: meskes
Date: 2008-11-30 16:33:44 +0000 (Sun, 30 Nov 2008)
New Revision: 186
Removed:
webcit/trunk/debian/patches/r6407_rate_passwords.diff
webcit/trunk/debian/patches/r6414_perf_serv_printf.diff
webcit/trunk/debian/patches/r6425_url_parser_fix.diff
webcit/trunk/debian/patches/r6443_fix_im_window_weakness.diff
webcit/trunk/debian/patches/r6476_memleak_notes.diff
webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff
Modified:
webcit/trunk/debian/changelog
webcit/trunk/debian/patches/series
Log:
Started working on 7.38-1.
Modified: webcit/trunk/debian/changelog
===================================================================
--- webcit/trunk/debian/changelog 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/changelog 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,3 +1,10 @@
+webcit (7.38-dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+ * Removed all prepatches.
+
+ -- Michael Meskes <meskes at debian.org> Sun, 30 Nov 2008 17:31:10 +0100
+
webcit (7.37-dfsg-6) unstable; urgency=medium
* Added missing build dependency on libssl-dev causing citadel-webcit to not
Deleted: webcit/trunk/debian/patches/r6407_rate_passwords.diff
===================================================================
--- webcit/trunk/debian/patches/r6407_rate_passwords.diff 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/patches/r6407_rate_passwords.diff 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,57 +0,0 @@
-diff -Naurp webcit-7.37-dfsg.orig/auth.c webcit-7.37-dfsg/auth.c
---- webcit-7.37-dfsg.orig/auth.c 2008-06-19 21:17:09.000000000 +0200
-+++ webcit-7.37-dfsg/auth.c 2008-08-15 14:04:31.000000000 +0200
-@@ -6,6 +6,7 @@
-
- #include "webcit.h"
- #include "webserver.h"
-+#include <ctype.h>
-
- /*
- * Access level definitions. This is initialized from a function rather than a
-@@ -671,8 +672,43 @@ void validate(void)
- if (a == 1)
- wprintf("#%s<br /><H1>%s</H1>",
- buf, &cmd[4]);
-- if (a == 2)
-- wprintf("PW: %s<br />\n", buf);
-+ if (a == 2) {
-+ char *pch;
-+ int haveChar = 0;
-+ int haveNum = 0;
-+ int haveOther = 0;
-+ int count = 0;
-+ pch = buf;
-+ while (!IsEmptyStr(pch))
-+ {
-+ if (isdigit(*pch))
-+ haveNum = 1;
-+ else if (isalpha(*pch))
-+ haveChar = 1;
-+ else
-+ haveOther = 1;
-+ pch ++;
-+ }
-+ count = pch - buf;
-+ if (count > 7)
-+ count = 0;
-+ switch (count){
-+ case 0:
-+ pch = _("verry weak");
-+ break;
-+ case 1:
-+ pch = _("weak");
-+ break;
-+ case 2:
-+ pch = _("ok");
-+ break;
-+ case 3:
-+ default:
-+ pch = _("strong");
-+ }
-+
-+ wprintf("PW: %s<br />\n", pch);
-+ }
- if (a == 3)
- wprintf("%s<br />\n", buf);
- if (a == 4)
Deleted: webcit/trunk/debian/patches/r6414_perf_serv_printf.diff
===================================================================
--- webcit/trunk/debian/patches/r6414_perf_serv_printf.diff 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/patches/r6414_perf_serv_printf.diff 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,58 +0,0 @@
-diff -Naurp webcit-7.37-dfsg.orig/tcp_sockets.c webcit-7.37-dfsg/tcp_sockets.c
---- webcit-7.37-dfsg.orig/tcp_sockets.c 2008-06-19 21:17:09.000000000 +0200
-+++ webcit-7.37-dfsg/tcp_sockets.c 2008-08-15 14:05:22.000000000 +0200
-@@ -123,21 +123,21 @@ int tcp_connectsock(char *host, char *se
- * \param buf the buffer to get the input to
- * \param bytes the maximal number of bytes to read
- */
--void serv_read(char *buf, int bytes)
-+inline void _serv_read(char *buf, int bytes, struct wcsession *WCC)
- {
- int len, rlen;
-
- len = 0;
- while (len < bytes) {
-- rlen = read(WC->serv_sock, &buf[len], bytes - len);
-+ rlen = read(WCC->serv_sock, &buf[len], bytes - len);
- if (rlen < 1) {
- lprintf(1, "Server connection broken: %s\n",
- strerror(errno));
- wc_backtrace();
-- close(WC->serv_sock);
-- WC->serv_sock = (-1);
-- WC->connected = 0;
-- WC->logged_in = 0;
-+ close(WCC->serv_sock);
-+ WCC->serv_sock = (-1);
-+ WCC->connected = 0;
-+ WCC->logged_in = 0;
- memset(buf, 0, bytes);
- return;
- }
-@@ -145,19 +145,25 @@ void serv_read(char *buf, int bytes)
- }
- }
-
-+void serv_read(char *buf, int bytes)
-+{
-+ struct wcsession *WCC = WC;
-+ _serv_read(buf, bytes, WCC);
-+}
-
- /**
- * \brief input string from pipe
- */
- int serv_getln(char *strbuf, int bufsize)
- {
-+ struct wcsession *WCC = WC;
- int ch, len;
- char buf[2];
-
- len = 0;
- strbuf[0] = 0;
- do {
-- serv_read(&buf[0], 1);
-+ _serv_read(&buf[0], 1, WCC);
- ch = buf[0];
- if ((ch != 13) && (ch != 10)) {
- strbuf[len++] = ch;
Deleted: webcit/trunk/debian/patches/r6425_url_parser_fix.diff
===================================================================
--- webcit/trunk/debian/patches/r6425_url_parser_fix.diff 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/patches/r6425_url_parser_fix.diff 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,20 +0,0 @@
-diff -Naurp webcit-7.37-dfsg.orig/webcit.c webcit-7.37-dfsg/webcit.c
---- webcit-7.37-dfsg.orig/webcit.c 2008-06-19 21:17:09.000000000 +0200
-+++ webcit-7.37-dfsg/webcit.c 2008-08-15 14:05:48.000000000 +0200
-@@ -109,7 +109,7 @@ void addurls(char *url, long ulen)
- buf[ulen] = '\0';
- eptr = buf + ulen;
- up = buf;
-- while (!IsEmptyStr(up)) {
-+ while ((up < eptr) && (!IsEmptyStr(up))) {
- aptr = up;
- while ((aptr < eptr) && (*aptr != '\0') && (*aptr != '='))
- aptr++;
-@@ -143,6 +143,7 @@ void addurls(char *url, long ulen)
- lprintf(9, "%s = [%ld] %s\n", u->url_key, u->url_data_size, u->url_data);
- #endif
- }
-+ free(buf);
- }
-
- /*
Deleted: webcit/trunk/debian/patches/r6443_fix_im_window_weakness.diff
===================================================================
--- webcit/trunk/debian/patches/r6443_fix_im_window_weakness.diff 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/patches/r6443_fix_im_window_weakness.diff 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,16 +0,0 @@
-diff -Naurp webcit-7.37-dfsg.orig/static/instant_messenger.html webcit-7.37-dfsg/static/instant_messenger.html
---- webcit-7.37-dfsg.orig/static/instant_messenger.html 2008-06-19 21:17:09.000000000 +0200
-+++ webcit-7.37-dfsg/static/instant_messenger.html 2008-08-15 14:06:10.000000000 +0200
-@@ -47,10 +47,10 @@ function SendSomething(which_div, sendfo
-
- // Send the text to the server
- parms = 'r=' + Math.random()
-- + '&g_cmd=SEXP ' + recipient + '|' + escape(thetext);
-+ + '&g_cmd=SEXP ' + recipient + '|-\n' + escape(thetext);
- new Ajax.Request('../ajax_servcmd',
- {
-- method: 'get',
-+ method: 'post',
- parameters: parms
- }
- );
Deleted: webcit/trunk/debian/patches/r6476_memleak_notes.diff
===================================================================
--- webcit/trunk/debian/patches/r6476_memleak_notes.diff 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/patches/r6476_memleak_notes.diff 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,21 +0,0 @@
-diff -Naurp webcit-7.37-dfsg.orig/notes.c webcit-7.37-dfsg/notes.c
---- webcit-7.37-dfsg.orig/notes.c 2008-06-19 21:17:09.000000000 +0200
-+++ webcit-7.37-dfsg/notes.c 2008-08-15 14:06:45.000000000 +0200
-@@ -227,13 +227,16 @@ struct vnote *vnote_new_from_msg(long ms
- void write_vnote_to_server(struct vnote *v)
- {
- char buf[1024];
-+ char *pch;
-
- serv_puts("ENT0 1|||4");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '4') {
- serv_puts("Content-type: text/vnote");
- serv_puts("");
-- serv_puts(vnote_serialize(v));
-+ pch = vnote_serialize(v);
-+ serv_puts(pch);
-+ free(pch);
- serv_puts("000");
- }
- }
Deleted: webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff
===================================================================
--- webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/patches/r6563_fix_vcard_interoperability.diff 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,42 +0,0 @@
-diff -Naurp webcit-7.37-dfsg.orig/vcard_edit.c webcit-7.37-dfsg/vcard_edit.c
---- webcit-7.37-dfsg.orig/vcard_edit.c 2008-06-19 21:17:09.000000000 +0200
-+++ webcit-7.37-dfsg/vcard_edit.c 2008-08-15 14:04:31.000000000 +0200
-@@ -134,7 +134,7 @@
- safestrncpy(org, value, sizeof org);
- }
-
-- else if (!strcasecmp(key, "adr")) {
-+ else if ( (!strcasecmp(key, "adr")) || (!strncasecmp(key, "adr;", 4)) ) {
- extract_token(pobox, value, 0, ';', sizeof pobox);
- extract_token(extadr, value, 1, ';', sizeof extadr);
- extract_token(street, value, 2, ';', sizeof street);
-@@ -144,23 +144,24 @@
- extract_token(country, value, 6, ';', sizeof country);
- }
-
-- else if (!strcasecmp(key, "tel;home")) {
-+ else if ( (!strcasecmp(key, "tel;home")) || (!strcasecmp(key, "tel;type=home")) ) {
- extract_token(hometel, value, 0, ';', sizeof hometel);
- }
-
-- else if (!strcasecmp(key, "tel;work")) {
-+ else if ( (!strcasecmp(key, "tel;work")) || (!strcasecmp(key, "tel;type=work")) ) {
- extract_token(worktel, value, 0, ';', sizeof worktel);
- }
-
-- else if (!strcasecmp(key, "tel;fax")) {
-+ else if ( (!strcasecmp(key, "tel;fax")) || (!strcasecmp(key, "tel;type=fax")) ) {
- extract_token(faxtel, value, 0, ';', sizeof faxtel);
- }
-
-- else if (!strcasecmp(key, "tel;cell")) {
-+ else if ( (!strcasecmp(key, "tel;cell")) || (!strcasecmp(key, "tel;type=cell")) ) {
- extract_token(mobiletel, value, 0, ';', sizeof mobiletel);
- }
-
-- else if (!strcasecmp(key, "email;internet")) {
-+ else if ( (!strcasecmp(key, "email;internet"))
-+ || (!strcasecmp(key, "email;type=internet")) ) {
- if (primary_inetemail[0] == 0) {
- safestrncpy(primary_inetemail, value, sizeof primary_inetemail);
- }
Modified: webcit/trunk/debian/patches/series
===================================================================
--- webcit/trunk/debian/patches/series 2008-11-30 16:30:33 UTC (rev 185)
+++ webcit/trunk/debian/patches/series 2008-11-30 16:33:44 UTC (rev 186)
@@ -1,6 +0,0 @@
-r6407_rate_passwords.diff
-r6414_perf_serv_printf.diff
-r6425_url_parser_fix.diff
-r6443_fix_im_window_weakness.diff
-r6476_memleak_notes.diff
-r6563_fix_vcard_interoperability.diff
More information about the Pkg-citadel-commit
mailing list