Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] remove rpmextract from build, no conflicts with rpm anymore
Date: Tue, 24 Jan 2023 01:27:42 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41831@inbox.vuxu.org> (raw)

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

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

https://github.com/sgn/void-packages rpm-extract-remove
https://github.com/void-linux/void-packages/pull/41831

remove rpmextract from build, no conflicts with rpm anymore
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpm-extract-remove-41831.patch --]
[-- Type: text/x-diff, Size: 12734 bytes --]

From 0f4117edf994143f62767504bc51d932af57cee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:05:48 +0700
Subject: [PATCH 01/12] rpmextract: update to 1.2.

---
 srcpkgs/rpmextract/files/rpm2cpio   | 26 --------------------------
 srcpkgs/rpmextract/files/rpmextract | 12 ++++++++----
 srcpkgs/rpmextract/template         | 13 ++++++-------
 3 files changed, 14 insertions(+), 37 deletions(-)
 delete mode 100755 srcpkgs/rpmextract/files/rpm2cpio

diff --git a/srcpkgs/rpmextract/files/rpm2cpio b/srcpkgs/rpmextract/files/rpm2cpio
deleted file mode 100755
index a0eba24032b3..000000000000
--- a/srcpkgs/rpmextract/files/rpm2cpio
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-pkg=$1
-if [ "$pkg" = "" -o ! -e "$pkg" ]; then
-  echo "no package supplied" 1>&2
-  exit 1
-fi
-
-leadsize=96
-o=`expr $leadsize + 8`
-set `od -j $o -N 8 -t u1 $pkg`
-il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
-dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
-# echo "sig il: $il dl: $dl"
-
-sigsize=`expr 8 + 16 \* $il + $dl`
-o=`expr $o + $sigsize + \( 8 - \( $sigsize \% 8 \) \) \% 8 + 8`
-set `od -j $o -N 8 -t u1 $pkg`
-il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
-dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
-# echo "hdr il: $il dl: $dl"
-
-hdrsize=`expr 8 + 16 \* $il + $dl`
-o=`expr $o + $hdrsize`
-
-dd if=$pkg ibs=$o skip=1 2>/dev/null
diff --git a/srcpkgs/rpmextract/files/rpmextract b/srcpkgs/rpmextract/files/rpmextract
index 47ad01dfe1e1..c42ce466dbc9 100755
--- a/srcpkgs/rpmextract/files/rpmextract
+++ b/srcpkgs/rpmextract/files/rpmextract
@@ -1,6 +1,10 @@
 #!/bin/sh
-if [ "$1" = "" -o ! -e "$1" ]; then
-    echo "no package supplied" 1>&2
-   exit 1
+
+if [ -z "$1" ]; then
+	echo "no package supplied" >&2
+	exit 1
+elif [ ! -f "$1" ]; then
+	echo "'$1': not found" >&2
+	exit 1
 fi
-rpm2cpio $1 | bsdtar -xf -
+rpm2cpio "$1" | bsdtar -xf -
diff --git a/srcpkgs/rpmextract/template b/srcpkgs/rpmextract/template
index 3a3cc4328632..74c334afe311 100644
--- a/srcpkgs/rpmextract/template
+++ b/srcpkgs/rpmextract/template
@@ -1,14 +1,13 @@
 # Template file for 'rpmextract'
 pkgname=rpmextract
-version=1.1
-revision=4
-depends="bsdtar coreutils"
-short_desc="Script to convert or extract RPM archives (contains rpm2cpio)"
+version=1.2
+revision=1
+depends="bsdtar rpm>=4.17.1_3"
+short_desc="Script to convert or extract RPM archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-1.0-or-later"
-homepage="http://www.archlinux.org"
+license="BSD-2-Clause"
+homepage="http://www.voidlinux.org"
 
 do_install() {
-	vbin ${FILESDIR}/rpm2cpio
 	vbin ${FILESDIR}/rpmextract
 }

From 9d113eab672666695bacfb7ac4195d31935af381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:06:39 +0700
Subject: [PATCH 02/12] rpm: not conflicts with rpmextract anymore

---
 srcpkgs/rpm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 13dfb592c82e..3f2b3915daa0 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,7 +1,7 @@
 # Template file for 'rpm'
 pkgname=rpm
 version=4.17.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-cap --with-acl
  --enable-python PYTHON=python3 --sharedstatedir=/var/lib"
@@ -17,7 +17,6 @@ changelog="https://rpm.org/wiki/Releases/${version}.html"
 distfiles="https://ftp.osuosl.org/pub/rpm/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
 checksum=0c11b793466e7258851ff82bd65c8ffd8c2dbbc70acc869a5d34150549926e5d
 python_version=3
-conflicts="rpmextract>=0" # Both provide rpm2cpio
 
 CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 

From d2201e47ffaca7a79684eb12999eada812c0e02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:13:51 +0700
Subject: [PATCH 03/12] do-fetch: remove support for rpm contents checksum

It doesn't make sense to support contents checksum here.
---
 common/hooks/do-fetch/00-distfiles.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh
index 3d9f80162b4e..9ce2a1895bd0 100644
--- a/common/hooks/do-fetch/00-distfiles.sh
+++ b/common/hooks/do-fetch/00-distfiles.sh
@@ -54,14 +54,7 @@ contents_cksum() {
 		fi
 		;;
 	rpm)
-		if command -v rpmextract &>/dev/null; then
-			cksum=$($XBPS_DIGEST_CMD <(rpm2cpio "$curfile" | $TAR_CMD -x -f -))
-			if [ $? -ne 0 ]; then
-				msg_error "$pkgver: extracting $curfile to pipe.\n"
-			fi
-		else
-			msg_error "$pkgver: cannot find rpmextract for extraction.\n"
-		fi
+		msg_error "$pkgver: contents checksum not support for rpm.\n"
 		;;
 	txt)
 		cksum=$($XBPS_DIGEST_CMD "$curfile")

From c41ee052ae159abf0be9acd6914c9510fc7e2ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:14:33 +0700
Subject: [PATCH 04/12] bff: no needs rpmextract

---
 srcpkgs/bff/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/bff/template b/srcpkgs/bff/template
index 54cf5d44f49a..1e8a67152198 100644
--- a/srcpkgs/bff/template
+++ b/srcpkgs/bff/template
@@ -3,8 +3,6 @@ pkgname=bff
 reverts=1.0.5_1
 version=1.0
 revision=3
-create_wrksrc="yes"
-hostmakedepends="rpmextract"
 short_desc="Brainfuck interpreter (DBFI dialect)"
 maintainer="ananteris <ananteris@mailinator.com>"
 license="Public Domain"

From 895ccc72b53fe1ba2e5385cedf53cb2dc210b2ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:15:17 +0700
Subject: [PATCH 05/12] anydesk: no needs rpmextract

---
 srcpkgs/anydesk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 268c6c067c8a..21922027d154 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -3,8 +3,7 @@ pkgname=anydesk
 version=6.2.0
 revision=2
 archs="x86_64"
-create_wrksrc="yes"
-hostmakedepends="patchelf rpmextract"
+hostmakedepends="patchelf"
 depends="hicolor-icon-theme gtkglext"
 short_desc="Fast remote desktop application"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 0aa7f6105bae6c09893d9bbc6a8eeab63369154c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:16:58 +0700
Subject: [PATCH 06/12] brother-brscan4: remove custom do_extract

---
 srcpkgs/brother-brscan4/template | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpkgs/brother-brscan4/template b/srcpkgs/brother-brscan4/template
index ac642e3f69e1..82565cd229e8 100644
--- a/srcpkgs/brother-brscan4/template
+++ b/srcpkgs/brother-brscan4/template
@@ -3,7 +3,6 @@ pkgname=brother-brscan4
 version=0.4.9
 revision=1
 archs="i686 x86_64"
-hostmakedepends="rpmextract"
 depends="sane"
 short_desc="SANE scanner driver for brscan4-compatible printers"
 maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
@@ -32,10 +31,6 @@ else
 	_rpmlibdir="usr/lib"
 fi
 
-do_extract() {
-	rpmextract ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_rpmpkgid}.rpm
-}
-
 do_install() {
 	# binary package makes a fine mess of things, and installs stuff in very
 	# unwieldly locations. Some of this cannot be avoided.

From 5372b376f2c62c293fb2fe8d5ba95c805405e168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:18:49 +0700
Subject: [PATCH 07/12] crack-attack: remove rpmextract

---
 srcpkgs/crack-attack/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index c107b5609851..0a9fdccd9812 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -2,11 +2,10 @@
 pkgname=crack-attack
 version=1.1.14
 revision=10
-create_wrksrc=yes
 build_wrksrc="$pkgname-$version"
 build_style=gnu-configure
 configure_args="--enable-sound=yes ac_cv_file__proc_self_maps=yes"
-hostmakedepends="pkg-config rpmextract"
+hostmakedepends="pkg-config"
 makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
  libXmu-devel libXi-devel"
 depends="desktop-file-utils"

From 0e45f1d83837a8eebc884ddbfa954fccb5903cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:21:36 +0700
Subject: [PATCH 08/12] epson-inkjet-printer-escpr2: remove rpmextract

---
 srcpkgs/epson-inkjet-printer-escpr2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template
index 74f62e072bad..6fa318254b1e 100644
--- a/srcpkgs/epson-inkjet-printer-escpr2/template
+++ b/srcpkgs/epson-inkjet-printer-escpr2/template
@@ -6,7 +6,7 @@ archs="x86_64 i686 aarch64 armv7l"
 build_style=gnu-configure
 configure_args="--with-cupsfilterdir=/usr/lib/cups/filter
  --with-cupsppddir=/usr/share/ppd"
-hostmakedepends="automake rpmextract"
+hostmakedepends="automake"
 makedepends="cups-devel ghostscript-devel"
 short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"

From 4e920317ba2bbe24570cec334fef46b86979a570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:23:24 +0700
Subject: [PATCH 09/12] opera: remove rpmextract

---
 srcpkgs/opera/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index a2b2e37b91bf..ce8012e09d97 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -3,8 +3,6 @@ pkgname=opera
 version=94.0.4606.76
 revision=1
 archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="rpmextract"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
 short_desc="Fast, secure, easy to use browser"
 maintainer="mobinmob <mobinmob@disroot.org>"

From 96d6c516164a3b67a8d00591f6fc2e1159d40bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:24:05 +0700
Subject: [PATCH 10/12] skype: remove rpmextract

---
 srcpkgs/skype/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index c20a1be4d9db..778d2ae8fba5 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -4,8 +4,6 @@ pkgname=skype
 version=8.93.0.403
 revision=1
 archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="rpmextract"
 depends="elogind"
 short_desc="Skype for Linux"
 maintainer="mobinmob <mobinmob@disroot.org>"

From ab1f81cb47dafd8b64f9f26e56a90c4ffb3b5f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:24:42 +0700
Subject: [PATCH 11/12] wps-office: no needs rpmetract

---
 srcpkgs/wps-office/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 6aa21cc69389..96dcd6a22f23 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -3,8 +3,6 @@ pkgname=wps-office
 version=11.1.0.10920
 revision=1
 archs="x86_64"
-create_wrksrc=yes
-makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
 maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the

From e2bdacfd27d5d2a7d5650c79fc8425d83bdd8b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:28 +0700
Subject: [PATCH 12/12] zoom: no needs rpmextract

---
 srcpkgs/zoom/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 9ddc81ef1aba..1935f5e00f4c 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -3,8 +3,6 @@ pkgname=zoom
 version=5.13.0.599
 revision=1
 archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="rpmextract"
 depends="$(vopt_if systemqt 'qt5 qt5-graphicaleffects qt5-imageformats qt5-quickcontrols qt5-quickcontrols2 qt5-svg qt5-script qt5-declarative')
  xcb-util-image xcb-util-keysyms glib libXfixes libXtst libgbm libglvnd
  nss atk at-spi2-atk libXcomposite libXdamage libXrandr libxkbcommon pango

             reply	other threads:[~2023-01-24  0:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-24  0:27 sgn [this message]
2023-01-27 10:03 ` [PR PATCH] [Updated] " sgn
2023-01-27 10:15 ` sgn
2023-01-27 10:18 ` sgn
2023-01-27 13:27 ` sgn
2023-01-28  2:47 ` sgn
2023-01-28  2:51 ` [PR PATCH] [Merged]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41831@inbox.vuxu.org \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).