diff options
Diffstat (limited to 'mail/balsa/files')
| -rw-r--r-- | mail/balsa/files/patch-configure | 52 | ||||
| -rw-r--r-- | mail/balsa/files/patch-libbalsa_imap_imap-handle.c | 10 | ||||
| -rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_local.c | 6 | ||||
| -rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_local.h | 4 | ||||
| -rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_maildir.c | 36 | ||||
| -rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_mbox.c | 19 | ||||
| -rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_mh.c | 248 | ||||
| -rw-r--r-- | mail/balsa/files/patch-src_main-window.h | 11 | ||||
| -rw-r--r-- | mail/balsa/files/patch-src_threads.h | 10 |
9 files changed, 40 insertions, 356 deletions
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure index 92a98f1fa52b..2f9854a63192 100644 --- a/mail/balsa/files/patch-configure +++ b/mail/balsa/files/patch-configure @@ -1,47 +1,29 @@ ---- configure.orig 2014-04-30 13:56:20.982115758 +0000 -+++ configure 2014-04-30 13:56:44.128114528 +0000 -@@ -15038,7 +15038,7 @@ - conftest$ac_exeext conftest.$ac_ext - if test $have_res_init = no ; then - save_LIBS=$LIBS -- LIBS="$LIBS -lresolv" -+ LIBS="$LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <resolv.h> -@@ -16088,7 +16088,7 @@ - $as_echo_n "(cached) " >&6 - else +--- configure.orig 2023-06-10 11:48:17 UTC ++++ configure +@@ -16081,7 +16081,7 @@ + fi + BALSA_WEB_EXTENSIONS="${libdir}/${PACKAGE}" + +- CPPFLAGS="$CPPFLAGS -DBALSA_WEB_EXTENSIONS=\\\"$BALSA_WEB_EXTENSIONS\\\"" ++ CPPFLAGS="$CPPFLAGS -DBALSA_WEB_EXTENSIONS=\\\"$BALSA_WEB_EXTENSIONS\\\"" + for ac_prog in python-html2text \ + html2markdown \ + html2markdown.py2 \ +@@ -16501,7 +16501,7 @@ + printf %s "(cached) " >&6 + else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap -llber -lresolv $LIBS" +LIBS="-lldap -llber $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -16122,7 +16122,7 @@ +@@ -16534,7 +16534,7 @@ - $as_echo "#define ENABLE_LDAP 1" >>confdefs.h + printf "%s\n" "#define ENABLE_LDAP 1" >>confdefs.h - LIBS="-lldap -llber -lresolv $LIBS" + LIBS="-lldap -llber $LIBS" - else + else $as_nop as_fn_error $? "*** You enabled LDAP but ldap library is not found." "$LINENO" 5 fi -@@ -18071,8 +18071,6 @@ - - - --$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h -- - ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h> - " - if test "x$ac_cv_have_decl_localtime_r" = xyes; then : -@@ -18339,7 +18337,7 @@ - INSTALL_MIME_ICONS_FALSE= - fi - --HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-3.0`/share/icons/hicolor -+HICOLOR_ICON_DIR=/usr/local/share/icons/hicolor - - - diff --git a/mail/balsa/files/patch-libbalsa_imap_imap-handle.c b/mail/balsa/files/patch-libbalsa_imap_imap-handle.c deleted file mode 100644 index a7206c8229b7..000000000000 --- a/mail/balsa/files/patch-libbalsa_imap_imap-handle.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libbalsa/imap/imap-handle.c.orig Sun May 1 17:37:58 2005 -+++ libbalsa/imap/imap-handle.c Tue May 3 01:39:13 2005 -@@ -23,6 +23,7 @@ - - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <netdb.h> - #include <glib.h> - #include <glib-object.h> diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.c b/mail/balsa/files/patch-libbalsa_mailbox_local.c index ebe5653298ec..0ca91556c26d 100644 --- a/mail/balsa/files/patch-libbalsa_mailbox_local.c +++ b/mail/balsa/files/patch-libbalsa_mailbox_local.c @@ -1,6 +1,6 @@ ---- libbalsa/mailbox_local.c.orig 2009-05-23 03:02:12.000000000 -0400 -+++ libbalsa/mailbox_local.c 2009-12-25 12:39:52.000000000 -0500 -@@ -440,7 +440,7 @@ libbalsa_mailbox_local_load_config(LibBa +--- libbalsa/mailbox_local.c.orig 2009-05-23 03:02:12 UTC ++++ libbalsa/mailbox_local.c +@@ -468,7 +468,7 @@ typedef struct { GArray * array; diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.h b/mail/balsa/files/patch-libbalsa_mailbox_local.h index 7006f7f42b9f..a9e8958b9f13 100644 --- a/mail/balsa/files/patch-libbalsa_mailbox_local.h +++ b/mail/balsa/files/patch-libbalsa_mailbox_local.h @@ -1,5 +1,5 @@ ---- libbalsa/mailbox_local.h.orig Sun May 6 13:57:53 2007 -+++ libbalsa/mailbox_local.h Thu May 31 01:04:10 2007 +--- libbalsa/mailbox_local.h.orig Sun May 6 13:57:53 UTC ++++ libbalsa/mailbox_local.h @@ -79,7 +79,7 @@ struct _LibBalsaMailboxLocalClass { gint (*check_files)(const gchar * path, gboolean create); void (*set_path)(LibBalsaMailboxLocal * local, const gchar * path); diff --git a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c index 9d865279b4c7..646e0a158883 100644 --- a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c +++ b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c @@ -1,15 +1,15 @@ ---- libbalsa/mailbox_maildir.c.orig 2008-04-13 06:16:40.000000000 -0400 -+++ libbalsa/mailbox_maildir.c 2008-07-04 16:27:21.000000000 -0400 -@@ -25,6 +25,8 @@ - #define _XOPEN_SOURCE 500 - #define _XOPEN_SOURCE_EXTENDED 1 +--- libbalsa/mailbox_maildir.c.orig 2023-01-06 18:47:11 UTC ++++ libbalsa/mailbox_maildir.c +@@ -23,6 +23,8 @@ + #endif /* HAVE_CONFIG_H */ + +#include <sys/types.h> +#include <sys/stat.h> #include <unistd.h> #include <fcntl.h> #include <errno.h> -@@ -49,7 +51,7 @@ struct message_info { +@@ -52,7 +54,7 @@ /* The message's order when parsing; needed for saving the message * tree in a form that will match the msgnos when the mailbox is * reopened. */ @@ -18,25 +18,25 @@ }; #define REAL_FLAGS(flags) ((flags) & LIBBALSA_MESSAGE_FLAGS_REAL) #define FLAGS_REALLY_DIFFER(orig_flags, flags) \ -@@ -175,7 +177,7 @@ libbalsa_mailbox_maildir_class_init(LibB +@@ -152,7 +154,7 @@ libbalsa_mailbox_local_class->check_files = lbm_maildir_check_files; libbalsa_mailbox_local_class->set_path = lbm_maildir_set_path; libbalsa_mailbox_local_class->remove_files = lbm_maildir_remove_files; - libbalsa_mailbox_local_class->fileno = lbm_maildir_fileno; + libbalsa_mailbox_local_class->sti_fileno = lbm_maildir_fileno; libbalsa_mailbox_local_class->get_info = lbm_maildir_get_info; + libbalsa_mailbox_local_class->add_message = lbm_maildir_add_message; } - -@@ -390,7 +392,7 @@ static LibBalsaMessageFlag parse_filenam - } - - static void lbm_maildir_parse(LibBalsaMailboxMaildir * mdir, -- const gchar *subdir, guint * fileno) -+ const gchar *subdir, guint * md_fileno) +@@ -369,7 +371,7 @@ + static void + lbm_maildir_parse(LibBalsaMailboxMaildir *mdir, + const gchar *subdir, +- guint *fileno) ++ guint *md_fileno) { + const gchar *local_path; gchar *path; - GDir *dir; -@@ -443,12 +445,12 @@ static void lbm_maildir_parse(LibBalsaMa +@@ -420,12 +422,12 @@ msg_info->key=key; msg_info->filename=g_strdup(filename); msg_info->local_info.flags = msg_info->orig_flags = flags; @@ -52,7 +52,7 @@ } g_dir_close(dir); } -@@ -456,21 +458,21 @@ static void lbm_maildir_parse(LibBalsaMa +@@ -433,21 +435,21 @@ static void lbm_maildir_parse_subdirs(LibBalsaMailboxMaildir * mdir) { @@ -78,7 +78,7 @@ } static gboolean -@@ -871,7 +873,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal +@@ -849,7 +851,7 @@ msg_info = message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno); diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c b/mail/balsa/files/patch-libbalsa_mailbox_mbox.c deleted file mode 100644 index 2511938ff5de..000000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libbalsa/mailbox_mbox.c.orig Tue Dec 27 14:54:34 2005 -+++ libbalsa/mailbox_mbox.c Thu Dec 29 01:44:01 2005 -@@ -26,6 +26,7 @@ - - #include <gmime/gmime-stream-fs.h> - -+#include <sys/stat.h> - #include <stdlib.h> - #include <unistd.h> - #include <fcntl.h> -@@ -214,7 +215,7 @@ lbm_mbox_check_files(const gchar * path, - } else if (create) { - gint fd; - -- if ((fd = creat(path, S_IRUSR | S_IWUSR)) == -1) { -+ if ((fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)) == -1) { - g_warning("An error:\n%s\n occurred while trying to " - "create the mailbox \"%s\"\n", - strerror(errno), path); diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mh.c b/mail/balsa/files/patch-libbalsa_mailbox_mh.c deleted file mode 100644 index 2caca699b920..000000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_mh.c +++ /dev/null @@ -1,248 +0,0 @@ ---- libbalsa/mailbox_mh.c.orig 2013-03-04 19:36:37.000000000 +0000 -+++ libbalsa/mailbox_mh.c 2014-04-30 13:49:32.084143219 +0000 -@@ -27,6 +27,8 @@ - /* to compile this on BSD/Darwin */ - #undef _POSIX_SOURCE - -+#include <sys/types.h> -+#include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> - #include <errno.h> -@@ -45,7 +47,7 @@ - struct message_info { - LibBalsaMailboxLocalMessageInfo local_info; - LibBalsaMessageFlag orig_flags; /* Has only real flags */ -- gint fileno; -+ gint mi_fileno; - }; - - #define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL) -@@ -261,7 +263,7 @@ - - #define MH_BASENAME(msg_info) \ - g_strdup_printf((msg_info->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \ -- ",%d" : "%d", msg_info->fileno) -+ ",%d" : "%d", msg_info->mi_fileno) - - static GMimeStream * - libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox, -@@ -336,7 +338,7 @@ - lbm_mh_compare_fileno(const struct message_info ** a, - const struct message_info ** b) - { -- return (*a)->fileno - (*b)->fileno; -+ return (*a)->mi_fileno - (*b)->mi_fileno; - } - - static void -@@ -353,7 +355,7 @@ - - while ((filename = g_dir_read_name(dir)) != NULL) { - LibBalsaMessageFlag delete_flag = 0; -- guint fileno; -+ guint mh_fileno; - - if (filename[0] == ',') { - filename++; -@@ -362,22 +364,22 @@ - if (lbm_mh_check_filename(filename) == FALSE) - continue; - -- if (sscanf(filename, "%10d", &fileno) != 1) -+ if (sscanf(filename, "%10d", &mh_fileno) != 1) - break; /* FIXME report error? */ -- if (fileno > mh->last_fileno) -- mh->last_fileno = fileno; -+ if (mh_fileno > mh->last_fileno) -+ mh->last_fileno = mh_fileno; - - if (add_msg_info && mh->messages_info) { - struct message_info *msg_info = - g_hash_table_lookup(mh->messages_info, -- GINT_TO_POINTER(fileno)); -+ GINT_TO_POINTER(mh_fileno)); - if (!msg_info) { - msg_info = g_new0(struct message_info, 1); - msg_info->local_info.flags = INVALID_FLAG; - g_hash_table_insert(mh->messages_info, -- GINT_TO_POINTER(fileno), msg_info); -+ GINT_TO_POINTER(mh_fileno), msg_info); - g_ptr_array_add(mh->msgno_2_msg_info, msg_info); -- msg_info->fileno = fileno; -+ msg_info->mi_fileno = mh_fileno; - } - msg_info->orig_flags = delete_flag; - } -@@ -395,17 +397,17 @@ - static const gchar *LibBalsaMailboxMhRecent = "recent:"; - - static void --lbm_mh_set_flag(LibBalsaMailboxMh * mh, guint fileno, LibBalsaMessageFlag flag) -+lbm_mh_set_flag(LibBalsaMailboxMh * mh, guint mh_fileno, LibBalsaMessageFlag flag) - { - struct message_info *msg_info; - -- if (!fileno) -+ if (!mh_fileno) - return; - -- msg_info = g_hash_table_lookup(mh->messages_info, GINT_TO_POINTER(fileno)); -+ msg_info = g_hash_table_lookup(mh->messages_info, GINT_TO_POINTER(mh_fileno)); - - if (!msg_info) { -- g_print("MH sequence info for nonexistent message %d\n", fileno); -+ g_print("MH sequence info for nonexistent message %d\n", mh_fileno); - return; - } - -@@ -434,7 +436,7 @@ - - for (seq = sequences; *seq; seq++) { - guint end = 0; -- guint fileno; -+ guint mh_fileno; - - if (!**seq) - continue; -@@ -445,11 +447,11 @@ - if (sscanf(line, "%10d", &end) != 1) - break; /* FIXME report error? */ - } -- if (sscanf(*seq, "%10d", &fileno) != 1) -+ if (sscanf(*seq, "%10d", &mh_fileno) != 1) - break; /* FIXME report error? */ - do -- lbm_mh_set_flag(mh, fileno, flag); -- while (++fileno <= end); -+ lbm_mh_set_flag(mh, mh_fileno, flag); -+ while (++mh_fileno <= end); - } - - g_strfreev(sequences); -@@ -581,7 +583,7 @@ - sequences = g_strsplit(p, " ", 0); - for (seq = sequences; *seq; seq++) { - guint end = 0; -- guint fileno; -+ guint mh_fileno; - - if (!**seq) - continue; -@@ -592,15 +594,15 @@ - if (sscanf(p, "%10d", &end) != 1) - break; /* FIXME report error? */ - } -- if (sscanf(*seq, "%10d", &fileno) != 1) -+ if (sscanf(*seq, "%10d", &mh_fileno) != 1) - break; /* FIXME report error? */ - do { -- p = g_strdup_printf("%s/%d", path, fileno); -+ p = g_strdup_printf("%s/%d", path, mh_fileno); - if (access(p, F_OK) == 0) - retval = TRUE; - g_free(p); - /* One undeleted unread message is enough. */ -- } while (!retval && ++fileno <= end); -+ } while (!retval && ++mh_fileno <= end); - } - g_strfreev(sequences); - break; -@@ -687,7 +689,7 @@ - else { - g_ptr_array_remove(mh->msgno_2_msg_info, msg_info); - g_hash_table_remove(mh->messages_info, -- GINT_TO_POINTER(msg_info->fileno)); -+ GINT_TO_POINTER(msg_info->mi_fileno)); - libbalsa_mailbox_local_msgno_removed(mailbox, msgno); - if (renumber > msgno) - /* First message that needs renumbering. */ -@@ -764,11 +766,11 @@ - if (!(msg_info->local_info.flags & flag)) - return; - -- if (li->last < msg_info->fileno - 1) { -+ if (li->last < msg_info->mi_fileno - 1) { - lbm_mh_print_line(li); -- li->first = msg_info->fileno; -+ li->first = msg_info->mi_fileno; - } -- li->last = msg_info->fileno; -+ li->last = msg_info->mi_fileno; - } - - static gboolean -@@ -850,7 +852,7 @@ - /* free old information */ - g_ptr_array_remove(mh->msgno_2_msg_info, msg_info); - g_hash_table_remove(mh->messages_info, -- GINT_TO_POINTER(msg_info->fileno)); -+ GINT_TO_POINTER(msg_info->mi_fileno)); - libbalsa_mailbox_local_msgno_removed(mailbox, msgno); - } else { - lbm_mh_flag_line(msg_info, LIBBALSA_MESSAGE_FLAG_NEW, &unseen); -@@ -1039,7 +1041,7 @@ - * we'll just add new lines and let the next sync merge them with any - * existing lines. */ - static void --lbm_mh_update_sequences(LibBalsaMailboxMh * mh, gint fileno, -+lbm_mh_update_sequences(LibBalsaMailboxMh * mh, gint mh_fileno, - LibBalsaMessageFlag flags) - { - FILE *fp; -@@ -1050,13 +1052,13 @@ - return; - - if (flags & LIBBALSA_MESSAGE_FLAG_NEW) -- fprintf(fp, "unseen: %d\n", fileno); -+ fprintf(fp, "unseen: %d\n", mh_fileno); - if (flags & LIBBALSA_MESSAGE_FLAG_FLAGGED) -- fprintf(fp, "flagged: %d\n", fileno); -+ fprintf(fp, "flagged: %d\n", mh_fileno); - if (flags & LIBBALSA_MESSAGE_FLAG_REPLIED) -- fprintf(fp, "replied: %d\n", fileno); -+ fprintf(fp, "replied: %d\n", mh_fileno); - if (flags & LIBBALSA_MESSAGE_FLAG_RECENT) -- fprintf(fp, "recent: %d\n", fileno); -+ fprintf(fp, "recent: %d\n", mh_fileno); - fclose(fp); - } - -@@ -1073,7 +1075,7 @@ - int fd; - GMimeStream *out_stream; - GMimeFilter *crlffilter; -- int fileno; -+ int mh_fileno; - int retries; - GMimeStream *in_stream; - -@@ -1116,14 +1118,14 @@ - libbalsa_mime_stream_shared_unlock(stream); - g_object_unref(in_stream); - -- fileno = mh->last_fileno; -+ mh_fileno = mh->last_fileno; - retries = 10; - do { - /* rename tempfile to message-number-name */ - char *new_filename; - gint rename_status; - -- new_filename = g_strdup_printf("%s/%d", path, ++fileno); -+ new_filename = g_strdup_printf("%s/%d", path, ++mh_fileno); - rename_status = libbalsa_safe_rename(tmp, new_filename); - g_free(new_filename); - if (rename_status != -1) -@@ -1146,9 +1148,9 @@ - "Too high activity?"); - return FALSE; - } -- mh->last_fileno = fileno; -+ mh->last_fileno = mh_fileno; - -- lbm_mh_update_sequences(mh, fileno, -+ lbm_mh_update_sequences(mh, mh_fileno, - flags | LIBBALSA_MESSAGE_FLAG_RECENT); - - return TRUE; diff --git a/mail/balsa/files/patch-src_main-window.h b/mail/balsa/files/patch-src_main-window.h deleted file mode 100644 index c46acf3aa41b..000000000000 --- a/mail/balsa/files/patch-src_main-window.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main-window.h.orig 2014-04-30 17:56:08.057123807 +0000 -+++ src/main-window.h 2014-04-30 17:56:29.581127225 +0000 -@@ -28,6 +28,8 @@ - #include <libnotify/notify.h> - #endif - -+#include <glib.h> -+ - #if GLIB_CHECK_VERSION(2, 32, 0) - #include <gio/gio.h> - #elif defined(HAVE_LIBNM_GLIB) diff --git a/mail/balsa/files/patch-src_threads.h b/mail/balsa/files/patch-src_threads.h deleted file mode 100644 index 585d798ba6f9..000000000000 --- a/mail/balsa/files/patch-src_threads.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/threads.h.orig 2009-08-30 05:03:26.000000000 -0400 -+++ src/threads.h 2009-12-25 12:41:53.000000000 -0500 -@@ -23,6 +23,7 @@ - #define __THREADS_H__ - - #include <unistd.h> -+#include <pthread.h> - - /* FIXME: mailbox_lock is really an internal libbalsa mutex. */ - extern pthread_mutex_t mailbox_lock; |