aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-06-13 12:12:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-06-13 12:12:57 +0000
commitfbb670c0d42a7e22ca60af8e325439c4b919bfaa (patch)
tree7e88175c998252b00b7dd2920c52ee4f8ef10a2a
parent738d8fb3f2faac1e7845f243d6b9dc9bf0f3ecef (diff)
downloadaports-fbb670c0d42a7e22ca60af8e325439c4b919bfaa.tar.gz
aports-fbb670c0d42a7e22ca60af8e325439c4b919bfaa.tar.bz2
aports-fbb670c0d42a7e22ca60af8e325439c4b919bfaa.tar.xz
main/e2fsprogs: enable uninit_bg by default
this speeds up mkfs a bit. remove unused patch
-rw-r--r--main/e2fsprogs/0001-implement-com_right_r.patch59
-rw-r--r--main/e2fsprogs/APKBUILD15
-rw-r--r--main/e2fsprogs/mke2fs-uninit_bg.patch13
3 files changed, 23 insertions, 64 deletions
diff --git a/main/e2fsprogs/0001-implement-com_right_r.patch b/main/e2fsprogs/0001-implement-com_right_r.patch
deleted file mode 100644
index dc285d9acd..0000000000
--- a/main/e2fsprogs/0001-implement-com_right_r.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 527d258d605e5a1dd841bccc6091c0b894a10411 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 27 Jan 2010 16:02:08 +0000
-Subject: [PATCH] implement com_right_r()
-
-For heimdal compat
----
- lib/et/com_err.h | 2 ++
- lib/et/com_right.c | 14 ++++++++++++++
- 2 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/lib/et/com_err.h b/lib/et/com_err.h
-index de0146e..eb2106f 100644
---- a/lib/et/com_err.h
-+++ b/lib/et/com_err.h
-@@ -16,6 +16,7 @@
- #define COM_ERR_ATTR(x)
- #endif
-
-+#include <stddef.h>
- #include <stdarg.h>
-
- typedef long errcode_t;
-@@ -49,6 +50,7 @@ extern void add_to_error_table(struct et_list *new_table);
-
- /* Provided for Heimdall compatibility */
- extern const char *com_right(struct et_list *list, long code);
-+extern const char *com_right_r(struct et_list *list, long code, char *str, size_t len);
- extern void initialize_error_table_r(struct et_list **list,
- const char **messages,
- int num_errors,
-diff --git a/lib/et/com_right.c b/lib/et/com_right.c
-index 173fd1a..dbc1e41 100644
---- a/lib/et/com_right.c
-+++ b/lib/et/com_right.c
-@@ -55,6 +55,20 @@ com_right(struct et_list *list, long code)
- return NULL;
- }
-
-+const char *
-+com_right_r(struct et_list *list, long code, char *str, size_t len)
-+{
-+ struct et_list *p;
-+ for (p = list; p; p = p->next) {
-+ if (code >= p->table->base && code < p->table->base + p->table->n_msgs) {
-+ strlcpy(str, p->table->msgs[code - p->table->base], len);
-+ return str;
-+ }
-+ }
-+ return NULL;
-+}
-+
-+
- struct foobar {
- struct et_list etl;
- struct error_table tab;
---
-1.6.6.1
-
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 121669c508..3fc8694573 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
pkgver=1.43
-pkgrel=1
+pkgrel=2
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
arch="all"
@@ -12,7 +12,9 @@ install=
depends_dev="util-linux-dev"
makedepends="$depends_dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
-source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz
+ mke2fs-uninit_bg.patch
+ "
_builddir="$srcdir"/$pkgname-$pkgver
@@ -78,6 +80,9 @@ extra() {
mv "$pkgdir"/usr "$subpkgdir"/
}
-md5sums="83f3256fcf37dd6dd4acbb648a30625a e2fsprogs-1.43.tar.gz"
-sha256sums="8729c4a7d2e7bb194ea4ea76db5473d9d0161cc94ad1641c50d7d61910055f0a e2fsprogs-1.43.tar.gz"
-sha512sums="206ccbadd01d2cebaf94e67b1f8f279b3d3f3a6e2b21dea9d97146693bf7df071bb942c2c64434b45f77816878483ddd3295554a2e309b6e897f5b8cc1d9c144 e2fsprogs-1.43.tar.gz"
+md5sums="83f3256fcf37dd6dd4acbb648a30625a e2fsprogs-1.43.tar.gz
+aec2304bbeb1d589e802cec78360db95 mke2fs-uninit_bg.patch"
+sha256sums="8729c4a7d2e7bb194ea4ea76db5473d9d0161cc94ad1641c50d7d61910055f0a e2fsprogs-1.43.tar.gz
+38e62b1604601861cb4088030ae0569b325fab4a09c600bd14f17174a6a36e18 mke2fs-uninit_bg.patch"
+sha512sums="206ccbadd01d2cebaf94e67b1f8f279b3d3f3a6e2b21dea9d97146693bf7df071bb942c2c64434b45f77816878483ddd3295554a2e309b6e897f5b8cc1d9c144 e2fsprogs-1.43.tar.gz
+d27034edaa776879bbd218fefedc22e6e3af507d363877da99ecbda8c688f75017fde3e2a934c92ce16b6accedec7404da4a209f7f4e1e856b57983f99f1f964 mke2fs-uninit_bg.patch"
diff --git a/main/e2fsprogs/mke2fs-uninit_bg.patch b/main/e2fsprogs/mke2fs-uninit_bg.patch
new file mode 100644
index 0000000000..898eff6dcd
--- /dev/null
+++ b/main/e2fsprogs/mke2fs-uninit_bg.patch
@@ -0,0 +1,13 @@
+diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
+index 78fe50a..291a723 100644
+--- a/misc/mke2fs.conf.in
++++ b/misc/mke2fs.conf.in
+@@ -11,7 +11,7 @@
+ features = has_journal
+ }
+ ext4 = {
+- features = has_journal,extent,huge_file,flex_bg,64bit,dir_nlink,extra_isize
++ features = has_journal,extent,huge_file,uninit_bg,flex_bg,64bit,dir_nlink,extra_isize
+ inode_size = 256
+ }
+ ext4dev = {