Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xbps-src: don't use deprecated egrep
@ 2022-10-17 23:32 paper42
  2022-10-18  4:04 ` classabbyamp
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: paper42 @ 2022-10-17 23:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages xbps-src-no-egrep
https://github.com/void-linux/void-packages/pull/40015

xbps-src: don't use deprecated egrep
grep 3.8 now prints a warning that egrep is deprecated and we should use grep -E instead

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **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/40015.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-no-egrep-40015.patch --]
[-- Type: text/x-diff, Size: 1530 bytes --]

From 130757f17f0d071226b8d8d83589e38e5c1372ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 18 Oct 2022 00:57:46 +0200
Subject: [PATCH] xbps-src: don't use deprecated egrep

grep 3.8 now prints a warning that egrep is deprecated and we should use
grep -E instead
---
 common/xbps-src/shutils/build_dependencies.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index e4e2210d4e56..1d19de54ae80 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -25,9 +25,9 @@ setup_pkg_depends() {
             _pkgname=$(xbps-uhelper getpkgname $_depname 2>/dev/null)
             [ -z "$_pkgname" ] && _pkgname="$_depname"
             if [ -s ${XBPS_DISTDIR}/etc/virtual ]; then
-                foo=$(egrep "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2)
+                foo=$(grep -E "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2)
             elif [ -s ${XBPS_DISTDIR}/etc/defaults.virtual ]; then
-                foo=$(egrep "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/defaults.virtual|cut -d ' ' -f2)
+                foo=$(grep -E "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/defaults.virtual|cut -d ' ' -f2)
             fi
             if [ -z "$foo" ]; then
                 msg_error "$pkgver: failed to resolve virtual dependency for '$j' (missing from etc/virtual)\n"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: xbps-src: don't use deprecated egrep
  2022-10-17 23:32 [PR PATCH] xbps-src: don't use deprecated egrep paper42
@ 2022-10-18  4:04 ` classabbyamp
  2022-10-18 12:10 ` paper42
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2022-10-18  4:04 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40015#issuecomment-1281785932

Comment:
there seem to be a few instances of `[ef]grep` in packages, should those get changed too?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: xbps-src: don't use deprecated egrep
  2022-10-17 23:32 [PR PATCH] xbps-src: don't use deprecated egrep paper42
  2022-10-18  4:04 ` classabbyamp
@ 2022-10-18 12:10 ` paper42
  2022-10-18 16:32 ` classabbyamp
  2022-10-22 13:33 ` [PR PATCH] [Merged]: " paper42
  3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-10-18 12:10 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40015#issuecomment-1282284873

Comment:
templates should probably be fixed too, but importing patches to fix packages seems unnecessary if it doesn't break the build. Using grep on the world rebuild showed me these packages use egrep or fgrep:

0ad Haru LanguageTool PolyMC SDL SDL2 SDL2_image SDL2_mixer SDL_image SDL_mixer a2ps abiword allegro4 allegro5 antlr3-bin apache-ant apache-fop apache-jmeter apache-kafka apache-maven apache-storm apache-tomcat ardor arpwatch at autoconf autoconf213 autogen avr-binutils avr-gcc avr-gdb axel bglibs binutils bitlbee bitlbee-steam bochs boinc byacc c-client calc camlp5 cdrtools chatty chronograf ck clojure colobot complexity cproto cross-aarch64-linux-gnu cross-aarch64-linux-musl cross-arm-linux-gnueabi cross-arm-linux-gnueabihf cross-arm-linux-musleabi cross-arm-linux-musleabihf cross-arm-none-eabi-binutils cross-arm-none-eabi-gcc cross-arm-none-eabi-gdb cross-armv7l-linux-gnueabihf cross-armv7l-linux-musleabihf cross-i686-linux-musl cross-i686-pc-linux-gnu cross-mips-linux-musl cross-mips-linux-muslhf cross-mipsel-linux-musl cross-mipsel-linux-muslhf cross-or1k-none-elf-binutils cross-or1k-none-elf-gcc cross-powerpc-linux-gnu cross-powerpc-linux-musl cross-powerpc64-linux-gnu cross-powerpc64-linux-musl cross-powerpc64le-linux-gnu cross-powerpc64le-linux-musl cross-powerpcle-linux-gnu cross-powerpcle-linux-musl cross-x86_64-linux-gnu cross-x86_64-w64-mingw32 cscope dante dar dcron dev86 dhcping dialog diffstat ditaa dracut-crypt-ssh dsh elfutils entr es esh exo firefox firefox-esr foomatic-db freetype frr gambit gcc gcc6 gcolor2 gdb global gltron gnome-keyring gnupg gnupg1 gnuplot gnupod gradle grive2 gtk2fontsel gwenhywfar hplip id3lib irssi jbig2dec jenkins jnettop julia ksh kubernetes kwallet-pam libaacs libcap libcap-pam libdill libffi libgccjit libgcrypt libgda libgnome-keyring libid3tag libmad libmill libotr libreoffice libtheora libvpx5 libvpx6 libvpx7 libxslt linux-tools linux5.10 linux5.15 linux5.18 linux5.19 linux5.4 lurch lynx mawk maxima mdbtools mercury monitoring-plugins mozjs78 mozjs91 msp430-toolchain muparser mysql++ nauty ncftp ncurses net-snmp netbsd-rumpkernel netcat nethack netpbm nmh nspr ntfs-3g octave opam openconnect openjade openjdk7-bootstrap openmpi openntpd openttd pari pdfgrep perl pidgin-otr plan9port plib postfix postgresql13 postgresql14 pragha proot qca-qt5 quota reflex rsyslog rubber ruby runawk runelite-launcher runit-void sbt schilytools scummvm sdcc setzer smali socat spin2cpp splint streamripper stremio-shell sugar tbb tcpdump texlive thunderbird timelimit tin tomahawk toybox trn tuxguitar uucp vile vino virtuoso vlc vpnc vttest wmii wxWidgets wxWidgets-gtk3 xcircuit xen xf86-input-evdev xf86-input-joystick xf86-input-libinput xf86-input-mtrack xf86-input-synaptics xf86-input-vmmouse xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-cirrus xf86-video-dummy xf86-video-fbdev xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-nouveau xf86-video-openchrome xf86-video-qxl xf86-video-r128 xf86-video-sisusb xf86-video-vesa xf86-video-vmware xfce4-i3-workspaces-plugin xine-lib xrootd xterm yarn yarn-bin yersinia zproto zramen

They should be fixed upstream, but it doesn't matter too much, it doesn't seem like any of them currently break because of the warning. Some may also be false positives if the build system tries to use fgrep, but would use grep -F if it doesn't exist. Logs used for this are from here: https://vasilek.cz/logs/lab/

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: xbps-src: don't use deprecated egrep
  2022-10-17 23:32 [PR PATCH] xbps-src: don't use deprecated egrep paper42
  2022-10-18  4:04 ` classabbyamp
  2022-10-18 12:10 ` paper42
@ 2022-10-18 16:32 ` classabbyamp
  2022-10-22 13:33 ` [PR PATCH] [Merged]: " paper42
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2022-10-18 16:32 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40015#issuecomment-1282676298

Comment:
I mostly meant in templates/other files in srcpkgs 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: xbps-src: don't use deprecated egrep
  2022-10-17 23:32 [PR PATCH] xbps-src: don't use deprecated egrep paper42
                   ` (2 preceding siblings ...)
  2022-10-18 16:32 ` classabbyamp
@ 2022-10-22 13:33 ` paper42
  3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-10-22 13:33 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

xbps-src: don't use deprecated egrep
https://github.com/void-linux/void-packages/pull/40015

Description:
grep 3.8 now prints a warning that egrep is deprecated and we should use grep -E instead

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **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
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-10-22 13:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-17 23:32 [PR PATCH] xbps-src: don't use deprecated egrep paper42
2022-10-18  4:04 ` classabbyamp
2022-10-18 12:10 ` paper42
2022-10-18 16:32 ` classabbyamp
2022-10-22 13:33 ` [PR PATCH] [Merged]: " paper42

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).