From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch | 59 +++++++++++++++++++++++++ app-arch/tarsync/files/tarsync-0.2.1-make.patch | 13 ++++++ 2 files changed, 72 insertions(+) create mode 100644 app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch create mode 100644 app-arch/tarsync/files/tarsync-0.2.1-make.patch (limited to 'app-arch/tarsync/files') 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/files/tarsync-0.2.1-make.patch b/app-arch/tarsync/files/tarsync-0.2.1-make.patch new file mode 100644 index 000000000000..72591115a45a --- /dev/null +++ b/app-arch/tarsync/files/tarsync-0.2.1-make.patch @@ -0,0 +1,13 @@ +Respect CC and LDFLAGS. + +--- Makefile ++++ Makefile +@@ -2,7 +2,7 @@ + CC=gcc + endif + tarsync: main.o names.o tar.o string-misc.o fs.o options.o excludes.o +- gcc $(CFLAGS) $^ -o tarsync -lcfile ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o tarsync -lcfile + all: tarsync + + clean: -- cgit v1.2.3