Fixes for dangling patches

deleted file mode 100644
index 506210f..0000000
@@ -1,29 +0,0 @@
-Upstream-Status: Accepted [http://hg.python.org/cpython/rev/c816479f6aaf/]
-Bugtracker: http://bugs.python.org/issue12326
-
-[Removed "Misc/NEWS" hunk]
-
-Signed-off-by: Andreas Oberritter <[email protected]>
-
-# HG changeset patch
-# User Victor Stinner <[email protected]>
-# Date 1313841758 -7200
-# Node ID c816479f6aaf71dbd3f3fe4b239186d60c55ce48
-# Parent  3e093590ac57fdda428c7da3f72ddf0c475ecf2b
-Issue #12326: sys.platform is now always 'linux2' on Linux
-
-Even if Python is compiled on Linux 3.
-
-Index: Python-3.3.0rc2/configure.ac
-===================================================================
---- Python-3.3.0rc2.orig/configure.ac	2012-09-09 02:11:14.000000000 -0700
-+++ Python-3.3.0rc2/configure.ac	2012-09-20 00:44:03.317124001 -0700
-@@ -366,7 +366,7 @@
-     MACHDEP="$ac_md_system$ac_md_release"
- 
-     case $MACHDEP in
--	linux*) MACHDEP="linux";;
-+	linux*) MACHDEP="linux2";;
- 	cygwin*) MACHDEP="cygwin";;
- 	darwin*) MACHDEP="darwin";;
- 	irix646) MACHDEP="irix6";;

index a66087e..7207cfc 100644
@@ -36,6 +36,10 @@ JFFS2: Erase block at 0x00028000 is not formatted. It will be erased
 Signed-off-by: Liu Shuo <[email protected]>
 Signed-off-by: Li Yang <[email protected]>
 
+Updated for the new version
+
+Signed-off-by: Robert Yang <[email protected]>
+
 ---
 v2 : get length of availble freeoob bytes from oobinfo information,
       not use the ioctl ECCGETLAYOUT which is being deprecated.

@@ -44,18 +48,18 @@ v2 : get length of availble freeoob bytes from oobinfo information,
  1 files changed, 39 insertions(+), 7 deletions(-)
 
 diff --git a/flash_erase.c b/flash_erase.c
-index fe2eaca..3e94495 100644
+index 933373a..4b9d84b 100644
 --- a/flash_erase.c
 +++ b/flash_erase.c
-@@ -98,6 +98,7 @@ int main(int argc, char *argv[])
- 	int isNAND;
+@@ -99,6 +99,7 @@ int main(int argc, char *argv[])
+ 	bool isNAND;
  	int error = 0;
- 	uint64_t offset = 0;
+ 	off_t offset = 0;
 +	void *oob_data = NULL;
  
  	/*
  	 * Process user arguments
-@@ -197,15 +198,43 @@ int main(int argc, char *argv[])
+@@ -201,15 +202,43 @@ int main(int argc, char *argv[])
  			if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0)
  				return sys_errmsg("%s: unable to get NAND oobinfo", mtd_device);
  

@@ -104,7 +108,7 @@ index fe2eaca..3e94495 100644
  			} else {
  				/* Legacy mode */
  				switch (mtd.oob_size) {
-@@ -223,7 +252,6 @@ int main(int argc, char *argv[])
+@@ -227,7 +256,6 @@ int main(int argc, char *argv[])
  						break;
  				}
  			}

@@ -112,13 +116,13 @@ index fe2eaca..3e94495 100644
  		}
  		cleanmarker.hdr_crc = cpu_to_je32(mtd_crc32(0, &cleanmarker, sizeof(cleanmarker) - 4));
  	}
-@@ -272,7 +300,8 @@ int main(int argc, char *argv[])
+@@ -276,7 +304,8 @@ int main(int argc, char *argv[])
  
  		/* write cleanmarker */
  		if (isNAND) {
--			if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, &cleanmarker) != 0) {
+-			if (mtd_write_oob(mtd_desc, &mtd, fd, (uint64_t)offset + clmpos, clmlen, &cleanmarker) != 0) {
 +			void *data = oob_data ? oob_data + clmpos : &cleanmarker;
-+			if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, data) != 0) {
++			if (mtd_write_oob(mtd_desc, &mtd, fd, (uint64_t)offset + clmpos, clmlen, data) != 0) {
  				sys_errmsg("%s: MTD writeoob failure", mtd_device);
  				continue;
  			}

index f991ea1..7010cac 100644
@@ -14,6 +14,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \
            file://add-exclusion-to-mkfs-jffs2-git-2.patch \
            file://fix-armv7-neon-alignment.patch \
            file://0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch \
+           file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \
 "
 
 S = "${WORKDIR}/git/"

deleted file mode 100644
index 565ff16..0000000
@@ -1,67 +0,0 @@
-Fix for CVE-2014-1545
-
-Upstream-Status: Backport
-
-Backported from nspr-4.10.6.tar.gz.
----
---- a/pr/src/io/prprf.c
-+++ b/pr/src/io/prprf.c
-@@ -50,6 +50,10 @@
- #include "prlog.h"
- #include "prmem.h"
- 
-+#ifdef _MSC_VER
-+#define snprintf _snprintf
-+#endif
-+
- /*
- ** WARNING: This code may *NOT* call PR_LOG (because PR_LOG calls it)
- */
-@@ -330,7 +334,7 @@
- ** Convert a double precision floating point number into its printable
- ** form.
- **
--** XXX stop using sprintf to convert floating point
-+** XXX stop using snprintf to convert floating point
- */
- static int cvt_f(SprintfState *ss, double d, const char *fmt0, const char *fmt1)
- {
-@@ -338,15 +342,14 @@
-     char fout[300];
-     int amount = fmt1 - fmt0;
- 
--    PR_ASSERT((amount > 0) && (amount < sizeof(fin)));
--    if (amount >= sizeof(fin)) {
--	/* Totally bogus % command to sprintf. Just ignore it */
-+    if (amount <= 0 || amount >= sizeof(fin)) {
-+        /* Totally bogus % command to snprintf. Just ignore it */
- 	return 0;
-     }
-     memcpy(fin, fmt0, amount);
-     fin[amount] = 0;
- 
--    /* Convert floating point using the native sprintf code */
-+    /* Convert floating point using the native snprintf code */
- #ifdef DEBUG
-     {
-         const char *p = fin;
-@@ -356,14 +359,11 @@
-         }
-     }
- #endif
--    sprintf(fout, fin, d);
--
--    /*
--    ** This assert will catch overflow's of fout, when building with
--    ** debugging on. At least this way we can track down the evil piece
--    ** of calling code and fix it!
--    */
--    PR_ASSERT(strlen(fout) < sizeof(fout));
-+    memset(fout, 0, sizeof(fout));
-+    snprintf(fout, sizeof(fout), fin, d);
-+    /* Explicitly null-terminate fout because on Windows snprintf doesn't
-+     * append a null-terminator if the buffer is too small. */
-+    fout[sizeof(fout) - 1] = '\0';
- 
-     return (*ss->stuff)(ss, fout, strlen(fout));
- }

deleted file mode 100644
index b9621c9..0000000
@@ -1,147 +0,0 @@
-From be2a7edaf289c5da74a4f9ed3a0b6c733e775230 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <[email protected]>
-Date: Thu, 16 Oct 2014 13:59:47 +0800
-Subject: Fix for CVE-2014-3660
-
-Issues related to the billion laugh entity expansion which happened to
-escape the initial set of fixes
-
-Upstream-status: Backport
-Reference: https://git.gnome.org/browse/libxml2/commit/?id=be2a7edaf289c5da74a4f9ed3a0b6c733e775230&context=3&ignorews=0&ss=0
-
-Signed-off-by: Joe MacDonald <[email protected]>
-
-diff --git a/parser.c b/parser.c
-index f51e8d2..1d93967 100644
---- a/parser.c
-+++ b/parser.c
-@@ -130,6 +130,29 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
-         return (0);
-     if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
-         return (1);
-+
-+    /*
-+     * This may look absurd but is needed to detect
-+     * entities problems
-+     */
-+    if ((ent != NULL) && (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) &&
-+	(ent->content != NULL) && (ent->checked == 0)) {
-+	unsigned long oldnbent = ctxt->nbentities;
-+	xmlChar *rep;
-+
-+	ent->checked = 1;
-+
-+	rep = xmlStringDecodeEntities(ctxt, ent->content,
-+				  XML_SUBSTITUTE_REF, 0, 0, 0);
-+
-+	ent->checked = (ctxt->nbentities - oldnbent + 1) * 2;
-+	if (rep != NULL) {
-+	    if (xmlStrchr(rep, '<'))
-+		ent->checked |= 1;
-+	    xmlFree(rep);
-+	    rep = NULL;
-+	}
-+    }
-     if (replacement != 0) {
- 	if (replacement < XML_MAX_TEXT_LENGTH)
- 	    return(0);
-@@ -189,9 +212,12 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
-             return (0);
-     } else {
-         /*
--         * strange we got no data for checking just return
-+         * strange we got no data for checking
-          */
--        return (0);
-+	if (((ctxt->lastError.code != XML_ERR_UNDECLARED_ENTITY) &&
-+	     (ctxt->lastError.code != XML_WAR_UNDECLARED_ENTITY)) ||
-+	    (ctxt->nbentities <= 10000))
-+	    return (0);
-     }
-     xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
-     return (1);
-@@ -2589,6 +2615,7 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
- 				      name, NULL);
- 		    ctxt->valid = 0;
- 		}
-+		xmlParserEntityCheck(ctxt, 0, NULL, 0);
- 	    } else if (ctxt->input->free != deallocblankswrapper) {
- 		    input = xmlNewBlanksWrapperInputStream(ctxt, entity);
- 		    if (xmlPushInput(ctxt, input) < 0)
-@@ -2759,6 +2786,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- 	    if ((ctxt->lastError.code == XML_ERR_ENTITY_LOOP) ||
- 	        (ctxt->lastError.code == XML_ERR_INTERNAL_ERROR))
- 	        goto int_error;
-+	    xmlParserEntityCheck(ctxt, 0, ent, 0);
- 	    if (ent != NULL)
- 	        ctxt->nbentities += ent->checked / 2;
- 	    if ((ent != NULL) &&
-@@ -2810,6 +2838,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- 	    ent = xmlParseStringPEReference(ctxt, &str);
- 	    if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
- 	        goto int_error;
-+	    xmlParserEntityCheck(ctxt, 0, ent, 0);
- 	    if (ent != NULL)
- 	        ctxt->nbentities += ent->checked / 2;
- 	    if (ent != NULL) {
-@@ -7312,6 +7341,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- 		   (ret != XML_WAR_UNDECLARED_ENTITY)) {
- 	    xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY,
- 		     "Entity '%s' failed to parse\n", ent->name);
-+	    xmlParserEntityCheck(ctxt, 0, ent, 0);
- 	} else if (list != NULL) {
- 	    xmlFreeNodeList(list);
- 	    list = NULL;
-@@ -7418,7 +7448,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- 		/*
- 		 * We are copying here, make sure there is no abuse
- 		 */
--		ctxt->sizeentcopy += ent->length;
-+		ctxt->sizeentcopy += ent->length + 5;
- 		if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
- 		    return;
- 
-@@ -7466,7 +7496,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- 		/*
- 		 * We are copying here, make sure there is no abuse
- 		 */
--		ctxt->sizeentcopy += ent->length;
-+		ctxt->sizeentcopy += ent->length + 5;
- 		if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
- 		    return;
- 
-@@ -7652,6 +7682,7 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
- 		ctxt->sax->reference(ctxt->userData, name);
- 	    }
- 	}
-+	xmlParserEntityCheck(ctxt, 0, ent, 0);
- 	ctxt->valid = 0;
-     }
- 
-@@ -7845,6 +7876,7 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
- 			  "Entity '%s' not defined\n",
- 			  name);
- 	}
-+	xmlParserEntityCheck(ctxt, 0, ent, 0);
- 	/* TODO ? check regressions ctxt->valid = 0; */
-     }
- 
-@@ -8004,6 +8036,7 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt)
- 			  name, NULL);
- 	    ctxt->valid = 0;
- 	}
-+	xmlParserEntityCheck(ctxt, 0, NULL, 0);
-     } else {
- 	/*
- 	 * Internal checking in case the entity quest barfed
-@@ -8243,6 +8276,7 @@ xmlParseStringPEReference(xmlParserCtxtPtr ctxt, const xmlChar **str) {
- 			  name, NULL);
- 	    ctxt->valid = 0;
- 	}
-+	xmlParserEntityCheck(ctxt, 0, NULL, 0);
-     } else {
- 	/*
- 	 * Internal checking in case the entity quest barfed
--- 
-cgit v0.10.1
-

deleted file mode 100644
index 0abb475..0000000
@@ -1,119 +0,0 @@
-bind_Fix_for_CVE-2012-5166
-
-Upstream-Status: Backport
-
-Reference:http://launchpadlibrarian.net/119212498/bind9_1%3A9.7.3.dfsOBg
--1ubuntu2.6_1%3A9.7.3.dfsg-1ubuntu2.7.diff.gz
-
-ISC BIND 9.x before 9.7.6-P4, 9.8.x before 9.8.3-P4, 9.9.x before
-9.9.1-P4, and 9.4-ESV and 9.6-ESV before 9.6-ESV-R7-P4 allows
-remote attackers to cause a denial of service (named daemon hang)
-via unspecified combinations of resource records.
-
-http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-5166
-
-Signed-off-by: yanjun.zhu <[email protected]>
-diff -urpN a/bin/named/query.c b/bin/named/query.c
---- a/bin/named/query.c	2012-10-22 13:24:27.000000000 +0800
-+++ b/bin/named/query.c	2012-10-22 13:17:04.000000000 +0800
-@@ -1137,13 +1137,6 @@ query_isduplicate(ns_client_t *client, d
- 		mname = NULL;
- 	}
- 
--	/*
--	 * If the dns_name_t we're looking up is already in the message,
--	 * we don't want to trigger the caller's name replacement logic.
--	 */
--	if (name == mname)
--		mname = NULL;
--
- 	*mnamep = mname;
- 
- 	CTRACE("query_isduplicate: false: done");
-@@ -1341,6 +1334,7 @@ query_addadditional(void *arg, dns_name_
- 	if (dns_rdataset_isassociated(rdataset) &&
- 	    !query_isduplicate(client, fname, type, &mname)) {
- 		if (mname != NULL) {
-+			INSIST(mname != fname);
- 			query_releasename(client, &fname);
- 			fname = mname;
- 		} else
-@@ -1401,11 +1395,13 @@ query_addadditional(void *arg, dns_name_
- 			mname = NULL;
- 			if (!query_isduplicate(client, fname,
- 					       dns_rdatatype_a, &mname)) {
--				if (mname != NULL) {
--					query_releasename(client, &fname);
--					fname = mname;
--				} else
--					need_addname = ISC_TRUE;
-+				if (mname != fname) {
-+					if (mname != NULL) {
-+						query_releasename(client, &fname);
-+						fname = mname;
-+					} else
-+						need_addname = ISC_TRUE;
-+				}
- 				ISC_LIST_APPEND(fname->list, rdataset, link);
- 				added_something = ISC_TRUE;
- 				if (sigrdataset != NULL &&
-@@ -1444,11 +1440,13 @@ query_addadditional(void *arg, dns_name_
- 			mname = NULL;
- 			if (!query_isduplicate(client, fname,
- 					       dns_rdatatype_aaaa, &mname)) {
--				if (mname != NULL) {
--					query_releasename(client, &fname);
--					fname = mname;
--				} else
--					need_addname = ISC_TRUE;
-+				if (mname != fname) {
-+					if (mname != NULL) {
-+						query_releasename(client, &fname);
-+						fname = mname;
-+					} else
-+						need_addname = ISC_TRUE;
-+				}
- 				ISC_LIST_APPEND(fname->list, rdataset, link);
- 				added_something = ISC_TRUE;
- 				if (sigrdataset != NULL &&
-@@ -1960,22 +1958,24 @@ query_addadditional2(void *arg, dns_name
- 		    crdataset->type == dns_rdatatype_aaaa) {
- 			if (!query_isduplicate(client, fname, crdataset->type,
- 					       &mname)) {
--				if (mname != NULL) {
--					/*
--					 * A different type of this name is
--					 * already stored in the additional
--					 * section.  We'll reuse the name.
--					 * Note that this should happen at most
--					 * once.  Otherwise, fname->link could
--					 * leak below.
--					 */
--					INSIST(mname0 == NULL);
--
--					query_releasename(client, &fname);
--					fname = mname;
--					mname0 = mname;
--				} else
--					need_addname = ISC_TRUE;
-+				if (mname != fname) {
-+					if (mname != NULL) {
-+						/*
-+						 * A different type of this name is
-+						 * already stored in the additional
-+						 * section.  We'll reuse the name.
-+						 * Note that this should happen at most
-+						 * once.  Otherwise, fname->link could
-+						 * leak below.
-+						 */
-+						INSIST(mname0 == NULL);
-+
-+						query_releasename(client, &fname);
-+						fname = mname;
-+						mname0 = mname;
-+					} else
-+						need_addname = ISC_TRUE;
-+				}
- 				ISC_LIST_UNLINK(cfname.list, crdataset, link);
- 				ISC_LIST_APPEND(fname->list, crdataset, link);
- 				added_something = ISC_TRUE;

89 lines not on this page · raw message

92 lines not on this page · raw message

41 lines not on this page · raw message

141 lines not on this page · raw message

deleted file mode 100644
index ed2750e..0000000
@@ -1,43 +0,0 @@
-Upstream-Status: Backport
-
-logrotate: fix for CVE-2011-1548
-
-If a logfile is a symlink, it may be read when being compressed, being
-copied (copy, copytruncate) or mailed. Secure data (eg. password files)
-may be exposed.
-
-Portback nofollow.patch from:
-http://logrotate.sourcearchive.com/downloads/3.8.1-5/logrotate_3.8.1-5.debian.tar.gz
-
-Signed-off-by: Wenzong Fan <[email protected]>
-
----
---- a/logrotate.c	2012-09-06 13:25:08.000000000 +0800
-+++ b/logrotate.c	2012-09-06 13:35:57.000000000 +0800
-@@ -390,7 +390,7 @@
-     compressedName = alloca(strlen(name) + strlen(log->compress_ext) + 2);
-     sprintf(compressedName, "%s%s", name, log->compress_ext);
- 
--    if ((inFile = open(name, O_RDWR)) < 0) {
-+    if ((inFile = open(name, O_RDWR | O_NOFOLLOW)) < 0) {
- 	message(MESS_ERROR, "unable to open %s for compression\n", name);
- 	return 1;
-     }
-@@ -470,7 +470,7 @@
-     char *mailArgv[] = { mailCommand, "-s", subject, address, NULL };
-     int rc = 0;
- 
--    if ((mailInput = open(logFile, O_RDONLY)) < 0) {
-+    if ((mailInput = open(logFile, O_RDONLY | O_NOFOLLOW)) < 0) {
- 	message(MESS_ERROR, "failed to open %s for mailing: %s\n", logFile,
- 		strerror(errno));
- 	return 1;
-@@ -561,7 +561,7 @@
-     message(MESS_DEBUG, "copying %s to %s\n", currLog, saveLog);
- 
-     if (!debug) {
--	if ((fdcurr = open(currLog, (flags & LOG_FLAG_COPY) ? O_RDONLY : O_RDWR)) < 0) {
-+	if ((fdcurr = open(currLog, ((flags & LOG_FLAG_COPY) ? O_RDONLY : O_RDWR) | O_NOFOLLOW)) < 0) {
- 	    message(MESS_ERROR, "error opening %s: %s\n", currLog,
- 		    strerror(errno));
- 	    return 1;

deleted file mode 100644
index 49b0209..0000000
@@ -1,29 +0,0 @@
-Upstream-Status: Pending
-
-Subject: Makefile.am: fix parallel build problem
-
-Fix parallel build problem to avoid errors like below.
-
-    install: cannot stat 'testsuite/module-playground/mod-fake-cciss.ko': No such file or directory
-
-Signed-off-by: Chen Qi <[email protected]>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 9457655..d5b02eb 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -237,7 +237,7 @@ rootfs: build-module-playground
- 
- .PHONY: rootfs build-playground
- 
--$(ROOTFS): $(ROOTFS_PRISTINE)
-+$(ROOTFS): $(ROOTFS_PRISTINE) build-module-playground
- 	$(CREATE_ROOTFS)
- 
- TESTSUITE_OVERRIDE_LIBS = \
--- 
-1.9.1
-

deleted file mode 100644
index ee0a62c..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.1/Makefile.org
-===================================================================
---- openssl-1.0.1.orig/Makefile.org	2012-03-17 09:41:07.000000000 +0000
-+++ openssl-1.0.1/Makefile.org	2012-03-17 09:41:21.000000000 +0000
-@@ -135,7 +135,7 @@
- 
- BASEADDR=
- 
--DIRS=   crypto ssl engines apps test tools
-+DIRS=   crypto ssl engines apps tools
- ENGDIRS= ccgost
- SHLIBDIRS= crypto ssl
- 

deleted file mode 100644
index d7047bb..0000000
@@ -1,26 +0,0 @@
-openssl: avoid NULL pointer dereference in dh_pub_encode()/dsa_pub_encode()
-
-We should avoid accessing the pointer if ASN1_STRING_new()
-allocates memory failed.
-
-Upstream-Status: Submitted
-http://www.mail-archive.com/[email protected]/msg32859.html
-
-Signed-off-by: Xufeng Zhang <[email protected]>
----
-Index: openssl-1.0.2/crypto/dh/dh_ameth.c
-===================================================================
---- openssl-1.0.2.orig/crypto/dh/dh_ameth.c
-+++ openssl-1.0.2/crypto/dh/dh_ameth.c
-@@ -161,6 +161,11 @@ static int dh_pub_encode(X509_PUBKEY *pk
-     dh = pkey->pkey.dh;
- 
-     str = ASN1_STRING_new();
-+    if (!str) {
-+        DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
-+        goto err;
-+    }
-+
-     str->length = i2d_dhp(pkey, dh, &str->data);
-     if (str->length <= 0) {
-         DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);

66 lines not on this page · raw message

deleted file mode 100644
index d6c66e4..0000000
@@ -1,156 +0,0 @@
-Upstream-Status: Pending
-
-In 3.14, bi_sector and bi_size were moved into an iterator, thus
-breaking any tracepoints that still expect them in the bio.  Fix up
-the lttng-module tracepoints to use the new scheme when the kernel
-version is >= 3.14.
-
-Signed-off-by: Tom Zanussi <[email protected]>
-
-diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
-index f3b8bff..0a61543 100644
---- a/instrumentation/events/lttng-module/block.h
-+++ b/instrumentation/events/lttng-module/block.h
-@@ -341,9 +341,15 @@ TRACE_EVENT(block_bio_bounce,
- 	TP_fast_assign(
- 		tp_assign(dev, bio->bi_bdev ?
- 					  bio->bi_bdev->bd_dev : 0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio->bi_iter.bi_sector)
-+		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
-+		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio->bi_sector)
- 		tp_assign(nr_sector, bio->bi_size >> 9)
- 		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
- 	),
- 
-@@ -385,14 +391,24 @@ TRACE_EVENT(block_bio_complete,
- 
- 	TP_fast_assign(
- 		tp_assign(dev, bio->bi_bdev->bd_dev)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio->bi_iter.bi_sector)
-+		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio->bi_sector)
- 		tp_assign(nr_sector, bio->bi_size >> 9)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-+
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
- 		tp_assign(error, error)
- #else
- 		tp_assign(error, 0)
- #endif
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 	),
- 
- 	TP_printk("%d,%d %s %llu + %u [%d]",
-@@ -419,9 +435,15 @@ DECLARE_EVENT_CLASS(block_bio_merge,
- 
- 	TP_fast_assign(
- 		tp_assign(dev, bio->bi_bdev->bd_dev)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio->bi_iter.bi_sector)
-+		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
-+		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio->bi_sector)
- 		tp_assign(nr_sector, bio->bi_size >> 9)
- 		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
- 	),
- 
-@@ -485,9 +507,15 @@ TRACE_EVENT(block_bio_queue,
- 
- 	TP_fast_assign(
- 		tp_assign(dev, bio->bi_bdev->bd_dev)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio->bi_iter.bi_sector)
-+		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
-+		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio->bi_sector)
- 		tp_assign(nr_sector, bio->bi_size >> 9)
- 		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
- 	),
- 
-@@ -513,9 +541,15 @@ DECLARE_EVENT_CLASS(block_bio,
- 
- 	TP_fast_assign(
- 		tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio->bi_iter.bi_sector)
-+		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
-+		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio->bi_sector)
- 		tp_assign(nr_sector, bio->bi_size >> 9)
- 		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
- 	),
- 
-@@ -587,10 +621,17 @@ DECLARE_EVENT_CLASS(block_get_rq,
- 
- 	TP_fast_assign(
- 		tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
-+		tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
-+		blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
-+			      bio ? bio->bi_iter.bi_size >> 9 : 0)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio ? bio->bi_sector : 0)
- 		tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
- 		blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
- 			      bio ? bio->bi_size >> 9 : 0)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
-         ),
- 
-@@ -759,9 +800,15 @@ TRACE_EVENT(block_split,
- 
- 	TP_fast_assign(
- 		tp_assign(dev, bio->bi_bdev->bd_dev)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio->bi_iter.bi_sector)
-+		tp_assign(new_sector, new_sector)
-+		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio->bi_sector)
- 		tp_assign(new_sector, new_sector)
- 		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
- 	),
- 
-@@ -805,11 +852,19 @@ TRACE_EVENT(block_remap,
- 
- 	TP_fast_assign(
- 		tp_assign(dev, bio->bi_bdev->bd_dev)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
-+		tp_assign(sector, bio->bi_iter.bi_sector)
-+		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
-+		tp_assign(old_dev, dev)
-+		tp_assign(old_sector, from)
-+		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 		tp_assign(sector, bio->bi_sector)
- 		tp_assign(nr_sector, bio->bi_size >> 9)
- 		tp_assign(old_dev, dev)
- 		tp_assign(old_sector, from)
- 		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
- 	),
- 
- 	TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",

deleted file mode 100644
index 3fcf541..0000000
@@ -1,65 +0,0 @@
-From 5e96c73d5dfbdea8d0be82b7f3fc8d6735e5dfa7 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Sun, 17 Jan 2010 17:07:48 -0500
-Subject: [PATCH] add a generic syscall() fallback
-
-Upstream-Status: Pending
-
-Signed-off-by: Mike Frysinger <[email protected]>
-Signed-off-by: Riku Voipio <[email protected]>
----
- src/syscall-generic.h |   29 +++++++++++++++++++++++++++++
- src/syscall.h         |    3 ++-
- 2 files changed, 31 insertions(+), 1 deletions(-)
- create mode 100644 src/syscall-generic.h
-
-diff --git a/src/syscall-generic.h b/src/syscall-generic.h
-new file mode 100644
-index 0000000..24d7c7c
---- /dev/null
-+++ b/src/syscall-generic.h
-@@ -0,0 +1,29 @@
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/syscall.h>
-+
-+#define _body_io_syscall(sname, args...) \
-+{ \
-+   int ret = syscall(__NR_##sname, ## args); \
-+   return ret < 0 ? -errno : ret; \
-+}
-+
-+#define io_syscall1(type,fname,sname,type1,arg1) \
-+type fname(type1 arg1) \
-+_body_io_syscall(sname, (long)arg1)
-+
-+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \
-+type fname(type1 arg1,type2 arg2) \
-+_body_io_syscall(sname, (long)arg1, (long)arg2)
-+
-+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \
-+type fname(type1 arg1,type2 arg2,type3 arg3) \
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3)
-+
-+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-+type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4)
-+
-+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, type5,arg5) \
-+type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-+_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5)
-diff --git a/src/syscall.h b/src/syscall.h
-index 78becfe..d954af0 100644
---- a/src/syscall.h
-+++ b/src/syscall.h
-@@ -25,5 +25,6 @@
- #elif defined(__arm__)
- #include "syscall-arm.h"
- #else
--#error "add syscall-arch.h"
-+#warning "using generic syscall method"
-+#include "syscall-generic.h"
- #endif
--- 
-1.7.3.1
-

deleted file mode 100644
index ef69143..0000000
@@ -1,51 +0,0 @@
-From 0e70072ce655a0d053bb7433083ced5e6eac74d4 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <[email protected]>
-Date: Thu, 15 Aug 2013 23:49:47 -0700
-Subject: [PATCH] handle correctly @enumerate specification greater than 10
-
-Upstream-Status: Backport
-
-Revision: 5270
-          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5270
-Author:   pertusus
-Date:     2013-07-29 20:02:23 +0000 (Mon, 29 Jul 2013)
-Log Message:
------------
-        * tp/Common.pm (enumerate_item_representation), Texinfo/Parser.pm:
-        handle correctly @enumerate specification greater than 10.  Report
-        from Dmitry Shachnev.
-
----
- tp/Texinfo/Common.pm |    2 +-
- tp/Texinfo/Parser.pm |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
-index 8aee9f7..bdffeee 100644
---- a/tp/Texinfo/Common.pm
-+++ b/tp/Texinfo/Common.pm
-@@ -1382,7 +1382,7 @@ sub enumerate_item_representation($$)
-   my $specification = shift;
-   my $number = shift;
-
--  if ($specification =~ /^[0-9]$/) {
-+  if ($specification =~ /^[0-9]+$/) {
-     return $specification + $number -1;
-   }
-
-diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
-index cf8fa72..8e845e9 100644
---- a/tp/Texinfo/Parser.pm
-+++ b/tp/Texinfo/Parser.pm
-@@ -2973,7 +2973,7 @@ sub _end_line($$$)
-                         $current->{'cmdname'});
-           }
-           my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
--          if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) {
-+          if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) {
-             $self->_command_error($current, $line_nr, 
-                         $self->__("bad argument to \@%s"),
-                         $current->{'cmdname'});
---
-1.7.1
-

index dc56dfa..0d8490d 100644
@@ -34,6 +34,7 @@ SRC_URI += "\
         file://elfutils-ar-c-fix-num-passed-to-memset.patch \
         file://Fix_elf_cvt_gunhash.patch \
         file://elf_begin.c-CVE-2014-9447-fix.patch \
+        file://fix-build-gcc-4.8.patch \
 "
 # Only apply when building uclibc based target recipe
 SRC_URI_append_libc-uclibc = " file://uclibc-support-for-elfutils-0.148.patch"