xbps{,-static}: update to 0.44.1.
This commit is contained in:
Juan RP
parent
9da428491f
commit
b77b3f5a6c
4 changed files with 13 additions and 86 deletions
|
|
@ -2,23 +2,24 @@
|
|||
#
|
||||
# NOTE: keep this package synchronized with "srcpkgs/xbps".
|
||||
pkgname=xbps-static
|
||||
version=0.44
|
||||
revision=3
|
||||
version=0.44.1
|
||||
revision=1
|
||||
build_style=configure
|
||||
short_desc="The XBPS package system utilities - static binaries"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.voidlinux.eu/xbps"
|
||||
license="2-clause-BSD"
|
||||
distfiles="https://github.com/voidlinux/xbps/archive/${version}.tar.gz"
|
||||
checksum=159199564c6b6203dc2ce517fbe8c377e470813ffa7f51121df2589cb8259e4c
|
||||
|
||||
wrksrc="xbps-${version}"
|
||||
hostmakedepends="pkg-config"
|
||||
hostmakedepends="git pkg-config"
|
||||
makedepends="zlib-devel libressl-devel>=2.1.4 libarchive-devel>=3.1.2"
|
||||
depends="xbps-triggers"
|
||||
|
||||
only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b${version} git://github.com/voidlinux/xbps ${wrksrc}
|
||||
}
|
||||
do_configure() {
|
||||
HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-debug
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
From acb00d52e48ad6486c1dccc6cfa26ce57370a8b9 Mon Sep 17 00:00:00 2001
|
||||
From: Juan RP <xtraeme@gmail.com>
|
||||
Date: Sat, 7 Mar 2015 09:11:12 +0100
|
||||
Subject: [PATCH] xbps-checkvers(8): fix manually added packages as arguments.
|
||||
|
||||
Regression introduced in the 0.44 changes.
|
||||
---
|
||||
bin/xbps-checkvers/main.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/bin/xbps-checkvers/main.c b/bin/xbps-checkvers/main.c
|
||||
index 5a6ac65..a57b370 100644
|
||||
--- bin/xbps-checkvers/main.c
|
||||
+++ bin/xbps-checkvers/main.c
|
||||
@@ -589,6 +589,7 @@ rcv_check_version(rcv_t *rcv)
|
||||
|
||||
xbps_dictionary_get_cstring_nocopy(rcv->pkgd, "pkgver", &repover);
|
||||
|
||||
+
|
||||
if (repover == NULL && (rcv->show_missing || rcv->manual )) {
|
||||
printf("pkgname: %.*s repover: ? srcpkgver: %s\n",
|
||||
(int)pkgname.v.len, pkgname.v.s, srcver+pkgname.v.len+1);
|
||||
@@ -732,7 +733,13 @@ main(int argc, char **argv)
|
||||
for (i = 0; i < argc; i++) {
|
||||
tmpl = argv[i] + (strlen(argv[i]) - strlen("template"));
|
||||
if ((strcmp("template", tmpl)) == 0) {
|
||||
- rcv_process_file(&rcv, argv[i], rcv_check_version);
|
||||
+ /* strip "srcpkgs/" prefix if found */
|
||||
+ if (strncmp(argv[i], "srcpkgs/", 8) == 0)
|
||||
+ tmpl = strchr(argv[i], '/') + 1;
|
||||
+ else
|
||||
+ tmpl = argv[i];
|
||||
+
|
||||
+ rcv_process_file(&rcv, tmpl, rcv_check_version);
|
||||
}
|
||||
}
|
||||
rcv_end(&rcv);
|
||||
--
|
||||
2.3.1
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From f9b6dd9d2d347028c1607b3ab09dd9156f96fdd8 Mon Sep 17 00:00:00 2001
|
||||
From: Juan RP <xtraeme@gmail.com>
|
||||
Date: Wed, 11 Mar 2015 17:06:45 +0100
|
||||
Subject: [PATCH] proplib: anonymous mappings need MAP_ANON.
|
||||
|
||||
Somehow I removed this accidentally in a previous change... sigh.
|
||||
---
|
||||
lib/portableproplib/prop_object.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/portableproplib/prop_object.c b/lib/portableproplib/prop_object.c
|
||||
index 3afb4d9..335b0c6 100644
|
||||
--- lib/portableproplib/prop_object.c
|
||||
+++ lib/portableproplib/prop_object.c
|
||||
@@ -40,7 +40,9 @@
|
||||
static pthread_mutex_t _prop_refcnt_mtx = PTHREAD_MUTEX_INITIALIZER;
|
||||
#endif /* _PROP_NEED_REFCNT_MTX */
|
||||
|
||||
+#define __USE_MISC /* MAP_ANON on glibc */
|
||||
#include <sys/mman.h>
|
||||
+#undef __USE_MISC
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
@@ -957,7 +959,7 @@ _prop_object_internalize_map_file(const char *fname)
|
||||
if (need_guard) {
|
||||
if (mmap(mf->poimf_xml + mf->poimf_mapsize,
|
||||
pgsize, PROT_READ,
|
||||
- MAP_PRIVATE|MAP_FIXED, -1,
|
||||
+ MAP_ANON|MAP_PRIVATE|MAP_FIXED, -1,
|
||||
(off_t)0) == MAP_FAILED) {
|
||||
(void) munmap(mf->poimf_xml, mf->poimf_mapsize);
|
||||
_PROP_FREE(mf, M_TEMP);
|
||||
--
|
||||
2.3.2
|
||||
|
||||
|
|
@ -1,16 +1,15 @@
|
|||
# Template file for 'xbps'
|
||||
pkgname=xbps
|
||||
version=0.44
|
||||
revision=3
|
||||
version=0.44.1
|
||||
revision=1
|
||||
bootstrap=yes
|
||||
build_style=configure
|
||||
short_desc="The XBPS package system utilities"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="https://github.com/voidlinux/xbps"
|
||||
license="2-clause-BSD"
|
||||
distfiles="https://github.com/voidlinux/xbps/archive/${version}.tar.gz"
|
||||
checksum=159199564c6b6203dc2ce517fbe8c377e470813ffa7f51121df2589cb8259e4c
|
||||
|
||||
hostmakedepends="git"
|
||||
makedepends="zlib-devel libressl-devel>=2.1.4 libarchive-devel>=3.1.2"
|
||||
depends="xbps-triggers"
|
||||
|
||||
|
|
@ -18,7 +17,7 @@ if [ -z "$CHROOT_READY" ]; then
|
|||
CFLAGS+=" -idirafter ${XBPS_MASTERDIR}/usr/include"
|
||||
LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
|
||||
else
|
||||
hostmakedepends="pkg-config"
|
||||
hostmakedepends+=" pkg-config"
|
||||
makedepends+=" atf-devel>=0.21"
|
||||
|
||||
xbps-tests_package() {
|
||||
|
|
@ -30,6 +29,9 @@ else
|
|||
|
||||
fi
|
||||
|
||||
do_fetch() {
|
||||
git clone -b${version} git://github.com/voidlinux/xbps ${wrksrc}
|
||||
}
|
||||
do_configure() {
|
||||
HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug \
|
||||
${CHROOT_READY:+--enable-tests}
|
||||
|
|
|
|||
Loading…
Reference in a new issue