diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/CPP-DEFINES | 25 | ||||
| -rw-r--r-- | admin/ChangeLog | 74 | ||||
| -rw-r--r-- | admin/admin.el | 4 | ||||
| -rw-r--r-- | admin/make-tarball.txt | 5 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 23 | ||||
| -rw-r--r-- | admin/notes/bzr | 65 | ||||
| -rw-r--r-- | admin/notes/copyright | 4 |
7 files changed, 160 insertions, 40 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 661cde9c43e..393cf56e993 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -9,7 +9,6 @@ documented in config.in, and this file would not be necessary. AIX _AIX -BSD4_2 BSD_SYSTEM CYGWIN Compiling the Cygwin port. __CYGWIN__ Ditto @@ -86,7 +85,6 @@ anymore, so they can be removed. AMPERSAND_FULL_NAME BROKEN_DATAGRAM_SOCKETS BROKEN_FIONREAD -BROKEN_GETWD BROKEN_GET_CURRENT_DIR_NAME BROKEN_NON_BLOCKING_CONNECT BROKEN_PTY_READ_AFTER_EAGAIN @@ -119,7 +117,6 @@ HAVE_CFMAKERAW HAVE_CFSETSPEED HAVE_CLOCK_GETTIME HAVE_CLOCK_SETTIME -HAVE_CLOSEDIR HAVE_COFF_H HAVE_COM_ERR_H HAVE_COPYSIGN @@ -144,15 +141,12 @@ HAVE_DES_H HAVE_DEV_PTMX HAVE_DIALOGS HAVE_DIFFTIME -HAVE_DIRENT_H HAVE_DUP2 HAVE_ENDGRENT HAVE_ENDPWENT HAVE_ENVIRON_DECL HAVE_EUIDACCESS -HAVE_FCNTL_H HAVE_FORK -HAVE_FPATHCONF HAVE_FREEIFADDRS HAVE_FREETYPE HAVE_FSEEKO @@ -163,7 +157,6 @@ HAVE_FUTIMESAT HAVE_GAI_STRERROR HAVE_GCONF HAVE_GETADDRINFO -HAVE_GETCWD HAVE_GETDELIM HAVE_GETGRENT HAVE_GETHOSTNAME @@ -180,7 +173,6 @@ HAVE_GETRLIMIT HAVE_GETRUSAGE HAVE_GETSOCKNAME HAVE_GETTIMEOFDAY -HAVE_GETWD HAVE_GET_CURRENT_DIR_NAME HAVE_GHOSTSCRIPT HAVE_GIF @@ -266,7 +258,6 @@ HAVE_MEMSET HAVE_MENUS HAVE_MKSTEMP HAVE_MMAP -HAVE_MOUSE HAVE_MULTILINGUAL_MENU HAVE_NANOTIME HAVE_NET_IF_DL_H @@ -298,9 +289,7 @@ HAVE_SENDTO HAVE_SEQPACKET HAVE_SETITIMER HAVE_SETLOCALE -HAVE_SETPGID HAVE_SETRLIMIT -HAVE_SETSID HAVE_SHARED_GAME_DIR HAVE_SHUTDOWN HAVE_SIGNED_${GLTYPE} @@ -308,7 +297,6 @@ HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T HAVE_SIGSET_T -HAVE_SIZE_T HAVE_SNPRINTF HAVE_SOCKETS HAVE_SOUND @@ -373,7 +361,6 @@ HAVE_TM_ZONE HAVE_TOUCHLOCK HAVE_TZNAME HAVE_TZSET -HAVE_UNISTD_H HAVE_UNSIGNED_LONG_LONG_INT HAVE_UTIL_H HAVE_UTIMENSAT @@ -422,10 +409,7 @@ NSIG NSIG_MINIMUM NULL_DEVICE ORDINARY_LINK -O_RDONLY -O_RDWR PAGESIZE -PENDING_OUTPUT_COUNT PREFER_VSUSP PTY_ITERATION PTY_NAME_SPRINTF @@ -433,16 +417,8 @@ PTY_OPEN PTY_TTY_NAME_SPRINTF PURESIZE RUN_TIME_REMAP -SETPGRP_RELEASES_CTTY SETUP_SLAVE_PTY -SIGALRM -SIGCHLD -SIGHUP -SIGKILL SIGNALS_VIA_CHARACTERS -SIGPIPE -SIGQUIT -SIGTRAP STDC_HEADERS SYSTEM_PURESIZE_EXTRA SYSTEM_MALLOC @@ -452,7 +428,6 @@ TERM TIME_WITH_SYS_TIME TIOCSIGSEND TM_IN_SYS_TIME -ULIMIT_BREAK_VALUE UNIX98_PTYS USE_TOOLKIT_SCROLL_BARS USG_SUBTTY_WORKS diff --git a/admin/ChangeLog b/admin/ChangeLog index 7166d363e8a..a75094fa3f1 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,77 @@ +2012-12-14 Paul Eggert <eggert@cs.ucla.edu> + + Fix permissions bugs with setgid directories etc. (Bug#13125) + * CPP-DEFINES (BSD4_2): Remove. + +2012-12-08 Paul Eggert <eggert@cs.ucla.edu> + + Use putenv+unsetenv instead of modifying environ directly (Bug#13070). + * merge-gnulib (GNULIB_MODULES): Add putenv, unsetenv. + + Simplify get_lim_data. + * CPP-DEFINES (ULIMIT_BREAK_VALUE): Remove. + +2012-12-03 Paul Eggert <eggert@cs.ucla.edu> + + Assume POSIX 1003.1-1988 or later for signal.h (Bug#13026). + * CPP-DEFINES (SIGALRM, SIGCHLD, SIGHUP, SIGKILL, SIGPIPE, SIGQUIT): + Remove. + (SIGTRAP): Remove this one too, as config.h no longer defines it. + * merge-gnulib (GNULIB_MODULES): Add sig2str. + +2012-11-24 Ken Brown <kbrown@cornell.edu> + + * CPP-DEFINES (HAVE_MOUSE): Remove. + +2012-11-23 Paul Eggert <eggert@cs.ucla.edu> + + Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958). + * CPP-DEFINES (HAVE_CLOSEDIR, HAVE_DIRENT_H): Remove. + * notes/copyright: Adjust to src/ndir.h -> nt/inc/dirent.h renaming. + +2012-11-21 Paul Eggert <eggert@cs.ucla.edu> + + Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945). + * CPP-DEFINES (BROKEN_GETWD, HAVE_GETCWD, HAVE_GETWD, HAVE_SIZE_T) + (HAVE_UNISTD_H): Remove. + +2012-11-17 Paul Eggert <eggert@cs.ucla.edu> + + Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881). + * CPP-DEFINES (O_RDONLY, O_RDWR, HAVE_FCNTL_H): Remove. + * merge-gnulib (GNULIB_MODULES): Add fcntl-h. + +2012-11-16 Paul Eggert <eggert@cs.ucla.edu> + + Remove no-longer-used pty_max_bytes variable. + * CPP-DEFINES (HAVE_FPATHCONF): Remove. + +2012-11-14 Paul Eggert <eggert@cs.ucla.edu> + + Use faccessat, not access, when checking file permissions (Bug#12632). + * merge-gnulib (GNULIB_MODULES): Add faccessat. + (GNULIB_TOOL_FLAGS): Avoid at-internal, fchdir, malloc-posix, + openat-die, openat-h, save-cwd. Do not avoid fcntl-h. + Omit gnulib's m4/fcntl-o.m4. + +2012-11-05 Paul Eggert <eggert@cs.ucla.edu> + + Assume at least POSIX.1-1988 for getpgrp, setpgid, setsid (Bug#12800). + * CPP-DEFINES (HAVE_SETPGID, HAVE_SETSID, SETPGRP_RELEASES_CTTY): + Remove; obsolete. + + Simplify by assuming __fpending. + * CPP-DEFINES (PENDING_OUTPUT_COUNT): Remove. + +2012-11-03 Glenn Morris <rgm@gnu.org> + + * admin.el (set-copyright): Add msdos/sed2v2.inp. + +2012-11-01 Paul Eggert <eggert@cs.ucla.edu> + + Fix data-loss with --batch (Bug#9574). + * merge-gnulib (GNULIB_MODULES): Add close-stream. + 2012-10-12 Kenichi Handa <handa@gnu.org> * charsets/Makefile (JISC6226.map): Add missing mappings. diff --git a/admin/admin.el b/admin/admin.el index b1a9b37a96e..e815dfade47 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -158,6 +158,10 @@ Root must be the root of an Emacs source tree." (set-version-in-file root "configure.ac" copyright (rx (and bol "copyright" (0+ (not (in ?\"))) ?\" (submatch (1+ (not (in ?\")))) ?\"))) + (set-version-in-file root "msdos/sed2v2.inp" copyright + (rx (and bol "/^#undef " (1+ not-newline) + "define COPYRIGHT" (1+ space) + ?\" (submatch (1+ (not (in ?\")))) ?\"))) (set-version-in-file root "nt/config.nt" copyright (rx (and bol "#" (0+ blank) "define" (1+ blank) "COPYRIGHT" (1+ blank) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index eda28b639d2..aa87f2694e6 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -66,9 +66,8 @@ For each step, check for possible errors. 11. Now you should upload the files to the GNU ftp server. In order to do that, you must be registered as an Emacs maintainer and have your - GPG key acknowledged by the ftp people. Mail <ftp-upload@gnu.org> - for instructions. - + GPG key acknowledged by the ftp people. For instructions, see + http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html You can use the gnupload script to upload each FILE, like this: gnupload --to alpha.gnu.org:emacs/pretest FILE (for a pretest) gnupload --to ftp.gnu.org:emacs FILE (for a release) diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 9a722b5bd85..f3509d98b85 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -27,21 +27,24 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git GNULIB_MODULES=' alloca-opt c-ctype c-strcase - careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 - dtoastr dtotimespec dup2 environ execinfo - filemode getloadavg getopt-gnu gettime gettimeofday + careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 + dtoastr dtotimespec dup2 environ execinfo faccessat + fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat - manywarnings mktime pselect pthread_sigmask readlink - socklen stat-time stdalign stdarg stdbool stdio + manywarnings mktime pselect pthread_sigmask putenv readlink + sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat - sys_time time timer-time timespec-add timespec-sub utimens + sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings ' GNULIB_TOOL_FLAGS=' - --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat - --avoid=msvc-inval --avoid=msvc-nothrow - --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types + --avoid=at-internal + --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat + --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow + --avoid=openat-die --avoid=openat-h + --avoid=raise + --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --conditional-dependencies --import --no-changelog --no-vc-files --makefile-name=gnulib.mk @@ -85,7 +88,7 @@ test -x "$gnulib_srcdir"/gnulib-tool || { } "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && -rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && +rm -- "$src"m4/fcntl-o.m4 "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && autoreconf -i -I m4 -- ${src:+"$src"} diff --git a/admin/notes/bzr b/admin/notes/bzr index 50eaf3710ee..cdcfa7e7e3d 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -182,6 +182,71 @@ where revision N+1 is the one where file was removed. You could also try `bzr add --file-ids-from', if you have a copy of another branch where file still exists. +* Undoing a commit (uncommitting) + +It is possible to undo/remove a bzr commit (ie, to uncommit). +Only do this if you really, really, need to. For example, if you +somehow made a commit that triggers a bug in bzr itself. +Don't do it because you made a typo in a commit or the log. + +If you do need to do this, do it as soon as possible, because the +longer you leave it, the more work is involved. + +0. First, tell emacs-devel that you are going to do this, and suggest +people not commit anything to the affected branch for the duration. + +In the following, replace USER with your Savannah username, and +BRANCH with the name of the branch. +Let's assume that revno 100 is the bad commit, and that there have +been two more commits after that (because nothing is ever easy). + +1. Ensure your copy of the branch is up-to-date (for a bound +branch, bzr up; for an unbound branch, bzr pull) and has no local +changes (bzr st). + +2. Make a record of the commits you are going to undo: +bzr diff -c 102 > /tmp/102.diff +etc + +Also record the commit message, author, and any --fixes information. + +3. Most Emacs branches are set up to prevent just this kind of thing. +So we need to disable that protection: + +bzr config append_revisions_only=False \ + -d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/ + +4. Undo the commits: +bzr uncommit -r -4 + +This will show the commits it is going to undo, and prompt you to confirm. + +5. If using an unbound branch: +bzr push --overwrite + +6. Now, replay the commits you just undid (obviously, fix whatever it +was in the bad commit that caused the problem): + +patch -p0 < /tmp/100.diff +bzr commit --author ... --fixes ... -F /tmp/100.log +etc + +7. If using an unbound branch: +bzr push + +8. Finally, re-enable the branch protection: +bzr config append_revisions_only=True \ + -d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/ + +9. Tell emacs-devel that it is ok to use the branch again. +Anyone with local changes should back them up before doing anything. + +For a bound branch, bzr up will convert any of the undone commits to a +pending merge. Just bzr revert these away. + +For an unbound branch, bzr pull will complain about diverged branches +and refuse to do anything. Use bzr pull --overwrite. + * Loggerhead Loggerhead is the bzr tool for viewing a repository over http (similar diff --git a/admin/notes/copyright b/admin/notes/copyright index 67a5d0b6638..3a404b69678 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -380,7 +380,7 @@ Makefile.in does now. src/gmalloc.c - contains numerous copyrights from the GNU C library. Leave them alone. -src/ndir.h +nt/inc/dirent.h - see comments below. This file is OK to be released with Emacs 22, but we may want to revisit it afterwards. @@ -429,7 +429,7 @@ admin/check-doc-strings File says it's in the public domain, but that might not make it so. etc/e/eterm-color.ti -src/ndir.h +nt/inc/dirent.h On legal advice from Matt Norwood, the following comment was added to these files in Feb/Mar 2007: |