P21.4 From netbsd
Vin Shelton <[email protected]> Sun, 15 Feb 2015 08:16:35 -0500
| Newsgroups | gmane.emacs.xemacs.patches |
|---|---|
| Message-ID | <CACeGjnUTXUhmag-mW5LDuFrRyOUWyF7hDTXK7mchYAXpWmrYZA@mail.gmail.com> |
I have culled through the netbsd patches and I think two should be applied to the general source tree: 1. The configure.in changes to support the various netbsd platforms. 2. A change to src/dired.c to use NAME_MAX when it is available. See attached. The vcdiff change comes from emacs and is GPLv3 and cannot be added to 21.4's GPLv2 codebase. - Vin _______________________________________________ XEmacs-Patches mailing list [email protected] http://lists.xemacs.org/mailman/listinfo/xemacs-patches
netbsd.patch
(text/x-patch, 3.1 KB)
diff -r c9a575c99146 ChangeLog --- a/ChangeLog Sat Feb 14 17:45:13 2015 -0500 +++ b/ChangeLog Sat Feb 14 23:13:29 2015 -0500 @@ -1,3 +1,8 @@ +2015-02-15 Vin Shelton <[email protected]> + + * configure.in: Additional netbsd platform definitions. + * configure: Rebuild. + 2015-01-29 Vin Shelton <[email protected]> * XEmacs 21.4.23 is released diff -r c9a575c99146 configure.in --- a/configure.in Sat Feb 14 17:45:13 2015 -0500 +++ b/configure.in Sat Feb 14 23:13:29 2015 -0500 @@ -1082,6 +1082,7 @@ dnl Straightforward machine determination case "$canonical" in + arm-*-* ) machine=arm ;; sparc-*-* ) machine=sparc ;; alpha*-*-* ) machine=alpha ;; vax-*-* ) machine=vax ;; @@ -1160,10 +1161,10 @@ case "$canonical" in i[[3-9]]86-*-netbsd*) machine=intel386 ;; hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* ) - dnl Yes, this is somewhat bogus. - machine=hp9000s300 ;; + machine=m68k ;; pc532-*-netbsd* | ns32k-*-netbsd* ) machine=ns32000 ;; pmax-*-netbsd* | mips-*-netbsd* ) machine=pmax ;; + alpha-*-netbsd* ) machine=alpha ;; esac ;; @@ -1545,6 +1546,7 @@ *-sysv5* ) opsys=sco7 ;; *-386bsd* ) opsys=386bsd ;; *-freebsd* ) opsys=freebsd ;; + *-dragonfly* ) opsys=dragonfly ;; *-nextstep* ) opsys=nextstep ;; *-pc-cygwin* ) opsys=cygwin32 ;; *-pc-mingw* ) opsys=mingw32 ; @@ -2245,7 +2247,7 @@ decosf* | linux* | irix*) dash_r="-rpath " ;; *) dash_r="" - for try_dash_r in "-R" "-R " "-rpath "; do + for try_dash_r in "-Wl,-R" "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" XE_PROTECT_LINKER_FLAGS(xe_check_libs) AC_TRY_LINK(, , dash_r="$try_dash_r") @@ -4522,6 +4524,9 @@ done fi dnl with_tty +AC_CHECK_LIB(ossaudio, main, LIBOSSAUDIO=-lossaudio) +AC_SUBST(LIBOSSAUDIO) + dnl Do we need event-unixoid.o ? dnl This is needed for X, or for TTY, or for MSWIN w/Cygwin select() dnl [but not Mingw MSWIN] diff -r c9a575c99146 src/ChangeLog --- a/src/ChangeLog Sat Feb 14 17:45:13 2015 -0500 +++ b/src/ChangeLog Sat Feb 14 23:13:29 2015 -0500 @@ -1,3 +1,8 @@ +2015-02-15 Vin Shelton <[email protected]> + + * dired.c (Fdirectory_files): Use POSIX-approved NAME_MAX if it's + available. + 2015-02-14 Vin Shelton <[email protected]> * glyphs-eimage.c: CVE-2009-2688 - Check for images too large diff -r c9a575c99146 src/dired.c --- a/src/dired.c Sat Feb 14 17:45:13 2015 -0500 +++ b/src/dired.c Sat Feb 14 23:13:29 2015 -0500 @@ -21,6 +21,7 @@ /* Synched up with: FSF 19.30. */ #include <config.h> +#include <limits.h> #include "lisp.h" #include "sysfile.h" @@ -97,7 +98,11 @@ directory = Ffile_name_as_directory (directory); directorylen = XSTRING_LENGTH (directory); +#ifdef NAME_MAX + statbuf = (char *)alloca (directorylen + NAME_MAX + 1); +#else statbuf = (char *)alloca (directorylen + MAXNAMLEN + 1); +#endif memcpy (statbuf, XSTRING_DATA (directory), directorylen); statbuf_tail = statbuf + directorylen;