[csw-devel] SF.net SVN: gar:[20834] csw/mgar/pkg/mailutils/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Apr 21 23:51:21 CEST 2013
Revision: 20834
http://gar.svn.sourceforge.net/gar/?rev=20834&view=rev
Author: chninkel
Date: 2013-04-21 21:51:20 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
mailutils/trunk: updated to 2.2
Modified Paths:
--------------
csw/mgar/pkg/mailutils/trunk/Makefile
csw/mgar/pkg/mailutils/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch
csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch
csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch
csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch
Removed Paths:
-------------
csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch
csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch
csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch
csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch
Modified: csw/mgar/pkg/mailutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailutils/trunk/Makefile 2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/Makefile 2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,6 +1,6 @@
# $Id$
NAME = mailutils
-VERSION = 1.2
+VERSION = 2.2
GARTYPE = v2
DESCRIPTION = A collection of mail related utilities
@@ -23,37 +23,43 @@
RUNTIME_DEP_PKGS_CSWmailutils += CSWlibgnutls26
RUNTIME_DEP_PKGS_CSWmailutils += CSWlibreadline6
RUNTIME_DEP_PKGS_CSWmailutils += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibguile2-0-22
RUNTIME_DEP_PKGS_CSWmailutils += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibldap2-4-2
# We will not fix this compliance issue today
CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-pkgname-mismatch
CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-package-contains-so-symlink
-# emacs is an optional requirement
CHECKPKG_OVERRIDES_CSWmailutils += missing-dependency|CSWemacs-common
-# Solaris doesn't have asprintf until recently so we have
-# to define it, we should rather use gnulib but this
-# seemed complicated for a tempororary workaround
-PATCHFILES = 0001-define-asprintf-and-vasprintf.patch
-
-PATCHFILES += 0002-Fix-building-with-fribidi2.noautoconf.patch
+CHECKPKG_OVERRIDES_CSWmailutils += file-with-bad-content|/usr/local|root/opt/csw/bin/mimeview
+CHECKPKG_OVERRIDES_CSWmailutils += file-with-bad-content|/usr/local|root/opt/csw/bin/mail
-# Some libraries are missing in a makefile (?!)
-PATCHFILES += 0003-Add-missing-libraries.patch
+# Workaround a bug with krb5-config
+# see https://www.opencsw.org/mantis/view.php?id=5007
+PATCHFILES += 0001-filter-krb5-config-output.patch
-PATCHFILES += 0004-remove-usr-local-etc-mailcap-path.patch
+PATCHFILES += 0002-remove-usr-local-etc-mailcap-path.patch
+# scm_i_string_chars is not available anymore in guile
+PATCHFILES += 0003-remove-deprecated-guile-function.patch
+
+
DOCFILES = ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog
-DOCFILES += INSTALL NEWS README THANKS TODO
+DOCFILES += INSTALL NEWS README README.guimb.scm README.libsieve
+DOCFILES += THANKS TODO
+PRESERVECONF = $(sysconfdir)/mailutils.rc
+
MIGRATE_FILES = mailutils.rc domain
MIGRATE_SOURCE_DIR = $(prefix)/etc/
MIGRATE_DEST_DIR = $(sysconfdir)/
+GARCOMPILER = GNU
-GARCOMPILER = SUN
-
# This is to find the gnulib generated local lib/stdint.h
EXTRA_CPPFLAGS += -I../lib -I../../lib
@@ -62,22 +68,31 @@
EXTRA_LDFLAGS += -D_XPG6
ifeq ($(GARCOMPILER),SUN)
+
# Mailutils needs to be compiled in C99 mode
EXTRA_CFLAGS += -xc99=all
# This is needed for __FUNCTION__
EXTRA_CPPFLAGS += -features=extensions -D__FUNCTION__=__func__
+# Workaround bug in guile headers when solaris studio is used
+# see https://www.opencsw.org/mantis/view.php?id=5069
+PATCHFILES += 0004-workaround-guile-compilation-bug-with-solaris-studio.patch
+
else # GNU
+
# Mailutils needs to be compiled in C99 mode
EXTRA_CFLAGS += -std=gnu99
+
endif
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-rpath
-CONFIGURE_ARGS += --enable-mh-utils
CONFIGURE_ARGS += --with-gnutls
CONFIGURE_ARGS += --with-gssapi
CONFIGURE_ARGS += --with-mysql
-CONFIGURE_ARGS += --without-guile
+CONFIGURE_ARGS += --with-guile
+CONFIGURE_ARGS += --disable-cxx
+CONFIGURE_ARGS += --without-python
# Make sure the gnulib is built first
BUILD_SCRIPTS = $(WORKSRC)/lib/Makefile
@@ -89,11 +104,11 @@
cd $(WORKSRC)/include/mailutils && $(MAKE) types.h
post-install:
- ginstall -d "$(PKGROOT)$(sysconfdir)/domain"
+ @$(MAKECOOKIE)
for FILE in $(DOCFILES); do \
ginstall -D "$(WORKSRC)/$$FILE" "$(PKGROOT)$(docdir)/$(NAME)/$$FILE"; \
done
ginstall -D "$(FILEDIR)/README.CSW" "$(PKGROOT)$(docdir)/$(NAME)/README.CSW"
ginstall -D "$(FILEDIR)/mailutils.rc" "$(PKGROOT)$(sysconfdir)/mailutils.rc.CSW"
- @$(MAKECOOKIE)
+ rm -f "$(PKGROOT)$(libdir)/charset.alias"
Modified: csw/mgar/pkg/mailutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/mailutils/trunk/checksums 2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/checksums 2013-04-21 21:51:20 UTC (rev 20834)
@@ -1 +1 @@
-0a5bf84e908f15343414c6a95118a373 mailutils-1.2.tar.bz2
+834d2f616b922856127ecfe6c2de7d1a mailutils-2.2.tar.bz2
Deleted: csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch 2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,59 +0,0 @@
-From 9f79b76a93555dda97ca5a9089fb4d23ef3bf96f Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sat, 20 Apr 2013 15:30:34 +0200
-Subject: [PATCH] define asprintf and vasprintf
-
----
- mailbox/mailer.c | 36 +++
- 1 files changed, 36 insertions(+)
-
-diff --git a/mailbox/mailer.c b/mailbox/mailer.c
-index cbb3938..ae10f45 100644
---- a/mailbox/mailer.c
-+++ b/mailbox/mailer.c
-@@ -51,6 +51,42 @@
-
- static char *mailer_url_default;
-
-+#if (defined (__SVR4) && defined (__sun))
-+int vasprintf(char **ret, const char *format, va_list args)
-+{
-+ va_list copy;
-+ va_copy(copy, args);
-+
-+ /* Make sure it is determinate, despite manuals indicating otherwise */
-+ *ret = 0;
-+
-+ int count = vsnprintf(NULL, 0, format, args);
-+ if (count >= 0) {
-+ char* buffer = malloc(count + 1);
-+ if (buffer != NULL) {
-+ count = vsnprintf(buffer, count + 1, format, copy);
-+ if (count < 0)
-+ free(buffer);
-+ else
-+ *ret = buffer;
-+ }
-+ }
-+ va_end(args); // Each va_start() or va_copy() needs a va_end()
-+
-+ return count;
-+}
-+
-+int asprintf(char **strp, const char *fmt, ...)
-+{
-+ int size;
-+ va_list args;
-+ va_start(args, fmt);
-+ size = vasprintf(strp, fmt, args);
-+ va_end(args);
-+ return size;
-+}
-+#endif
-+
- /* FIXME: I'd like to check that the URL is valid, but that requires that the
- mailers already be registered! */
- int
---
-1.8.1.4
-
Added: csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,25 @@
+From 92434e056d3114f0dd1c16f7d7641a9d3def915d Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 21:47:28 +0200
+Subject: [PATCH] filter krb5-config output
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 2c4dcba..8dd1eec 100755
+--- a/configure
++++ b/configure
+@@ -42872,6 +42872,8 @@ $as_echo "GSSAPI libraries not found" >&6; }
+ do
+ case $arg in
+ -Wl,*) ;;
++ -xchip*) ;;
++ -xarch*) ;;
+ *) SERV_AUTHLIBS="$SERV_AUTHLIBS $arg"
+ esac
+ done
+--
+1.8.1.4
+
Deleted: csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch 2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,72 +0,0 @@
-From 6c03bcffdf2504e7ae757128c3e2335d3fe7cd77 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sat, 20 Apr 2013 19:04:04 +0200
-Subject: [PATCH] Fix building with fribidi2
-
----
- frm/common.c | 34 +++++++++++++----------
- 1 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/frm/common.c b/frm/common.c
-index 4ec73c5..a32b10e 100644
---- a/frm/common.c
-+++ b/frm/common.c
-@@ -62,10 +62,10 @@ static char *output_charset = NULL;
- const char *
- get_charset ()
- {
-- char *tmp;
--
- if (!output_charset)
- {
-+ char *tmp;
-+ const char *str = NULL;
- char locale[32];
-
- memset (locale, 0, sizeof (locale));
-@@ -86,16 +86,16 @@ get_charset ()
-
- lang = strtok_r (locale, "_", &sp);
- terr = strtok_r (NULL, ".", &sp);
-- output_charset = strtok_r (NULL, "@", &sp);
-+ str = strtok_r (NULL, "@", &sp);
-
-- if (output_charset)
-- output_charset = xstrdup (output_charset);
-- else
-- output_charset = mu_charset_lookup (lang, terr);
-+ if (!str)
-+ str = mu_charset_lookup (lang, terr);
- }
-
-- if (!output_charset)
-- output_charset = "ASCII";
-+ if (!str)
-+ str = "ASCII";
-+
-+ output_charset = xstrdup (str);
- }
- return output_charset;
- }
-@@ -104,6 +104,9 @@ get_charset ()
- /* BIDI support (will be moved to lib when it's ready) */
- #ifdef HAVE_LIBFRIBIDI
-
-+# include <wchar.h>
-+# define mu_fribidi_wcwidth(c) wcwidth((wchar_t)c)
-+
- static int fb_charset_num = -1;
- FriBidiChar *logical;
- char *outstring;
-@@ -170,7 +184,7 @@ puts_bidi (char *string)
- if (fb_charset_num != FRIBIDI_CHARSET_CAP_RTL)
- {
- while (wid > 0 && idx < len)
-- wid -= fribidi_wcwidth (visual[idx++]);
-+ wid -= mu_fribidi_wcwidth (visual[idx++]);
- }
- else
- {
---
-1.8.1.4
-
Copied: csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch (from rev 20833, csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch)
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,24 @@
+From 8ebbeb7686c5fba4bf52441ac69a80d110d13631 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 10:39:11 +0200
+Subject: [PATCH] remove /usr/local/etc/mailcap path
+
+---
+ lib/mailcap.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/mailcap.c b/lib/mailcap.c
+index 5a43329..65abc13 100644
+--- a/lib/mailcap.c
++++ b/lib/mailcap.c
+@@ -36,7 +36,6 @@
+
+ /* Default mailcap path, the $HOME/.mailcap: entry is prepended to it */
+ #define DEFAULT_MAILCAP \
+- "/usr/local/etc/mailcap:"\
+ "/usr/etc/mailcap:"\
+ "/etc/mailcap:"\
+ "/etc/mail/mailcap:"\
+--
+1.8.1.4
+
Deleted: csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch 2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,28 +0,0 @@
-From b2c9549631b42638687e261eefb9bc8981032016 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sun, 21 Apr 2013 00:57:25 +0200
-Subject: [PATCH] Add missing libraries
-
----
- mail.local/Makefile.in | 5 +
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/mail.local/Makefile.in b/mail.local/Makefile.in
-index 3e2e2d8..00a86b0 100644
---- a/mail.local/Makefile.in
-+++ b/mail.local/Makefile.in
-@@ -374,6 +374,11 @@ mail_local_LDADD = \
- ../lib/libmuaux.la \
- ${MU_LIB_SIEVE}\
- ${MU_LIB_MBOX}\
-+ ${MU_LIB_IMAP}\
-+ ${MU_LIB_MAILDIR}\
-+ ${MU_LIB_MH}\
-+ ${MU_LIB_NNTP}\
-+ ${MU_LIB_POP}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS} \
---
-1.8.1.4
-
Added: csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,50 @@
+From eb851fbc9fec91c1bd095500d3e9b24829ee53cc Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray at gnu.org.ua>
+Date: Thu, 04 Aug 2011 13:13:21 +0000
+Subject: Various bugfixes.
+
+* libmu_scm/mu_message.c (string_sloppy_member): Remove.
+(mu-message-get-header-fields): Use scm_member instead of
+string_sloppy_member.
+---
+(limited to 'libmu_scm/mu_message.c')
+
+diff --git a/libmu_scm/mu_message.c b/libmu_scm/mu_message.c
+index 4a99a8e..4ee603e 100644
+--- a/libmu_scm/mu_message.c
++++ b/libmu_scm/mu_message.c
+@@ -495,20 +495,6 @@ SCM_DEFINE_PUBLIC (scm_mu_message_get_header, "mu-message-get-header", 2, 0, 0,
+ }
+ #undef FUNC_NAME
+
+-static int
+-string_sloppy_member (SCM lst, char *name)
+-{
+- for(; SCM_CONSP (lst); lst = SCM_CDR(lst))
+- {
+- SCM car = SCM_CAR (lst);
+- if (scm_is_string (car)
+- && mu_c_strncasecmp (scm_i_string_chars (car), name,
+- scm_i_string_length (car)) == 0)
+- return 1;
+- }
+- return 0;
+-}
+-
+ SCM_DEFINE_PUBLIC (scm_mu_message_get_header_fields, "mu-message-get-header-fields", 1, 1, 0,
+ (SCM mesg, SCM headers),
+ "Returns list of headers in the message @var{mesg}. optional argument\n"
+@@ -547,8 +533,9 @@ SCM_DEFINE_PUBLIC (scm_mu_message_get_header_fields, "mu-message-get-header-fiel
+ mu_scm_error (FUNC_NAME, status,
+ "Cannot get header field ~A, message ~A",
+ scm_list_2 (scm_from_size_t (i), mesg));
+-
+- if (!scm_is_null (headers) && string_sloppy_member (headers, name) == 0)
++
++ if (!scm_is_null (headers) &&
++ scm_member (headers, scm_from_locale_string (name)) == SCM_BOOL_F)
+ continue;
+ status = mu_header_aget_field_value (hdr, i, &value);
+ if (status)
+--
+cgit v0.9.0.2
Deleted: csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch 2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,24 +0,0 @@
-From 8ebbeb7686c5fba4bf52441ac69a80d110d13631 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sun, 21 Apr 2013 10:39:11 +0200
-Subject: [PATCH] remove /usr/local/etc/mailcap path
-
----
- lib/mailcap.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/mailcap.c b/lib/mailcap.c
-index 5a43329..65abc13 100644
---- a/lib/mailcap.c
-+++ b/lib/mailcap.c
-@@ -36,7 +36,6 @@
-
- /* Default mailcap path, the $HOME/.mailcap: entry is prepended to it */
- #define DEFAULT_MAILCAP \
-- "/usr/local/etc/mailcap:"\
- "/usr/etc/mailcap:"\
- "/etc/mailcap:"\
- "/etc/mail/mailcap:"\
---
-1.8.1.4
-
Added: csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch 2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,38 @@
+From 29b1e1311ef537f2e5709015e77be0d7b8fe7b70 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 19:51:18 +0200
+Subject: [PATCH] Workaround guile compilation bug with solaris studio
+
+---
+ configure | 1 +
+ include/mailutils/guile.h | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 2c4dcba..e11b3ab 100755
+--- a/configure
++++ b/configure
+@@ -54548,6 +54548,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++extern void scm_remember_upto_here_1();
+ #include <libguile.h>
+ int
+ main ()
+diff --git a/include/mailutils/guile.h b/include/mailutils/guile.h
+index 1db5b8a..9a5be0e 100644
+--- a/include/mailutils/guile.h
++++ b/include/mailutils/guile.h
+@@ -20,6 +20,8 @@
+ #ifndef _MU_SCM_H
+ #define _MU_SCM_H
+
++extern void scm_remember_upto_here_1();
++
+ #include <libguile.h>
+
+ #define MU_SCM_SYMBOL_VALUE(p) SCM_VARIABLE_REF(scm_c_lookup(p))
+--
+1.8.1.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list