Attachment 42638 Details for Bug 66444 – file.diff

[patch] file.diff

file.diff (text/plain), 2.33 KB, created by Udo.Schweigert on 2004-05-10 11:10:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Udo.Schweigert

Created: 2004-05-10 11:10:22 UTC

Size: 2.33 KB

patch

obsolete

>diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
>--- /usr/ports/mail/mutt-devel/Makefile	Sun Mar 14 07:16:54 2004
>+++ ./Makefile	Fri Apr 23 07:52:37 2004
>@@ -37,6 +37,9 @@
> #  WITH_MUTT_COMPRESSED_FOLDERS
> #  This is a default knob and can be disabled by WITHOUT_MUTT_COMPRESSED_FOLDERS
> #
>+# If you do not want mutt to use the iconv library define:
>+#  WITHOUT_MUTT_ICONV
>+#
> # If you want to enable extended quoting functions define:
> #  WITH_MUTT_QUOTE_PATCH
> #  This is a default knob and can be disabled by WITHOUT_MUTT_QUOTE_PATCH
>@@ -113,7 +116,7 @@
> CONFIGURE_ARGS=	--enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \
> 		--with-sharedir=${PREFIX}/share/mutt --with-docdir=${DOCSDIR} \
> 		--sysconfdir=${PREFIX}/etc --enable-external-dotlock \
>-		--with-libiconv-prefix=${PREFIX} --enable-pop --enable-imap
>+		--enable-pop --enable-imap
> .if defined(MUTT_CONFIGURE_ARGS)
> CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
> .endif
>@@ -184,6 +187,9 @@
> .if !defined(WITHOUT_NLS)
> USE_GETTEXT=	yes
> .endif
>+.if !defined(WITHOUT_MUTT_ICONV)
>+USE_ICONV=	yes
>+.endif
> 
> .if defined(NOPORTDOCS)
> SGML_USED=	no
>@@ -239,6 +245,11 @@
> .endif
> .if defined(WITHOUT_NLS)
> CONFIGURE_ARGS+=	--disable-nls
>+.endif
>+.if defined(WITHOUT_MUTT_ICONV) 
>+CONFIGURE_ARGS+=	--disable-iconv
>+.else
>+CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
> .endif
> 
> PATCH_DIST_STRIP=	-p1
>diff -ru  /usr/ports/mail/mutt-devel/files/patch-mktemp ./files/patch-mktemp
>--- /usr/ports/mail/mutt-devel/files/patch-mktemp	Mon Feb  9 16:26:15 2004
>+++ ./files/patch-mktemp	Mon May 10 06:49:52 2004
>@@ -1,12 +1,15 @@
>---- muttlib.c.orig	Sun Feb  1 18:15:17 2004
>-+++ muttlib.c	Mon Feb  9 08:44:36 2004
>-@@ -657,7 +657,8 @@
>+--- muttlib.c.orig	Thu Apr 22 14:43:58 2004
>++++ muttlib.c	Thu Apr 22 14:51:01 2004
>+@@ -657,7 +657,11 @@
>  
>  void _mutt_mktemp (char *s, const char *src, int line)
>  {
> -  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++);
>-+  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
>++  char t[7];
>++  snprintf (t, 7, "-%05d", Counter++);
>++  snprintf (s, _POSIX_PATH_MAX-7, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
> +  mktemp (s);
>++  strncat(s, t, _POSIX_PATH_MAX);
>    dprint (1, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
>    unlink (s);
>  }

Actions: View | Diff

Attachments on bug 66444: 42638