Hanno commited on 2019-10-15 09:54:37
Zeige 3 geänderte Dateien mit 8 Einfügungen und 162 Löschungen.
| ... | ... |
@@ -1,7 +1,5 @@ |
| 1 | 1 |
AUX screen-4.3.0-no-utempter.patch 363 BLAKE2B 2230c4cd52687f12f3cfd095f9d24d95fb2ec5fba283b60234779ad805d7caed740edc0ac6811b9e210483519be034c5cd799671d1fe0a4e0da1fe78ae6a305f SHA512 0b2e6a2b54e6155e217ab44a0d8314afafd97fae684fbc2875c0f4d21df29cb259ea4023343e92da16dd3a2bf11ec6d06e677d765748299d1633aa1b9261a604 |
| 2 | 2 |
AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7 |
| 3 |
-DIST screen-4.4.0.tar.gz 846010 BLAKE2B 7c7d37b22c1993420dbd8d4083bee0a748f28ace434963b822607747879bda60c1f2f435814e9d07ea88e4bbc1b43b6f600fce204fda7fde4a52a6314a27494a SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b |
|
| 4 | 3 |
DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336 |
| 5 |
-EBUILD screen-4.4.0.ebuild 4011 BLAKE2B c826e8ac5ed4cc40cf4ae0ebce32a4fcdc893dcf6d142d8176d428b4fc6e519991ef9988fc090846c11fd7789f72f80401793b1a0fc3f01c114ba50936603e6b SHA512 6546653a5e1d01fec0620b022c992311c46ae2c98a53cf56967a182b36d001daf29ec392eb24fdde2e53d541b00c5b2109d775be1cb3c7f703421561d9559ecb |
|
| 6 |
-EBUILD screen-4.6.1.ebuild 4019 BLAKE2B 22a3956f24d09d28a6dae3519e2134ff63dde879cc3a7322a1b7f9359d0dad8672cd2b94622b4fc3df37123032729cbb5cf5fc00dc01cbec023deec1ea43d0c7 SHA512 6882424a1fa884e65ef35051f54554674fe7a445ab1d9094557d43113e055954a257b6d273859ed2dd1c254c610c350d5c6d01d175bbbdecc3b34ca3ec9d814e |
|
| 4 |
+EBUILD screen-4.6.1.ebuild 4112 BLAKE2B f29b4bd4c38caca89c6137d9a355dce966bda306cc23117ffe3246a862eb5d1aaf317d4ef921073d0eff59466f5b25c3d7f90df77ae9bc4895d838bf62e4fa21 SHA512 d722c1c97dae37033f3e3ff24b2840a7cd04329936b4112a067765282fe384cec86f7616075d2605f60621376b66095685a2ac75a439815b35132df8b3f787be |
|
| 7 | 5 |
MISC metadata.xml 1836 BLAKE2B 4625e11b8c3120b23e613e14d03ac88b505b412be97270159c881f56ebf674c78274a8dcf199d69ea91f6438d2661635ebbbf38fdc7ebebe8dd6e2ff88f4c6d7 SHA512 e327b61501e6b496045d552851db574b519a99f56c9203c3376b886808a422f8e4aab23b667bcab0d1388ba7ea781c9c9e9f1d07b1426f113119c60cd70d0bcf |
| ... | ... |
@@ -1,155 +0,0 @@ |
| 1 |
-# Copyright 1999-2016 Gentoo Foundation |
|
| 2 |
-# Distributed under the terms of the GNU General Public License v2 |
|
| 3 |
-# $Id$ |
|
| 4 |
- |
|
| 5 |
-EAPI=5 |
|
| 6 |
- |
|
| 7 |
-inherit autotools eutils flag-o-matic pam toolchain-funcs user |
|
| 8 |
- |
|
| 9 |
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation" |
|
| 10 |
-HOMEPAGE="https://www.gnu.org/software/screen/" |
|
| 11 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
|
|
| 12 |
- |
|
| 13 |
-LICENSE="GPL-2" |
|
| 14 |
-SLOT="0" |
|
| 15 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
|
| 16 |
-IUSE="debug nethack pam selinux multiuser" |
|
| 17 |
- |
|
| 18 |
-CDEPEND=" |
|
| 19 |
- >=sys-libs/ncurses-5.2:0= |
|
| 20 |
- pam? ( virtual/pam )" |
|
| 21 |
-RDEPEND="${CDEPEND}
|
|
| 22 |
- selinux? ( sec-policy/selinux-screen )" |
|
| 23 |
-DEPEND="${CDEPEND}
|
|
| 24 |
- sys-apps/texinfo" |
|
| 25 |
- |
|
| 26 |
-# Patches: |
|
| 27 |
-# - Don't use utempter even if it is found on the system. |
|
| 28 |
-PATCHES=( |
|
| 29 |
- "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
|
|
| 30 |
-) |
|
| 31 |
- |
|
| 32 |
-pkg_setup() {
|
|
| 33 |
- # Make sure utmp group exists, as it's used later on. |
|
| 34 |
- enewgroup utmp 406 |
|
| 35 |
-} |
|
| 36 |
- |
|
| 37 |
-src_prepare() {
|
|
| 38 |
- # Apply patches. |
|
| 39 |
- epatch "${PATCHES[@]}"
|
|
| 40 |
- |
|
| 41 |
- # sched.h is a system header and causes problems with some C libraries |
|
| 42 |
- mv sched.h _sched.h || die |
|
| 43 |
- sed -i '/include/ s:sched.h:_sched.h:' screen.h || die |
|
| 44 |
- |
|
| 45 |
- # Fix manpage. |
|
| 46 |
- sed -i \ |
|
| 47 |
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
|
|
| 48 |
- -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
|
|
| 49 |
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
|
|
| 50 |
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
|
|
| 51 |
- -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
|
|
| 52 |
- doc/screen.1 \ |
|
| 53 |
- || die |
|
| 54 |
- |
|
| 55 |
- if [[ ${CHOST} == *-darwin* ]] ; then
|
|
| 56 |
- sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
|
| 57 |
- fi |
|
| 58 |
- |
|
| 59 |
- # reconfigure |
|
| 60 |
- eautoreconf |
|
| 61 |
-} |
|
| 62 |
- |
|
| 63 |
-src_configure() {
|
|
| 64 |
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
|
|
| 65 |
- |
|
| 66 |
- if [[ ${CHOST} == *-solaris* ]] ; then
|
|
| 67 |
- # https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00095.html |
|
| 68 |
- append-cppflags -D_XOPEN_SOURCE \ |
|
| 69 |
- -D_XOPEN_SOURCE_EXTENDED=1 \ |
|
| 70 |
- -D__EXTENSIONS__ |
|
| 71 |
- append-libs -lsocket -lnsl |
|
| 72 |
- fi |
|
| 73 |
- |
|
| 74 |
- use nethack || append-cppflags "-DNONETHACK" |
|
| 75 |
- use debug && append-cppflags "-DDEBUG" |
|
| 76 |
- |
|
| 77 |
- econf \ |
|
| 78 |
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
|
|
| 79 |
- --with-pty-mode=0620 \ |
|
| 80 |
- --with-pty-group=5 \ |
|
| 81 |
- --enable-rxvt_osc \ |
|
| 82 |
- --enable-telnet \ |
|
| 83 |
- --enable-colors256 \ |
|
| 84 |
- $(use_enable pam) |
|
| 85 |
-} |
|
| 86 |
- |
|
| 87 |
-src_compile() {
|
|
| 88 |
- LC_ALL=POSIX emake comm.h term.h |
|
| 89 |
- emake osdef.h |
|
| 90 |
- |
|
| 91 |
- emake -C doc screen.info |
|
| 92 |
- default |
|
| 93 |
-} |
|
| 94 |
- |
|
| 95 |
-src_install() {
|
|
| 96 |
- local tmpfiles_perms tmpfiles_group |
|
| 97 |
- |
|
| 98 |
- dobin screen |
|
| 99 |
- |
|
| 100 |
- if use multiuser || use prefix |
|
| 101 |
- then |
|
| 102 |
- fperms 4755 /usr/bin/screen |
|
| 103 |
- tmpfiles_perms="0755" |
|
| 104 |
- tmpfiles_group="root" |
|
| 105 |
- else |
|
| 106 |
- fowners root:utmp /usr/bin/screen |
|
| 107 |
- fperms 2755 /usr/bin/screen |
|
| 108 |
- tmpfiles_perms="0775" |
|
| 109 |
- tmpfiles_group="utmp" |
|
| 110 |
- fi |
|
| 111 |
- |
|
| 112 |
- dodir /etc/tmpfiles.d |
|
| 113 |
- echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
|
|
| 114 |
- > "${ED}"/etc/tmpfiles.d/screen.conf
|
|
| 115 |
- |
|
| 116 |
- insinto /usr/share/screen |
|
| 117 |
- doins terminfo/{screencap,screeninfo.src}
|
|
| 118 |
- insinto /usr/share/screen/utf8encodings |
|
| 119 |
- doins utf8encodings/?? |
|
| 120 |
- insinto /etc |
|
| 121 |
- doins "${FILESDIR}"/screenrc
|
|
| 122 |
- |
|
| 123 |
- pamd_mimic_system screen auth |
|
| 124 |
- |
|
| 125 |
- dodoc \ |
|
| 126 |
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \ |
|
| 127 |
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
|
|
| 128 |
- |
|
| 129 |
- doman doc/screen.1 |
|
| 130 |
- doinfo doc/screen.info |
|
| 131 |
-} |
|
| 132 |
- |
|
| 133 |
-pkg_postinst() {
|
|
| 134 |
- if [[ -z ${REPLACING_VERSIONS} ]]
|
|
| 135 |
- then |
|
| 136 |
- elog "Some dangerous key bindings have been removed or changed to more safe values." |
|
| 137 |
- elog "We enable some xterm hacks in our default screenrc, which might break some" |
|
| 138 |
- elog "applications. Please check /etc/screenrc for information on these changes." |
|
| 139 |
- fi |
|
| 140 |
- |
|
| 141 |
- # Add /tmp/screen in case it doesn't exist yet. This should solve |
|
| 142 |
- # problems like bug #508634 where tmpfiles.d isn't in effect. |
|
| 143 |
- local rundir="${EROOT%/}/tmp/screen"
|
|
| 144 |
- if [[ ! -d ${rundir} ]] ; then
|
|
| 145 |
- if use multiuser || use prefix ; then |
|
| 146 |
- tmpfiles_group="root" |
|
| 147 |
- else |
|
| 148 |
- tmpfiles_group="utmp" |
|
| 149 |
- fi |
|
| 150 |
- mkdir -m 0775 "${rundir}"
|
|
| 151 |
- chgrp ${tmpfiles_group} "${rundir}"
|
|
| 152 |
- fi |
|
| 153 |
- |
|
| 154 |
- ewarn "This revision changes the screen socket location to ${rundir}"
|
|
| 155 |
-} |
| ... | ... |
@@ -1,4 +1,4 @@ |
| 1 |
-# Copyright 1999-2018 Gentoo Foundation |
|
| 1 |
+# Copyright 1999-2019 Gentoo Authors |
|
| 2 | 2 |
# Distributed under the terms of the GNU General Public License v2 |
| 3 | 3 |
|
| 4 | 4 |
EAPI=6 |
| ... | ... |
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/" |
| 13 | 13 |
|
| 14 | 14 |
if [[ "${PV}" != 9999 ]] ; then
|
| 15 | 15 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
|
| 16 |
- KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
|
| 16 |
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
|
| 17 | 17 |
else |
| 18 | 18 |
EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git" |
| 19 | 19 |
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
|
| ... | ... |
@@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser" |
| 26 | 26 |
|
| 27 | 27 |
CDEPEND=" |
| 28 | 28 |
>=sys-libs/ncurses-5.2:0= |
| 29 |
- pam? ( virtual/pam )" |
|
| 29 |
+ pam? ( sys-libs/pam )" |
|
| 30 | 30 |
RDEPEND="${CDEPEND}
|
| 31 | 31 |
selinux? ( sec-policy/selinux-screen )" |
| 32 | 32 |
DEPEND="${CDEPEND}
|
| ... | ... |
@@ -59,10 +59,13 @@ src_prepare() {
|
| 59 | 59 |
doc/screen.1 \ |
| 60 | 60 |
|| die |
| 61 | 61 |
|
| 62 |
- if [[ ${CHOST} == *-darwin* ]] ; then
|
|
| 62 |
+ if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
|
|
| 63 | 63 |
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
| 64 | 64 |
fi |
| 65 | 65 |
|
| 66 |
+ # disable musl dummy headers for utmp[x] |
|
| 67 |
+ use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H" |
|
| 68 |
+ |
|
| 66 | 69 |
# reconfigure |
| 67 | 70 |
eautoreconf |
| 68 | 71 |
} |
| 69 | 72 |