domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/e2fsprogs: update to 1.42.13

Browse Source 
Update e2fsprogs to 1.42.13.
Refresh and cleanup patches.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 47426
This commit is contained in:
Felix Fietkau
2015-11-08 20:40:03 +00:00
parent 091284ff0b
commit b7e946f33e
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/e2fsprogs/Makefile
View File

@@ -1,5 +1,5 @@
# #
# Copyright (C) 2010-2013 OpenWrt.org # Copyright (C) 2010-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs PKG_NAME:=e2fsprogs
PKG_VERSION:=1.42.8 PKG_VERSION:=1.42.13
PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4 PKG_MD5SUM:=bc759fc62666786f5436e2075beb3265
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

12
tools/e2fsprogs/patches/003-openbsd-compat.patch
View File

@@ -1,7 +1,6 @@
diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/getsize.c --- a/lib/blkid/getsize.c
--- e2fsprogs-1.42.7.orig/lib/blkid/getsize.c Fri Nov 30 03:40:18 2012 +++ b/lib/blkid/getsize.c
+++ e2fsprogs-1.42.7/lib/blkid/getsize.c Thu Mar 7 14:21:59 2013 @@ -25,6 +25,9 @@
@@ -26,6 +26,9 @@
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
@@ -11,9 +10,8 @@ diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/g
#endif #endif
#ifdef HAVE_LINUX_FD_H #ifdef HAVE_LINUX_FD_H
#include <linux/fd.h> #include <linux/fd.h>
diff -Nur e2fsprogs-1.42.7.orig/lib/quota/mkquota.c e2fsprogs-1.42.7/lib/quota/mkquota.c --- a/lib/quota/mkquota.c
--- e2fsprogs-1.42.7.orig/lib/quota/mkquota.c Wed Jan 2 01:47:20 2013 +++ b/lib/quota/mkquota.c
+++ e2fsprogs-1.42.7/lib/quota/mkquota.c Thu Mar 7 14:21:59 2013
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

5
tools/e2fsprogs/patches/004-freebsd-compat.patch
View File

@@ -1,6 +1,5 @@
diff -Nur e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c e2fsprogs-1.42.7/lib/ext2fs/tdb.c --- a/lib/ext2fs/tdb.c
--- e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c 2012-07-06 15:37:27.000000000 +0200 +++ b/lib/ext2fs/tdb.c
+++ e2fsprogs-1.42.7/lib/ext2fs/tdb.c 2013-03-07 14:54:59.000000000 +0100
@@ -56,7 +56,9 @@ @@ -56,7 +56,9 @@
#include <utime.h> #include <utime.h>
#endif #endif

9
tools/e2fsprogs/patches/005-darwin-compat.patch
View File

@@ -6,9 +6,9 @@
+#include <stdint.h> +#include <stdint.h>
+ +
#ifndef HAVE___U8
#define HAVE___U8
#ifdef __U8_TYPEDEF #ifdef __U8_TYPEDEF
typedef __U8_TYPEDEF __u8;
#else
--- a/lib/ext2fs/ext2_types.h.in --- a/lib/ext2fs/ext2_types.h.in
+++ b/lib/ext2fs/ext2_types.h.in +++ b/lib/ext2fs/ext2_types.h.in
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
@@ -17,6 +17,7 @@
+#include <stdint.h> +#include <stdint.h>
+ +
#ifndef HAVE___U8
#define HAVE___U8
#ifdef __U8_TYPEDEF #ifdef __U8_TYPEDEF
typedef __U8_TYPEDEF __u8;
#else