SHA256
1
0
forked from pool/luit

Accepting request 113471 from home:vuntz:branches:X11:XOrg

Split luit out of xorg-x11; no change to the content

OBS-URL: https://build.opensuse.org/request/show/113471
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/luit?expand=0&rev=1
This commit is contained in:
Stefan Dirsch 2012-04-14 09:31:54 +00:00 committed by Git OBS Bridge
commit 9aaa923435
6 changed files with 141 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e0ee5a2bed7a65521a9b5e89009287d01ce529e71918c83c65db4d5b666739b
size 116043

5
luit.changes Normal file
View File

@ -0,0 +1,5 @@
-------------------------------------------------------------------
Fri Apr 13 08:46:08 UTC 2012 - vuntz@opensuse.org
- Split luit from xorg-x11. Initial version: 1.2-20111030.

57
luit.spec Normal file
View File

@ -0,0 +1,57 @@
#
# spec file for package luit
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: luit
Version: 1.2_20111030
%define _version 1.2-20111030
Release: 0
License: MIT
Summary: Locale and ISO 2022 support for Unicode terminals
Url: http://xorg.freedesktop.org/
Group: System/X11/Utilities
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{_version}.tar.bz2
# PATCH-FIX-UPSTREAM u_luit-Set-up-terminal-before-fork.diff fdo#48638 -- Set up terminal before fork
Patch0: u_luit-Set-up-terminal-before-fork.diff
BuildRequires: pkg-config
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Luit is a filter that can be run between an arbitrary application and a
UTF-8 terminal emulator. It will convert application output from the
locale's encoding into UTF-8, and convert terminal input from UTF-8 into
the locale's encoding.
%prep
%setup -q -n %{name}-%{_version}
%patch0 -p1
%build
%configure --with-localealiasfile=%{_datadir}/X11/locale/locale.alias
make %{?_smp_mflags}
%install
%make_install
%files
%defattr(-,root,root)
%doc
%{_bindir}/luit
%{_mandir}/man1/luit.1%{?ext_man}
%changelog

View File

@ -0,0 +1,52 @@
From 6b1da100f2984701f181f5d2635ffcff06db9be1 Mon Sep 17 00:00:00 2001
From: Mike Fabian <mike.fabian@gmx.de>
Date: Tue, 7 Jun 2011 13:42:00 +0200
Subject: [PATCH] Set up terminal before fork.
Patch-mainline: To be submitted.
After the fork it is undefined wether parent or child runs
first. So there can be a race: if the child runs before the
terminal of the parent is set up correctly luit may hang.
This patch sets up the terminal before forking and undoes
the settings in the child.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
---
luit.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/luit.c b/luit.c
index 6bd8775..c2a011c 100644
--- a/luit.c
+++ b/luit.c
@@ -577,6 +577,8 @@ condom(int argc, char **argv)
IGNORE_RC(pipe(c2p_waitpipe));
}
+ setup_io(pty);
+
pid = fork();
if (pid < 0) {
perror("Couldn't fork");
@@ -584,6 +586,10 @@ condom(int argc, char **argv)
}
if (pid == 0) {
+#ifdef SIGWINCH
+ installHandler(SIGWINCH, SIG_DFL);
+#endif
+ installHandler(SIGCHLD, SIG_DFL);
close(pty);
if (pipe_option) {
close_waitpipe(1);
@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty)
if (verbose) {
reportIso2022("Output", outputState);
}
- setup_io(pty);
if (pipe_option) {
write_waitpipe(p2c_waitpipe);
--
1.7.3.4