diff options
| -rw-r--r-- | editors/emacs/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ah | 32 |
3 files changed, 36 insertions, 3 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index ce2f21434b1..70384b8f0de 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.99 2007/01/23 17:45:13 drochner Exp $ +# $NetBSD: Makefile,v 1.100 2007/01/25 20:52:29 markd Exp $ DISTNAME= emacs-${EMACSVERSION}a -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= editors COMMENT= GNU editing macros (editor) diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 16b88acaa7d..fdc154b0913 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2006/11/01 11:18:20 markd Exp $ +$NetBSD: distinfo,v 1.31 2007/01/25 20:52:29 markd Exp $ SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a @@ -12,6 +12,7 @@ SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620 SHA1 (patch-ai) = ee6cdc06b101805c79e73bc3aaa04f5d79e48872 SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7 +SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91 SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76 diff --git a/editors/emacs/patches/patch-ah b/editors/emacs/patches/patch-ah new file mode 100644 index 00000000000..01269519ded --- /dev/null +++ b/editors/emacs/patches/patch-ah @@ -0,0 +1,32 @@ +$NetBSD: patch-ah,v 1.5 2007/01/25 20:52:29 markd Exp $ + +--- src/unexelf.c.orig 2002-10-16 03:21:44.000000000 +1300 ++++ src/unexelf.c +@@ -971,8 +971,13 @@ unexec (new_name, old_name, data_start, + } + else + { +- /* Any section that was original placed AFTER the bss +- section should now be off by NEW_DATA2_SIZE. */ ++ /* Any section that was originally placed after the .bss ++ section should now be off by NEW_DATA2_SIZE. If a ++ section overlaps the .bss section, consider it to be ++ placed after the .bss section. Overlap can occur if the ++ section just before .bss has less-strict alignment; this ++ was observed between .symtab and .bss on Solaris 2.5.1 ++ (sparc) with GCC snapshot 960602. */ + #ifdef SOLARIS_POWERPC + /* On PPC Reference Platform running Solaris 2.5.1 + the plt section is also of type NOBI like the bss section. +@@ -986,9 +991,8 @@ unexec (new_name, old_name, data_start, + >= OLD_SECTION_H (old_bss_index-1).sh_offset) + NEW_SECTION_H (nn).sh_offset += new_data2_size; + #else +- if (round_up (NEW_SECTION_H (nn).sh_offset, +- OLD_SECTION_H (old_bss_index).sh_addralign) +- >= new_data2_offset) ++ if (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size ++ > new_data2_offset) + NEW_SECTION_H (nn).sh_offset += new_data2_size; + #endif + /* Any section that was originally placed after the section |