Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xbps, xbps-static: update to 0.57
@ 2019-10-21 19:38 voidlinux-github
  2019-10-27  7:19 ` voidlinux-github
                   ` (29 more replies)
  0 siblings, 30 replies; 31+ messages in thread
From: voidlinux-github @ 2019-10-21 19:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages xbps057
https://github.com/void-linux/void-packages/pull/15677

xbps, xbps-static: update to 0.57


A patch file from https://github.com/void-linux/void-packages/pull/15677.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps057-15677.patch --]
[-- Type: text/x-diff, Size: 9430 bytes --]

From 4f4611a99e0bfdbb709ef16f31c6880e3a25419b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 19:40:11 +0200
Subject: [PATCH 1/2] xbps: update to 0.57

---
 srcpkgs/xbps/patches/44692f28d8.patch        | 22 --------
 srcpkgs/xbps/patches/7b728f5ac.patch         | 22 --------
 srcpkgs/xbps/patches/83aa486f6ba049399.patch | 56 --------------------
 srcpkgs/xbps/patches/bb96486b127.patch       | 33 ------------
 srcpkgs/xbps/patches/d72091a20.patch         | 18 -------
 srcpkgs/xbps/patches/series                  |  7 +--
 srcpkgs/xbps/patches/werror.patch            | 11 ++++
 srcpkgs/xbps/template                        |  6 +--
 8 files changed, 16 insertions(+), 159 deletions(-)
 delete mode 100644 srcpkgs/xbps/patches/44692f28d8.patch
 delete mode 100644 srcpkgs/xbps/patches/7b728f5ac.patch
 delete mode 100644 srcpkgs/xbps/patches/83aa486f6ba049399.patch
 delete mode 100644 srcpkgs/xbps/patches/bb96486b127.patch
 delete mode 100644 srcpkgs/xbps/patches/d72091a20.patch
 create mode 100644 srcpkgs/xbps/patches/werror.patch

diff --git a/srcpkgs/xbps/patches/44692f28d8.patch b/srcpkgs/xbps/patches/44692f28d8.patch
deleted file mode 100644
index fdfe56ec7d8..00000000000
--- a/srcpkgs/xbps/patches/44692f28d8.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 44692f28d859728fb919a5d736ada82606196f75
-Author: Johannes Brechtmann <johannes@jnbr.me>
-Date:   Wed Jun 26 22:51:41 2019 +0200
-
-    bin/xbps-install: update_pkg return EEXIST if package is up to date
-    
-    makes 58509996aabea52ffc40e5e01c9eb00730c6cdcc work for
-    xbps-install -u <pkg>
-
-diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c
-index cdcc92d7..fc5538bb 100644
---- bin/xbps-install/transaction.c
-+++ bin/xbps-install/transaction.c
-@@ -286,7 +286,7 @@ update_pkg(struct xbps_handle *xhp, const char *pkgname)
- 	rv = xbps_transaction_update_pkg(xhp, pkgname);
- 	if (rv == EEXIST) {
- 		printf("Package '%s' is up to date.\n", pkgname);
--		return 0;
-+		return EEXIST;
- 	} else if (rv == ENOENT)
- 		fprintf(stderr, "Package '%s' not found in "
- 		    "repository pool.\n", pkgname);
diff --git a/srcpkgs/xbps/patches/7b728f5ac.patch b/srcpkgs/xbps/patches/7b728f5ac.patch
deleted file mode 100644
index 7310ddd609d..00000000000
--- a/srcpkgs/xbps/patches/7b728f5ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7b728f5ac0adc28f3d7270c26e14ecff73a7f16f Mon Sep 17 00:00:00 2001
-From: Duncaen <mail@duncano.de>
-Date: Wed, 26 Jun 2019 22:24:47 +0200
-Subject: [PATCH] bin/xbps-remove: fix skipping executing orphans transaction
-
----
- bin/xbps-remove/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c
-index 1ef328a8..4ff943c0 100644
---- bin/xbps-remove/main.c
-+++ bin/xbps-remove/main.c
-@@ -295,7 +295,7 @@ main(int argc, char **argv)
- 			exit(rv);
- 		}
- 	}
--	if (missing == argc) {
-+	if (!orphans && missing == argc) {
- 		goto out;
- 	}
- 	if (orphans || (argc > optind)) {
diff --git a/srcpkgs/xbps/patches/83aa486f6ba049399.patch b/srcpkgs/xbps/patches/83aa486f6ba049399.patch
deleted file mode 100644
index 12c9575d8c2..00000000000
--- a/srcpkgs/xbps/patches/83aa486f6ba049399.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 83aa486f6ba049399e457c34be23a7a435f83ceb
-Author: Juan RP <xtraeme@gmail.com>
-Date:   Tue Jun 25 10:32:02 2019 +0200
-
-    xbps-remove: skip trans if all pkgs were not found.
-    
-    Restores behaviour with xbps<0.54.
-
-diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c
-index 61057029..1ef328a8 100644
---- bin/xbps-remove/main.c
-+++ bin/xbps-remove/main.c
-@@ -145,7 +145,7 @@ remove_pkg(struct xbps_handle *xhp, const char *pkgname, bool recursive)
- 		return rv;
- 	} else if (rv == ENOENT) {
- 		printf("Package `%s' is not currently installed.\n", pkgname);
--		return 0;
-+		return rv;
- 	} else if (rv != 0) {
- 		xbps_error_printf("Failed to queue `%s' for removing: %s\n",
- 		    pkgname, strerror(rv));
-@@ -180,7 +180,7 @@ main(int argc, char **argv)
- 	const char *rootdir, *cachedir, *confdir;
- 	int c, flags, rv;
- 	bool yes, drun, recursive, clean_cache, orphans;
--	int maxcols;
-+	int maxcols, missing;
- 
- 	rootdir = cachedir = confdir = NULL;
- 	flags = rv = 0;
-@@ -284,16 +284,24 @@ main(int argc, char **argv)
- 		}
- 	}
- 
-+	missing = optind;
- 	for (int i = optind; i < argc; i++) {
- 		rv = remove_pkg(&xh, argv[i], recursive);
--		if (rv != 0) {
-+		if (rv == ENOENT) {
-+			missing++;
-+			continue;
-+		} else if (rv != 0) {
- 			xbps_end(&xh);
- 			exit(rv);
- 		}
- 	}
-+	if (missing == argc) {
-+		goto out;
-+	}
- 	if (orphans || (argc > optind)) {
- 		rv = exec_transaction(&xh, maxcols, yes, drun);
- 	}
-+out:
- 	xbps_end(&xh);
- 	exit(rv);
- }
diff --git a/srcpkgs/xbps/patches/bb96486b127.patch b/srcpkgs/xbps/patches/bb96486b127.patch
deleted file mode 100644
index 34f1f5610a6..00000000000
--- a/srcpkgs/xbps/patches/bb96486b127.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit bb96486b127054e7b0e02c467b0f61a20d227161
-Author: Juan RP <xtraeme@gmail.com>
-Date:   Thu Jun 27 08:02:19 2019 +0200
-
-    xbps-install: make sure to call xbps_end() before exiting.
-
-diff --git a/bin/xbps-install/main.c b/bin/xbps-install/main.c
-index 371f26c8..3622af5a 100644
---- bin/xbps-install/main.c
-+++ bin/xbps-install/main.c
-@@ -263,7 +263,7 @@ main(int argc, char **argv)
- 			}
- 		}
- 		if (eexist == argc)
--			return 0;
-+			goto out;
- 
- 		rv = exec_transaction(&xh, maxcols, yes, drun);
- 	} else if (!update) {
-@@ -280,11 +280,12 @@ main(int argc, char **argv)
- 			}
- 		}
- 		if (eexist == argc)
--			return 0;
-+			goto out;
- 
- 		rv = exec_transaction(&xh, maxcols, yes, drun);
- 	}
- 
-+out:
- 	xbps_end(&xh);
- 	exit(rv);
- }
diff --git a/srcpkgs/xbps/patches/d72091a20.patch b/srcpkgs/xbps/patches/d72091a20.patch
deleted file mode 100644
index 25234d95e1c..00000000000
--- a/srcpkgs/xbps/patches/d72091a20.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d72091a2060817ac10f55fbd8de4e0611d6d6940
-Author: Duncaen <mail@duncano.de>
-Date:   Wed Jun 26 13:07:16 2019 +0200
-
-    lib/transaction_files.c: fix returning error on hash mismatch
-
-diff --git lib/transaction_files.c lib/transaction_files.c
-index 4dbf4584..9a6ca630 100644
---- lib/transaction_files.c
-+++ lib/transaction_files.c
-@@ -331,6 +331,7 @@ collect_obsoletes(struct xbps_handle *xhp)
- 				continue;
- 			case ERANGE:
- 				/* hash mismatch don't delete it */
-+				rv = 0;
- 				continue;
- 			default:
- 				break;
diff --git a/srcpkgs/xbps/patches/series b/srcpkgs/xbps/patches/series
index f47146b9d4b..18952842899 100644
--- a/srcpkgs/xbps/patches/series
+++ b/srcpkgs/xbps/patches/series
@@ -1,6 +1,3 @@
-d72091a20.patch
-83aa486f6ba049399.patch
-7b728f5ac.patch
-44692f28d8.patch
-bb96486b127.patch
+56ae190.patch
 fix-missing-sh.patch
+werror.patch
diff --git a/srcpkgs/xbps/patches/werror.patch b/srcpkgs/xbps/patches/werror.patch
new file mode 100644
index 00000000000..8af63a7bcf8
--- /dev/null
+++ b/srcpkgs/xbps/patches/werror.patch
@@ -0,0 +1,11 @@
+--- bin/xbps-checkvers/main.c
++++ bin/xbps-checkvers/main.c
+@@ -192,7 +192,7 @@ rcv_load_file(rcv_t *rcv, const char *fname)
+ 		}
+ 	}
+ 
+-	(void)fread(rcv->buf, sizeof(char), rcv->len, file);
++	(void)!fread(rcv->buf, sizeof(char), rcv->len, file);
+ 	rcv->buf[rcv->len] = '\0';
+ 	fclose(file);
+ 	rcv->ptr = rcv->buf;
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 8f217f60afa..ce945d31f86 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
-version=0.56
-revision=7
+version=0.57
+revision=1
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/void-linux/xbps"
 changelog="https://github.com/void-linux/xbps/blob/master/NEWS"
 distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz"
-checksum=e46521513b0c0ff486cc190089277381b18db45e770b04f799dc4eec99ffccd4
+checksum=d01b9c0ca625131862ac0bda1ad065841c0e4fef4085cf46a3972e06a067f75e
 
 hostmakedepends="pkg-config"
 checkdepends="kyua"

From a22314fcf0df5194c6bc194d6b3a16b48002fef8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Oct 2019 19:47:59 +0200
Subject: [PATCH 2/2] xbps-static: update to 0.57

---
 srcpkgs/xbps-static/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 4f8d4275601..090430aa752 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -1,8 +1,8 @@
 # Template file for 'xbps-static'
 # NOTE: keep this package synchronized with "srcpkgs/xbps"
 pkgname=xbps-static
-version=0.56
-revision=5
+version=0.57
+revision=1
 # only musl
 archs="*-musl"
 wrksrc="xbps-${version}"
@@ -16,7 +16,11 @@ license="BSD-2-Clause"
 homepage="https://www.voidlinux.org/xbps"
 changelog="https://github.com/void-linux/xbps/blob/master/NEWS"
 distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz"
-checksum=e46521513b0c0ff486cc190089277381b18db45e770b04f799dc4eec99ffccd4
+checksum=d01b9c0ca625131862ac0bda1ad065841c0e4fef4085cf46a3972e06a067f75e
+
+# LTO objects break static builds, override
+CFLAGS="-fno-lto"
+LDFLAGS="-fno-lto"
 
 do_configure() {
 	./configure --prefix=/usr --sysconfdir=/etc --enable-static

^ permalink raw reply	[flat|nested] 31+ messages in thread
end of thread, other threads:[~2019-10-28 20:03 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-21 19:38 [PR PATCH] xbps, xbps-static: update to 0.57 voidlinux-github
2019-10-27  7:19 ` voidlinux-github
2019-10-27  7:20 ` voidlinux-github
2019-10-27  7:26 ` voidlinux-github
2019-10-27  7:30 ` voidlinux-github
2019-10-27  7:31 ` voidlinux-github
2019-10-27  7:40 ` voidlinux-github
2019-10-27  7:47 ` voidlinux-github
2019-10-27  7:59 ` voidlinux-github
2019-10-27  8:01 ` voidlinux-github
2019-10-27  8:03 ` voidlinux-github
2019-10-27  8:06 ` voidlinux-github
2019-10-27  8:09 ` voidlinux-github
2019-10-27  8:10 ` voidlinux-github
2019-10-27  8:10 ` voidlinux-github
2019-10-27  8:11 ` voidlinux-github
2019-10-27  8:12 ` voidlinux-github
2019-10-27  8:15 ` voidlinux-github
2019-10-27  8:16 ` voidlinux-github
2019-10-27  8:17 ` voidlinux-github
2019-10-27  8:39 ` voidlinux-github
2019-10-27  8:46 ` voidlinux-github
2019-10-27  8:47 ` voidlinux-github
2019-10-27  8:50 ` voidlinux-github
2019-10-27  8:53 ` voidlinux-github
2019-10-27  8:53 ` voidlinux-github
2019-10-27 20:07 ` voidlinux-github
2019-10-28 17:52 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-28 17:52 ` voidlinux-github
2019-10-28 17:53 ` xbps, xbps-static: update to 0.57.1 voidlinux-github
2019-10-28 20:03 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).