summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch79
-rw-r--r--packages/x11-libs/libutempter/libutempter-1.2.1.exheres-0 (renamed from packages/x11-libs/libutempter/libutempter-1.1.6.exheres-0)6
2 files changed, 1 insertions, 84 deletions
diff --git a/packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch b/packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch
deleted file mode 100644
index 39dc24515..000000000
--- a/packages/x11-libs/libutempter/files/libutempter-1.1.6-musl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no, upstream appears dead
-
-From 4c0914bb9fde4810bb64acfea71c18bada402474 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Sat, 7 Nov 2015 02:27:03 -0500
-Subject: [PATCH] Don't assume glibc is the only libc for linux
-
----
- libutempter/utempter.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/libutempter/utempter.c b/libutempter/utempter.c
-index b79af97..af37a64 100644
---- a/libutempter/utempter.c
-+++ b/libutempter/utempter.c
-@@ -34,13 +34,13 @@
- #include <sys/stat.h>
- #include <utmp.h>
-
--#ifdef __GLIBC__
-+#ifdef linux
- # include <pty.h>
- #elif defined(__FreeBSD__)
- # include <libutil.h>
- #else
- # error Unsupported platform
--#endif /* __GLIBC__ || __FreeBSD__ */
-+#endif /* linux || __FreeBSD__ */
-
- #define DEV_PREFIX "/dev/"
- #define DEV_PREFIX_LEN (sizeof(DEV_PREFIX)-1)
-@@ -106,7 +106,7 @@ validate_device(const char *device)
-
- static int
- write_uwtmp_record(const char *user, const char *term, const char *host,
--#ifdef __GLIBC__
-+#ifdef linux
- pid_t pid,
- #endif
- int add)
-@@ -114,7 +114,7 @@ write_uwtmp_record(const char *user, const char *term, const char *host,
- struct utmp ut;
- struct timeval tv;
-
--#ifdef __GLIBC__
-+#ifdef linux
- size_t offset;
- #endif
-
-@@ -128,7 +128,7 @@ write_uwtmp_record(const char *user, const char *term, const char *host,
- if (host)
- strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-
--#ifdef __GLIBC__
-+#ifdef linux
-
- offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 :
- strlen(term) - sizeof(ut.ut_id);
-@@ -175,7 +175,7 @@ write_uwtmp_record(const char *user, const char *term, const char *host,
- }
- }
-
--#endif /* __GLIBC__ || __FreeBSD__ */
-+#endif /* linux || __FreeBSD__ */
-
- #ifdef UTEMPTER_DEBUG
- fprintf(stderr,
-@@ -255,7 +255,7 @@ main(int argc, const char *argv[])
- validate_device(device);
-
- return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host,
--#ifdef __GLIBC__
-+#ifdef linux
- pid,
- #endif
- add);
---
-2.6.2
-
diff --git a/packages/x11-libs/libutempter/libutempter-1.1.6.exheres-0 b/packages/x11-libs/libutempter/libutempter-1.2.1.exheres-0
index 3e41ec1de..ad6ef73a5 100644
--- a/packages/x11-libs/libutempter/libutempter-1.1.6.exheres-0
+++ b/packages/x11-libs/libutempter/libutempter-1.2.1.exheres-0
@@ -5,7 +5,7 @@
SUMMARY="A library interface for terminal emulators to record user sessions to utmp and wtmp"
HOMEPAGE=""
-DOWNLOADS="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${PNV}.tar.bz2"
+DOWNLOADS="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${PNV}.tar.gz"
REMOTE_IDS="freecode:${PN}"
@@ -19,10 +19,6 @@ DEPENDENCIES="
group/utmp
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- -p2 "${FILES}"/${PNV}-musl.patch
-)
-
DEFAULT_SRC_COMPILE_PARAMS=(
libdir="/usr/$(exhost --target)/lib"
libexecdir="/usr/$(exhost --target)/libexec"