diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-12-19 15:07:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-12-20 10:08:07 +0000 |
| commit | 1260ba010d54d1ffaa548482b6c77de3b671495c (patch) | |
| tree | c2556e560d5bdaca6e1e5a45f047f20d4a9014dc | |
| parent | 6b4410b36643817d3eddb1db61a0d3b8360885b9 (diff) | |
| download | aports-1260ba010d54d1ffaa548482b6c77de3b671495c.tar.bz2 aports-1260ba010d54d1ffaa548482b6c77de3b671495c.tar.xz | |
main/busybox: fix sed performance issue on musl
http://comments.gmane.org/gmane.linux.busybox/37945
| -rw-r--r-- | main/busybox/APKBUILD | 6 | ||||
| -rw-r--r-- | main/busybox/sed-performance.patch | 54 |
2 files changed, 59 insertions, 1 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index e89ad7bf72..6efe1762c5 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.21.1 -pkgrel=0 +pkgrel=1 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -19,6 +19,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 bb-app-location.patch loginutils-sha512.patch busybox-musl-fixes.patch + sed-performance.patch 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch @@ -108,6 +109,7 @@ b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch c5a8dbc8696db6da9c4624b0e11d8fba bb-app-location.patch 8c42c9ef0f0419c314c86bcaf7796106 loginutils-sha512.patch f718d6d53b6cd1e012edcee32686a846 busybox-musl-fixes.patch +78f2bcb83779740f1217f71e87cf3077 sed-performance.patch 04eeda8c49d4688e6dec02451f8b6aae 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch e1c183cbe1ca18a0fa0d9597314076c9 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch b4e7c47c05c1fdaee0a418731e1d1135 busyboxconfig @@ -120,6 +122,7 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef busybox-uname- 576366b4d50f1078da6c0364ef70415de92d97c93c64f4d790b11d7a34cdccd2 bb-app-location.patch 57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493 loginutils-sha512.patch 06e0804532b1253019061078c3cd0a46cba74cb8a32a2d3f80cec23e04fa0386 busybox-musl-fixes.patch +e1c98f71b0888af6082c042b0f79c550896514038c064f97a4fe237f32af00d6 sed-performance.patch 2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch 53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch 7774d71ddab017c4e436bc575637bd54e3936a7e82574756afced8e1e0077c57 busyboxconfig @@ -132,6 +135,7 @@ eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d4 5c42b05be69c834c9fd5372c6b0d55a6399c74146a94ea09eae7285dd4fa75d1bde38bf7ab73e98638f65eb72db02115453cbdfe85a0085d742940366f617c7d bb-app-location.patch 69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61 loginutils-sha512.patch eed527c8cab79347ed786929c36da76028bf9592a4f047706c3ce14bc96787fc7e685441eca14006eab88b0b8d5ed939116daea95110fa0f87f8b94b1f5e9673 busybox-musl-fixes.patch +b0b6dde2183a8b95ad0213c2157e6dadcaf0c95c6f6d035a5dfdbf08b5327b32d033ddae911d8aada3bf08a6d5aaea3f27dddbf55384490e8b0350471334095a sed-performance.patch f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch 373b23c3a0db5353dc19bc1f758ec1ebaec82a05f99ac1ab839b95c94e6214f1c252b6b39fcd56cd5f0e0b3bd6c32bd9dde72a4afa5be49c49b6bc9190a8776f busyboxconfig diff --git a/main/busybox/sed-performance.patch b/main/busybox/sed-performance.patch new file mode 100644 index 0000000000..e6c8f78de7 --- /dev/null +++ b/main/busybox/sed-performance.patch @@ -0,0 +1,54 @@ +From b0e9b72915a87121aabf21d4e382e16e0a9a5175 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <vda.linux@googlemail.com> +Date: Sun, 21 Jul 2013 20:09:44 +0000 +Subject: sed: fix matching of newlines by $ + +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +--- +diff --git a/editors/sed.c b/editors/sed.c +index e625a09..3a0d917 100644 +--- a/editors/sed.c ++++ b/editors/sed.c +@@ -330,7 +330,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex) + next = index_of_next_unescaped_regexp_delim(delimiter, ++pos); + temp = copy_parsing_escapes(pos, next); + *regex = xzalloc(sizeof(regex_t)); +- xregcomp(*regex, temp, G.regex_type|REG_NEWLINE); ++ xregcomp(*regex, temp, G.regex_type); + free(temp); + /* Move position to next character after last delimiter */ + pos += (next+1); +diff --git a/testsuite/sed.tests b/testsuite/sed.tests +index 468565f..2af1e4c 100755 +--- a/testsuite/sed.tests ++++ b/testsuite/sed.tests +@@ -310,6 +310,27 @@ testing "sed zero chars match/replace logic must not falsely trigger here 2" \ + "sed 's/ *$/_/g'" \ + "qwerty_\n" "" "qwerty\n" + ++testing "sed /\$_in_regex/ should not match newlines, only end-of-line" \ ++ "sed ': testcont; /\\\\$/{ =; N; b testcont }'" \ ++ "\ ++this is a regular line ++2 ++line with \\ ++continuation ++more regular lines ++5 ++line with \\ ++continuation ++" \ ++ "" "\ ++this is a regular line ++line with \\ ++continuation ++more regular lines ++line with \\ ++continuation ++" ++ + # testing "description" "commands" "result" "infile" "stdin" + + exit $FAILCOUNT +-- +cgit v0.9.1 |