* [PR PATCH] xbps 0.59.1
@ 2020-04-01 9:43 xtraeme
2020-04-01 9:47 ` [PR PATCH] [Updated] " xtraeme
2020-04-01 10:12 ` [PR PATCH] [Merged]: " xtraeme
0 siblings, 2 replies; 3+ messages in thread
From: xtraeme @ 2020-04-01 9:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
There is a new pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages xbps-0.59.1
https://github.com/void-linux/void-packages/pull/20541
xbps 0.59.1
A patch file from https://github.com/void-linux/void-packages/pull/20541.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-0.59.1-20541.patch --]
[-- Type: text/x-diff, Size: 6910 bytes --]
From 531c345ea5005d6acb95b57ad2f5c8ac9ec77f87 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 1 Apr 2020 11:43:04 +0200
Subject: [PATCH 1/2] xbps: update to 0.59.1.
---
...-fix-regression-in-small-transaction.patch | 25 -------------
...check_revdeps.c-fix-regression-in-re.patch | 30 ----------------
...ion_check_revdeps.c-fix-previous-fix.patch | 35 -------------------
srcpkgs/xbps/template | 8 ++---
4 files changed, 4 insertions(+), 94 deletions(-)
delete mode 100644 srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch
delete mode 100644 srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch
delete mode 100644 srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch
diff --git a/srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch b/srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch
deleted file mode 100644
index 1b669665ed8..00000000000
--- a/srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d40179a8ae86f16aeea1418b6a0b58c8ed8f3d7 Mon Sep 17 00:00:00 2001
-From: Duncan Overbruck <mail@duncano.de>
-Date: Wed, 4 Mar 2020 12:46:44 +0100
-Subject: [PATCH] bin/xbps-install: fix regression in small transaction stats
-
-fixes #242
----
- bin/xbps-install/transaction.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git bin/xbps-install/transaction.c bin/xbps-install/transaction.c
-index ae1ddcf2..89d1b8a4 100644
---- bin/xbps-install/transaction.c
-+++ bin/xbps-install/transaction.c
-@@ -125,6 +125,7 @@ show_package_list(struct transaction *trans, xbps_trans_type_t ttype, unsigned i
- xbps_dictionary_get_bool(obj, "download", &dload);
- tt = xbps_transaction_pkg_type(obj);
-
-+ buf = NULL;
- if (tt == XBPS_TRANS_UPDATE) {
- /* get installed pkgver */
- ipkgd = xbps_pkgdb_get_pkg(trans->xhp, pkgname);
---
-2.25.1
-
diff --git a/srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch b/srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch
deleted file mode 100644
index 951236efd28..00000000000
--- a/srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aed9402d6282c193ac23252a8686394ac833b713 Mon Sep 17 00:00:00 2001
-From: Duncan Overbruck <mail@duncano.de>
-Date: Wed, 4 Mar 2020 23:39:27 +0100
-Subject: [PATCH 1/2] lib/transaction_check_revdeps.c: fix regression in
- revdeps check
-
-this is probably the same as reported in #245.
-
-Its again not resetting/initializing a variable in a loop,
-falling back to the previous set value.
----
- lib/transaction_check_revdeps.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git lib/transaction_check_revdeps.c lib/transaction_check_revdeps.c
-index 211f1df0..7e30e3e8 100644
---- lib/transaction_check_revdeps.c
-+++ lib/transaction_check_revdeps.c
-@@ -172,6 +172,8 @@ xbps_transaction_check_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs)
- error = true;
- goto out;
- }
-+
-+ ttype = 0;
- if ((revpkgd = xbps_find_pkg_in_array(pkgs, pkgname, 0))) {
- ttype = xbps_transaction_pkg_type(revpkgd);
- if (ttype == XBPS_TRANS_REMOVE)
---
-2.25.1
-
diff --git a/srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch b/srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch
deleted file mode 100644
index 52033584b0d..00000000000
--- a/srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 044f75450bf80a5434097385cec90715c8655c6f Mon Sep 17 00:00:00 2001
-From: Duncan Overbruck <mail@duncano.de>
-Date: Thu, 5 Mar 2020 00:39:21 +0100
-Subject: [PATCH 2/2] lib/transaction_check_revdeps.c: fix previous fix
-
-Don't set transaction type from inside the revdep check,
-if the package is being removed then there is not point
-in continueing checking if its breaks.
-
-Referencing #245
----
- lib/transaction_check_revdeps.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git lib/transaction_check_revdeps.c lib/transaction_check_revdeps.c
-index 7e30e3e8..389daab2 100644
---- lib/transaction_check_revdeps.c
-+++ lib/transaction_check_revdeps.c
-@@ -173,11 +173,9 @@ xbps_transaction_check_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs)
- goto out;
- }
-
-- ttype = 0;
- if ((revpkgd = xbps_find_pkg_in_array(pkgs, pkgname, 0))) {
-- ttype = xbps_transaction_pkg_type(revpkgd);
-- if (ttype == XBPS_TRANS_REMOVE)
-- revpkgd = NULL;
-+ if (xbps_transaction_pkg_type(revpkgd) == XBPS_TRANS_REMOVE)
-+ continue;
- }
- if (revpkgd == NULL)
- revpkgd = xbps_pkgdb_get_pkg(xhp, curpkgver);
---
-2.25.1
-
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 6f3862911b9..ef7d1daf047 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,16 +1,16 @@
# Template file for 'xbps'
pkgname=xbps
-version=0.59
-revision=5
+version=0.59.1
+revision=1
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, BSD-3-Clause, MIT"
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=4d4a67b40a6cc4994c2131c786fb17407ddc9041f4f5734b8a9c5d743ede46d0
+checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
hostmakedepends="pkgconf"
checkdepends="kyua"
From a32a330729847254a3a3b8b813bd0cf6f3880afe Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 1 Apr 2020 11:43:07 +0200
Subject: [PATCH 2/2] xbps-static: update to 0.59.1.
---
srcpkgs/xbps-static/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 089b1d8b488..10ef422a8fb 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.59
-revision=5
+version=0.59.1
+revision=1
# only musl
archs="*-musl"
wrksrc="xbps-${version}"
@@ -12,7 +12,7 @@ makedepends="libarchive-devel"
depends="xbps-triggers"
short_desc="XBPS package system utilities - static binaries"
maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, BSD-3-Clause, MIT"
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"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] xbps 0.59.1
2020-04-01 9:43 [PR PATCH] xbps 0.59.1 xtraeme
@ 2020-04-01 9:47 ` xtraeme
2020-04-01 10:12 ` [PR PATCH] [Merged]: " xtraeme
1 sibling, 0 replies; 3+ messages in thread
From: xtraeme @ 2020-04-01 9:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
There is an updated pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages xbps-0.59.1
https://github.com/void-linux/void-packages/pull/20541
xbps 0.59.1
A patch file from https://github.com/void-linux/void-packages/pull/20541.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-0.59.1-20541.patch --]
[-- Type: text/x-diff, Size: 7146 bytes --]
From 531c345ea5005d6acb95b57ad2f5c8ac9ec77f87 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 1 Apr 2020 11:43:04 +0200
Subject: [PATCH 1/2] xbps: update to 0.59.1.
---
...-fix-regression-in-small-transaction.patch | 25 -------------
...check_revdeps.c-fix-regression-in-re.patch | 30 ----------------
...ion_check_revdeps.c-fix-previous-fix.patch | 35 -------------------
srcpkgs/xbps/template | 8 ++---
4 files changed, 4 insertions(+), 94 deletions(-)
delete mode 100644 srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch
delete mode 100644 srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch
delete mode 100644 srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch
diff --git a/srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch b/srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch
deleted file mode 100644
index 1b669665ed8..00000000000
--- a/srcpkgs/xbps/patches/0001-bin-xbps-install-fix-regression-in-small-transaction.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d40179a8ae86f16aeea1418b6a0b58c8ed8f3d7 Mon Sep 17 00:00:00 2001
-From: Duncan Overbruck <mail@duncano.de>
-Date: Wed, 4 Mar 2020 12:46:44 +0100
-Subject: [PATCH] bin/xbps-install: fix regression in small transaction stats
-
-fixes #242
----
- bin/xbps-install/transaction.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git bin/xbps-install/transaction.c bin/xbps-install/transaction.c
-index ae1ddcf2..89d1b8a4 100644
---- bin/xbps-install/transaction.c
-+++ bin/xbps-install/transaction.c
-@@ -125,6 +125,7 @@ show_package_list(struct transaction *trans, xbps_trans_type_t ttype, unsigned i
- xbps_dictionary_get_bool(obj, "download", &dload);
- tt = xbps_transaction_pkg_type(obj);
-
-+ buf = NULL;
- if (tt == XBPS_TRANS_UPDATE) {
- /* get installed pkgver */
- ipkgd = xbps_pkgdb_get_pkg(trans->xhp, pkgname);
---
-2.25.1
-
diff --git a/srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch b/srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch
deleted file mode 100644
index 951236efd28..00000000000
--- a/srcpkgs/xbps/patches/0001-lib-transaction_check_revdeps.c-fix-regression-in-re.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aed9402d6282c193ac23252a8686394ac833b713 Mon Sep 17 00:00:00 2001
-From: Duncan Overbruck <mail@duncano.de>
-Date: Wed, 4 Mar 2020 23:39:27 +0100
-Subject: [PATCH 1/2] lib/transaction_check_revdeps.c: fix regression in
- revdeps check
-
-this is probably the same as reported in #245.
-
-Its again not resetting/initializing a variable in a loop,
-falling back to the previous set value.
----
- lib/transaction_check_revdeps.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git lib/transaction_check_revdeps.c lib/transaction_check_revdeps.c
-index 211f1df0..7e30e3e8 100644
---- lib/transaction_check_revdeps.c
-+++ lib/transaction_check_revdeps.c
-@@ -172,6 +172,8 @@ xbps_transaction_check_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs)
- error = true;
- goto out;
- }
-+
-+ ttype = 0;
- if ((revpkgd = xbps_find_pkg_in_array(pkgs, pkgname, 0))) {
- ttype = xbps_transaction_pkg_type(revpkgd);
- if (ttype == XBPS_TRANS_REMOVE)
---
-2.25.1
-
diff --git a/srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch b/srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch
deleted file mode 100644
index 52033584b0d..00000000000
--- a/srcpkgs/xbps/patches/0002-lib-transaction_check_revdeps.c-fix-previous-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 044f75450bf80a5434097385cec90715c8655c6f Mon Sep 17 00:00:00 2001
-From: Duncan Overbruck <mail@duncano.de>
-Date: Thu, 5 Mar 2020 00:39:21 +0100
-Subject: [PATCH 2/2] lib/transaction_check_revdeps.c: fix previous fix
-
-Don't set transaction type from inside the revdep check,
-if the package is being removed then there is not point
-in continueing checking if its breaks.
-
-Referencing #245
----
- lib/transaction_check_revdeps.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git lib/transaction_check_revdeps.c lib/transaction_check_revdeps.c
-index 7e30e3e8..389daab2 100644
---- lib/transaction_check_revdeps.c
-+++ lib/transaction_check_revdeps.c
-@@ -173,11 +173,9 @@ xbps_transaction_check_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs)
- goto out;
- }
-
-- ttype = 0;
- if ((revpkgd = xbps_find_pkg_in_array(pkgs, pkgname, 0))) {
-- ttype = xbps_transaction_pkg_type(revpkgd);
-- if (ttype == XBPS_TRANS_REMOVE)
-- revpkgd = NULL;
-+ if (xbps_transaction_pkg_type(revpkgd) == XBPS_TRANS_REMOVE)
-+ continue;
- }
- if (revpkgd == NULL)
- revpkgd = xbps_pkgdb_get_pkg(xhp, curpkgver);
---
-2.25.1
-
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 6f3862911b9..ef7d1daf047 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,16 +1,16 @@
# Template file for 'xbps'
pkgname=xbps
-version=0.59
-revision=5
+version=0.59.1
+revision=1
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, BSD-3-Clause, MIT"
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=4d4a67b40a6cc4994c2131c786fb17407ddc9041f4f5734b8a9c5d743ede46d0
+checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
hostmakedepends="pkgconf"
checkdepends="kyua"
From c6bc2e36ac276510d6f983de3aa48ec5d0359452 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 1 Apr 2020 11:47:42 +0200
Subject: [PATCH 2/2] xbps-static: update to 0.59.1.
---
srcpkgs/xbps-static/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 089b1d8b488..62fba96b3c0 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.59
-revision=5
+version=0.59.1
+revision=1
# only musl
archs="*-musl"
wrksrc="xbps-${version}"
@@ -12,11 +12,11 @@ makedepends="libarchive-devel"
depends="xbps-triggers"
short_desc="XBPS package system utilities - static binaries"
maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, BSD-3-Clause, MIT"
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=4d4a67b40a6cc4994c2131c786fb17407ddc9041f4f5734b8a9c5d743ede46d0
+checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
do_configure() {
./configure --prefix=/usr --sysconfdir=/etc --enable-static
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: xbps 0.59.1
2020-04-01 9:43 [PR PATCH] xbps 0.59.1 xtraeme
2020-04-01 9:47 ` [PR PATCH] [Updated] " xtraeme
@ 2020-04-01 10:12 ` xtraeme
1 sibling, 0 replies; 3+ messages in thread
From: xtraeme @ 2020-04-01 10:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
There's a merged pull request on the void-packages repository
xbps 0.59.1
https://github.com/void-linux/void-packages/pull/20541
Description:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-01 10:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-01 9:43 [PR PATCH] xbps 0.59.1 xtraeme
2020-04-01 9:47 ` [PR PATCH] [Updated] " xtraeme
2020-04-01 10:12 ` [PR PATCH] [Merged]: " xtraeme
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).