Hello community, here is the log from the commit of package tmux for openSUSE:Factory checked in at 2014-11-18 22:45:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tmux (Old) and /work/SRC/openSUSE:Factory/.tmux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tmux" Changes: -------- --- /work/SRC/openSUSE:Factory/tmux/tmux.changes 2014-11-14 09:19:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tmux.new/tmux.changes 2014-11-18 22:46:18.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Nov 14 17:56:33 UTC 2014 - [email protected] + +- tmux-socket-path.patch: Just like screen, create socket + directory with tmpfiles.d functionality in /run/tmux + and not in /tmp. This patch only alters the default + directory that can be still overrriden by setting + TMUX_TMPDIR or TMPDIR environment variable. This add some + robustness against accidental deletion via + systemd-tmpfiles-clean, tmpwatch, or similar. + +------------------------------------------------------------------- New: ---- tmux-socket-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tmux.spec ++++++ --- /var/tmp/diff_new_pack.MNotbE/_old 2014-11-18 22:46:19.000000000 +0100 +++ /var/tmp/diff_new_pack.MNotbE/_new 2014-11-18 22:46:19.000000000 +0100 @@ -27,8 +27,11 @@ Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM tmux-fix-malloc-check-abort.patch http://sourceforge.net/p/tmux/tickets/105/ bnc#869950 [email protected] -- Fix glibc aborting with MALLOC_CHECK_=2 Patch0: tmux-fix-malloc-check-abort.patch +# PATCH-FIX-OPENSUSE tmux-socket-path.patch [email protected] -- Use /run/tmux instead of /tmp as the default socket path, this add some robustness against accidental deletion via systemd-tmpfiles-clean, tmpwatch, or similar +Patch1: tmux-socket-path.patch BuildRequires: libevent-devel BuildRequires: ncurses-devel +BuildRequires: pkgconfig(systemd) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,6 +49,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -55,10 +59,18 @@ %install %make_install +mkdir -p %{buildroot}%{_tmpfilesdir} + +printf 'd /run/tmux 1777 root root -' > %{buildroot}%{_tmpfilesdir}/tmux.conf + +%post +%{?tmpfiles_create:%tmpfiles_create %{_tmpfilesdir}/tmux.conf} + %files %defattr(-,root,root,-) %doc CHANGES FAQ TODO examples/ %doc %{_mandir}/man1/tmux.1.* %{_bindir}/tmux +%{_tmpfilesdir}/tmux.conf %changelog ++++++ tmux-socket-path.patch ++++++ --- tmux-1.9a.orig/tmux.c +++ tmux-1.9a/tmux.c @@ -137,7 +137,7 @@ makesocketpath(const char *label) else if ((s = getenv("TMPDIR")) != NULL && *s != '\0') xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid); else - xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid); + xsnprintf(base, sizeof base, "/run/tmux/%u", uid); if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST) return (NULL); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
