From 3d701bd77630b74a9b229afd3df602dd68b1bf16 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 28 Jan 2014 17:35:35 +0100
Subject: [PATCH] xbps: update to 0.30.
---
...ll-symlinks-in-a-package-are-removed.patch | 125 ------
...g.h-kludge-and-override-vasprintf-de.patch | 399 ------------------
srcpkgs/xbps/template | 5 +-
3 files changed, 2 insertions(+), 527 deletions(-)
delete mode 100644 srcpkgs/xbps/patches/0001-Make-sure-that-all-symlinks-in-a-package-are-removed.patch
delete mode 100644 srcpkgs/xbps/patches/0002-Remove-the-config.h-kludge-and-override-vasprintf-de.patch
diff --git a/srcpkgs/xbps/patches/0001-Make-sure-that-all-symlinks-in-a-package-are-removed.patch b/srcpkgs/xbps/patches/0001-Make-sure-that-all-symlinks-in-a-package-are-removed.patch
deleted file mode 100644
index e8e9429470b..00000000000
--- a/srcpkgs/xbps/patches/0001-Make-sure-that-all-symlinks-in-a-package-are-removed.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 292be5c4200ef1866885e3933a2740777c024f7f Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Sun, 12 Jan 2014 17:10:07 +0100
-Subject: [PATCH] Make sure that all symlinks in a package are removed, not
- just dangling symlinks.
-
----
- NEWS | 5 +++++
- lib/package_remove.c | 18 ----------------
- tests/xbps/libxbps/shell/remove_test.sh | 38 ++++++++++++++++++++++++++++++++-
- 3 files changed, 42 insertions(+), 19 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 640a275..c8d1586 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,8 @@
-+xbps-0.30 (??):
-+
-+ * Fixed a bug where in some cases valid symlinks in a package were not removed
-+ (just dangling symlinks were removed).
-+
- xbps-0.29 (2014-01-09):
-
- * Added XBPS_ARCH environment variable to override tha native architecture
-diff --git a/lib/package_remove.c b/lib/package_remove.c
-index 2bfa2fc..4bd7646 100644
---- a/lib/package_remove.c
-+++ b/lib/package_remove.c
-@@ -54,13 +54,11 @@ xbps_remove_pkg_files(struct xbps_handle *xhp,
- const char *key,
- const char *pkgver)
- {
-- struct stat st;
- xbps_array_t array;
- xbps_object_iterator_t iter;
- xbps_object_t obj;
- const char *file, *sha256, *curobj = NULL;
- char *path = NULL;
-- char buf[PATH_MAX];
- int rv = 0;
- bool found;
-
-@@ -137,22 +135,6 @@ xbps_remove_pkg_files(struct xbps_handle *xhp,
- free(path);
- break;
- }
-- } else if (strcmp(key, "links") == 0) {
-- /*
-- * All regular files from package were removed at this
-- * point, so we will only remove dangling symlinks.
-- */
-- if (realpath(path, buf) == NULL) {
-- if (errno != ENOENT && errno != ELOOP) {
-- free(path);
-- rv = errno;
-- break;
-- }
-- }
-- if (stat(buf, &st) == 0) {
-- free(path);
-- continue;
-- }
- }
- /*
- * Make sure to not remove any symlink of root directory.
-diff --git a/tests/xbps/libxbps/shell/remove_test.sh b/tests/xbps/libxbps/shell/remove_test.sh
-index 37d3f26..d049f6e 100644
---- a/tests/xbps/libxbps/shell/remove_test.sh
-+++ b/tests/xbps/libxbps/shell/remove_test.sh
-@@ -20,7 +20,7 @@ keep_base_symlinks_body() {
- xbps-rindex -a *.xbps
- atf_check_equal $? 0
- cd ..
-- xbps-install -r root --repository=$PWD/some_repo -y foo
-+ xbps-install -r root -C null.conf --repository=$PWD/some_repo -y foo
- atf_check_equal $? 0
- xbps-remove -r root -y foo
- atf_check_equal $? 0
-@@ -32,6 +32,42 @@ keep_base_symlinks_body() {
- atf_check_equal $rv 0
- }
-
-+# 2nd test: make sure that all symlinks are removed.
-+atf_test_case remove_symlinks
-+
-+remove_symlinks_head() {
-+ atf_set "descr" "Tests for package removal: symlink cleanup test"
-+}
-+
-+remove_symlinks_body() {
-+ mkdir some_repo
-+ mkdir -p pkg_A/usr/lib pkg_B/usr/lib
-+ touch -f pkg_A/usr/lib/libfoo.so.1.2.0
-+ ln -sfr pkg_A/usr/lib/libfoo.so.1.2.0 pkg_A/usr/lib/libfoo.so.1
-+ ln -sfr pkg_B/usr/lib/libfoo.so.1 pkg_B/usr/lib/libfoo.so
-+
-+ cd some_repo
-+ xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
-+ atf_check_equal $? 0
-+ xbps-create -A noarch -n B-1.0_1 --dependencies "A>=0" -s "B pkg" ../pkg_B
-+ atf_check_equal $? 0
-+ xbps-rindex -a *.xbps
-+ atf_check_equal $? 0
-+ cd ..
-+ xbps-install -r root -C null.conf --repository=$PWD/some_repo -y B
-+ atf_check_equal $? 0
-+ xbps-pkgdb -r root -m manual A
-+ atf_check_equal $? 0
-+ xbps-remove -r root -Ryv B
-+ atf_check_equal $? 0
-+ rv=0
-+ if [ -h root/usr/lib/libfoo.so ]; then
-+ rv=1
-+ fi
-+ atf_check_equal $rv 0
-+}
-+
- atf_init_test_cases() {
- atf_add_test_case keep_base_symlinks
-+ atf_add_test_case remove_symlinks
- }
---
-1.8.5.2
-
diff --git a/srcpkgs/xbps/patches/0002-Remove-the-config.h-kludge-and-override-vasprintf-de.patch b/srcpkgs/xbps/patches/0002-Remove-the-config.h-kludge-and-override-vasprintf-de.patch
deleted file mode 100644
index 26142d8c174..00000000000
--- a/srcpkgs/xbps/patches/0002-Remove-the-config.h-kludge-and-override-vasprintf-de.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 5eea259c1371448be362ccf1bc123da784aef39d Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Mon, 20 Jan 2014 18:50:33 +0100
-Subject: [PATCH] Remove the config.h kludge and override vasprintf detection
- via HAVE_VASPRINTF.
-
----
- Makefile | 4 ++--
- bin/xbps-install/fetch_cb.c | 1 -
- bin/xbps-query/search.c | 4 +---
- configure | 32 +++++++++++++++++---------------
- include/compat.h | 2 +-
- include/xbps_api_impl.h | 2 +-
- lib/cb_util.c | 4 ----
- lib/external/dewey.c | 3 ---
- lib/external/fexec.c | 4 +++-
- lib/fetch/common.c | 5 ++---
- lib/fetch/fetch.c | 5 ++---
- lib/fetch/file.c | 5 ++---
- lib/fetch/ftp.c | 5 ++---
- lib/fetch/http.c | 5 ++---
- lib/package_configure.c | 1 -
- lib/package_unpack.c | 4 ----
- lib/portableproplib/prop_object.c | 4 +---
- lib/util.c | 4 ----
- 18 files changed, 36 insertions(+), 58 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 16e8851..f6e6c89 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ endif
-
- .PHONY: all
- all:
-- @if test ! -e config.h; then \
-+ @if test ! -e config.mk; then \
- echo "You didn't run ./configure ... exiting."; \
- exit 1; \
- fi
-@@ -45,4 +45,4 @@ clean:
- @for dir in $(SUBDIRS); do \
- $(MAKE) -C $$dir clean || exit 1; \
- done
-- -rm -f config.h config.mk _ccflag.{,c,err}
-+ -rm -f config.mk _ccflag.{,c,err}
-diff --git a/bin/xbps-install/fetch_cb.c b/bin/xbps-install/fetch_cb.c
-index de671cf..162fcf7 100644
---- a/bin/xbps-install/fetch_cb.c
-+++ b/bin/xbps-install/fetch_cb.c
-@@ -42,7 +42,6 @@
-
- #include <xbps.h>
- #include "defs.h"
--#include "config.h"
-
- static void
- get_time(struct timeval *tvp)
-diff --git a/bin/xbps-query/search.c b/bin/xbps-query/search.c
-index d2358cc..4f91ca4 100644
---- a/bin/xbps-query/search.c
-+++ b/bin/xbps-query/search.c
-@@ -27,9 +27,7 @@
- # define _GNU_SOURCE /* for strcasestr(3) */
- #endif
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-
- #include <stdio.h>
- #include <stdbool.h>
-diff --git a/configure b/configure
-index 299e826..89c3049 100755
---- a/configure
-+++ b/configure
-@@ -111,7 +111,6 @@ _which()
- return 1
- }
-
--CONFIG_H=config.h
- CONFIG_MK=config.mk
-
- if [ -z "$BUILD" ]; then
-@@ -138,9 +137,8 @@ if [ -z "$OS" ]; then
- fi
-
- echo "Configuring xbps for ... $OS"
--rm -f $CONFIG_H $CONFIG_MK
-+rm -f $CONFIG_MK
- echo "# Common vars used by XBPS on $OS." >$CONFIG_MK
--echo "/* $OS */" >$CONFIG_H
-
- echo "VERSION = $VERSION" >>$CONFIG_MK
- echo "TOPDIR ?= $TOPDIR" >>$CONFIG_MK
-@@ -186,7 +184,6 @@ echo "CFLAGS = -O2 -pthread" >>$CONFIG_MK
-
- echo "LDFLAGS = -L\$(TOPDIR)/lib" >>$CONFIG_MK
- echo "CPPFLAGS = -I. -I\$(TOPDIR) -I\$(TOPDIR)/include" >>$CONFIG_MK
--echo "CPPFLAGS += -DHAVE_CONFIG_H" >>$CONFIG_MK
- echo "CPPFLAGS += -DXBPS_SYSCONF_PATH=\\\"${ETCDIR}\\\"" >>$CONFIG_MK
- echo "CPPFLAGS += -DXBPS_VERSION=\\\"${VERSION}\\\"" >>$CONFIG_MK
- echo "CPPFLAGS += -D_unused=\"__attribute__((__unused__))\"" >>$CONFIG_MK
-@@ -206,7 +203,7 @@ fi
-
- case "$OS" in
- linux)
-- echo "CPPFLAGS += -D_XOPEN_SOURCE=700" >>$CONFIG_MK
-+ echo "CPPFLAGS += -D_XOPEN_SOURCE=700" >>$CONFIG_MK
- echo "CPPFLAGS += -D_FILE_OFFSET_BITS=64" >> $CONFIG_MK
- ;;
- *)
-@@ -346,22 +343,31 @@ echo "STATIC_LIBS += -lpthread" >>$CONFIG_MK
- #
- func=vasprintf
- printf "Checking for $func() ... "
--cat <<EOF >_$func.c
-+if test -n "$HAVE_VASPRINTF"; then
-+ echo "yes (cached)."
-+else
-+ cat <<EOF >_$func.c
-+#define _GNU_SOURCE
- #include <stdio.h>
- int main(void) {
- vasprintf(NULL, NULL, NULL);
- return 0;
- }
- EOF
--if $XCC -D_GNU_SOURCE _$func.c -o _$func 2>/dev/null; then
-- echo yes.
-+
-+ if $XCC _$func.c -o _$func 2>/dev/null; then
-+ echo yes.
-+ HAVE_VASPRINTF=1
-+ else
-+ echo no.
-+ fi
-+ rm -f _$func.c _$func
-+fi
-+if test -n "$HAVE_VASPRINTF"; then
- echo "CPPFLAGS += -DHAVE_VASPRINTF" >> $CONFIG_MK
- else
-- echo no.
- echo "COMPAT_SRCS+= compat/vasprintf.o" >>$CONFIG_MK
-- echo "#include \"compat.h\"" >>$CONFIG_H
- fi
--rm -f _$func.c _$func
-
- #
- # Check for strcasestr().
-@@ -384,7 +390,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
- else
- echo no.
- echo "COMPAT_SRCS += compat/strcasestr.o" >>$CONFIG_MK
-- echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func _$func.c
-
-@@ -408,7 +413,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
- else
- echo no.
- echo "COMPAT_SRCS += compat/strlcpy.o" >>$CONFIG_MK
-- echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func.c _$func
-
-@@ -431,7 +435,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
- else
- echo no.
- echo "COMPAT_SRCS += compat/strlcat.o" >>$CONFIG_MK
-- echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func.c _$func
-
-@@ -454,7 +457,6 @@ if $XCC -lutil _$func.c -o _$func 2>/dev/null; then
- else
- echo no.
- echo "COMPAT_SRCS+= compat/humanize_number.o" >>$CONFIG_MK
-- echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func.c _$func
-
-diff --git a/include/compat.h b/include/compat.h
-index 9f057f9..235000a 100644
---- a/include/compat.h
-+++ b/include/compat.h
-@@ -22,7 +22,7 @@ size_t HIDDEN strlcpy(char *, const char *, size_t);
- char HIDDEN *strcasestr(const char *, const char *);
- #endif
-
--#if !defined(HAVE_VASPRINTF) && !defined(_GNU_SOURCE)
-+#ifndef HAVE_VASPRINTF
- int HIDDEN vasprintf(char **, const char *, va_list);
- #endif
-
-diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h
-index 497477e..e45350a 100644
---- a/include/xbps_api_impl.h
-+++ b/include/xbps_api_impl.h
-@@ -30,7 +30,7 @@
- #include <assert.h>
- #include <confuse.h>
- #define LIBXBPS_PRIVATE
--#include <xbps.h>
-+#include "xbps.h"
-
- /*
- * By default all public functions have default visibility, unless
-diff --git a/lib/cb_util.c b/lib/cb_util.c
-index 9cf65ac..1aa0f07 100644
---- a/lib/cb_util.c
-+++ b/lib/cb_util.c
-@@ -34,10 +34,6 @@
- #include <stdarg.h>
- #include <errno.h>
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include "xbps_api_impl.h"
-
- #ifdef __clang__
-diff --git a/lib/external/dewey.c b/lib/external/dewey.c
-index fb8dabf..f6502d4 100644
---- a/lib/external/dewey.c
-+++ b/lib/external/dewey.c
-@@ -37,9 +37,6 @@
- #include <ctype.h>
-
- #include "xbps_api_impl.h"
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-
- #define PKG_PATTERN_MAX 1024
-
-diff --git a/lib/external/fexec.c b/lib/external/fexec.c
-index 6261f59..cbdb0d5 100644
---- a/lib/external/fexec.c
-+++ b/lib/external/fexec.c
-@@ -29,13 +29,15 @@
-
- #define _BSD_SOURCE /* for vfork and chroot */
- #include <sys/types.h>
-+#include <unistd.h>
-+
- #include <sys/wait.h>
- #include <errno.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
--#include <unistd.h>
-
-+#undef _BSD_SOURCE
- #include "xbps_api_impl.h"
-
- static int
-diff --git a/lib/fetch/common.c b/lib/fetch/common.c
-index dde3682..8d7d3f5 100644
---- a/lib/fetch/common.c
-+++ b/lib/fetch/common.c
-@@ -30,9 +30,8 @@
- * $FreeBSD: common.c,v 1.53 2007/12/19 00:26:36 des Exp $
- */
-
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/fetch.c b/lib/fetch/fetch.c
-index e0bc07f..9b1ac27 100644
---- a/lib/fetch/fetch.c
-+++ b/lib/fetch/fetch.c
-@@ -30,9 +30,8 @@
- * $FreeBSD: fetch.c,v 1.41 2007/12/19 00:26:36 des Exp $
- */
-
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/file.c b/lib/fetch/file.c
-index 4e4b6a4..14640be 100644
---- a/lib/fetch/file.c
-+++ b/lib/fetch/file.c
-@@ -30,9 +30,8 @@
- * $FreeBSD: file.c,v 1.18 2007/12/14 10:26:58 des Exp $
- */
-
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/ftp.c b/lib/fetch/ftp.c
-index 9426e43..c104d5f 100644
---- a/lib/fetch/ftp.c
-+++ b/lib/fetch/ftp.c
-@@ -57,9 +57,8 @@
- *
- */
-
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/http.c b/lib/fetch/http.c
-index 4b2b558..d405a6a 100644
---- a/lib/fetch/http.c
-+++ b/lib/fetch/http.c
-@@ -63,9 +63,8 @@
- * SUCH DAMAGE.
- */
-
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/package_configure.c b/lib/package_configure.c
-index 79c313a..1ded640 100644
---- a/lib/package_configure.c
-+++ b/lib/package_configure.c
-@@ -29,7 +29,6 @@
- #include <errno.h>
-
- #include "xbps_api_impl.h"
--
- /**
- * @file lib/package_configure.c
- * @brief Package configuration routines
-diff --git a/lib/package_unpack.c b/lib/package_unpack.c
-index 5de73db..84565af 100644
---- a/lib/package_unpack.c
-+++ b/lib/package_unpack.c
-@@ -23,10 +23,6 @@
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <sys/stat.h>
- #include <stdio.h>
- #include <stdbool.h>
-diff --git a/lib/portableproplib/prop_object.c b/lib/portableproplib/prop_object.c
-index bc1aaa2..05dc256 100644
---- a/lib/portableproplib/prop_object.c
-+++ b/lib/portableproplib/prop_object.c
-@@ -29,9 +29,7 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-
- #include <prop/prop_object.h>
- #include "prop_object_impl.h"
-diff --git a/lib/util.c b/lib/util.c
-index dcea8a9..761d888 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -27,10 +27,6 @@
- # define _GNU_SOURCE /* for vasprintf(3) */
- #endif
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <stdio.h>
- #include <stdbool.h>
- #include <stdlib.h>
---
-1.8.5.3
-
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index e0393fea9c9..798336be6d0 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,8 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
-version=0.29
-revision=4
-patch_args="-Np1"
+version=0.30
+revision=1
bootstrap=yes
conf_files="/etc/xbps/xbps.conf"
replaces="xbps>=0"