MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
Date: Fri, 2 Dec 2011 13:16:31 +0000
From: "Matthias Scheler" <tron@netbsd.org>
Subject: CVS commit: [pkgsrc-2011Q3] pkgsrc/editors/emacs20
To: pkgsrc-changes@NetBSD.org
Reply-To: tron@netbsd.org
Message-Id: <20111202131631.D4638175DD@cvs.netbsd.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

Module Name:	pkgsrc
Committed By:	tron
Date:		Fri Dec  2 13:16:31 UTC 2011

Modified Files:
	pkgsrc/editors/emacs20 [pkgsrc-2011Q3]: distinfo
	pkgsrc/editors/emacs20/patches [pkgsrc-2011Q3]: patch-ab patch-bm
Removed Files:
	pkgsrc/editors/emacs20/patches [pkgsrc-2011Q3]: patch-cb

Log Message:
Pullup ticket #3617 - requested by dholland
editors/emacs20: bug fix patch

Revisions pulled up:
- editors/emacs20/distinfo                                      1.19-1.22
- editors/emacs20/patches/patch-ab                              1.4
- editors/emacs20/patches/patch-bm                              1.2-1.4
- editors/emacs20/patches/patch-cb                              deleted

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Thu Dec  1 04:05:41 UTC 2011

   Modified Files:
   	pkgsrc/editors/emacs20: distinfo
   	pkgsrc/editors/emacs20/patches: patch-ab

   Log Message:
   Patch up configure tests for cpp to avoid problems when running gcc
   4.5's cpp on makefiles. PR 45669.

   Unfortunately, this does not by itself fix the build; now I'm getting

      ./temacs -batch -l loadup dump
      gmake[1]: *** [emacs] Segmentation fault

   and I have a bad feeling that this may be the same issue that the
   other emacs versions are sometimes hitting.

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Thu Dec  1 04:51:30 UTC 2011

   Modified Files:
   	pkgsrc/editors/emacs20: distinfo
   	pkgsrc/editors/emacs20/patches: patch-bm
   Removed Files:
   	pkgsrc/editors/emacs20/patches: patch-cb

   Log Message:
   Fold patch-cb into patch-bm since they patch the same file. Related to
   PR 45669. hi joerg!

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Thu Dec  1 05:07:23 UTC 2011

   Modified Files:
   	pkgsrc/editors/emacs20: distinfo
   	pkgsrc/editors/emacs20/patches: patch-bm

   Log Message:
   Add __asm __volatile("":::"memory") at a critical point in alloc.c.

   gcc thinks it knows the semantics of malloc and so it thinks it can
   optimize out the manipulation of __malloc_hook; however, doing so causes
   the subsequent malloc call to come back to itself, leading to an infinite
   recursion and SIGSEGV in temacs.

   This fixes the remaining part of PR 45669.

   Someone(TM) should check if this issue affects other Emacs versions
   and/or XEmacs.

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Thu Dec  1 05:12:57 UTC 2011

   Modified Files:
   	pkgsrc/editors/emacs20: distinfo
   	pkgsrc/editors/emacs20/patches: patch-bm

   Log Message:
   Extend previous to realloc and free as well, which is almost certainly
   necessary. PR 45669.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 pkgsrc/editors/emacs20/distinfo
cvs rdiff -u -r1.3 -r1.3.50.1 pkgsrc/editors/emacs20/patches/patch-ab
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.68.1 pkgsrc/editors/emacs20/patches/patch-bm
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-cb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.