New upstream release

Do the right thing (tm) and revert to $upstream-behaviour:
No longer install tmux setgid and no longer use /var/run/tmux
for sockets. Use "tmux -S /var/run/tmux/tmux-`id -u`/default attach"
if you need to access an "old" tmux session
tmux can be used as a login shell so add it to /etc/shells

.gitignore

@@ -1,2 +1,3 @@
 tmux-1.3.tar.gz
 /tmux-1.4.tar.gz
+/tmux-1.5.tar.gz

sources

@@ -1 +1 @@
-0bfc7dd9a5bab192406167589c716a21  tmux-1.4.tar.gz
+3d4b683572af34e83bc8b183a8285263  tmux-1.5.tar.gz

tmux-1.0-02_fix_wrong_location.diff

@@ -1,59 +0,0 @@
-# correct directory /usr/local 
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -23,7 +23,7 @@
- 
- CC?= cc
- CFLAGS+= -DBUILD="\"$(VERSION)\""
--LDFLAGS+= -L/usr/local/lib
-+LDFLAGS+= -L/usr/lib
- LIBS+=
- 
- # Sun CC 
-@@ -51,7 +51,7 @@
- endif
- endif
- 
--PREFIX?= /usr/local
-+PREFIX?= /usr/
- INSTALL?= install
- INSTALLDIR= $(INSTALL) -d
- INSTALLBIN= $(INSTALL) -m 555
-@@ -81,7 +81,7 @@
- install:	all
- 		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin
- 		$(INSTALLBIN) tmux $(DESTDIR)$(PREFIX)/bin/tmux
--		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1
--		$(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)/man/man1/tmux.1
-+		$(INSTALLDIR) $(DESTDIR)$(PREFIX)share/man/man1
-+		$(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)share/man/man1/tmux.1
- 
- -include .depend
---- a/Makefile
-+++ b/Makefile
-@@ -24,7 +24,7 @@
- 
- CC?= cc
- CFLAGS+= -DBUILD="\"$(VERSION)\""
--LDFLAGS+= -L/usr/local/lib
-+LDFLAGS+= -L/usr/lib
- LIBS+=
- 
- .ifdef FDEBUG
-@@ -47,7 +47,7 @@
- .endif
- .endif
- 
--PREFIX?= /usr/local
-+PREFIX?= /usr/
- INSTALL?= install
- INSTALLDIR= ${INSTALL} -d
- INSTALLBIN= ${INSTALL} -m 555
-@@ -80,5 +80,5 @@
- install:	all
- 		${INSTALLDIR} ${DESTDIR}${PREFIX}/bin
- 		${INSTALLBIN} tmux ${DESTDIR}${PREFIX}/bin/
--		${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1
--		${INSTALLMAN} tmux.1 ${DESTDIR}${PREFIX}/man/man1/
-+		${INSTALLDIR} ${DESTDIR}${PREFIX}/share/man/man1
-+		${INSTALLMAN} tmux.1 ${DESTDIR}${PREFIX}/share/man/man1/

tmux-1.0-03_proper_socket_handling.diff

@@ -1,75 +0,0 @@
-# setting /usr/bin/tmux with sgid and proper location of socket
----
-# GNUmakefile |    2 +-
-# Makefile    |    2 +-
-# compat.h    |    2 +-
-# tmux.1      |    6 +++---
-# tmux.c      |    2 +-
-# 5 files changed, 7 insertions(+), 7 deletions(-)
-#
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -54,7 +54,7 @@
- PREFIX?= /usr/
- INSTALL?= install
- INSTALLDIR= $(INSTALL) -d
--INSTALLBIN= $(INSTALL) -m 555
-+INSTALLBIN= $(INSTALL) -g tmux -o root -m 2755
- INSTALLMAN= $(INSTALL) -m 444
- 
- SRCS= $(shell echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g')
---- a/Makefile
-+++ b/Makefile
-@@ -50,7 +50,7 @@
- PREFIX?= /usr/
- INSTALL?= install
- INSTALLDIR= ${INSTALL} -d
--INSTALLBIN= ${INSTALL} -m 555
-+INSTALLBIN= $(INSTALL) -g tmux -o root -m 2755
- INSTALLMAN= ${INSTALL} -m 444
- 
- SRCS!= echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g'
---- a/compat.h
-+++ b/compat.h
-@@ -25,7 +25,7 @@
- 
- #ifndef HAVE_PATHS_H
- #define	_PATH_BSHELL	"/bin/sh"
--#define	_PATH_TMP	"/tmp/"
-+#define _PATH_VARRUN    "/var/run/"
- #define _PATH_DEVNULL	"/dev/null"
- #define _PATH_TTY	"/dev/tty"
- #define _PATH_DEV	"/dev/"
---- a/tmux.c
-+++ b/tmux.c
-@@ -188,7 +188,7 @@
- 	u_int		uid;
- 
- 	uid = getuid();
--	xsnprintf(base, MAXPATHLEN, "%s/tmux-%d", _PATH_TMP, uid);
-+	xsnprintf(base, MAXPATHLEN, "%s/%s/%s-%d", _PATH_VARRUN, __progname, __progname, uid);
- 
- 	if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST)
- 		return (NULL);
---- a/tmux.1
-+++ b/tmux.1
-@@ -89,8 +89,8 @@
- and all sessions are managed by a single
- .Em server .
- The server and each client are separate processes which communicate through a
--socket in
--.Pa /tmp .
-+socket in a directory under
-+.Pa /var/run/tmux .
- .Pp
- The options are as follows:
- .Bl -tag -width "XXXXXXXXXXXX"
-@@ -134,7 +134,7 @@
- .It Fl L Ar socket-name
- .Nm
- stores the server socket in a directory under
--.Pa /tmp ;
-+.Pa /var/run/tmux ;
- the default socket is named
- .Em default .
- This option allows a different socket name to be specified, allowing several

tmux-1.0-04_dropping_unnecessary_privileges.diff

@@ -1,26 +0,0 @@
-# using setresgid() for safely dropping utmp group membership which were needed
-# for makesocketpath() to create the user directory under /var/run/tmux which is
-# only writeable for processes that have setgid utmp.
---- a/tmux.c
-+++ b/tmux.c
-@@ -235,6 +235,7 @@
- 	struct keylist	*keylist;
- 	char		*s, *path, *label, *home, **var;
- 	int	 	 opt, flags, quiet, keys;
-+	u_int		gid;
- 
- #if defined(DEBUG) && defined(__OpenBSD__)
- 	malloc_options = (char *) "AFGJPX";
-@@ -483,6 +484,12 @@
- 			}
- 		}
- 	}
-+	gid = getgid();
-+	/* drop unnecessary privileges which were needed for makesocketpath() 
-+	 * to create the user directory under /var/run/tmux which is only 
-+	 * writeable for processes that have setgid utmp. */
-+ 	if (setresgid(gid, gid, gid) != 0)
-+ 		return (NULL);
- 	if (label != NULL)
- 		xfree(label);
- 	if (realpath(path, socket_path) == NULL)

tmux-1.2-writehard.patch

@@ -1,57 +0,0 @@
-diff -up tmux-1.2/tty.c.writehard tmux-1.2/tty.c
---- tmux-1.2/tty.c.writehard	2010-03-08 15:53:49.000000000 +0100
-+++ tmux-1.2/tty.c	2010-03-28 12:01:49.335023195 +0200
-@@ -300,7 +300,8 @@ tty_free(struct tty *tty)
- void
- tty_raw(struct tty *tty, const char *s)
- {
--	write(tty->fd, s, strlen(s));
-+	if (write(tty->fd, s, strlen(s)) == -1)
-+		fatal("write failed");
- }
- 
- void
-@@ -333,7 +334,8 @@ tty_puts(struct tty *tty, const char *s)
- 	bufferevent_write(tty->event, s, strlen(s));
- 
- 	if (tty->log_fd != -1)
--		write(tty->log_fd, s, strlen(s));
-+		if(write(tty->log_fd, s, strlen(s)) == -1)
-+			fatal("write failed");
- }
- 
- void
-@@ -359,7 +361,8 @@ tty_putc(struct tty *tty, u_char ch)
- 	}
- 
- 	if (tty->log_fd != -1)
--		write(tty->log_fd, &ch, 1);
-+		if (write(tty->log_fd, &ch, 1) == -1)
-+			fatal("write failed");
- }
- 
- void
-@@ -370,7 +373,8 @@ tty_pututf8(struct tty *tty, const struc
- 	size = grid_utf8_size(gu);
- 	bufferevent_write(tty->event, gu->data, size);
- 	if (tty->log_fd != -1)
--		write(tty->log_fd, gu->data, size);
-+		if(write(tty->log_fd, gu->data, size) == -1)
-+			fatal("write failed");
- 	tty->cx += gu->width;
- }
- 
-diff -up tmux-1.2/window.c.writehard tmux-1.2/window.c
---- tmux-1.2/window.c.writehard	2010-02-08 19:10:07.000000000 +0100
-+++ tmux-1.2/window.c	2010-03-28 12:03:07.316900726 +0200
-@@ -518,7 +518,9 @@ window_pane_spawn(struct window_pane *wp
- 		return (-1);
- 	case 0:
- 		if (chdir(wp->cwd) != 0)
--			chdir("/");
-+			if (chdir("/") <0)
-+				fatal("chdir failed");
-+
- 
- 		if (tcgetattr(STDIN_FILENO, &tio2) != 0)
- 			fatal("tcgetattr failed");

tmux-tmpfiles.conf

@@ -1 +0,0 @@
-D /var/run/tmux 0775 root tmux -

tmux.spec

@@ -1,6 +1,6 @@
 Name:           tmux
-Version:        1.4
+Version:        1.5
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        A terminal multiplexer
 
 Group:          Applications/System
@@ -8,19 +8,7 @@ Group:          Applications/System
 # 3 clause BSD licensed.
 License:        ISC and BSD
 URL:            http://sourceforge.net/projects/tmux
-Requires(pre):  shadow-utils
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}-tmpfiles.conf
-# This first patch creates MANDIR in the GNUmakefile.  This has been sent
-# upstream via email but upstream replied and said would not change.
-Patch0:         tmux-1.0-02_fix_wrong_location.diff
-Patch1:         tmux-1.0-03_proper_socket_handling.diff
-# 2010-03-28: Submitted upstream:
-# https://sourceforge.net/tracker/?func=detail&aid=2977950&group_id=200378&atid=973264
-Patch2:         tmux-1.0-04_dropping_unnecessary_privileges.diff
-# 2010-03-28: Submitted upstream:
-# https://sourceforge.net/tracker/?func=detail&aid=2977945&group_id=200378&atid=973264
-Patch3:         tmux-1.2-writehard.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
@@ -34,10 +22,6 @@ as GNU Screen.
 
 %prep
 %setup -q
-%patch0 -p1 -b .location
-%patch1 -p1 -b .sockethandling
-%patch2 -p1 -b .dropprivs
-%patch3 -p1 -b .writehard
 
 %build
 %configure
@@ -45,37 +29,35 @@ make %{?_smp_mflags} LDFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 make install DESTDIR=%{buildroot} INSTALLBIN="install -p -m 755" INSTALLMAN="install -p -m 644"
 
-# Create the socket dir
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
-
 %clean
 rm -rf %{buildroot}
 
-%pre
-getent group tmux >/dev/null || groupadd -r tmux
-
 %post
-# Make sure that /var/run/tmux is created after package install because
+if [ ! -f %{_sysconfdir}/shells ] ; then
-# otherwise tmux would only start to work after a reboot
+    echo "%{_bindir}/tmux" > %{_sysconfdir}/shells
-mkdir /var/run/tmux
+else
-chown root.tmux /var/run/tmux
+    grep -q "^%{_bindir}/tmux$" %{_sysconfdir}/shells || echo "%{_bindir}/tmux" >> %{_sysconfdir}/shells
-chmod 775 /var/run/tmux
+fi
 
 %files
 %defattr(-,root,root,-)
 %doc CHANGES FAQ NOTES TODO examples/
-%attr(2755,root,tmux) %{_bindir}/tmux
+%{_bindir}/tmux
 %{_mandir}/man1/tmux.1.*
-%ghost %{_localstatedir}/run/tmux
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 
 %changelog
+* Tue Nov 01 2011 Sven Lankes <sven@lank.es> 1.5-1
+- New upstream release
+- Do the right thing (tm) and revert to $upstream-behaviour: 
+   No longer install tmux setgid and no longer use /var/run/tmux 
+   for sockets. Use "tmux -S /var/run/tmux/tmux-`id -u`/default attach"
+   if you need to access an "old" tmux session
+- tmux can be used as a login shell so add it to /etc/shells
+
 * Sat Apr 16 2011 Sven Lankes <sven@lank.es> 1.4-4
-- Add /var/run/tmp to tmpdir.d - fixes rhbz 656704 and 697134 
+- Add /var/run/tmp to tmpdir.d - fixes rhbz 656704 and 697134
 
 * Sun Apr 10 2011 Sven Lankes <sven@lank.es> 1.4-3
 - Fix CVE-2011-1496