Attachment #48164 for bug #73727

View | Details | Raw Unified | Return to bug 73727
Collapse All | Expand All

Lines 66-71 Link Here

(-)./Makefile (-10 / +35 lines)
66	# define	66	# define
67	# WITH_MUTT_CYRUS_SASL2	67	# WITH_MUTT_CYRUS_SASL2
68	#	68	#
		69	# If you want mutt to use the GNU aspell spelling checker define:
		70	# WITH_MUTT_ASPELL
		71	#
		72	# If you want mutt to use the ispell spelling checker define:
		73	# WITH_MUTT_ISPELL
		74	#
69	# If you want to use the rethreading functions define:	75	# If you want to use the rethreading functions define:
70	# WITH_MUTT_EDIT_THREADS	76	# WITH_MUTT_EDIT_THREADS
71	#	77	#
Lines 84-90 Link Here
84		90
85	PORTNAME= mutt-devel	91	PORTNAME= mutt-devel
86	PORTVERSION= 1.5.6	92	PORTVERSION= 1.5.6
87	PORTREVISION= 10	93	PORTREVISION= 11
88	CATEGORIES+= mail ipv6	94	CATEGORIES+= mail ipv6
89	.if defined(WITH_MUTT_NNTP)	95	.if defined(WITH_MUTT_NNTP)
90	CATEGORIES+= news	96	CATEGORIES+= news
Lines 165-174 Link Here
165	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \	171	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \
166	${BUILD_WRKSRC}/Makefile	172	${BUILD_WRKSRC}/Makefile
167		173
168	.if defined(PACKAGE_BUILDING)	174	.if exists(${LOCALBASE}/bin/aspell) && !defined(WITH_MUTT_ISPELL)
		175	WITH_MUTT_ASPELL= yes
		176	.elif exists(${LOCALBASE}/bin/ispell) && !defined(WITH_MUTT_ASPELL)
		177	WITH_MUTT_ISPELL= yes
		178	.endif
		179	.if defined(PACKAGE_BUILDING) && !defined(WITH_MUTT_ASPELL) && \
		180	!defined(WITH_MUTT_ISPELL)
		181	WITH_MUTT_ASPELL= yes
		182	.endif
		183	.if defined(WITH_MUTT_ASPELL)
		184	BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
		185	RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
		186	.elif defined(WITH_MUTT_ISPELL)
169	BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell	187	BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
170	RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \	188	RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
171	urlview:${PORTSDIR}/textproc/urlview	189	.endif
		190	.if defined(PACKAGE_BUILDING)
		191	RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview
172	.endif	192	.endif
173		193
174	.if defined(WITH_MUTT_NCURSES_PORT)	194	.if defined(WITH_MUTT_NCURSES_PORT)
Lines 200-206 Link Here
200	.endif	220	.endif
201	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000	221	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
202	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses	222	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
203	CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include	223	CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
204	.elif defined(MUTT_USES_SLANG)	224	.elif defined(MUTT_USES_SLANG)
205	LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang	225	LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
206	.endif	226	.endif
Lines 209-221 Link Here
209	.endif	229	.endif
210	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)	230	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
211	LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42	231	LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
212	CFLAGS+= -I${PREFIX}/include/db42	232	CFLAGS+= -I${LOCALBASE}/include/db42
213	.endif	233	.endif
214	.if exists(${LOCALBASE}/lib/libidn.so)	234	.if exists(${LOCALBASE}/lib/libidn.so)
215	WITH_MUTT_IDN= yes	235	WITH_MUTT_IDN= yes
216	.endif	236	.endif
217	.if defined(WITH_MUTT_IDN)	237	.if defined(WITH_MUTT_IDN)
218	LIB_DEPENDS+= idn.16:${PORTSDIR}/devel/libidn	238	LIB_DEPENDS+= idn:${PORTSDIR}/devel/libidn
219	.endif	239	.endif
220	.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)	240	.if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
221	pre-configure::	241	pre-configure::
Lines 249-261 Link Here
249	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-edit-threads	269	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-edit-threads
250	.endif	270	.endif
251		271
		272	.if defined(WITH_MUTT_ASPELL)
		273	pre-configure::
		274	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell
		275	.endif
		276
252	.if defined(WITH_MUTT_LOCALES_FIX)	277	.if defined(WITH_MUTT_LOCALES_FIX)
253	CONFIGURE_ARGS+= --enable-locales-fix	278	CONFIGURE_ARGS+= --enable-locales-fix
254	.endif	279	.endif
255	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000	280	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
256	CONFIGURE_ARGS+= --with-curses=${PREFIX}	281	CONFIGURE_ARGS+= --with-curses=${LOCALBASE}
257	.elif defined(MUTT_USES_SLANG)	282	.elif defined(MUTT_USES_SLANG)
258	CONFIGURE_ARGS+= --with-slang=${PREFIX}	283	CONFIGURE_ARGS+= --with-slang=${LOCALBASE}
259	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.slang.gz:vvv	284	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.slang.gz:vvv
260	.endif	285	.endif
261	.if defined(WITH_MUTT_CYRUS_SASL2)	286	.if defined(WITH_MUTT_CYRUS_SASL2)
Lines 267-273 Link Here
267	.if defined(WITHOUT_MUTT_ICONV)	292	.if defined(WITHOUT_MUTT_ICONV)
268	CONFIGURE_ARGS+= --disable-iconv	293	CONFIGURE_ARGS+= --disable-iconv
269	.else	294	.else
270	CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX}	295	CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
271	.endif	296	.endif
272	.if defined(WITH_MUTT_IDN)	297	.if defined(WITH_MUTT_IDN)
273	CONFIGURE_ARGS+= --with-idn	298	CONFIGURE_ARGS+= --with-idn

Line 0 Link Here

(-)./files/extra-patch-aspell (+11 lines)
	1	--- Muttrc.head.in.orig Thu Jan 24 13:10:47 2002
	2	+++ Muttrc.head.in Tue Nov 9 08:53:14 2004
	3	@@ -19,6 +19,8 @@
	4	macro index <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
	5	macro pager <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
	6
	7	+set ispell="/usr/local/bin/aspell --mode=email check"
	8	+
	9	# If Mutt is unable to determine your site's domain name correctly, you can
	10	# set the default here.
	11	#




--- a/PATCHES
+++ b/PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.tg.hcache.11
diff -Nru a/configure.in b/configure.in
--- a/configure.in	2004-08-18 09:43:09 +02:00
+++ b/configure.in	2004-10-14 07:21:52 +02:00

 WHERE char *MhUnseen;
diff -Nru a/hcache.c b/hcache.c
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/hcache.c	2004-11-09 00:09:22 +01:00
@@ -0,0 +1,880 @@
+/*
+ * Copyright (C) 2004 Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
+ * Copyright (C) 2004 Tobias Werth <sitowert@stud.uni-erlangen.de>

+        unsigned long long uid_validity;
+} validate;
+
+static void *
+lazy_malloc(size_t siz)
+{
+	if (0 < siz && siz < 4096) {
+		siz = 4096;
+	}
+
+	return safe_malloc(siz);
+}
+
+static void
+lazy_realloc(void *ptr, size_t siz)
+{
+	void **p = (void **)ptr;
+
+	if ( p != NULL
+	&&   0 < siz
+	&& siz < 4096) {
+		return;
+	}
+
+	safe_realloc(ptr, siz);
+}
+
+static unsigned char *
+dump_int(unsigned int i, unsigned char *d, int *off)
+{
+	lazy_realloc(&d, *off + sizeof(int));
+	memcpy(d + *off, &i, sizeof(int));
+	(*off) += sizeof(int);
+

+
+	size = mutt_strlen(c) + 1;
+	d = dump_int(size, d, off);
+	lazy_realloc(&d, *off + size);
+	memcpy(d + *off, c, size);
+	*off += size;
+

+	}
+
+	d = dump_int(size, d, off);
+	lazy_realloc(&d, *off + size);
+	memcpy(d + *off, c, size);
+	*off += size;
+

+static unsigned char *
+dump_body(BODY *c, unsigned char *d, int *off)
+{
+	lazy_realloc(&d, *off + sizeof(BODY));
+	memcpy(d + *off, c, sizeof(BODY));
+	*off += sizeof(BODY);
+

+{
+	int crc = 0;
+
+	crc = crc32(crc, (unsigned char const *) "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613", mutt_strlen("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
+
+#if HAVE_LANGINFO_CODESET
+	crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset));

+	unsigned char *d = NULL;
+	*off             = 0;
+
+	d = lazy_malloc(sizeof(validate));
+
+	if (uid_validity) {
+		memcpy(d, &uid_validity, sizeof(long long));

+
+	d = dump_int(db->crc, d, off);
+
+	lazy_realloc(&d, *off + sizeof(HEADER));
+	memcpy(d + *off, h, sizeof(HEADER));
+	*off += sizeof(HEADER);
+

Return to bug 73727

Lines 2-8 Link Here

(-)./files/extra-patch-maildir-header-cache (-10 / +34 lines)
2	--- a/PATCHES	2	--- a/PATCHES
3	+++ b/PATCHES	3	+++ b/PATCHES
4	@@ -0,0 +1 @@	4	@@ -0,0 +1 @@
5	+patch-1.5.6.tg.hcache.10	5	+patch-1.5.6.tg.hcache.11
6	diff -Nru a/configure.in b/configure.in	6	diff -Nru a/configure.in b/configure.in
7	--- a/configure.in 2004-08-18 09:43:09 +02:00	7	--- a/configure.in 2004-08-18 09:43:09 +02:00
8	+++ b/configure.in 2004-10-14 07:21:52 +02:00	8	+++ b/configure.in 2004-10-14 07:21:52 +02:00
Lines 131-138 Link Here
131	WHERE char *MhUnseen;	131	WHERE char *MhUnseen;
132	diff -Nru a/hcache.c b/hcache.c	132	diff -Nru a/hcache.c b/hcache.c
133	--- /dev/null Wed Dec 31 16:00:00 196900	133	--- /dev/null Wed Dec 31 16:00:00 196900
134	+++ b/hcache.c 2004-09-28 19:57:45 +02:00	134	+++ b/hcache.c 2004-11-09 00:09:22 +01:00
135	@@ -0,0 +1,856 @@	135	@@ -0,0 +1,880 @@
136	+/*	136	+/*
137	+ * Copyright (C) 2004 Thomas Glanzmann <sithglan@stud.uni-erlangen.de>	137	+ * Copyright (C) 2004 Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
138	+ * Copyright (C) 2004 Tobias Werth <sitowert@stud.uni-erlangen.de>	138	+ * Copyright (C) 2004 Tobias Werth <sitowert@stud.uni-erlangen.de>
Lines 200-209 Link Here
200	+ unsigned long long uid_validity;	200	+ unsigned long long uid_validity;
201	+} validate;	201	+} validate;
202	+	202	+
		203	+static void *
		204	+lazy_malloc(size_t siz)
		205	+{
		206	+ if (0 < siz && siz < 4096) {
		207	+ siz = 4096;
		208	+ }
		209	+
		210	+ return safe_malloc(siz);
		211	+}
		212	+
		213	+static void
		214	+lazy_realloc(void *ptr, size_t siz)
		215	+{
		216	+ void p = (void )ptr;
		217	+
		218	+ if ( p != NULL
		219	+ && 0 < siz
		220	+ && siz < 4096) {
		221	+ return;
		222	+ }
		223	+
		224	+ safe_realloc(ptr, siz);
		225	+}
		226	+
203	+static unsigned char *	227	+static unsigned char *
204	+dump_int(unsigned int i, unsigned char d, int off)	228	+dump_int(unsigned int i, unsigned char d, int off)
205	+{	229	+{
206	+ safe_realloc(&d, *off + sizeof(int));	230	+ lazy_realloc(&d, *off + sizeof(int));
207	+ memcpy(d + *off, &i, sizeof(int));	231	+ memcpy(d + *off, &i, sizeof(int));
208	+ (*off) += sizeof(int);	232	+ (*off) += sizeof(int);
209	+	233	+
Lines 230-236 Link Here
230	+	254	+
231	+ size = mutt_strlen(c) + 1;	255	+ size = mutt_strlen(c) + 1;
232	+ d = dump_int(size, d, off);	256	+ d = dump_int(size, d, off);
233	+ safe_realloc(&d, *off + size);	257	+ lazy_realloc(&d, *off + size);
234	+ memcpy(d + *off, c, size);	258	+ memcpy(d + *off, c, size);
235	+ *off += size;	259	+ *off += size;
236	+	260	+
Lines 247-253 Link Here
247	+ }	271	+ }
248	+	272	+
249	+ d = dump_int(size, d, off);	273	+ d = dump_int(size, d, off);
250	+ safe_realloc(&d, *off + size);	274	+ lazy_realloc(&d, *off + size);
251	+ memcpy(d + *off, c, size);	275	+ memcpy(d + *off, c, size);
252	+ *off += size;	276	+ *off += size;
253	+	277	+
Lines 430-436 Link Here
430	+static unsigned char *	454	+static unsigned char *
431	+dump_body(BODY c, unsigned char d, int *off)	455	+dump_body(BODY c, unsigned char d, int *off)
432	+{	456	+{
433	+ safe_realloc(&d, *off + sizeof(BODY));	457	+ lazy_realloc(&d, *off + sizeof(BODY));
434	+ memcpy(d + *off, c, sizeof(BODY));	458	+ memcpy(d + *off, c, sizeof(BODY));
435	+ *off += sizeof(BODY);	459	+ *off += sizeof(BODY);
436	+	460	+
Lines 542-548 Link Here
542	+{	566	+{
543	+ int crc = 0;	567	+ int crc = 0;
544	+	568	+
545	+ crc = crc32(crc, (unsigned char const *) "sithglan@stud.uni-erlangen.de[sithglan]\|hcache.c\|20040928175752\|08278", mutt_strlen("sithglan@stud.uni-erlangen.de[sithglan]\|hcache.c\|20040928175752\|08278"));	569	+ crc = crc32(crc, (unsigned char const *) "sithglan@stud.uni-erlangen.de[sithglan]\|hcache.c\|20041108231548\|29613", mutt_strlen("sithglan@stud.uni-erlangen.de[sithglan]\|hcache.c\|20041108231548\|29613"));
546	+	570	+
547	+#if HAVE_LANGINFO_CODESET	571	+#if HAVE_LANGINFO_CODESET
548	+ crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset));	572	+ crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset));
Lines 629-635 Link Here
629	+ unsigned char *d = NULL;	653	+ unsigned char *d = NULL;
630	+ *off = 0;	654	+ *off = 0;
631	+	655	+
632	+ d = safe_malloc(sizeof(validate));	656	+ d = lazy_malloc(sizeof(validate));
633	+	657	+
634	+ if (uid_validity) {	658	+ if (uid_validity) {
635	+ memcpy(d, &uid_validity, sizeof(long long));	659	+ memcpy(d, &uid_validity, sizeof(long long));
Lines 642-648 Link Here
642	+	666	+
643	+ d = dump_int(db->crc, d, off);	667	+ d = dump_int(db->crc, d, off);
644	+	668	+
645	+ safe_realloc(&d, *off + sizeof(HEADER));	669	+ lazy_realloc(&d, *off + sizeof(HEADER));
646	+ memcpy(d + *off, h, sizeof(HEADER));	670	+ memcpy(d + *off, h, sizeof(HEADER));
647	+ *off += sizeof(HEADER);	671	+ *off += sizeof(HEADER);
648	+	672	+