xbps: update to 0.29.

This commit is contained in:
Juan RP 2014-01-09 14:29:38 +01:00
parent 76721dbf62
commit 1b5065ed64
4 changed files with 2 additions and 91 deletions

View file

@ -1,33 +0,0 @@
From 3042dcd7aaaa9bb2970cc60ee72c8632ff8ac5b6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 7 Jan 2014 21:19:03 +0100
Subject: [PATCH 1/2] include/xbps_api_impl.h: remove __{BEGIN,END}_DECLS to
make musl happy.
---
include/xbps_api_impl.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h
index 1e94346..497477e 100644
--- a/include/xbps_api_impl.h
+++ b/include/xbps_api_impl.h
@@ -92,8 +92,6 @@
#endif
-__BEGIN_DECLS
-
/**
* @private
* From lib/external/dewey.c
@@ -263,6 +261,4 @@ void HIDDEN xbps_pkg_find_conflicts(struct xbps_handle *,
*/
const char HIDDEN *vpkg_user_conf(struct xbps_handle *, const char *, bool);
-__END_DECLS
-
#endif /* !_XBPS_API_IMPL_H_ */
--
1.8.5.2

View file

@ -1,27 +0,0 @@
From ae81cd1ea9c98ac3bf61ba581e3b3c63255465bd Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 7 Jan 2014 21:20:42 +0100
Subject: [PATCH 2/2] lib/initend.c: define _BSD_SOURCE for strlcpy() with
musl.
---
lib/initend.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/initend.c b/lib/initend.c
index 21d3bc5..00ef1a4 100644
--- a/lib/initend.c
+++ b/lib/initend.c
@@ -27,7 +27,9 @@
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
+#define _BSD_SOURCE /* required by strlcpy with musl */
#include <string.h>
+#undef _BSD_SOURCE
#include <errno.h>
#include <stdarg.h>
#include <dirent.h>
--
1.8.5.2

View file

@ -1,28 +0,0 @@
From 65370045321e97ee1cc82ead3fd6bb7c4b493b90 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 8 Jan 2014 20:16:02 +0100
Subject: [PATCH 3/3] xbps-create: do not use FTW_MOUNT with nftw(3).
There's not much point in using FTW_MOUNT anyway because we don't care
if files are in another filesystem. This makes it work with musl
(which uses a different behaviour when FTW_MOUNT is set).
---
bin/xbps-create/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 1624539..6223f1c 100644
--- a/bin/xbps-create/main.c
+++ b/bin/xbps-create/main.c
@@ -354,7 +354,7 @@ process_xentry(const char *key, const char *mutable_files)
static void
process_destdir(const char *mutable_files)
{
- if (nftw(".", ftw_cb, 20, FTW_PHYS|FTW_MOUNT) != 0)
+ if (nftw(".", ftw_cb, 20, FTW_PHYS) != 0)
die("failed to process destdir files (nftw):");
/* Process regular files */
--
1.8.5.2

View file

@ -1,9 +1,8 @@
# Template file for 'xbps'
pkgname=xbps
version=0.28.1
revision=3
version=0.29
revision=1
bootstrap=yes
patch_args="-Np1"
conf_files="/etc/xbps/xbps.conf"
replaces="xbps>=0"
build_style=configure