[arch-commits] Commit in abcde/trunk (PKGBUILD hostname.patch)

[Andreas Radke]

    Date: Friday, May 7, 2021 @ 08:31:08
  Author: andyrtr
Revision: 928572

upgpkg: abcde 2.9.3-5: drop inetutils and use corutils uname -n - FS#33006

Added:
  abcde/trunk/hostname.patch
Modified:
  abcde/trunk/PKGBUILD

----------------+
 PKGBUILD       |   14 +++++++++-----
 hostname.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-07 08:29:44 UTC (rev 928571)
+++ PKGBUILD	2021-05-07 08:31:08 UTC (rev 928572)
@@ -5,12 +5,12 @@
 
 pkgname=abcde
 pkgver=2.9.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Frontend command-line utility that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go'
 arch=('any')
 url='https://abcde.einval.com/'
 license=('GPL')
-depends=('bash' 'cd-discid' 'wget' 'vorbis-tools' 'which' 'inetutils')
+depends=('bash' 'cd-discid' 'wget' 'vorbis-tools' 'which')
 optdepends=('cdparanoia: Paranoia ripping support'
             'flac: FLAC encoding support'
             'glyr: album art support'
@@ -20,17 +20,21 @@
             'python-eyed3: ID3 tag support'
             'vorbisgain: Ogg Vorbis normalization support')
 backup=("etc/${pkgname}.conf")
-source=("https://abcde.einval.com/download/abcde-${pkgver}.tar.gz"{,.sign})
+source=("https://abcde.einval.com/download/abcde-${pkgver}.tar.gz"{,.sign}
+        hostname.patch)
 validpgpkeys=('CEBB52301D617E910390FE16587979573442684E'
               '742D444A5AFAF2951EF33E7BF8FB375D9CC820B3') # Steve McIntyre, Andrew Strong
 sha256sums=('046cd0bba78dd4bbdcbcf82fe625865c60df35a005482de13a6699c5a3b83124'
-            'SKIP')
+            'SKIP'
+            '6b4d8e70dbd34ad269db44fdb9f63eccc448b632cfc98d1b635c3ee6a77362ad')
 
-build() {
+prepare() {
   cd "${pkgname}-${pkgver}"
   sed -e "s:normalize-audio:normalize:g" -i ${pkgname}
   # https://bugs.archlinux.org/task/58046
   sed -i 's/^#CDDBMETHOD=musicbrainz/CDDBMETHOD=cddb/' abcde.conf
+  # replace inetutils hostname with coreutils uname -n
+  patch -Np1 -i ../hostname.patch
 }
 
 package() {

Added: hostname.patch
===================================================================
--- hostname.patch	                        (rev 0)
+++ hostname.patch	2021-05-07 08:31:08 UTC (rev 928572)
@@ -0,0 +1,11 @@
+--- abcde-2.9.3/abcde	2019-02-05 11:19:03.000000000 +0100
++++ abcde-2.9.3/abcde.new	2021-05-07 10:27:29.273996818 +0200
+@@ -3773,7 +3773,7 @@
+ CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
+ CDDBSUBMIT=freedb-submit at freedb.org
+ CDDBPROTO=6
+-HELLOINFO="$(whoami)@$(hostname)"
++HELLOINFO="$(whoami)@$(uname -n)"
+ CDDBCOPYLOCAL="n"
+ CDDBLOCALPOLICY="always"
+ CDDBLOCALRECURSIVE="y"