community/libutempter: upgrade to 1.2.0

2 files changed, 7 insertions, 89 deletions

diff --git a/community/libutempter/APKBUILD b/community/libutempter/APKBUILD
index ee5f8d88c1..aded0d4b45 100644
--- a/community/libutempter/APKBUILD
+++ b/community/libutempter/APKBUILD
@@ -1,7 +1,8 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=libutempter
-pkgver=1.1.6
+pkgver=1.2.0
+_pkgver=$pkgver-alt1
 pkgrel=0
 pkgdesc="Library interface to record user sessions in utmp/wtmp files"
 url="http://freecode.com/projects/libutempter"
@@ -10,21 +11,19 @@ license="LGPL-2.1"
 subpackages="$pkgname-dev $pkgname-doc"
 options="suid !check"
 pkggroups="utmp"
-source="ftp://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.bz2
-	libutempter-remove-glibc-assumption.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://github.com/altlinux/libutempter/archive/$_pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 build() {
-	cd "$builddir"
+	cd $pkgname
 	make
 }
 
 package() {
-	cd "$builddir"
+	cd $pkgname
 	make DESTDIR="$pkgdir" install
 	chown root:$pkggroups "$pkgdir/usr/lib/utempter/utempter"
 	chmod 2755 "$pkgdir/usr/lib/utempter/utempter"
 }
 
-sha512sums="6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede  libutempter-1.1.6.tar.bz2
-2d487a44ae3c84417f3dd55917ae707bee682b811ebe7aefe8b50aa9f309f879a7f9ed5cbce08119b6fea7dfddb97702348cfbb05ed45e79f95952d15f0366ff  libutempter-remove-glibc-assumption.patch"
+sha512sums="3e43b63ed988c82b91f6685463aa3556817fcc0b0ea9e2d84213cf63e06813ab89d55a317a2001e454ab0c3a96062d4a260a1f458e49289cfa1d407aa0eca209  1.2.0-alt1.tar.gz"
diff --git a/community/libutempter/libutempter-remove-glibc-assumption.patch b/community/libutempter/libutempter-remove-glibc-assumption.patch
deleted file mode 100644
index 6ed93355bb..0000000000
--- a/community/libutempter/libutempter-remove-glibc-assumption.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur libutempter-1.1.6.orig/utempter.c libutempter-1.1.6/utempter.c
---- libutempter-1.1.6.orig/utempter.c	2010-11-04 13:14:53.000000000 -0400
-+++ libutempter-1.1.6/utempter.c	2014-06-20 16:37:09.762403323 -0400
-@@ -34,13 +34,7 @@
- #include <sys/stat.h>
- #include <utmp.h>
- 
--#ifdef __GLIBC__
- # include <pty.h>
--#elif defined(__FreeBSD__)
--# include <libutil.h>
--#else
--# error Unsupported platform
--#endif /* __GLIBC__ || __FreeBSD__ */
- 
- #define	DEV_PREFIX	"/dev/"
- #define	DEV_PREFIX_LEN	(sizeof(DEV_PREFIX)-1)
-@@ -106,17 +100,12 @@
- 
- static int
- write_uwtmp_record(const char *user, const char *term, const char *host,
--#ifdef __GLIBC__
- 		   pid_t pid,
--#endif
- 		   int add)
- {
- 	struct utmp ut;
- 	struct timeval tv;
--
--#ifdef __GLIBC__
- 	size_t offset;
--#endif
- 
- 	memset(&ut, 0, sizeof(ut));
- 
-@@ -128,8 +117,6 @@
- 	if (host)
- 		strncpy(ut.ut_host, host, sizeof(ut.ut_host));
- 
--#ifdef __GLIBC__
--
- 	offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 :
- 			strlen(term) - sizeof(ut.ut_id);
- 	strncpy(ut.ut_id, term + offset, sizeof(ut.ut_id));
-@@ -156,27 +143,6 @@
- 
- 	(void) updwtmp(_PATH_WTMP, &ut);
- 
--#elif defined(__FreeBSD__)
--
--	ut.ut_time = tv.tv_sec;
--
--	if (add)
--	{
--		login(&ut);
--	} else
--	{
--		if (logout(term) != 1)
--		{
--#ifdef	UTEMPTER_DEBUG
--			fprintf(stderr, "utempter: logout: %s\n",
--				strerror(errno));
--#endif
--			exit(EXIT_FAILURE);
--		}
--	}
--
--#endif /* __GLIBC__ || __FreeBSD__ */
--
- #ifdef	UTEMPTER_DEBUG
- 	fprintf(stderr,
- 		"utempter: DEBUG: utmp/wtmp record %s for terminal '%s'\n",
-@@ -255,8 +221,6 @@
- 	validate_device(device);
- 
- 	return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host,
--#ifdef __GLIBC__
- 				  pid,
--#endif
- 				  add);
- }