This commit is contained in:
2020-02-22 10:25:55 -08:00
parent c720a78d2e
commit 00dc243a8f
14 changed files with 419 additions and 2 deletions

View File

@@ -1,2 +1,2 @@
DIST rinutils-0.2.0.tar.xz 17008 SHA256 2abcf60b99251f16f7a76827969cd626322f81f21500974deac4d1cff9f5c721 SHA512 82d09313f014fd118025438575a90dbc5b9a46d3d58ed9ffc774380d285b32ed00e7d9b453097ce0b8efc20a85a783e178b0d6831e925da3cd65f35037306dc3 WHIRLPOOL 73a0e52b7b1868d22227bc596fb6b1d50d0623d1501a2eb937e379cc13bdc0c3088035a1354a8c6c5e1629400d167caccfd5c7a67b828372fceed060aba23c0e
EBUILD rinutils-0.2.0.ebuild 288 SHA256 bbad816c26a79738163b255265caac2ab7acd3d7fb62cadaa9f7f94051d3a9ae SHA512 fb9169021091d63383b84b9f836794bf8e996c04cb1a15db9ceeee297bdb58f4592c30477955f82747e7ff8b9e2fe51273a61b717080bbb2ccc76249e94274d0 WHIRLPOOL 3564a8506008ebee3c584450043cdc4bd234f14d91de0b7290924521f05ea16727822bd6423926b6d3a65714e2cd359b2b66a5247df06115794196c115d2f6a2
EBUILD rinutils-0.2.0.ebuild 287 SHA256 55305d4558dd72f3da6d40daa7309b116370044367a20eea989a29840da311eb SHA512 7a1ca4867fb5597b2aa5cf8fe61686032747675abb22855d3acc1b471bffa2a027427c04d4eb4d1c6c156928e9a813624aae11cda58aacd60176d52bc3e239a1 WHIRLPOOL d255eb0567955b5364207909e03ecde48a78d0091896a22ff7a5528a258ced1a34e113a9c622fb8ef496deb5e37f2dcf5e0bccad16615c962efe7a70abb33320

View File

@@ -7,7 +7,7 @@ SRC_URI="https://github.com/shlomif/$PN/releases/download/$PV/$P.tar.xz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
DEPEND="dev-util/cmocka"

12
x11-apps/xinit/Manifest Normal file
View File

@@ -0,0 +1,12 @@
AUX 00-xhost 255 SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97 SHA512 ef9bc61b9af6723236e543dae1b7c92c739050dd3cb5acc59deaf2589a490323db7e1f52b890dc325e7e7b8db299cd50ad604456c1209ec761da124efd75cdf2 WHIRLPOOL 81de4d5fe95cf145e4ca72291d0bb0984993f165351d7dba78146ff9e2e2555abb4861a867f0962c1148aaac059c3489d52d1aee54c28faf6f0e228ffe38eb2f
AUX Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048 WHIRLPOOL 71669d591d60a6f5636f895471d94fee2dd1546c7561d3593e0d7b53211afed4860e4684d052e4f02913c7f98df1a11b9f64680fe85eb07daafc9263c0c3cddb
AUX Xsession.desktop 229 SHA256 68cc432e350e4c6a94dc5b9d4e6659382a92d8a76b6b30851254d140373f41fe SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d WHIRLPOOL 472f41a4f695723f7bdf89a07f789269607fc4466fa3c060a63b6b50cb8b9e4a1b509f729eed1ad4d05a66fc7171e287fabf980570d7de54fa5a61209667a6c8
AUX chooser.sh 1192 SHA256 1aceac55722a24593314c60e465a1e68982ccaf5fe0cf4d99d01e0a4d6f4cc63 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255 WHIRLPOOL ec48a47f3647aff62a6dbe25a38c4b68cbb772c65062bf2978cd5558e128ab58aa1a34cf6081c110eb81a91e8dd047e030812c4342dc77d4947b601e972b1dc3
AUX startDM.sh 865 SHA256 56ffff6b43892f17a39b6c8812823b1ebc2051905c6910b99abf58d4c86309ae SHA512 27326fca0aae7a1cda0e1c8d84c4de2c69999b3a334c4cc31c6cca9da4b5c5294486af5992278088e05046b44abb20d0c87aee2bfb9e5aa35c9cdb2c9c2852f4 WHIRLPOOL fcc4b68af6d9fa955f374df58bbbfc0d3f76a40b0a7867ba2724dcae98d3e548ce9730fad4523ec9bf4d561d3976e3af004001ec575ea8c04ac761bb5834893b
AUX xinit-1.3.3-gentoo-customizations.patch 1494 SHA256 8405f913acc9a6654a979d55555cb67187b3bee881ef6a452acf943b56cdc429 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b WHIRLPOOL ed7d7d141c4c6a908f3f42cd6ae836b522b4e9a6598e2ec8a11b631d1d4f6494b9a54c60570b43ab55f10e67e52caff074f8f4848547666c33c3092476aa6b95
AUX xinit-1.4.0-startx-current-vt.patch 740 SHA256 c96af339e7f3b89d25ae23509dbf763e9c135369dc3a4fc3e719820a25c09164 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15 WHIRLPOOL efa864fb18da829ade05adbd9be228551d0460ea59842f20425537fdecd651e3702039b67ade532d722ccce7c164b3bf66fe7eb74eeee425ff79cbf529f9d899
AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 SHA256 4d6830ba4956ebf437cc5a285bea74c63c6a0dd7a396818288237385bb65b7c2 SHA512 0fb93f0cebfd4091d7e58139ef375fec931392159b3b060d699d118c89d4403fd5cee82cd35582aedf7dd752aee495724119f864b17988d0dd9a5dfe76c88ce0 WHIRLPOOL 0603de2b46786bd9cf8db3eb64c79027d0089c03c0455d831c22109c935d2991f7261784579ab058689f4d8cb6bd547ca7404b15dea0680c34121f4a1f3d0d85
AUX xserverrc.2 143 SHA256 cddfb5ad5fe0905644b7170a193d7ffe00fb52b37678401c6663fef430e69014 SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5 WHIRLPOOL 557f4efa527311bcb4f6396635c39b71d8e104ba2d08804ed50351e8fbed934bd1e60e79e60cc06c34d090773d212e968c19f059b77a688ab4476c737782e8f6
DIST xinit-1.4.1.tar.bz2 176206 SHA256 de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 WHIRLPOOL a1bb5e4a59f438074e2dd6eb8a08b0106b3815dd7bb6ce0ff20ef85142fb8b99caefe808defcf0dafa06d52d3305d611be4894d9fe0ef0c2a48af1ff5eae4400
EBUILD xinit-1.4.1.ebuild 2240 SHA256 4c70ff41dfa33bfc90c96bc8bbcd449dfd0b411d6c006492faa1619831328ce5 SHA512 52bf1cd98a06c6e9f588854c0cedd8dcad6654c47fec468219461672bde31dd0361b1721523c13114afacbc5d034d4c8b26dcb94ae805bcdb6dc4611a43ab757 WHIRLPOOL fa326567d06c53887836fc3c1dd1e3150ae40283e5a1a62e3a27eaa781f60345a6d7c5c947fd630987eb79931c6c843bff32a531d397254f7b9a2e1f1c31ee52
MISC metadata.xml 477 SHA256 c0794585afca5b1ffd3e53d72841d46d1ea1d05fa3a9317fd6f53b02251b47b6 SHA512 c3e1095f0e3e017439777b3113d16ceccdc5ee7127da7f9e994126d6f51227a07c831e082d58c9c094aa6fed3e789458a212e27ec497fd3a14ba4cc5e4956205 WHIRLPOOL e0402e4ffa34ad5431e0d1b08ce5c72bf3cbf7070be00cdf88c846d7719bf6bef6414455920e4dcaacec4704c2a5dfc4cbf8ea3f08b205a7dabb7c6c489b7b69

View File

@@ -0,0 +1,7 @@
#!/bin/sh
# Allow all local connections from the current UID
# This fixes issues with hostname changes (usually by dhcp clients)
# see bug 287498 for more info
[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
xhost +si:localuser:`id -un` > /dev/null 2>&1

View File

@@ -0,0 +1,107 @@
#!/bin/sh
# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
case $# in
1)
case $1 in
failsafe)
exec xterm -geometry 80x24-0-0
;;
esac
esac
# redirect errors to a file in user's home directory if we can
for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
do
if ( cp /dev/null "$errfile" 2> /dev/null )
then
chmod 600 "$errfile"
exec > "$errfile" 2>&1
break
fi
done
# clean up after xbanner
if which freetemp 2> /dev/null ; then
freetemp
fi
startup=$HOME/.xsession
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
userxkbmap=$HOME/.Xkbmap
sysresources=/etc/X11/Xresources
sysmodmap=/etc/X11/Xmodmap
sysxkbmap=/etc/X11/Xkbmap
rh6sysresources=/etc/X11/xinit/Xresources
rh6sysmodmap=/etc/X11/xinit/Xmodmap
# merge in defaults
if [ -f "$rh6sysresources" ]; then
xrdb -merge "$rh6sysresources"
fi
if [ -f "$sysresources" ]; then
xrdb -merge "$sysresources"
fi
if [ -f "$userresources" ]; then
xrdb -merge "$userresources"
fi
# merge in keymaps
if [ -f "$sysxkbmap" ]; then
setxkbmap `cat "$sysxkbmap"`
XKB_IN_USE=yes
fi
if [ -f "$userxkbmap" ]; then
setxkbmap `cat "$userxkbmap"`
XKB_IN_USE=yes
fi
#
# Eeek, this seems like too much magic here
#
if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
if [ -n "$xkbsymbols" ]; then
setxkbmap -symbols "$xkbsymbols"
XKB_IN_USE=yes
fi
fi
fi
# xkb and xmodmap don't play nice together
if [ -z "$XKB_IN_USE" ]; then
if [ -f "$rh6sysmodmap" ]; then
xmodmap "$rh6sysmodmap"
fi
if [ -f "$sysmodmap" ]; then
xmodmap "$sysmodmap"
fi
if [ -f "$usermodmap" ]; then
xmodmap "$usermodmap"
fi
fi
unset XKB_IN_USE
if [ -x "$startup" ]; then
exec "$startup"
elif [ -x "$HOME/.Xclients" ]; then
exec "$HOME/.Xclients"
elif [ -x /etc/X11/xinit/Xclients ]; then
exec /etc/X11/xinit/Xclients
elif [ -x /etc/X11/Xclients ]; then
exec /etc/X11/Xclients
else
exec xsm
fi

View File

@@ -0,0 +1,8 @@
[Desktop Entry]
Name=XSession
Comment=This session logs you into your custom Xsession
Exec=/etc/X11/Sessions/Xsession
TryExec=/etc/X11/Sessions/Xsession
# no icon yet, only the top three are currently used
Icon=
Type=Application

View File

@@ -0,0 +1,51 @@
#!/bin/sh
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
# Author: Martin Schlemmer <azarah@gentoo.org>
# Find a match for $XSESSION in /etc/X11/Sessions
GENTOO_SESSION=""
for x in /etc/X11/Sessions/* ; do
if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then
GENTOO_SESSION=${x}
break
fi
done
GENTOO_EXEC=""
if [ -n "${XSESSION}" ]; then
if [ -f /etc/X11/Sessions/${XSESSION} ]; then
if [ -x /etc/X11/Sessions/${XSESSION} ]; then
GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
else
GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
fi
elif [ -n "${GENTOO_SESSION}" ]; then
if [ -x "${GENTOO_SESSION}" ]; then
GENTOO_EXEC="${GENTOO_SESSION}"
else
GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
fi
else
x=""
y=""
for x in "${XSESSION}" \
"`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
"`echo ${XSESSION} | awk '{ print tolower($1) }'`"
do
# Fall through ...
if [ -x "`which ${x} 2>/dev/null`" ]; then
GENTOO_EXEC="`which ${x} 2>/dev/null`"
break
fi
done
fi
fi
echo "${GENTOO_EXEC}"
# vim:ts=4

View File

@@ -0,0 +1,31 @@
#!/bin/sh
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2
# We need to source /etc/profile for stuff like $LANG to work
# bug #10190.
. /etc/profile
. /lib/rc/sh/functions.sh
# Bail out early if on a non-OpenRC system:
if [ ! -d /run/openrc ]; then
eerror "$0 should only be used on OpenRC systems"
fi
# baselayout-1 compat
if ! type get_options >/dev/null 2>/dev/null ; then
[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
fi
export RC_SVCNAME=xdm
EXEC="$(get_options service)"
NAME="$(get_options name)"
PIDFILE="$(get_options pidfile)"
START_STOP_ARGS="$(get_options start_stop_args)"
start-stop-daemon --start --exec ${EXEC} \
${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
eerror "ERROR: could not start the Display Manager"
# vim:ts=4

View File

@@ -0,0 +1,61 @@
From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Mon, 1 Nov 2010 16:46:36 +0100
Subject: [PATCH] Gentoo customizations.
Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
---
xinitrc.cpp | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/xinitrc.cpp b/xinitrc.cpp
index 049a8e4..80c3ad9 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
-sysresources=XINITDIR/.Xresources
-sysmodmap=XINITDIR/.Xmodmap
+sysresources=XINITDIR/Xresources
+sysmodmap=XINITDIR/Xmodmap
XCOMM merge in defaults and keymaps
@@ -84,15 +84,25 @@ fi
XCOMM This is the fallback case if nothing else is executed above
#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
+if [ -n "`/etc/X11/chooser.sh`" ]; then
+ command="`/etc/X11/chooser.sh`"
+else
+ failsafe="yes"
+fi
+
if [ -d XINITDIR/xinitrc.d ] ; then
- for f in XINITDIR/xinitrc.d/?*.sh ; do
+ for f in XINITDIR/xinitrc.d/?* ; do
[ -x "$f" ] && . "$f"
done
unset f
fi
-TWM &
-XCLOCK -geometry 50x50-1+1 &
-XTERM -geometry 80x50+494+51 &
-XTERM -geometry 80x20+494-0 &
-exec XTERM -geometry 80x66+0+0 -name login
+if [ -n "$failsafe" ]; then
+ TWM &
+ XCLOCK -geometry 50x50-1+1 &
+ XTERM -geometry 80x50+494+51 &
+ XTERM -geometry 80x20+494-0 &
+ exec XTERM -geometry 80x66+0+0 -name login
+else
+ exec $command
+fi
--
1.7.3.1

View File

@@ -0,0 +1,20 @@
--- a/startx.cpp
+++ b/startx.cpp
@@ -200,17 +200,6 @@ XCOMM process server arguments
if [ x"$server" = x ]; then
server=$defaultserver
-#ifdef __linux__
- XCOMM When starting the defaultserver start X on the current tty to avoid
- XCOMM the startx session being seen as inactive:
- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
- tty=$(tty)
- if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
- tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
- vtarg="vt$tty_num -keeptty"
- fi
-#endif
-
XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ x"$serverargs" = x -a x"$display" = x ]; then
if [ -f "$userserverrc" ]; then

View File

@@ -0,0 +1,22 @@
Move startx auth files in /tmp so they are removed on reboot.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
The trap patch didn't seem to work on reboot.
---
startx.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/startx.cpp
+++ b/startx.cpp
@@ -278,11 +278,11 @@ if [ x"$enable_xauth" = x1 ] ; then
exit 1
fi
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
- xserverauthfile=$HOME/.serverauth.$$
+ xserverauthfile=`mktemp --tmpdir serverauth.XXXXXXXXXX`
trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
xauth -q -f "$xserverauthfile" << EOF
add :$dummy . $mcookie
EOF
#if defined(__APPLE__) || defined(__CYGWIN__)

View File

@@ -0,0 +1,6 @@
#!/bin/sh
if [ -z "$XDG_VTNR" ]; then
exec /usr/bin/X -nolisten tcp "$@"
else
exec /usr/bin/X -nolisten tcp -keeptty "$@" "vt$XDG_VTNR"
fi

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
<name>X11</name>
</maintainer>
<use>
<flag name="twm">
Control dependencies on legacy apps (xterm, twm, ...). Safe to
disable if you use a modern desktop environment.
</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:x.org:xinit</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,75 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit xorg-3
DESCRIPTION="X Window System initializer"
LICENSE="${LICENSE} GPL-2"
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~arm-linux ~x86-linux"
IUSE="twm"
RDEPEND="
!<x11-base/xorg-server-1.8.0
x11-apps/xauth
x11-libs/libX11
"
DEPEND="${RDEPEND}"
PDEPEND="x11-apps/xrdb
twm? (
x11-apps/xclock
x11-apps/xsm
x11-terms/xterm
x11-wm/twm
)
"
PATCHES=(
"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
"${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch"
"${FILESDIR}/${PN}-1.4.1-move-serverauthfile-into-tmp.patch"
)
XORG_CONFIGURE_OPTIONS=(
--with-xinitdir="${EPREFIX}"/etc/X11/xinit
)
src_install() {
xorg-3_src_install
exeinto /etc/X11
doexe "${FILESDIR}"/chooser.sh
doexe "${FILESDIR}"/startDM.sh
exeinto /etc/X11/Sessions
doexe "${FILESDIR}"/Xsession
exeinto /etc/X11/xinit
newexe "${FILESDIR}"/xserverrc.2 xserverrc
exeinto /etc/X11/xinit/xinitrc.d/
doexe "${FILESDIR}"/00-xhost
insinto /usr/share/xsessions
doins "${FILESDIR}"/Xsession.desktop
}
pkg_postinst() {
if ! has_version 'x11-apps/xinit'; then
ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
ewarn "any executable. When you run startx, it will run this as the login session."
ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
ewarn "Here's an example of setting it for the whole system:"
ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
ewarn " env-update && source /etc/profile"
fi
if has_version "<${CATEGORY}/${PN}-1.4.1"; then
ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the"
ewarn "home directory but rather are created in \$TMPDIR (typically /tmp). The change"
ewarn "is transparent for most of users, however those that use runtime temporary"
ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them"
ewarn "not to remove the 'serverauth.*' files."
fi
}