diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2020-10-25 15:05:28 -0600 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2020-10-25 15:06:44 -0600 |
| commit | 7144f27531398496d228b19fb78353b256c60c78 (patch) | |
| tree | ba904b535b7209a726d6796ad17d7d2f8e29ce64 | |
| parent | 752393a525c8d7e56eb01dc152e59feaf062998d (diff) | |
main/screen: utmpify
| -rw-r--r-- | main/screen/APKBUILD | 13 | ||||
| -rw-r--r-- | main/screen/utmpx.patch | 21 |
2 files changed, 29 insertions, 5 deletions
diff --git a/main/screen/APKBUILD b/main/screen/APKBUILD index 21607b33624..9c7794baa74 100644 --- a/main/screen/APKBUILD +++ b/main/screen/APKBUILD @@ -2,22 +2,24 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=screen pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Window manager that multiplexes a physical terminal" url="https://www.gnu.org/software/screen/" arch="all" license="GPL-3.0-or-later" options="!check" # No test suite. -makedepends="ncurses-dev ncurses" +makedepends="utmps-dev ncurses-dev libutempter-dev ncurses" subpackages="$pkgname-doc" -source="https://ftp.gnu.org/gnu/screen/screen-$pkgver.tar.gz" +source="https://ftp.gnu.org/gnu/screen/screen-$pkgver.tar.gz + utmpx.patch" # secfixes: # 4.8.0-r0: # - CVE-2020-9366 build() { - ./configure \ + CFLAGS="$CFLAGS -DNONETHACK -DGETUTENT -I/usr/include/utmps" \ + LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -42,4 +44,5 @@ package() { install -Dm644 etc/screenrc "$pkgdir"/etc/skel/.screenrc } -sha512sums="770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c screen-4.8.0.tar.gz" +sha512sums="770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c screen-4.8.0.tar.gz +82aca3e16c8cd7a3029d3b589ff2dd3471708d6287979ebb5cfdaedbd1f3012c0cd660b131e0cbe142b99786e49ef8b24c63159523d870e95ccf71ec94b82634 utmpx.patch" diff --git a/main/screen/utmpx.patch b/main/screen/utmpx.patch new file mode 100644 index 00000000000..c8c6f444bd1 --- /dev/null +++ b/main/screen/utmpx.patch @@ -0,0 +1,21 @@ +--- screen-4.6.2/os.h.old 2018-09-27 23:11:11.655480028 -0700 ++++ screen-4.6.2/os.h 2018-09-27 23:11:34.745808665 -0700 +@@ -250,17 +250,13 @@ + #endif + + #if defined(UTMPOK) || defined(BUGGYGETLOGIN) +-# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) ++# if defined(linux) + # include <utmpx.h> + # define UTMPFILE UTMPX_FILE + # define utmp utmpx +-# define getutent getutxent + # define getutid getutxid + # define getutline getutxline + # define pututline pututxline +-# define setutent setutxent +-# define endutent endutxent +-# define ut_time ut_xtime + # else /* SVR4 */ + # include <utmp.h> + # endif /* SVR4 */ |