fix compilation with gcc-5.1, bug #548314

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 85 insertions, 14 deletions

diff --git a/app-arch/tarsync/ChangeLog b/app-arch/tarsync/ChangeLog
index aa8276ffa478..912ada13c887 100644
--- a/app-arch/tarsync/ChangeLog
+++ b/app-arch/tarsync/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/tarsync
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tarsync/ChangeLog,v 1.23 2014/01/26 22:38:39 ottxor Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tarsync/ChangeLog,v 1.24 2015/05/26 23:41:12 tamiko Exp $
+
+  26 May 2015; Matthias Maier <tamiko@gentoo.org>
+  +files/tarsync-0.2.1-gcc5.patch, tarsync-0.2.1-r1.ebuild:
+  fix compilation with gcc-5.1, bug #548314
 
   26 Jan 2014; Christoph Junghans <ottxor@gentoo.org> tarsync-0.2.1-r1.ebuild:
   added prefix support
diff --git a/app-arch/tarsync/Manifest b/app-arch/tarsync/Manifest
index fcd4095d9bb6..4d8f8425f2e3 100644
--- a/app-arch/tarsync/Manifest
+++ b/app-arch/tarsync/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tarsync-0.2.1-gcc5.patch 2069 SHA256 411c3d8bb8eeddf3c7bd99ada4a6972f846029eb4febd58fe82d76f8049f595b SHA512 f62fa7f65e506d34d6f9a90579cda2e0568da55cd11c0926dc8f39b5f3d0f4952e6984bd4b6913f3bff938271d37e689e2b8168f393382a04ae269aafbebcd8c WHIRLPOOL 8f60e50eadf801e5940311ad5a8540aa9617cbb76a5e9b9f0a3f261195f264a45b2625b2a86f151e4656b337f053e9343079085ad5a41eee4a07b1167f286234
 AUX tarsync-0.2.1-make.patch 269 SHA256 f3e74f80aaa5c62552b925a6b4ad03eff369f218328a4b3cca6d030c20aefcad SHA512 011c028ffad1575f0b7c1eca10d9744d1466fa74efd9414af54d8b0ef336ef1f7d340ff486a915a946ed2720141016597d3831f452c560bc6fda9569de90643f WHIRLPOOL 6e0c7179d93cf81d4bbf149168693886ac779bd5a16dd52295109bfb1ce1b27dc74aa72e8050e1a72461744bae4df8e9fa13249ba5609d5856ac3f64cf01fcd2
 DIST tarsync-0.2.1.tar.bz2 13593 SHA256 5cbfdcb637b899c29bfb74e97a09daff6173c45201840aa5ac251eb93aef1775 SHA512 bebf8e495ad196c002414c41f9fe9737b5300de18b7c3b16576a7d3bfd94608f36f1b86cb6ed4879c600b71c7706255d9b2d4140b73c5743a473fa2500dbca2d WHIRLPOOL 27ec7ee1942b553aa05e47789b5d0c227a7ba4b239cf6837aeadf168420ebb671b0ac237dbf739d83d538b18d24f054a1e62364b7bd93811ed132958a1ab0417
-EBUILD tarsync-0.2.1-r1.ebuild 807 SHA256 63d0e9a54e867d674f3bec64b289e52fbd001e51864c826a62dcc747d4674915 SHA512 750f40039ea4024eb5e5835f6d002c115ac6ad5c83e634c6b0d9c4464ab1c619fa287883a4889ff8f16de8201b4c6f6826d1fb492fd66f6d3b96d42c19482dea WHIRLPOOL 89a5ac97a960ef94b043f22d854f4a1ab758c9ee163057be7b5786db02db9398b459c11e4f8d0364ff5b1eb6c205128526f4399a3b42b450279089ba2c3026fd
-MISC ChangeLog 3111 SHA256 559e2d3a213ea6728d4dd254df70dd0270b725c010b3abcc33bc67262a6f393e SHA512 9f26363701d69fe35102ff84075e9c626987721e8677a6e2417eeaee7e6eaf32766ce2a5bc8669b69d431c1c5004b9c9d7bc1c50c1281f726aa5a87e7c7c5891 WHIRLPOOL 8854f3c81c23ef534e6243c6f7c50a14e8d00dd91f775ca8de8282406579bb55a797865851b6955c46ec1fbcdc68d4fca04e442357e23b80245e2d6ab92d979c
+EBUILD tarsync-0.2.1-r1.ebuild 845 SHA256 08938fd5c89c174a95767bb7d92f20b89af64136492e8785889994f5cafcecad SHA512 ca96d82e235929922fd40d59593a50db6501322ae46997e0c84f1c7b89c1993e0331431f271dee3266cc8bc44bba721b1a323c4c1f04970bd6c8c30bd2572317 WHIRLPOOL 7031d4eab91fcd3d038c2f0d63fa5aa31344c15eb4018a0913349df80e24d0ffe6d044a30df9dcfc50c3e1702daea2f6d0752daf2cfec14c58e86b06ba70af16
+MISC ChangeLog 3266 SHA256 a5e25ae1d3af7a6d5423903f8f89ef15ef5ab364b989d44a9ab08c7e3b1ec522 SHA512 f0c0fd8955fb37f4b3256c8f46a72023bb9ed1d55e7c417f59f01178708628e34abcd746a532a50315d552f310b16ca0de91cffae9f30ffb54bc6f77c39b13ba WHIRLPOOL 37fe71b37177c019a3e35839ef685c5085c7482cd4d4f333c42211b5a3efa714f956443bac3018ee014732fc74dbff28ad33851b10555eae00cb2985391f0fe4
 MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJS5Y52AAoJEOeBhlrCAAWGgPEIAJJb/N9tbs6s2xMKXgSw5UWN
-o1z0G1aNo6pb1piP11+l1gKhG2j2YmppSH6kPkKZ19r2DT5/tUaAJfxHp9ChnAWy
-/qnqAL6WvYiH2KqYqFSJnn59geNpkFVrXw3XXiayaESI6myC9kuhuf7uAvelSwR/
-c/hmFYawG+6uL06XioavHioH3RslQJEL6avu6mCLlpbv0bHVPlhHWSKmfb6aEl51
-ux9W6+RC7dz1dEdzNQFgDs2ykdqCW4fS3K4vCuajKkUZAtFC7aQyCGLUm1QOKuCi
-UC3Dn/z+aZS3xTP2QYjTLLaoQeGvvnt4TLn311JsL9DmQIUSuZxpf7qVWeAsZbI=
-=e8r/
+iQIcBAEBCAAGBQJVZQSWAAoJELhOzYlK7nn/rJEP/3EZJjVlxDkVpYx29QPLeQc1
+eyKkuxdRd0RGJlndDTiT94buXF+kBGoMI31fMPGg5Jqhl2ToJu/uiPsNG2ckZi1l
+UIcHw87YUm+hwNTXyFsuxcrDtq4X80k9w8CYuaJ01ExBIM+lnSIcuZoQ5VPoImAM
+YyCKp4Woch0fJLWOBhaDlWcXTUZMx+Hx6nAf1TOlQt9n5NkHTDgIGl8vavH7I9I3
+ffRDYyMthZ6WURosdk+nqQSx0tsTo+ie7s9gGVAFHmNuqsahnRc+3ScTOPF0ZxFt
++7oqxADrliPhcCIjStm/rDOJJqCgSwy+eIcfXjdI74ogstyTnvcODlhSe0N0lufS
+VoPII+xkwpPgSPlVqHLEj/KUElzK/zLSuLus+tgB+a3fuJ2KxAZbONrKtbBms9v6
+RzcuEXSspVQRWa1yKJrVq2GAsy1uaxcFxpE4h6B6ZhixHzStZIO8EaKOtk0M4AgO
+dr2LZsnuNrUQ9TICdC/+IW75kwBBIlSVjur/y8vYBSwEYari9W3fPBG5FZ2OyJDX
+YLjbgZX1VKBkX1zKdbDPzpkonzVi+ViIyyJHB9re4JbZGAV9JSbvUBYIDDcSAtdF
+QLKGv8fVUMhN1h4+sHeU7RHak56e+3pNFHb8QiTu+IwwiNi92dtrUTOapjKixbxy
+/wKmtEkpOYpTK35lLZF7
+=Y9On
 -----END PGP SIGNATURE-----
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch b/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
new file mode 100644
index 000000000000..f11c86bb248a
--- /dev/null
+++ b/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
@@ -0,0 +1,59 @@
+diff --git a/excludes.c b/excludes.c
+index b7c928d..fa43cef 100644
+--- a/excludes.c
++++ b/excludes.c
+@@ -106,7 +106,7 @@ build_exclude(fnm_exclude **ex_ptr, const char *pattern)
+ }
+ 
+ 
+-inline int
++int
+ match_excludes(const char *dir, const char *file, fnm_exclude **excludes)
+ {
+ 	char *p;
+diff --git a/main.c b/main.c
+index 84feed4..2c2da3e 100644
+--- a/main.c
++++ b/main.c
+@@ -42,8 +42,8 @@ int remove_node(const char *path, struct stat *st);
+ int ensure_files_layout(const tar_entry **ttar, const unsigned int ttar_count, tar_entry ***missing, 
+ 	unsigned int *missing_count, tar_entry ***existing, unsigned int *existing_count,
+ 	fnm_exclude **excludes);
+-inline int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
+-inline int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
++int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
++int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
+ int copy_whole_file(cfile *tar_cfh, const tar_entry *ttent);
+ 
+ static int check_mtime = 1;
+@@ -669,7 +669,7 @@ recursively_delete_dir(const char *path)
+ 	return ret;
+ }
+ 
+-inline int
++int
+ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st)
+ {
+ 	int type;
+@@ -685,7 +685,7 @@ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st
+ 	return 0;
+ }
+ 
+-inline int
++int
+ enforce_owner(const char *path, const tar_entry *t, struct stat *st)
+ {
+ 	struct stat st2;
+diff --git a/tar.c b/tar.c
+index 792ccd4..42dc8e7 100644
+--- a/tar.c
++++ b/tar.c
+@@ -40,7 +40,7 @@ int check_str_chksum(const char *block)
+ 
+ /* possibly this could be done different, what of endptr of strtol?
+    Frankly I worry about strtol trying to go too far and causing a segfault, due to tar fields not always having trailing \0 */
+-inline unsigned long octal_str2long(const char *string, unsigned int length)
++unsigned long octal_str2long(const char *string, unsigned int length)
+ {
+ 	if(string[length]) {
+ 		char *ptr = strndup(string, length);
diff --git a/app-arch/tarsync/tarsync-0.2.1-r1.ebuild b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
index bca45bd78b0d..7a86ffb41f55 100644
--- a/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
+++ b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tarsync/tarsync-0.2.1-r1.ebuild,v 1.7 2014/01/26 22:38:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tarsync/tarsync-0.2.1-r1.ebuild,v 1.8 2015/05/26 23:41:12 tamiko Exp $
 
 EAPI=5
 
@@ -26,6 +26,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P}-gcc5.patch
 }
 
 src_install() {