diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-30 20:20:35 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-30 20:20:35 +0000 |
| commit | 8e020ea06c96baaef3f1cdfb36182a12ee6895d2 (patch) | |
| tree | 5730d2f43c6ac23a767914a614921f5172f7f319 /system/skalibs | |
| parent | 01e07c91e249e8f1bd88fe550de3d65c4f95c7dc (diff) | |
| parent | 4b99f2a6399966628192b2bfe2bd6846ae8b2623 (diff) | |
| download | packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.tar.gz packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.tar.bz2 packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.tar.xz packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.zip | |
Merge branch 'skaware.20190925' into 'master'
system/skalibs: bump to 2.9.0.0 + related skaware bumps
See merge request adelie/packages!345
Diffstat (limited to 'system/skalibs')
| -rw-r--r-- | system/skalibs/APKBUILD | 11 | ||||
| -rw-r--r-- | system/skalibs/env_dump-unterminated-strings.patch | 26 |
2 files changed, 4 insertions, 33 deletions
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index cbf64462e..e621916be 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.8.1.0 +pkgver=2.9.0.0 pkgrel=1 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -9,16 +9,14 @@ arch="all" options="!check" # No test suite. license="ISC" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz - env_dump-unterminated-strings.patch" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { cd "$builddir" ./configure \ --enable-shared \ --enable-static \ - --libdir=/usr/lib \ - --enable-clock + --libdir=/usr/lib make } @@ -60,5 +58,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86 skalibs-2.8.1.0.tar.gz -286a8e0537399fc52c550c1aeac7dd0748c07d34d51b65cb36ab9e3db5a44ff51ba988c212c6bafa74b107ce80698bcab37a99df6276fe7ce60550de0ffc0567 env_dump-unterminated-strings.patch" +sha512sums="7ed4b45bc527e87fb436b6ac81148a31534c91f7097fe064da586f84afa3188577720d23df9499ebe8fc3eae2cd73f7378c243ca6825e02f986f5802169eee22 skalibs-2.9.0.0.tar.gz" diff --git a/system/skalibs/env_dump-unterminated-strings.patch b/system/skalibs/env_dump-unterminated-strings.patch deleted file mode 100644 index a20a78125..000000000 --- a/system/skalibs/env_dump-unterminated-strings.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d69644de85148f56efeed4259a783881e2a1bddc Mon Sep 17 00:00:00 2001 -From: Laurent Bercot <ska-skaware@skarnet.org> -Date: Wed, 31 Jul 2019 23:47:35 +0000 -Subject: [PATCH] bugfix: env_dump() unterminated strings - ---- - src/libstddjb/env_dump.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/libstddjb/env_dump.c b/src/libstddjb/env_dump.c -index fc79bc3..10f5913 100644 ---- a/src/libstddjb/env_dump.c -+++ b/src/libstddjb/env_dump.c -@@ -32,7 +32,8 @@ int env_dump (char const *dir, mode_t mode, char const *const *envp) - size_t len = str_chr(*envp, '=') ; - size_t vallen = strlen(*envp + len + 1) ; - char fn[len + 1] ; -- memcpy(fn, *envp, len + 1) ; -+ memcpy(fn, *envp, len) ; -+ fn[len] = 0 ; - len = openwritenclose_at(fd, fn, *envp + len + 1, vallen) ; - if (len < vallen) goto cerr ; - } --- -2.22.0 - |