From 3c697a839c5baa112a9fdfde1cb06e19232f9cb8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 2 Dec 2014 22:21:02 +0000 Subject: libbsd: update to 0.7.0 --- abs/extra/libbsd/PKGBUILD | 14 ++++++------- abs/extra/libbsd/spt.patch | 50 ---------------------------------------------- 2 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 abs/extra/libbsd/spt.patch diff --git a/abs/extra/libbsd/PKGBUILD b/abs/extra/libbsd/PKGBUILD index 2e9b745..d882b1e 100644 --- a/abs/extra/libbsd/PKGBUILD +++ b/abs/extra/libbsd/PKGBUILD @@ -3,33 +3,33 @@ # Contributor: Gerardo Exequiel Pozzi pkgname=libbsd -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') options=('staticlibs') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}) -md5sums=('f6c75f0a9818e323a589bcbd560a0eb4' +source=("http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"{,.asc}) +md5sums=('fcceb4e66fd448ca4ed42ba22a8babb0' 'SKIP') build() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } check() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" make check } package() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install rm "${pkgdir}"/usr/lib/libbsd.a diff --git a/abs/extra/libbsd/spt.patch b/abs/extra/libbsd/spt.patch deleted file mode 100644 index b19dc9b..0000000 --- a/abs/extra/libbsd/spt.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -u -r libbsd-0.5.2-orig/src/setproctitle.c libbsd-0.5.2/src/setproctitle.c ---- libbsd-0.5.2-orig/src/setproctitle.c 2013-06-08 18:26:04.000000000 +0200 -+++ libbsd-0.5.2/src/setproctitle.c 2013-06-18 02:35:59.441393418 +0200 -@@ -86,7 +86,7 @@ - if (environ != envp) - return 0; - -- /* Make a copy of the old environ array of pointers, in case -+ /* Make a deep copy of the old environ array of pointers, in case - * clearenv() or setenv() is implemented to free the internal - * environ array, because we will need to access the old environ - * contents to make the new copy. */ -@@ -94,11 +94,13 @@ - envcopy = malloc(envsize); - if (envcopy == NULL) - return errno; -- memcpy(envcopy, envp, envsize); -+ for (i = 0; envp[i]; i++) envcopy[i] = strdup(envp[i]); -+ envcopy[i] = NULL; - - error = spt_clearenv(); - if (error) { - environ = envp; -+ for(i = 0; envcopy[i]; i++) free(envcopy[i]); - free(envcopy); - return error; - } -@@ -116,18 +118,20 @@ - if (error) { - #ifdef HAVE_CLEARENV - /* Because the old environ might not be available -- * anymore we will make do with the shallow copy. */ -+ * anymore we will make do with the deep copy. */ - environ = envcopy; - #else - environ = envp; -+ for(i = 0; envcopy[i]; i++) free(envcopy[i]); - free(envcopy); - #endif - return error; - } - } - -- /* Dispose of the shallow copy, now that we've finished transfering -+ /* Dispose of the deep copy, now that we've finished transfering - * the old environment. */ -+ for(i = 0; envcopy[i]; i++) free(envcopy[i]); - free(envcopy); - - return 0; -- cgit v0.12