snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps: update to 0.25.

This commit is contained in:
Juan RP 2013-07-05 08:14:30 +02:00
parent 355225c7f8
commit 81cfd9eb45
4 changed files with 7 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
srcpkgs/xbps/patches/0001-lib-package_unpack.c-remove-extra-arg-in-xbps_set_cb.patch
View File

@ -1,26 +0,0 @@
From 7da5f6e8f76a47e899df1fc0d0e58256bc0dbcd0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 15 May 2013 12:45:35 +0200
Subject: [PATCH] lib/package_unpack.c: remove extra arg in
xbps_set_cb_state().
---
lib/package_unpack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/package_unpack.c b/lib/package_unpack.c
index e1d0fc1..259b13c 100644
--- lib/package_unpack.c
+++ lib/package_unpack.c
@@ -452,7 +452,7 @@ unpack_archive(struct xbps_handle *xhp,
if (archive_read_extract(ar, entry, flags) != 0) {
rv = archive_errno(ar);
xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL,
- rv, pkgver, NULL,
+ rv, pkgver,
"%s: [unpack] failed to extract file `%s': %s",
pkgver, entry_pname, strerror(rv));
} else {
--
1.8.2.2

27
srcpkgs/xbps/patches/0002-xbps-create-8-calculate-correctly-target-file-for-re.patch
View File

@ -1,27 +0,0 @@
From d6605e1b97fcec16169c788b9bd35d269134d1ca Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 May 2013 10:27:55 +0200
Subject: [PATCH] xbps-create(8): calculate correctly target file for relative
symlinks.
---
NEWS | 2 ++
bin/xbps-create/main.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 9a6c2be..2a2373d 100644
--- bin/xbps-create/main.c
+++ bin/xbps-create/main.c
@@ -237,7 +237,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
*/
xe->target = strdup(buf);
} else {
- xe->target = strdup(p + strlen(destdir));
+ xe->target = strdup(p + strlen(destdir) - 1);
free(p);
}
} else if (strchr(buf, '/') == NULL) {
--
1.8.3

44
srcpkgs/xbps/patches/0003-xbps-create-improve-d6605e1b97-sanitize-destdir-to-r.patch
View File

@ -1,44 +0,0 @@
From fa9d3471d921e1d49cdddeeab546d61f04bc1cf1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 May 2013 13:03:40 +0200
Subject: [PATCH] xbps-create: improve d6605e1b97 (sanitize destdir to resolve
target files in symlinks).
Previously in d6605e1b97 if destdir had trailing '/' the behavior
of detecting target files in symlinks was changed slightly.
---
bin/xbps-create/main.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 2a2373d..5d0a265 100644
--- bin/xbps-create/main.c
+++ bin/xbps-create/main.c
@@ -178,7 +178,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
{
struct xentry *xe = NULL;
const char *filep = NULL;
- char *buf, *p, *dname;
+ char *buf, *p, *p2, *dname;
ssize_t r;
(void)ftwbuf;
@@ -237,7 +237,14 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
*/
xe->target = strdup(buf);
} else {
- xe->target = strdup(p + strlen(destdir) - 1);
+ /*
+ * Sanitize destdir just in case.
+ */
+ if ((p2 = realpath(destdir, NULL)) == NULL)
+ die("failed to sanitize destdir %s: %s", destdir, strerror(errno));
+
+ xe->target = strdup(p+strlen(p2));
+ free(p2);
free(p);
}
} else if (strchr(buf, '/') == NULL) {
--
1.8.3

16
srcpkgs/xbps/template
View File

@ -1,13 +1,11 @@
# Template file for 'xbps'
pkgname=xbps
version=0.24
revision=4
version=0.25
revision=1
build_style=configure
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
--enable-static --enable-debug --enable-tests"
configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests"
hostmakedepends="which pkg-config"
makedepends="zlib-devel proplib-devel>=0.6.3 openssl-devel
libfetch-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
short_desc="The XBPS package system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/xbps"
@ -19,18 +17,18 @@ libxbps_package() {
short_desc+=" - runtime library"
replaces="xbps<0.16.3_2 libxbps>=0"
pkg_install() {
vmove "usr/lib/*.so*"
vmove "usr/lib/*.so.*"
}
}
libxbps-devel_package() {
short_desc+=" - runtime library (development files)"
depends="zlib-devel proplib-devel confuse-devel libfetch-devel
libarchive-devel libxbps>=${version}"
depends="zlib-devel libarchive-devel libxbps>=${version}"
replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}