* [PR PATCH] base-files: Remove bad openssl alternative
@ 2021-03-08 9:08 the-maldridge
2021-03-08 9:09 ` the-maldridge
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: the-maldridge @ 2021-03-08 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
There is a new pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages vpkgs
https://github.com/void-linux/void-packages/pull/29304
base-files: Remove bad openssl alternative
> 02:57 <heliocat> duncaen: someone should update base-packages to remove /usr/share/xbps.d/void-virtualpackages.conf
02:58 <heliocat> void-mklive/installer.sh is what's copying that file for some people and it's going to have broken a whole lot of folks
A patch file from https://github.com/void-linux/void-packages/pull/29304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vpkgs-29304.patch --]
[-- Type: text/x-diff, Size: 1188 bytes --]
From 6e02d86337ad1c4ca31976131ee183e76e57c3f2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 8 Mar 2021 01:06:59 -0800
Subject: [PATCH] base-files: Remove bad openssl alternative
---
srcpkgs/base-files/INSTALL | 3 +++
srcpkgs/base-files/template | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/base-files/INSTALL b/srcpkgs/base-files/INSTALL
index 85a7f92cd4e..63ff77d544a 100644
--- a/srcpkgs/base-files/INSTALL
+++ b/srcpkgs/base-files/INSTALL
@@ -62,6 +62,9 @@ make_system_dirs() {
# fix bad permissions from installer with umask 077
chmod 755 var var/db var/db/xbps usr usr/share
+
+ # remove bad libressl alternative
+ sed -i "/virtualpkg=openssl/d" /usr/share/xbps.d/void-virtualpackages.conf
}
case "${ACTION}" in
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 0683d19209c..ff629498408 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
# Template file for 'base-files'
pkgname=base-files
version=0.141
-revision=10
+revision=11
bootstrap=yes
depends="xbps-triggers"
short_desc="Void Linux base system files"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
@ 2021-03-08 9:09 ` the-maldridge
2021-03-08 9:15 ` [PR REVIEW] " heliocat
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2021-03-08 9:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/29304#issuecomment-792602402
Comment:
@heliocat
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
2021-03-08 9:09 ` the-maldridge
@ 2021-03-08 9:15 ` heliocat
2021-03-08 9:16 ` heliocat
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: heliocat @ 2021-03-08 9:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New review comment by heliocat on void-packages repository
https://github.com/void-linux/void-packages/pull/29304#discussion_r589268771
Comment:
This will error for most installs that didn't come from the live image.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
2021-03-08 9:09 ` the-maldridge
2021-03-08 9:15 ` [PR REVIEW] " heliocat
@ 2021-03-08 9:16 ` heliocat
2021-03-08 9:17 ` [PR PATCH] [Updated] " the-maldridge
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: heliocat @ 2021-03-08 9:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New review comment by heliocat on void-packages repository
https://github.com/void-linux/void-packages/pull/29304#discussion_r589268771
Comment:
This will error for most installs that didn't come from the live image. Something like `[ -f /usr/share/xbps.d/void-virtualpackages.conf ] && sed ...` would do it.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (2 preceding siblings ...)
2021-03-08 9:16 ` heliocat
@ 2021-03-08 9:17 ` the-maldridge
2021-03-08 9:19 ` [PR REVIEW] " heliocat
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2021-03-08 9:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages vpkgs
https://github.com/void-linux/void-packages/pull/29304
base-files: Remove bad openssl alternative
```
02:57 <heliocat> duncaen: someone should update base-packages to remove /usr/share/xbps.d/void-virtualpackages.conf
02:58 <heliocat> void-mklive/installer.sh is what's copying that file for some people and it's going to have broken a whole lot of folks
```
A patch file from https://github.com/void-linux/void-packages/pull/29304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vpkgs-29304.patch --]
[-- Type: text/x-diff, Size: 1234 bytes --]
From 3656ad5eef44382c6003bb7782ac3378dd57d61d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 8 Mar 2021 01:06:59 -0800
Subject: [PATCH] base-files: Remove bad openssl alternative
---
srcpkgs/base-files/INSTALL | 4 ++++
srcpkgs/base-files/template | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/base-files/INSTALL b/srcpkgs/base-files/INSTALL
index 85a7f92cd4e..eb379c30418 100644
--- a/srcpkgs/base-files/INSTALL
+++ b/srcpkgs/base-files/INSTALL
@@ -62,6 +62,10 @@ make_system_dirs() {
# fix bad permissions from installer with umask 077
chmod 755 var var/db var/db/xbps usr usr/share
+
+ # remove bad libressl alternative
+ [ -f /usr/share/xbps.d/void-virtualpackages.conf ] && \
+ sed -i "/virtualpkg=openssl/d" /usr/share/xbps.d/void-virtualpackages.conf
}
case "${ACTION}" in
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 0683d19209c..ff629498408 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
# Template file for 'base-files'
pkgname=base-files
version=0.141
-revision=10
+revision=11
bootstrap=yes
depends="xbps-triggers"
short_desc="Void Linux base system files"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (3 preceding siblings ...)
2021-03-08 9:17 ` [PR PATCH] [Updated] " the-maldridge
@ 2021-03-08 9:19 ` heliocat
2021-03-08 9:20 ` heliocat
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: heliocat @ 2021-03-08 9:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
New review comment by heliocat on void-packages repository
https://github.com/void-linux/void-packages/pull/29304#discussion_r589268771
Comment:
This will error for most installs that didn't come from the live image. Something like `[ -f /usr/share/xbps.d/void-virtualpackages.conf ] && sed ...` would do it.
EDIT: never mind, this is in the make_system_dirs hook which I believe only fires when first installed. Shouldn't code review when tired.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (4 preceding siblings ...)
2021-03-08 9:19 ` [PR REVIEW] " heliocat
@ 2021-03-08 9:20 ` heliocat
2021-03-08 9:25 ` Duncaen
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: heliocat @ 2021-03-08 9:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
New review comment by heliocat on void-packages repository
https://github.com/void-linux/void-packages/pull/29304#discussion_r589268771
Comment:
This will error for most installs that didn't come from the live image. Something like `[ -f /usr/share/xbps.d/void-virtualpackages.conf ] && sed ...` would do it.
EDIT: I think this only fires on first install so it won't error for people coming from the live image but it probably still should be protected for other install paths. Not 100% on that though.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (5 preceding siblings ...)
2021-03-08 9:20 ` heliocat
@ 2021-03-08 9:25 ` Duncaen
2021-03-08 9:29 ` [PR PATCH] [Updated] " the-maldridge
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Duncaen @ 2021-03-08 9:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/29304#issuecomment-792614211
Comment:
I think an empty file in xbps would better, there shouldn't be an untracked file in `/usr/share/xbps.d` at all and we would optimally have this removed before a full update is done.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] base-files: Remove bad openssl alternative
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (6 preceding siblings ...)
2021-03-08 9:25 ` Duncaen
@ 2021-03-08 9:29 ` the-maldridge
2021-03-08 9:48 ` [PR PATCH] [Updated] xbps: Remove untracked virtualpkgs file the-maldridge
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2021-03-08 9:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages vpkgs
https://github.com/void-linux/void-packages/pull/29304
base-files: Remove bad openssl alternative
```
02:57 <heliocat> duncaen: someone should update base-packages to remove /usr/share/xbps.d/void-virtualpackages.conf
02:58 <heliocat> void-mklive/installer.sh is what's copying that file for some people and it's going to have broken a whole lot of folks
```
A patch file from https://github.com/void-linux/void-packages/pull/29304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vpkgs-29304.patch --]
[-- Type: text/x-diff, Size: 811 bytes --]
From 845c76440f4a3a690d2b3593c6cb9f6229b45eb6 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 8 Mar 2021 01:29:39 -0800
Subject: [PATCH] xbps: Remove untracked virtualpkgs file
---
srcpkgs/xbps/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 16bf4155e7b..a5f515f9333 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=4
+revision=5
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
@@ -48,6 +48,8 @@ post_install() {
vlicense LICENSE
vlicense LICENSE.3RDPARTY
+
+ echo "" > ${DESTDIR}/usr/share/xbps.d/void-virtualpackages.conf
}
libxbps_package() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] xbps: Remove untracked virtualpkgs file
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (7 preceding siblings ...)
2021-03-08 9:29 ` [PR PATCH] [Updated] " the-maldridge
@ 2021-03-08 9:48 ` the-maldridge
2021-03-08 10:04 ` the-maldridge
2021-03-08 10:04 ` [PR PATCH] [Merged]: " the-maldridge
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2021-03-08 9:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages vpkgs
https://github.com/void-linux/void-packages/pull/29304
xbps: Remove untracked virtualpkgs file
```
02:57 <heliocat> duncaen: someone should update base-packages to remove /usr/share/xbps.d/void-virtualpackages.conf
02:58 <heliocat> void-mklive/installer.sh is what's copying that file for some people and it's going to have broken a whole lot of folks
```
A patch file from https://github.com/void-linux/void-packages/pull/29304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vpkgs-29304.patch --]
[-- Type: text/x-diff, Size: 807 bytes --]
From f737a7e77fa03829755705195d205153ba9b33dc Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 8 Mar 2021 01:29:39 -0800
Subject: [PATCH] xbps: Remove untracked virtualpkgs file
---
srcpkgs/xbps/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 16bf4155e7b..8f986d22f9f 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=4
+revision=5
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
@@ -48,6 +48,8 @@ post_install() {
vlicense LICENSE
vlicense LICENSE.3RDPARTY
+
+ echo "" > ${DESTDIR}/usr/share/xbps.d/void-virtualpkgs.conf
}
libxbps_package() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] xbps: Remove untracked virtualpkgs file
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (8 preceding siblings ...)
2021-03-08 9:48 ` [PR PATCH] [Updated] xbps: Remove untracked virtualpkgs file the-maldridge
@ 2021-03-08 10:04 ` the-maldridge
2021-03-08 10:04 ` [PR PATCH] [Merged]: " the-maldridge
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2021-03-08 10:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages vpkgs
https://github.com/void-linux/void-packages/pull/29304
xbps: Remove untracked virtualpkgs file
```
02:57 <heliocat> duncaen: someone should update base-packages to remove /usr/share/xbps.d/void-virtualpackages.conf
02:58 <heliocat> void-mklive/installer.sh is what's copying that file for some people and it's going to have broken a whole lot of folks
```
A patch file from https://github.com/void-linux/void-packages/pull/29304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vpkgs-29304.patch --]
[-- Type: text/x-diff, Size: 807 bytes --]
From 0700dc22f9b23327b6b1f7ec262fbde58b246fc6 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 8 Mar 2021 01:29:39 -0800
Subject: [PATCH] xbps: Remove untracked virtualpkgs file
---
srcpkgs/xbps/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 16bf4155e7b..8f986d22f9f 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=4
+revision=5
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
@@ -48,6 +48,8 @@ post_install() {
vlicense LICENSE
vlicense LICENSE.3RDPARTY
+
+ echo "" > ${DESTDIR}/usr/share/xbps.d/void-virtualpkgs.conf
}
libxbps_package() {
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Merged]: xbps: Remove untracked virtualpkgs file
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
` (9 preceding siblings ...)
2021-03-08 10:04 ` the-maldridge
@ 2021-03-08 10:04 ` the-maldridge
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2021-03-08 10:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
There's a merged pull request on the void-packages repository
xbps: Remove untracked virtualpkgs file
https://github.com/void-linux/void-packages/pull/29304
Description:
```
02:57 <heliocat> duncaen: someone should update base-packages to remove /usr/share/xbps.d/void-virtualpackages.conf
02:58 <heliocat> void-mklive/installer.sh is what's copying that file for some people and it's going to have broken a whole lot of folks
```
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-03-08 10:04 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-08 9:08 [PR PATCH] base-files: Remove bad openssl alternative the-maldridge
2021-03-08 9:09 ` the-maldridge
2021-03-08 9:15 ` [PR REVIEW] " heliocat
2021-03-08 9:16 ` heliocat
2021-03-08 9:17 ` [PR PATCH] [Updated] " the-maldridge
2021-03-08 9:19 ` [PR REVIEW] " heliocat
2021-03-08 9:20 ` heliocat
2021-03-08 9:25 ` Duncaen
2021-03-08 9:29 ` [PR PATCH] [Updated] " the-maldridge
2021-03-08 9:48 ` [PR PATCH] [Updated] xbps: Remove untracked virtualpkgs file the-maldridge
2021-03-08 10:04 ` the-maldridge
2021-03-08 10:04 ` [PR PATCH] [Merged]: " the-maldridge
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).