patched to fix fgrep deprecation warning

3 files changed, 60 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8f8372d3b8c..f9d1b7ffad6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
-# Generated by mksrcinfo v8
-# Mon Aug  8 09:31:51 UTC 2016
 pkgbase = localepurge
 	pkgdesc = Script to remove disk space wasted for unneeded localizations.
 	pkgver = 0.7.3.10
-	pkgrel = 0
+	pkgrel = 1
 	url = http://packages.debian.org/source/sid/localepurge
 	arch = any
 	license = GPL
 	backup = etc/locale.nopurge
-	source = http://deb.debian.org/debian/pool/main/l/localepurge/${pkgname}_${pkgver}.tar.xz
+	source = http://deb.debian.org/debian/pool/main/l/localepurge/localepurge_0.7.3.10.tar.xz
 	source = localepurge.diff
+	source = localepurge_fgrep.diff
 	source = localepurge.8.diff
 	source = localepurge.config.diff
 	source = locale.nopurge
 	sha256sums = 56b08640f46d6ebf20b2d535e5ba54d062de70c8f2aadf5a5c665b6007f7f6e2
 	sha256sums = 7a3bff4fd339c883060c9219795e416e85d04ee46fce8dde6d5f0e0a0a51d0b5
+	sha256sums = 906c1a429f79ace7bc9acf448dc3084d372626e0ba7d9e87d4d0d54f8706b771
 	sha256sums = 82bd40594ef0646465eed6e525368e87694322513c0d3280879fcfc5c40cb6a7
 	sha256sums = b27e69a87f81ecb01ecd9fd92c174ed3c4406200eedc50ba6ebabce91e3851e8
 	sha256sums = b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8
 
 pkgname = localepurge
-
diff --git a/PKGBUILD b/PKGBUILD
index 9c4496383d54..dba07c7356b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Nicolas Formichella <stigpro@outlook.fr>
+# Maintainer: Luca Canavese <l.canavese@protonmail.com>
+# Contributor: Nicolas Formichella <stigpro@outlook.fr>
 # Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux @ free.fr>
 # Contributor: Francesco Groccia <frgroccia gmail.com>
 # Contributor: Dincer Celik <dincer@bornovali.com>
 
 pkgname=localepurge
 pkgver=0.7.3.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Script to remove disk space wasted for unneeded localizations."
 arch=('any')
 url="http://packages.debian.org/source/sid/localepurge"
@@ -13,13 +14,21 @@ license=('GPL')
 backup=('etc/locale.nopurge')
 source=("http://deb.debian.org/debian/pool/main/l/localepurge/${pkgname}_${pkgver}.tar.xz"
         "${pkgname}.diff"
+        "${pkgname}_fgrep.diff"
         "${pkgname}.8.diff"
         "${pkgname}.config.diff"
         "locale.nopurge")
+sha256sums=('56b08640f46d6ebf20b2d535e5ba54d062de70c8f2aadf5a5c665b6007f7f6e2'
+            '7a3bff4fd339c883060c9219795e416e85d04ee46fce8dde6d5f0e0a0a51d0b5'
+            '906c1a429f79ace7bc9acf448dc3084d372626e0ba7d9e87d4d0d54f8706b771'
+            '82bd40594ef0646465eed6e525368e87694322513c0d3280879fcfc5c40cb6a7'
+            'b27e69a87f81ecb01ecd9fd92c174ed3c4406200eedc50ba6ebabce91e3851e8'
+            'b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8')
 
 prepare()
 {
     patch -uN ${srcdir}/${pkgname}-${pkgver}/usr/sbin/localepurge < ${srcdir}/localepurge.diff
+    patch -uN ${srcdir}/${pkgname}-${pkgver}/usr/sbin/localepurge < ${srcdir}/localepurge_fgrep.diff
     patch -uN ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.8 < ${srcdir}/localepurge.8.diff
     patch -uN ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.config < ${srcdir}/localepurge.config.diff
 }
@@ -37,8 +46,4 @@ package()
     fi
     install -D -m644 ${srcdir}/localelist ${pkgdir}/var/cache/localepurge/localelist
 }
-sha256sums=('56b08640f46d6ebf20b2d535e5ba54d062de70c8f2aadf5a5c665b6007f7f6e2'
-            '7a3bff4fd339c883060c9219795e416e85d04ee46fce8dde6d5f0e0a0a51d0b5'
-            '82bd40594ef0646465eed6e525368e87694322513c0d3280879fcfc5c40cb6a7'
-            'b27e69a87f81ecb01ecd9fd92c174ed3c4406200eedc50ba6ebabce91e3851e8'
-            'b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8')
+
diff --git a/localepurge_fgrep.diff b/localepurge_fgrep.diff
new file mode 100644
index 000000000000..d5c1e33f2bf3
--- /dev/null
+++ b/localepurge_fgrep.diff
@@ -0,0 +1,44 @@
+--- localepurge.orig	2022-09-24 22:36:03.000000000 +0200
++++ localepurge	2022-09-24 22:37:43.292433897 +0200
+@@ -27,7 +27,7 @@
+     echo " No $NOPURGECONF file present, exiting ..."
+     exit 0
+ else
+-    if fgrep --quiet --line-regexp NEEDSCONFIGFIRST $NOPURGECONF ; then
++    if grep -F --quiet --line-regexp NEEDSCONFIGFIRST $NOPURGECONF ; then
+ 	echo
+ 	echo "	  You have to configure \"localepurge\" by editing"
+ 	echo
+@@ -54,19 +54,19 @@
+ MANDELETE=0
+ globaltot=0
+ 
+-if fgrep --quiet --line-regexp DONTBOTHERNEWLOCALE $NOPURGECONF; then
++if grep -F --quiet --line-regexp DONTBOTHERNEWLOCALE $NOPURGECONF; then
+     DONTBOTHERNEWLOCALE=1
+ fi
+ 
+-if fgrep --quiet --line-regexp SHOWFREEDSPACE $NOPURGECONF; then
++if grep -F --quiet --line-regexp SHOWFREEDSPACE $NOPURGECONF; then
+     SHOWFREEDSPACE=1
+ fi
+ 
+-if fgrep --quiet --line-regexp MANDELETE $NOPURGECONF; then
++if grep -F --quiet --line-regexp MANDELETE $NOPURGECONF; then
+     MANDELETE=1
+ fi
+ 
+-if fgrep --quiet --line-regexp VERBOSE $NOPURGECONF \
++if grep -F --quiet --line-regexp VERBOSE $NOPURGECONF \
+     || [ "$1" = "-verbose" ] || [ "$1" = "-v" ] \
+     || [ "$2" = "-verbose" ] || [ "$2" = "-v" ]; then
+     VERBOSE=1
+@@ -165,7 +165,7 @@
+ if ! ((SHOWFREEDSPACE)); then
+     function get_used_space () { echo 0; }
+ else
+-    if fgrep --quiet --line-regexp QUICKNDIRTYCALC $NOPURGECONF; then
++    if grep -F --quiet --line-regexp QUICKNDIRTYCALC $NOPURGECONF; then
+ 	function get_used_space ()
+ 	{
+ 	    [ -d "$1" ] || return 1 # bail out if there's no such dir