From: Armaan Bhojwani <me@armaanb.net>
Date: Sat, 17 Jul 2021 01:15:16 +0000 (-0400)
Subject: ugrep: move to extra
X-Git-Url: https://git.armaanb.net/?p=asd-repo.git;a=commitdiff_plain;h=6b4d60d67e5612f76a8c075f2dac6f5a5e974262

ugrep: move to extra
---

diff --git a/core/busybox/checksums b/core/busybox/checksums
index 61a7edc..ae4161d 100644
--- a/core/busybox/checksums
+++ b/core/busybox/checksums
@@ -1,5 +1,5 @@
 b0409da19243f364e401dc91e345e230dbcb83938a1815a788d0a549f43886d1
-6168fe718fda28bd00456d80f0d276fbaf860b229a3ba8db71ecaa2af9f73e69
+ac5acd557c557dafe145d30b43b1914efafc61bae7946d1b49413682fc73e306
 3764993c00fbae89f43b1ac991ebc96774afcd7aa663a434539a5f154c8d991e
 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12
 11fe9cdb031d0c387dfb366dc9cdbabadd129f5bbed34659868914058ada11c7
diff --git a/core/busybox/files/config b/core/busybox/files/config
index 5a83767..0208bf2 100644
--- a/core/busybox/files/config
+++ b/core/busybox/files/config
@@ -453,10 +453,10 @@ CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
 CONFIG_FEATURE_FIND_LINKS=y
-CONFIG_GREP=n
-CONFIG_EGREP=n
-CONFIG_FGREP=n
-CONFIG_FEATURE_GREP_CONTEXT=n
+CONFIG_GREP=y
+CONFIG_EGREP=y
+CONFIG_FGREP=y
+CONFIG_FEATURE_GREP_CONTEXT=y
 CONFIG_XARGS=y
 CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
 CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
diff --git a/core/busybox/version b/core/busybox/version
index 360f8a1..6a4d044 100644
--- a/core/busybox/version
+++ b/core/busybox/version
@@ -1 +1 @@
-1.33.1 6
+1.33.1 7
diff --git a/core/ugrep/build b/core/ugrep/build
deleted file mode 100755
index 5a77b7a..0000000
--- a/core/ugrep/build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man
-
-make
-make DESTDIR="$1" install
-
-ln -s /usr/share/man/man1/ugrep.1 "$1/usr/share/man/man1/grep.1"
-
-for i in grep fgrep egrep; do
-    install -Dm755 "$i" "$1/usr/bin/$i"
-done
diff --git a/core/ugrep/checksums b/core/ugrep/checksums
deleted file mode 100644
index 9ca7d6b..0000000
--- a/core/ugrep/checksums
+++ /dev/null
@@ -1,4 +0,0 @@
-b5eca59aa67020052e5f796dfaddc1cb30ee9dd6e4cd89fb5cde1e3f110584ff
-d867e90a7fcdf4b1204dd9ef1110fef912c01bbc4704b790a740d6d7477a4600
-dd3e6f6ddc258b1dc1133bb9e0d1cafe088e309e4bf1465e9fb255f431f2985b
-0c35b018adbba13a3c848c5fe79d6718017b6b7385a5323429ab3673fdcc4fa9
diff --git a/core/ugrep/depends b/core/ugrep/depends
deleted file mode 100644
index e57c894..0000000
--- a/core/ugrep/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-bzip2
-xz
-zlib
diff --git a/core/ugrep/files/egrep b/core/ugrep/files/egrep
deleted file mode 100644
index 13df85b..0000000
--- a/core/ugrep/files/egrep
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/sh -e
-
-ugrep --sort -E -U -Y -. -Dread -dread $@
diff --git a/core/ugrep/files/fgrep b/core/ugrep/files/fgrep
deleted file mode 100644
index 01299a5..0000000
--- a/core/ugrep/files/fgrep
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/sh -e
-
-ugrep --sort -F -U -Y -. -Dread -dread
diff --git a/core/ugrep/files/grep b/core/ugrep/files/grep
deleted file mode 100644
index 390cb81..0000000
--- a/core/ugrep/files/grep
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/sh -e
-
-ugrep --sort -G -U -Y -. -Dread -dread $@
diff --git a/core/ugrep/sources b/core/ugrep/sources
deleted file mode 100644
index 79e6a3b..0000000
--- a/core/ugrep/sources
+++ /dev/null
@@ -1,4 +0,0 @@
-https://github.com/Genivia/ugrep/archive/refs/tags/v3.3.4.tar.gz
-files/grep
-files/egrep
-files/fgrep
diff --git a/core/ugrep/version b/core/ugrep/version
deleted file mode 100644
index 96f2b39..0000000
--- a/core/ugrep/version
+++ /dev/null
@@ -1,2 +0,0 @@
-3.3.4 4
-
diff --git a/extra/ugrep/build b/extra/ugrep/build
new file mode 100755
index 0000000..9f16fb4
--- /dev/null
+++ b/extra/ugrep/build
@@ -0,0 +1,9 @@
+#!/usr/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man
+
+make
+make DESTDIR="$1" install
diff --git a/extra/ugrep/checksums b/extra/ugrep/checksums
new file mode 100644
index 0000000..7ade2d6
--- /dev/null
+++ b/extra/ugrep/checksums
@@ -0,0 +1 @@
+b5eca59aa67020052e5f796dfaddc1cb30ee9dd6e4cd89fb5cde1e3f110584ff
diff --git a/extra/ugrep/depends b/extra/ugrep/depends
new file mode 100644
index 0000000..e57c894
--- /dev/null
+++ b/extra/ugrep/depends
@@ -0,0 +1,3 @@
+bzip2
+xz
+zlib
diff --git a/extra/ugrep/sources b/extra/ugrep/sources
new file mode 100644
index 0000000..fd3b83d
--- /dev/null
+++ b/extra/ugrep/sources
@@ -0,0 +1 @@
+https://github.com/Genivia/ugrep/archive/refs/tags/v3.3.4.tar.gz
diff --git a/extra/ugrep/version b/extra/ugrep/version
new file mode 100644
index 0000000..928a5c9
--- /dev/null
+++ b/extra/ugrep/version
@@ -0,0 +1,2 @@
+3.3.4 5
+