upgrade e2fsprogs and logrotate

deleted file mode 100644
index ae44730..0000000
@@ -1,47 +0,0 @@
-debugfs: properly set up extent header in do_write
-
-do_write doesn't fully set up the first extent header on a new
-inode, so if we write a 0-length file, and don't write any data
-to the new file, we end up creating something that looks corrupt
-to kernelspace:
-
-EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0)
-
-Do something similar to ext4_ext_tree_init() here, and
-fill out the first extent header upon creation to avoid this.
-
-Upstream-Status: Backport
-
-Reported-by: Robert Yang <[email protected]>
-Signed-off-by: Eric Sandeen <[email protected]>
----
- debugfs/debugfs.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
---- a/debugfs/debugfs.c
-+++ b/debugfs/debugfs.c
-@@ -1726,8 +1726,19 @@ void do_write(int argc, char *argv[])
- 	inode.i_links_count = 1;
- 	inode.i_size = statbuf.st_size;
- 	if (current_fs->super->s_feature_incompat &
--	    EXT3_FEATURE_INCOMPAT_EXTENTS)
-+	    EXT3_FEATURE_INCOMPAT_EXTENTS) {
-+		int i;
-+		struct ext3_extent_header *eh;
-+
-+		eh = (struct ext3_extent_header *) &inode.i_block[0];
-+		eh->eh_depth = 0;
-+		eh->eh_entries = 0;
-+		eh->eh_magic = EXT3_EXT_MAGIC;
-+		i = (sizeof(inode.i_block) - sizeof(*eh)) /
-+			sizeof(struct ext3_extent);
-+		eh->eh_max = ext2fs_cpu_to_le16(i);
- 		inode.i_flags |= EXT4_EXTENTS_FL;
-+	}
- 	if (debugfs_write_new_inode(newfile, &inode, argv[0])) {
- 		close(fd);
- 		return;
--- 
-1.8.1.2
-

148 lines not on this page · raw message

41 lines not on this page · raw message

43 lines not on this page · raw message

deleted file mode 100644
index d074c15..0000000
@@ -1,22 +0,0 @@
-We assume that fallocate is supported somehow
-but we need to check if we have fallocate()
-this problem shows up on uclibc systems since
-uclibc does not have fallocate() implemented
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
-===================================================================
---- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c	2012-01-17 17:24:34.290780625 -0800
-+++ e2fsprogs-1.42/lib/ext2fs/unix_io.c	2012-01-17 17:25:37.338783680 -0800
-@@ -895,7 +895,7 @@
- 		goto unimplemented;
- #endif
- 	} else {
--#ifdef FALLOC_FL_PUNCH_HOLE
-+#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE
- 		/*
- 		 * If we are not on block device, try to use punch hole
- 		 * to reclaim free space.

similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/acinclude.m4
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4

similarity index 91%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch
index ad4e343..03c0abc 100644
@@ -16,11 +16,7 @@ cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full()
 Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was
 cached by bufsize = 156), so there would be errors.
 
-Note: the upstream has changed the icache lot, so this patch is
-inappropriate for the upstream, we can drop this patch when we update
-the package.
-
-Upstream-Status: [Inappropriate]
+Upstream-Status: [Submitted]
 
 Signed-off-by: Robert Yang <[email protected]>
 ---

similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/mkdir.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir.patch

similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh

similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch

similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/remove.ldconfig.call.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch

similarity index 85%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index 6175ce7..0c8ec71 100644
@@ -3,17 +3,13 @@ require e2fsprogs.inc
 
 SRC_URI += "file://acinclude.m4 \
             file://remove.ldconfig.call.patch \
-            file://debugfs-too-short.patch \
-            file://debugfs-sparse-copy.patch \
             file://fix-icache.patch \
-            file://debugfs-extent-header.patch \
             file://populate-extfs.sh \
-            file://e2fsprogs-fix-tests-f_extent_oobounds.patch \
             file://quiet-debugfs.patch \
 "
 
-SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"
-SRC_URI[sha256sum] = "b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97"
+SRC_URI[md5sum] = "3f8e41e63b432ba114b33f58674563f7"
+SRC_URI[sha256sum] = "2f92ac06e92fa00f2ada3ee67dad012d74d685537527ad1241d82f2d041f2802"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
 EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"

@@ -37,9 +33,7 @@ do_install () {
 	rm -f ${D}${base_sbindir}/blkid
 	rm -f ${D}${base_sbindir}/fsck
 	rm -f ${D}${base_sbindir}/findfs
-}
 
-do_install_append () {
 	# e2initrd_helper and the pkgconfig files belong in libdir
 	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
 		install -d ${D}${libdir}

similarity index 65%
rename from meta/recipes-extended/logrotate/logrotate-3.8.1/act-as-mv-when-rotate.patch
rename to meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
index c9fb1d2..ce64040 100644
@@ -3,18 +3,18 @@ Act as the "mv" command when rotate log
 Act as the "mv" command when rotate log, first rename, if failed, then
 read and write.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted
 
 Signed-off-by: Robert Yang <[email protected]>
 ---
- logrotate.c |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 53 insertions(+), 6 deletions(-)
+ logrotate.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 56 insertions(+), 9 deletions(-)
 
 diff --git a/logrotate.c b/logrotate.c
-index 537e8d6..b04482f 100644
+index 174a26b..b18b629 100644
 --- a/logrotate.c
 +++ b/logrotate.c
-@@ -808,6 +808,53 @@ int findNeedRotating(struct logInfo *log, int logNum)
+@@ -906,6 +906,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force)
      return 0;
  }
  

@@ -23,7 +23,7 @@ index 537e8d6..b04482f 100644
 + * the strerror(errorno) to handle the error message, so we don't have
 + * to print the error message here */
 +
-+int mvFile (char *oldName, char *newName, struct logInfo *log)
++int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl)
 +{
 +    struct stat sbprev;
 +    int fd_old, fd_new, n;

@@ -45,7 +45,7 @@ index 537e8d6..b04482f 100644
 +            return 1;
 +        else {
 +            if ((fd_new = createOutputFile(newName,
-+                O_WRONLY | O_CREAT | O_TRUNC, &sbprev)) < 0 )
++                O_WRONLY | O_CREAT | O_TRUNC, &sbprev, acl, 0)) < 0 )
 +                return 1;
 +        }
 +

@@ -68,8 +68,8 @@ index 537e8d6..b04482f 100644
  int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
  		       struct logNames *rotNames)
  {
-@@ -1148,15 +1195,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
- 		    rotNames->baseName, i, fileext, compext);
+@@ -1268,15 +1315,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+ 		}
  
  	    message(MESS_DEBUG,
 -		    "renaming %s to %s (rotatecount %d, logstart %d, i %d), \n",

@@ -77,7 +77,7 @@ index 537e8d6..b04482f 100644
  		    oldName, newName, rotateCount, logStart, i);
  
 -	    if (!debug && rename(oldName, newName)) {
-+	    if (!debug && mvFile(oldName, newName, log)) {
++	    if (!debug && mvFile(oldName, newName, log, prev_acl)) {
  		if (errno == ENOENT) {
  		    message(MESS_DEBUG, "old log %s does not exist\n",
  			    oldName);

@@ -87,7 +87,7 @@ index 537e8d6..b04482f 100644
  			    oldName, newName, strerror(errno));
  		    hasErrors = 1;
  		}
-@@ -1286,11 +1333,11 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+@@ -1408,11 +1455,11 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
  			}
  		}
  #endif /* WITH_ACL */

@@ -97,11 +97,38 @@ index 537e8d6..b04482f 100644
  	    if (!debug && !hasErrors &&
 -		rename(log->files[logNum], rotNames->finalName)) {
 -		message(MESS_ERROR, "failed to rename %s to %s: %s\n",
-+        mvFile(log->files[logNum], rotNames->finalName, log)) {
++        mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
 +        message(MESS_ERROR, "failed to move %s to %s: %s\n",
  			log->files[logNum], rotNames->finalName,
  			strerror(errno));
  			hasErrors = 1;
+@@ -1775,7 +1822,7 @@ int rotateLogSet(struct logInfo *log, int force)
+     return hasErrors;
+ }
+ 
+-static int writeState(char *stateFilename)
++static int writeState(struct logInfo *log, char *stateFilename)
+ {
+ 	struct logState *p;
+ 	FILE *f;
+@@ -1939,7 +1986,7 @@ static int writeState(char *stateFilename)
+ 		fclose(f);
+ 
+ 	if (error == 0) {
+-		if (rename(tmpFilename, stateFilename)) {
++		if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
+ 			unlink(tmpFilename);
+ 			error = 1;
+ 			message(MESS_ERROR, "error renaming temp state file %s\n",
+@@ -2223,7 +2270,7 @@ int main(int argc, const char **argv)
+ 		rc |= rotateLogSet(log, force);
+ 
+ 	if (!debug)
+-		rc |= writeState(stateFile);
++		rc |= writeState(log, stateFile);
+ 
+ 	return (rc != 0);
+ }
 -- 
-1.7.4.1
+1.7.10.4
 

similarity index 96%
rename from meta/recipes-extended/logrotate/logrotate-3.8.1/disable-check-different-filesystems.patch
rename to meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
index 5cb6038..43068bd 100644
@@ -3,7 +3,7 @@ Disable the check for different filesystems
 The logrotate supports rotate log across different filesystems now, so
 disable the check for different filesystems.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted
 
 Signed-off-by: Robert Yang <[email protected]>
 ---

similarity index 100%
rename from meta/recipes-extended/logrotate/logrotate-3.8.1/logrotate-CVE-2011-1548.patch
rename to meta/recipes-extended/logrotate/logrotate/logrotate-CVE-2011-1548.patch

similarity index 61%
rename from meta/recipes-extended/logrotate/logrotate-3.8.1/update-the-manual.patch
rename to meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
index 5cab649..517acdd 100644
@@ -1,14 +1,13 @@
 Update the manual
 
-* Update the mannual
-* Fix a bug in the mannual(\f should be \fR)
+Update the manual for rotating on different filesystems.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted
 
 Signed-off-by: Robert Yang <[email protected]>
 ---
- logrotate.8 |    9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
+ logrotate.8 |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/logrotate.8 b/logrotate.8
 index 8b34167..5f15432 100644

@@ -28,15 +27,6 @@ index 8b34167..5f15432 100644
  overridden by the \fBnoolddir\fR option.
  
  .TP
-@@ -435,7 +434,7 @@ Log files are rotated only if they grow bigger then \fIsize\fR bytes. If
- \fIsize\fR is followed by \fIk\fR, the size is assumed to be in kilobytes.
- If the \fIM\fR is used, the size is in megabytes, and if \fIG\fR is used, the
- size is in gigabytes. So \fBsize 100\fR, \fIsize 100k\fR, \fIsize 100M\fR and
--\fIsize 100G\f are all valid.
-+\fIsize 100G\fR are all valid.
- 
- .TP
- \fBsharedscripts\fR
 -- 
 1.7.4.1
 

similarity index 78%
rename from meta/recipes-extended/logrotate/logrotate_3.8.1.bb
rename to meta/recipes-extended/logrotate/logrotate_3.8.7.bb
index b12a325..055bfd56 100644
@@ -1,6 +1,6 @@
 SUMMARY = "Rotates, compresses, removes and mails system log files"
 SECTION = "console/utils"
-HOMEPAGE = "https://fedorahosted.org/releases/l/o/logrotate"
+HOMEPAGE = "https://fedorahosted.org/logrotate/"
 LICENSE = "GPLv2"
 
 DEPENDS="coreutils popt"

@@ -11,12 +11,10 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g
            file://act-as-mv-when-rotate.patch \
            file://disable-check-different-filesystems.patch \
            file://update-the-manual.patch \
-           file://logrotate-CVE-2011-1548.patch \
             "
 
-SRC_URI[md5sum] = "bd2e20d8dc644291b08f9215397d28a5"
-SRC_URI[sha256sum] = "c12471e70ae8bc923bd5c4f25e8fd6483b68c6301f3cd79f7cfe37bc5b370169"
-
+SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
+SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
 
 EXTRA_OEMAKE = "CC='${CC}'"
 

index 055bfd56..b386b85 100644
@@ -16,13 +16,10 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g
 SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
 SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
 
-EXTRA_OEMAKE = "CC='${CC}'"
+EXTRA_OEMAKE = ""
 
 do_install(){
     oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
-}
-
-do_install_append(){
     mkdir -p ${D}${sysconfdir}/logrotate.d
     mkdir -p ${D}${sysconfdir}/cron.daily
     mkdir -p ${D}${localstatedir}/lib