diff --git a/tar-1.19-xattrs-conf.patch b/tar-1.19-xattrs-conf.patch deleted file mode 100644 index 43632c3..0000000 --- a/tar-1.19-xattrs-conf.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -urNp tar-1.22-orig/config.hin tar-1.22/config.hin ---- tar-1.22-orig/config.hin 2009-03-05 08:08:07.000000000 +0100 -+++ tar-1.22/config.hin 2009-03-05 09:57:06.000000000 +0100 -@@ -131,6 +131,9 @@ - */ - #undef HAVE_ALLOCA_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_ATTR_XATTR_H -+ - /* Define to 1 if you have the `btowc' function. */ - #undef HAVE_BTOWC - -@@ -372,12 +375,21 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_FEATURES_H - -+/* Define to 1 if you have the `fgetxattr' function. */ -+#undef HAVE_FGETXATTR -+ -+/* Define to 1 if you have the `flistxattr' function. */ -+#undef HAVE_FLISTXATTR -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_FLOAT_H - - /* Define to 1 if you have the `flockfile' function. */ - #undef HAVE_FLOCKFILE - -+/* Define to 1 if you have the `fsetxattr' function. */ -+#undef HAVE_FSETXATTR -+ - /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ - #undef HAVE_FSEEKO - -@@ -423,6 +435,9 @@ - /* Define to 1 if you have the `gettimeofday' function. */ - #undef HAVE_GETTIMEOFDAY - -+/* Define to 1 if you have the `getxattr' function. */ -+#undef HAVE_GETXATTR -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_GRP_H - -@@ -468,15 +483,30 @@ - /* Define to 1 if you have the `lchown' function. */ - #undef HAVE_LCHOWN - -+/* Define to 1 if you have the `lgetxattr' function. */ -+#undef HAVE_LGETXATTR -+ -+/* Define to 1 if you have the `acl' library (-lacl). */ -+#undef HAVE_LIBACL -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_LIBINTL_H - -+/* Define to 1 if you have the `selinux' library (-lselinux). */ -+#undef HAVE_LIBSELINUX -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_LINEWRAP_H - - /* Define to 1 if you have the header file. */ - #undef HAVE_LINUX_FD_H - -+/* Define to 1 if you have the `listxattr' function. */ -+#undef HAVE_LISTXATTR -+ -+/* Define to 1 if you have the `llistxattr' function. */ -+#undef HAVE_LLISTXATTR -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_LOCALE_H - -@@ -486,6 +516,9 @@ - /* Define to 1 if the system has the type `long long int'. */ - #undef HAVE_LONG_LONG_INT - -+/* Define to 1 if you have the `lsetxattr' function. */ -+#undef HAVE_LSETXATTR -+ - /* Define to 1 if you have the `lstat' function. */ - #undef HAVE_LSTAT - -@@ -589,12 +622,18 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_SEARCH_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SELINUX_SELINUX_H -+ - /* Define to 1 if you have the `setenv' function. */ - #undef HAVE_SETENV - - /* Define to 1 if you have the `setlocale' function. */ - #undef HAVE_SETLOCALE - -+/* Define to 1 if you have the `setxattr' function. */ -+#undef HAVE_SETXATTR -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_SGTTY_H - -@@ -734,6 +773,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYSEXITS_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_ACL_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_BITYPES_H - -@@ -891,6 +933,9 @@ - /* Define if utimes works properly. */ - #undef HAVE_WORKING_UTIMES - -+/* Define if we have a working extended attributes */ -+#undef HAVE_XATTRS -+ - /* Define to 1 if the system has the type `_Bool'. */ - #undef HAVE__BOOL - diff --git a/tar-1.22-memleakxheader.patch b/tar-1.22-memleakxheader.patch deleted file mode 100644 index 7b375cb..0000000 --- a/tar-1.22-memleakxheader.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urNp tar-1.22-orig/src/xheader.c tar-1.22/src/xheader.c ---- tar-1.22-orig/src/xheader.c 2009-08-20 18:09:08.000000000 +0200 -+++ tar-1.22/src/xheader.c 2009-08-20 18:23:37.000000000 +0200 -@@ -723,6 +723,8 @@ xheader_read (struct xheader *xhdr, unio - size_t j = 0; - - xheader_init (xhdr); -+ if (xhdr->buffer) -+ free(xhdr->buffer); - size += BLOCKSIZE; - xhdr->size = size; - xhdr->buffer = xmalloc (size + 1); -#@@ -798,7 +800,7 @@ xheader_destroy (struct xheader *xhdr) -# free (xhdr->stk); -# xhdr->stk = NULL; -# } -#- else -#+ else //if (xhdr->buffer) -# free (xhdr->buffer); -# xhdr->buffer = 0; -# xhdr->size = 0; diff --git a/tar-1.22-xheaderleak.patch b/tar-1.22-xheaderleak.patch new file mode 100644 index 0000000..22e1615 --- /dev/null +++ b/tar-1.22-xheaderleak.patch @@ -0,0 +1,11 @@ +diff -urNp tar-1.22-orig/src/xheader.c tar-1.22/src/xheader.c +--- tar-1.22-orig/src/xheader.c 2009-11-23 15:29:22.000000000 +0100 ++++ tar-1.22/src/xheader.c 2009-11-23 15:30:55.000000000 +0100 +@@ -722,7 +722,6 @@ xheader_read (struct xheader *xhdr, unio + { + size_t j = 0; + +- xheader_init (xhdr); + size += BLOCKSIZE; + xhdr->size = size; + xhdr->buffer = xmalloc (size + 1); diff --git a/tar.spec b/tar.spec index b52571d..d845057 100644 --- a/tar.spec +++ b/tar.spec @@ -12,11 +12,11 @@ Source2: tar.1 Patch1: tar-1.14-loneZeroWarning.patch Patch2: tar-1.15.1-vfatTruncate.patch Patch3: tar-1.19-xattrs.patch -Patch4: tar-1.19-xattrs-conf.patch -Patch5: tar-1.17-wildcards.patch -Patch6: tar-1.22-atime-rofs.patch -Patch7: tar-1.22-shortreadbuffer.patch -Patch8: tar-1.22-fortifysourcessigabrt.patch +Patch4: tar-1.17-wildcards.patch +Patch5: tar-1.22-atime-rofs.patch +Patch6: tar-1.22-shortreadbuffer.patch +Patch7: tar-1.22-fortifysourcessigabrt.patch +Patch8: tar-1.22-xheaderleak.patch Prereq: info BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk rsh Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,11 +40,11 @@ the rmt package. %patch1 -p1 -b .loneZeroWarning %patch2 -p1 -b .vfatTruncate %patch3 -p1 -b .xattrs -%patch4 -p1 -b .xattrs-conf -%patch5 -p1 -b .wildcards -%patch6 -p1 -b .rofs -%patch7 -p1 -b .shortread -%patch8 -p1 -b .headerblackmagic +%patch4 -p1 -b .wildcards +%patch5 -p1 -b .rofs +%patch6 -p1 -b .shortread +%patch7 -p1 -b .headerblackmagic +%patch8 -p1 -b .xheaderleak %build autoreconf