Version bump which adds official upstream security release for CVE-2014-3634 (bug #524058)

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 31 insertions, 118 deletions

diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index 7d102fdf4a22..0501721e4bee 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/sysklogd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.90 2014/10/04 09:21:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.91 2014/10/06 16:52:31 polynomial-c Exp $
+
+*sysklogd-1.5.1 (06 Oct 2014)
+
+  06 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -sysklogd-1.5-r4.ebuild,
+  +sysklogd-1.5.1.ebuild, -files/sysklogd-1.5_CVE-2014-3634.diff:
+  Version bump which adds official upstream security release for CVE-2014-3634
+  (bug #524058).
 
 *sysklogd-1.5-r4 (04 Oct 2014)
 
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 8e0dac2222dd..f67bacddf4c1 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -14,7 +14,6 @@ AUX sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff 3245 SHA256 0105d924d94515316
 AUX sysklogd-1.5-build.patch 626 SHA256 1395e48418e0790cec2a8af9a3821b5d2c0bafe11cd599e181f90f4e720835f6 SHA512 aa8ce937733bb24f6b4bc4a47e40df99697c554276a29a21201b76354b902875bbeb7387520f3b7f8e05a76b16d3c4431bf775c85480fd9e31b78d499b5605fa WHIRLPOOL 6a60b497629dd7396e9b6eb36e3abcb399b981b35c08ee55922f45104e3292d8d437bc7319032f28dbad6251bad142380b071c64188fe58628697abb5152f20a
 AUX sysklogd-1.5-debian-cron.patch 913 SHA256 7667df1da0af05120d80f5622b830748b4831c4d555c28d38f3cad266a865b3f SHA512 5af0a61e5fb8dd78c30fa42d747b4de3a4f68b80b86a2f53447d2277c98d72972c242ffe5649c30a9f08f30e27974fd3bfe4a5537fa1c7b8658312b0550b28e0 WHIRLPOOL 3ef686ef93a068a98ef609a362d87c2bc1bf8d202ec08ffe25627417dd4972bd0d26bd20a13a8193fb8a72f5558ee09e53c30a063e3b3e59ca522f2db0f5c9d5
 AUX sysklogd-1.5-syslog-func-collision.patch 2273 SHA256 e035765eb6d7f013d42d872dc0561deac52dccaf00fa26e21504891b3e0ae14a SHA512 1fc3e215a45d95dd11ca2d1713f9a3f416e82b9d60127da62d904071f02ec1e934aa099a20d09a7c1eea37f9d93dbaa0e0ce8118af9b58b92d781cc26659e5fc WHIRLPOOL 2d1e25a2cc1ca3154d831db080036ca4c4de7a4c7958fd65cb4c246a313bd81076b95d8195f2448c7728daacb133983bff1da81a8138e7509d6a56e0ee0717ad
-AUX sysklogd-1.5_CVE-2014-3634.diff 3078 SHA256 5fbf37e8994cbd18d16213a89120761b2496e8343748d8a83a8cde07f1c66b80 SHA512 c18dbf2ad345f80bab2162f17ec3c9aaee8b20b45ed4cadf82bc2c7cc118ba2c4f229b3e125bf7f03e7299e3ffb3f36bcb46c8580b4e0aaaec38733ae380503e WHIRLPOOL 72675671839ddb2a1b0de043330ef38654c30b8539cf666868c8357594a1877a0872b236a7fc5b8de41d90c6bdef1b41f4785d3ed08aa3cf5af30b806123d6a1
 AUX sysklogd.confd 113 SHA256 11a1eeb9edd09639d5143227bada137945822b23c5abb88fec5ebaef064b991d SHA512 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c WHIRLPOOL 4785cb1036e25a15a11de75b68e46138563ed0a610ccc70454807e8c0b22235e40779910157ad5dce67d98d661b9a614a22cbf7c4f76db9df15cbafdb9733bfa
 AUX sysklogd.logrotate 402 SHA256 2e864ce0e5a2ca2c7964f7dff0fe1a76a5dcb90d237c0df7c19fa9cc6b5cb5e4 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7 WHIRLPOOL b03ff6ecdf95fc164e161389e51bcf6c38760815dbafab711f7e2a5720d939fb54dbef930d97c7d752262d5dcf840c2b9296c2f02190730083947bf682a958d9
 AUX sysklogd.rc6 1575 SHA256 d62ddc4d2750dca70c577f497bde69e30d9d258f709326aa4ecb8d75995f78a9 SHA512 ec578ce4930725a6270a977a00ad48c80d5f8cb3690855a4dae792bef87f11cfa28193fa8f71c281c7d709a267ed71c92e8d4e917b09d4e00ef4d36ea3c4355d WHIRLPOOL 011c91cea0a3de86afc703da68f4fe52e74ad58fc722badb5c2d2db30007b4fc43c57fd7abf806194e41ad5ba31a0f9dd4aefd0d75fcc735f87c61acfd7945f8
@@ -25,28 +24,29 @@ AUX syslogd-listfiles 2759 SHA256 8622d5efba7bcbaa912f689cde94d6d331dfd1b53701be
 AUX syslogd-listfiles.8 2540 SHA256 e8e624d7efef7e2c74be3f87cf3708fe25334feb6e759705d1560001df81c145 SHA512 bc172f3e9bd9375631fda7df45838b0f893b599d61958197e006f4a4eb718bec93f7e4d6b4593972d758786de25980e93212b72c702e432515c90664b183b1c2 WHIRLPOOL 6d1d8999c257167055225e072a51ca2b14e619269716f0afdf3138029b0d68d5da41d592793707d58ad3e606d4909a9d3edbeed63e7f45ddd2126ea06a35af89
 DIST sysklogd-1.4.1-cvs-20061230.patch.bz2 12584 SHA256 4ca2fd34dacd1c10018b6a786c24faa392d6fef57607e240e3bcaf925231e2b2 SHA512 30c6577638b5591473ec8c1d81c4f5932beccdabfcb94c6aaf5a149eb7502078f67e79fed48bb8d6215f5d4a57504aebcbafc648f4bcd3ee5c35cf0495fb2eeb WHIRLPOOL dacbf8481f72dd535d94a4348f4f188666e25e2822f965071019ac970d599f3d4117515670815aef43e3f866102ac38a1c47f9c0c582cf4210e8be054c1975c3
 DIST sysklogd-1.4.1.tar.gz 81784 SHA256 44357e0fae8c8f0e315bf130b4e86a4f96b91d66eeb4e473def4ce8336fff102 SHA512 01924f9b9c72e3a0ee1a530eb8bd39779ca52dfabb62725085c6d3d71898777e6a47dae1c104ad6d376064c66b9dada9e3ba27e98ba92915a0875e789d8b2c8b WHIRLPOOL 2a275609c70af99fd8f72de29823c61f338322062d9ea8895dd6f4e906d01690546d76d5733035f052715b6e09f35e4af5e0d26cf3a688cb6b9e0b7bd88d8ef9
+DIST sysklogd-1.5.1.tar.gz 90011 SHA256 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201 SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7 WHIRLPOOL a9be298553e89d1b61f3ac4d5cfc6bd5662ab84d9120adfcdd6b8aaf5fe4d54d9e34ac19dab5c1738578af302597e424e95fc68345a1855e3be2760b093037ea
 DIST sysklogd-1.5.tar.gz 86557 SHA256 6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773 SHA512 19ef104c03a8c87ea30c811fe54bb30e7c73a2834a83c8720841f0d553d41508dbf052d4e3dd9ea929eedff31e9fbb79f8c05546f48005b74f01ebf2a57e48f7 WHIRLPOOL 29c44d78bed58224291403e6ff26fd5c50d9d1f774df2f8560ad5f24fe0dd3ac6c232ac19489c96eeaa1d2a6171a735f5b8f0c9e5734c88e9d03e98d1ac08e48
 DIST sysklogd_1.5-6.diff.gz 25677 SHA256 1c5366865bd058530071a6071c317ab3562f33f4b0f3a934878cb97059fde20a SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e WHIRLPOOL 0c330ed79b5a688ddec0a80e6333c181cfa297350ec9559166e5828d715a305b5b52eee5f7cc95f7b4ebccf03f21de594d428fa2b2ef117bd0a1630684c71364
 EBUILD sysklogd-1.4.2_pre20061230-r2.ebuild 1845 SHA256 cc7634ea2bd49a1ef042994cb60de73110dee195154778559d733dee228a3a91 SHA512 ab4e735f22211581302b5638c2aa057f3cec2a05081f9f2cf61aa7946a601d9c4d4637e496ae63f2f9bf56ae7a701d6574ab3df74f320e6292f37cf72d382082 WHIRLPOOL 6ad876624663cdf7fcb46a30b61fa3bccfb4abe5ec7d33b5e0f11e571f965c7da4b54f56721907f63d28122ea532db62e766ebd6a0f295bfd3628e7f5ef9790f
 EBUILD sysklogd-1.5-r2.ebuild 1679 SHA256 6f5889a86bdc4cd06372ef10e48fede5f25a52dfa99f82ad6ae38cd96262fba4 SHA512 734fa36fc257593aee5e5a1998aa006c780e0e3b6491ffb91e7b7ab08b33c6f0bf202b729262b56b0c2c0bf5340739d4339b6c5b1b50d26f45346485935d90ce WHIRLPOOL 828a731f2efdf8a57fe5b68eb24f9a39a827b9f87089cbc7a17e898e83cd39b63793d7d4ec835b6239da98ac78dac6a5fc558177255a7d8b4f51f2190f516377
 EBUILD sysklogd-1.5-r3.ebuild 1812 SHA256 2ebfed074a584239bf90e02b33b446792a47e45570c646e120133a6fff87aefa SHA512 1d5f5260f0f6eda0ab6f2a3dd0dbff158ba19d7a9523aa17847856fa3da637c1b9fc35f2d28096c1fb8f2013c36f9f8fc9f2be72c5b6e686bb42d2165be8622d WHIRLPOOL fcb8b04d3fcc933d9f7d3aef1e58fa70a609253b5378f06ac1fa617a8736ac92cc48cfcb37e6f83fd71aa509ed4fc4011b57976a9764412219337f7fb4909346
-EBUILD sysklogd-1.5-r4.ebuild 1870 SHA256 576d0bb7f34e703ba48bf61c0266c61938286ff97d3693776c01da852c1fbb1f SHA512 5fc74d8cf605dd08d639411a84d4a063c87b619dd17ebda6b7b51794787daddef0c5c0eef0234f8206ca3666a2e74e12e8988fa1ae1fa6300abb3702bb6d9208 WHIRLPOOL a9a010e915a41e8af915cd82d1d0ebb644697593ee6e371b123a2b004e59d62e7dda5a3f06bd3ebc3d3710d408b98d19baa3292dba6944b36c14abeeeb4535fd
-MISC ChangeLog 13660 SHA256 7077b5167c6e4e7ffa3c99a92c397c069e5d5429e66505840612bff9ba707b47 SHA512 d7a0cf21c351fa031231620763a6dfd8df2f3ab4bff72d91e96ee9605128aacc778772796a3bb0ff54eb2091d26f0cd65d65089150a53151ea7903ea528fe756 WHIRLPOOL 5b3ff30132c55fc5f77842f3d30d42eb18bc46722af1148a25c2f8d0600478bec766fb5f7a926174da9e1f5bd60f497c2eefc6d87df085f737c6db2488888b9f
+EBUILD sysklogd-1.5.1.ebuild 1771 SHA256 de2c1d1d2fc1deba912a799cde08f601e641f875c0e8df4130b04eab3d1d2b6e SHA512 b0300f4be3472ca337ea9b6a2ee9f25117e372621c2636b1d21caf44c4841ff7be1c720bfbfac88af35900ef6a10cc0c843dd27c7f9e0c2356b382ca8e522314 WHIRLPOOL 58f942e033699fbb2b49579a20757735dc0f45f51644c8bd0fc8a89e4bdbf696cfe98357def9366da62d697cfec134171da657f268e65f411baad28edd6def0c
+MISC ChangeLog 13933 SHA256 799e3562e7e9cd9acde049e0ab857ae5e9ecc5e16eacab2d24df45ddc0eff259 SHA512 5bbb224035038e7dafcd328018e446ee965624d34aba8e9125de4ab9d9e3236f090209ba4b8187d33ced3a12aab93e10acb83c32550552434aac002efd540817 WHIRLPOOL af63f8feb3c6e1d8f35700a582318afc3201dfc6c2ecace03ba53a0fc3842738f4c4081555080a211b98d9849e2efd0608f0e5c4ad72e1322d28133459f64dcd
 MISC metadata.xml 286 SHA256 1da9a105e361faa4f82b5a309461857cdaa116af0f58c2276852f1241f637c2d SHA512 0341cc7b590ecaf8f1f03f28ff80adb2af3d429879c0b7eca048bbf87e11fe72f7ef9b76ecd3899f097df3443a3df48c1c447f2c9f51affa14f3406b4d5a993b WHIRLPOOL 91d57b8c23199b941cccd933b6e35f880072aba50305e5bf8d16b3d1e7aca4d0f78068859a562786dc6381984fbc0f9ba37f2a1de86d2db3b1a10af7627d41bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUL7w2AAoJEPiazRVxLXTFIvYP/3n+OTsa8lI/S59G3NBmW8if
-YN7CfXJ/+OylQXXXTeh9iGf1/ErsOs9JB9AkeswROkx/MYL3xzVv33RefR5oRjsz
-HZDPlYdN8ejJdlF5yqNTSPjT5oYyebyuo2nPSOqXJ34tP9HZwdVfIxEYhRB9FrnT
-7MaoQeYQk2TOpzd2vDqkU78ibx5ep7PVaCsSvceai54Wpvu5nMb6bhg/JMBKQnG5
-N8lcabYhD/sEfupB7djSbG5ORXpkKEbvsSdnlpPCET75NwXmR+RLrFrgrU7K0mhx
-KhWTBY5Uj+TrEO1OX2DYDOwTbNLtuLRTkDTMujCKKW4ECnjd6tXch3zbTma+o6MZ
-ecvaY5IxVZtUQc6p7vWtoarJDjscAzYfoizO+E8yAAK5uO+GCR3JQX1B94XDIZPF
-l6i5urfnS3HIxwgZ7hOQshPCnubEz+kaG7m+FinYIpF3QalYV81PTcPt+1CQQ8zJ
-WK2jAerqFTBTVDtQ8LbZfqCAOYZ5LfPkc4l6rwLpI3AujCvRy8xUoHDmpO9h58LW
-wQPXn5KHpVry1gNvxM2Dj0cZsEay62hKqXFNvzfsNEzOsEzlmO5CD8LryqGoTmio
-XIrH1cQwcAy4XOiJXXM5nV1rlS+0okdDufi5kGeabvkpLTzAybEdQT4Hnnz88Hh7
-xnAPoDw770d0BOfwgfp+
-=JgPi
+iQIcBAEBCAAGBQJUMsjRAAoJEPiazRVxLXTFa9gP+gMgLpUs8HglpENH54+0x3Pb
+GofThzh/Gwhk/OS2DdIP49Y6j6Fhnn8F/qemVA1K4TJoJIE1w+gXokOCQu6+SV8x
+9sQPd9UeiymwEhtw1AfAmtgPuTjd1f/TeV6Uz0ff92VYjg0/MDQ21YuODySPWOUZ
+wBB//zmsneCaj9sLzb06MbiEKQ+eJZm22zWGmMM6snJ09Ybw3cplxtoZoPTvz4bn
+6PjmNJ9iQwUIFb9aBPEIrI8v6TvG1YHleiio1vdzZ3iUZOKAKUk31Qu7VmJ58PJa
+IIvg3oGXTNr6r7bhA0aSDqdnGugK8u3Ld55LMvZGpmKUJM6K9z50mjYBFbb+tJYP
+QKA83Y//2bupbE2t8BhSd338sQzvth7WIXk+bVS18/bBSQESQOl8t8VnMMoHoAeo
+8v6JUTiUI6reblFIEiug6NN2WV69eMqIxLK5qRm8cAC+s1MM/ZbYcz43rVxPoOby
+2IytIKuU7WXAHZN1DUQD7ESNSo7lbSYi4+luHHEz4sx19YEgaF3oPpB4rMrAyWAg
+nV8HGgVbHL5dry3e55SJl7UFgu0N3CMxxnFD2l5LZ/wA35OvvtidstFRCkqH/++M
+H4JqQO7GgkLTedoi2Z2XPdWubv4x6H5SLT2rA+aK0CRqjNmprGA/nsuc0ynTv9er
+3ZGcplze04IRRYj17521
+=APIq
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sysklogd/files/sysklogd-1.5_CVE-2014-3634.diff b/app-admin/sysklogd/files/sysklogd-1.5_CVE-2014-3634.diff
deleted file mode 100644
index bc64756f1854..000000000000
--- a/app-admin/sysklogd/files/sysklogd-1.5_CVE-2014-3634.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-From 43797330e75d7d4687b7ae6926a996c3c85c2679 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1 AT zoho DOT com>
-Date: Wed, 1 Oct 2014
-Subject: CVE-2014-3634
-
-Rainer Gerhards, rsyslog project leader, discovered an issue in rsyslogd
-where invalid priority values can trigger DoS and potentially RCE.
-
-As his analysis reveals, the cause of the problem identified in rsyslog's
-rsyslogd also exists in sysklogd's syslogd (from which rsyslogd was forked)
-and stems from the use of a (LOG_FACMASK|LOG_PRIMASK) mask to detect invalid
-priority values.
-
-In sysklogd's syslogd, invalid priority values between 192 and 1023 (directly
-or arrived at via overflow wraparound) can propagate through code causing
-out-of-bounds access to the f_pmask array within the 'filed' structure by up
-to 104 bytes past its end. Though most likely insufficient to reach
-unallocated memory because there are around 544 bytes past f_pmask in 'filed'
-(mod packing and other differences), incorrect access of fields at higher
-positions of the 'filed' structure definition can cause unexpected behavior
-including message mis-classification, forwarding issues, message loss,
-or other.
-
-This patch imposes a restriction on PRI message parts and requires they
-be properly-delimited priority value strings that have non-negative
-numerical values not exceeding 191. As before, sysklogd's syslogd permits
-zero padding to not break compatibility with RFC-non-compliant loggers that
-issue PRIs such as <0091>. Messages without well-formed PRI parts get
-logged with priority user.notice (13). (c.f. RFC 3164)
-
-Thanks to Rainer Gerhards for the initial report and analysis.
-
-[1] http://www.rsyslog.com/remote-syslog-pri-vulnerability/
-[2] http://www.rsyslog.com/remote-syslog-pri-vulnerability-cve-2014-3683/
-
----
- syslogd.c |   25 +++++++++++++++++++------
- 1 file changed, 19 insertions(+), 6 deletions(-)
-
---- a/syslogd.c
-+++ b/syslogd.c
-@@ -632,6 +632,8 @@ int funix[MAXFUNIX] = { -1, };
- #define TABLE_ALLPRI    0xFF    /* Value to indicate all priorities in f_pmask */
- #define	LOG_MARK	LOG_MAKEPRI(LOG_NFACILITIES, 0)	/* mark "facility" */
- 
-+#define MAX_PRI		191	/* Maximum Priority per RFC 3164 */
-+
- /*
-  * Flags to logmsg().
-  */
-@@ -1491,23 +1493,34 @@ void printline(hname, msg)
- 	register char *p, *q;
- 	register unsigned char c;
- 	char line[MAXLINE + 1];
--	int pri;
-+	unsigned int pri;       	// Valid Priority values are 0-191
-+	int prilen=0;			// Track Priority value string len
-+	int msglen;
- 
- 	/* test for special codes */
-+	msglen=strlen(msg);
- 	pri = DEFUPRI;
- 	p = msg;
- 
- 	if (*p == '<') {
- 		pri = 0;
--		while (isdigit(*++p))
--		{
--		   pri = 10 * pri + (*p - '0');
-+		while (--msglen > 0 && isdigit((unsigned char)*++p) &&
-+		      			pri <= MAX_PRI) {
-+			pri = 10 * pri + (*p - '0');
-+			prilen++;
- 		}
--		if (*p == '>')
-+		if (*p == '>' && prilen)
- 			++p;
-+		else {
-+			pri = DEFUPRI;
-+			p = msg;
-+		}
- 	}
--	if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
-+
-+	if ((pri &~ (LOG_FACMASK|LOG_PRIMASK)) || (pri > MAX_PRI)) {
- 		pri = DEFUPRI;
-+		p = msg;
-+	}
- 
- 	memset (line, 0, sizeof(line));
- 	q = line;
diff --git a/app-admin/sysklogd/sysklogd-1.5-r4.ebuild b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
index 0ece02bd7349..7961b0da560a 100644
--- a/app-admin/sysklogd/sysklogd-1.5-r4.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.5-r4.ebuild,v 1.1 2014/10/04 09:21:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.5.1.ebuild,v 1.1 2014/10/06 16:52:31 polynomial-c Exp $
 
 EAPI="4"
 
 inherit eutils flag-o-matic toolchain-funcs
 
-DEB_VER="6"
+DEB_PV="1.5-6"
 DESCRIPTION="Standard log daemons"
 HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
 SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
-	mirror://debian/pool/main/s/sysklogd/${PN}_${PV}-${DEB_VER}.diff.gz"
+	mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,20 +23,17 @@ RDEPEND="dev-lang/perl
 	sys-apps/debianutils"
 
 src_prepare() {
-	pushd "${WORKDIR}" >/dev/null
-	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
-	popd >/dev/null
+	epatch "${WORKDIR}"/${PN}_${DEB_PV}.diff
 
-	epatch "${FILESDIR}"/${P}-debian-cron.patch
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${PN}-1.5-debian-cron.patch
+	epatch "${FILESDIR}"/${PN}-1.5-build.patch
 
 	# CAEN/OWL security patches
 	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
 	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
 	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
 
-	epatch "${FILESDIR}"/${P}-syslog-func-collision.patch #342601
-	epatch "${FILESDIR}"/${P}_CVE-2014-3634.diff #524058
+	epatch "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
 }
 
 src_configure() {