+++ /dev/null
-diff -Nru zsh-3.1.7.orig/Src/Makefile.in zsh-3.1.7/Src/Makefile.in
---- zsh-3.1.7.orig/Src/Makefile.in Wed May 31 13:55:56 2000
-+++ zsh-3.1.7/Src/Makefile.in Wed May 31 13:58:05 2000
-@@ -178,14 +178,7 @@
- # install binary, creating install directory if necessary
- install.bin-here: zsh$(EXEEXT) install.bin-@L@
- $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir)
-- $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT)
-- if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \
-- rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \
-- $(LN) $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).old; \
-- else :; fi
-- rm -f $(DESTDIR)$(bindir)/$(tzsh).new
-- $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).new
-- mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT)
-+ $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)
- .PHONY: install.bin-here
-
- install.bin-N:
+++ /dev/null
-diff -ur zsh-4.2.5/configure.ac zsh-4.2.5.new/configure.ac
---- zsh-4.2.5/configure.ac 2005-04-04 09:48:58.000000000 +0000
-+++ zsh-4.2.5.new/configure.ac 2005-04-12 08:50:59.871181848 +0000
-@@ -1874,61 +1874,6 @@
- fi
-
- dnl -----------
--dnl if found tcsetpgrp, test to see if it actually works
--dnl for instance, BeOS R4.51 does not support it yet
--dnl -----------
--AH_TEMPLATE([BROKEN_TCSETPGRP],
--[Define to 1 if tcsetpgrp() doesn't work, ie BeOS R4.51.])
--AC_ARG_WITH(tcsetpgrp,
--[ --with-tcsetpgrp assumes that tcsetpgrp() exists and works correctly],[
--case "x$withval" in
-- xyes) zsh_working_tcsetpgrp=yes;;
-- xno) zsh_working_tcsetpgrp=no;;
-- *) AC_ERROR([please use --with-tcsetpgrp=yes or --with-tcsetpgrp=no]);;
--esac],[zsh_working_tcsetpgrp=check])
--if test "x$ac_cv_func_tcsetpgrp" = xyes; then
--case "x$zsh_working_tcsetpgrp" in
-- xcheck)
-- ( trap "" SIGTTOU > /dev/null 2>&1 ) && trap "" SIGTTOU > /dev/null 2>&1
-- AC_CACHE_CHECK(if tcsetpgrp() actually works,
-- zsh_cv_sys_tcsetpgrp,
-- [AC_TRY_RUN([
--#include <sys/types.h>
--#include <unistd.h>
--#include <fcntl.h>
--main() {
-- int fd;
-- int ret;
-- fd=open("/dev/tty", O_RDWR);
-- if (fd < 0) exit(2);
-- ret=tcsetpgrp(fd, tcgetpgrp(fd));
-- if (ret < 0) exit(1);
-- exit(0);
--}
--],
-- zsh_cv_sys_tcsetpgrp=yes, [
--case $? in
-- 1) zsh_cv_sys_tcsetpgrp=no;;
-- 2) zsh_cv_sys_tcsetpgrp=notty;;
-- *) zsh_cv_sys_tcsetpgrp=error;;
--esac
-- ], zsh_cv_sys_tcsetpgrp=yes)])
-- case "x$zsh_cv_sys_tcsetpgrp" in
-- xno) AC_DEFINE(BROKEN_TCSETPGRP);;
-- xyes) :;;
-- xnotty) AC_MSG_ERROR([no controlling tty
--Try running configure with --with-tcsetpgrp or --without-tcsetpgrp]);;
-- *) AC_MSG_ERROR([unexpected return status]);;
-- esac
-- ( trap - SIGTTOU > /dev/null 2>&1 ) && trap - SIGTTOU > /dev/null 2>&1
-- ;;
-- xyes) :;;
-- xno) AC_DEFINE(BROKEN_TCSETPGRP);;
-- *) AC_MSG_ERROR([unexpected value zsh_working_tcsetpgrp=$zsh_working_tcsetpgrp]);;
--esac
--fi
--
--dnl -----------
- dnl test for faked getpwnam() entry, ie a single entry returned for any username
- dnl for instance, BeOS R4.51 is not multiuser yet, and fakes getpwnam()
- dnl test by looking up two usernames that shouldn't succeed, and compare entry
+++ /dev/null
---- zsh.org/Src/hist.c.org 2005-12-16 10:51:24.680963000 +0100
-+++ zsh/Src/hist.c 2005-12-16 10:59:14.100963000 +0100
-@@ -2127,8 +2127,18 @@
- }
- fclose(out);
- if (tmpfile) {
-+ struct stat sb;
-+ int restore = 0;
-+ if (stat(unmeta(fn), &sb) == 0)
-+ restore = 1;
- if (rename(tmpfile, unmeta(fn)) < 0)
- zerr("can't rename %s.new to $HISTFILE", fn, 0);
-+ else if (restore) {
-+ if (chown(unmeta(fn), sb.st_uid, sb.st_gid) < 0)
-+ zerr("can't restore user/group on $HISTFILE", NULL, 0);
-+ if (chmod(unmeta(fn), sb.st_mode) < 0)
-+ zerr("can't restore permissions on $HISTFILE", NULL, 0);
-+ }
- free(tmpfile);
- }
-