Date: Monday, August 11, 2014 @ 16:31:10
Author: lfleischer
Revision: 219572
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libbsd/repos/testing-i686/
libbsd/repos/testing-i686/PKGBUILD
(from rev 219571, libbsd/trunk/PKGBUILD)
libbsd/repos/testing-i686/spt.patch
(from rev 219571, libbsd/trunk/spt.patch)
libbsd/repos/testing-x86_64/
libbsd/repos/testing-x86_64/PKGBUILD
(from rev 219571, libbsd/trunk/PKGBUILD)
libbsd/repos/testing-x86_64/spt.patch
(from rev 219571, libbsd/trunk/spt.patch)
--------------------------+
testing-i686/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++
testing-i686/spt.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++
testing-x86_64/spt.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 178 insertions(+)
Copied: libbsd/repos/testing-i686/PKGBUILD (from rev 219571,
libbsd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-08-11 14:31:10 UTC (rev 219572)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz...@yahoo.com.ar>
+
+pkgname=libbsd
+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=('fcceb4e66fd448ca4ed42ba22a8babb0'
+ 'SKIP')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+ rm "${pkgdir}"/usr/lib/libbsd.a
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: libbsd/repos/testing-i686/spt.patch (from rev 219571,
libbsd/trunk/spt.patch)
===================================================================
--- testing-i686/spt.patch (rev 0)
+++ testing-i686/spt.patch 2014-08-11 14:31:10 UTC (rev 219572)
@@ -0,0 +1,50 @@
+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;
Copied: libbsd/repos/testing-x86_64/PKGBUILD (from rev 219571,
libbsd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-08-11 14:31:10 UTC (rev 219572)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz...@yahoo.com.ar>
+
+pkgname=libbsd
+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=('fcceb4e66fd448ca4ed42ba22a8babb0'
+ 'SKIP')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+ rm "${pkgdir}"/usr/lib/libbsd.a
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: libbsd/repos/testing-x86_64/spt.patch (from rev 219571,
libbsd/trunk/spt.patch)
===================================================================
--- testing-x86_64/spt.patch (rev 0)
+++ testing-x86_64/spt.patch 2014-08-11 14:31:10 UTC (rev 219572)
@@ -0,0 +1,50 @@
+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;
