[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/tar/FC-5 tar-1.15.1-xattrs.patch,1.2,1.3 tar.spec,1.38,1.39



Author: pvrabec

Update of /cvs/dist/rpms/tar/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8833

Modified Files:
	tar-1.15.1-xattrs.patch tar.spec 
Log Message:
another fix of tar-1.15.1-xattrs.patch from James Antill


tar-1.15.1-xattrs.patch:
 Makefile.in         |   24 +
 aclocal.m4          |  386 +++++++------------------
 config.hin          |   45 ++
 config/config.guess |  141 +++------
 config/config.sub   |  111 +------
 configure           |  790 +++++++++++++++++++++++++++++++++++++++++++++++++---
 configure.ac        |    9 
 doc/Makefile.in     |   17 -
 doc/header.texi     |   22 +
 doc/stamp-vti       |    4 
 doc/tar.info        |  409 +++++++++++++++-----------
 doc/tar.texi        |   47 +++
 doc/version.texi    |    4 
 lib/Makefile.in     |    6 
 lib/localedir.h     |    2 
 rmt/Makefile.in     |    9 
 scripts/Makefile.in |   10 
 src/Makefile.am     |    7 
 src/Makefile.in     |   23 -
 src/common.h        |   24 +
 src/create.c        |   36 ++
 src/extract.c       |  124 ++++++--
 src/list.c          |    7 
 src/misc.c          |    4 
 src/tar.c           |   80 +++++
 src/tar.h           |   22 +
 src/xattrs.c        |  402 ++++++++++++++++++++++++++
 src/xattrs.h        |   14 
 src/xheader.c       |  318 +++++++++++++++++---
 tests/Makefile.in   |    6 
 30 files changed, 2306 insertions(+), 797 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 tar-1.15.1-xattrs.patch
Index: tar-1.15.1-xattrs.patch
===================================================================
RCS file: /cvs/dist/rpms/tar/FC-5/tar-1.15.1-xattrs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tar-1.15.1-xattrs.patch	2 Oct 2006 13:04:09 -0000	1.2
+++ tar-1.15.1-xattrs.patch	10 Oct 2006 09:13:14 -0000	1.3
@@ -1,4208 +1,24 @@
---- tar-1.15.1/lib/localedir.h.xattrs	2004-12-21 15:01:12.000000000 +0100
-+++ tar-1.15.1/lib/localedir.h	2006-10-01 08:32:50.000000000 +0200
-@@ -1,4 +1,4 @@
- #define LOCALEDIR "/usr/share/locale"
- #ifndef DEFAULT_RMT_COMMAND
--# define DEFAULT_RMT_COMMAND "/etc/rmt"
-+# define DEFAULT_RMT_COMMAND "/sbin/rmt"
- #endif
---- tar-1.15.1/lib/Makefile.in.xattrs	2004-12-21 14:31:00.000000000 +0100
-+++ tar-1.15.1/lib/Makefile.in	2006-10-01 08:32:13.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.3 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -20,8 +20,6 @@
- # Free Software Foundation, Inc.
- 
- 
--SOURCES = $(libtar_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
---- tar-1.15.1/config.hin.xattrs	2004-12-21 14:33:11.000000000 +0100
-+++ tar-1.15.1/config.hin	2006-10-01 08:32:13.000000000 +0200
-@@ -76,6 +76,9 @@
-    includes <alloca.h> only if HAVE_ALLOCA_H is defined. */
- #undef HAVE_ALLOCA_H
- 
-+/* Define to 1 if you have the <attr/xattr.h> header file. */
-+#undef HAVE_ATTR_XATTR_H
-+
- /* Define to 1 if you have the `btowc' function. */
- #undef HAVE_BTOWC
- 
-@@ -222,9 +225,18 @@
- /* Define to 1 if you have the <features.h> 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 `flockfile' function. */
- #undef HAVE_FLOCKFILE
- 
-+/* Define to 1 if you have the `fsetxattr' function. */
-+#undef HAVE_FSETXATTR
-+
- /* Define to 1 if you have the `fsync' function. */
- #undef HAVE_FSYNC
- 
-@@ -252,6 +264,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 if you have the iconv() function. */
- #undef HAVE_ICONV
- 
-@@ -280,12 +295,27 @@
- /* 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 `selinux' library (-lselinux). */
-+#undef HAVE_LIBSELINUX
-+
- /* Define to 1 if you have the <linewrap.h> header file. */
- #undef HAVE_LINEWRAP_H
- 
- /* Define to 1 if you have the <linux/fd.h> 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 <locale.h> header file. */
- #undef HAVE_LOCALE_H
- 
-@@ -298,6 +328,9 @@
- /* Define if you have the 'long long' type. */
- #undef HAVE_LONG_LONG
- 
-+/* Define to 1 if you have the `lsetxattr' function. */
-+#undef HAVE_LSETXATTR
-+
- /* Define to 1 if you have the `lstat' function. */
- #undef HAVE_LSTAT
- 
-@@ -358,12 +391,18 @@
- /* Define to 1 if you have the <search.h> header file. */
- #undef HAVE_SEARCH_H
- 
-+/* Define to 1 if you have the <selinux/selinux.h> 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 <sgtty.h> header file. */
- #undef HAVE_SGTTY_H
- 
-@@ -473,6 +512,9 @@
- /* Define to 1 if you have the <sysexits.h> header file. */
- #undef HAVE_SYSEXITS_H
- 
-+/* Define to 1 if you have the <sys/acl.h> header file. */
-+#undef HAVE_SYS_ACL_H
-+
- /* Define to 1 if you have the <sys/buf.h> header file. */
- #undef HAVE_SYS_BUF_H
- 
-@@ -580,6 +622,9 @@
- /* Define to 1 if you have the `wmempcpy' function. */
- #undef HAVE_WMEMPCPY
- 
-+/* Define if we have a working extended attributes */
-+#undef HAVE_XATTRS
-+
- /* Define to 1 if the system has the type `_Bool'. */
- #undef HAVE__BOOL
- 
---- tar-1.15.1/configure.ac.xattrs	2004-12-21 14:29:02.000000000 +0100
-+++ tar-1.15.1/configure.ac	2006-10-01 08:32:13.000000000 +0200
-@@ -40,6 +40,9 @@
-   sys/inet.h sys/io/trioctl.h \
-   sys/mtio.h sys/time.h sys/tprintf.h sys/tape.h \
-   unistd.h locale.h)
-+AC_CHECK_HEADERS(selinux/selinux.h)
-+AC_CHECK_HEADERS(attr/xattr.h)
-+AC_CHECK_HEADERS(sys/acl.h)
+--- tar-1.15.1/config/config.sub.xattrs	2004-12-15 09:55:00.000000000 +0100
++++ tar-1.15.1/config/config.sub	2006-10-04 11:52:36.000000000 +0200
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
- AC_CHECK_HEADERS([sys/buf.h], [], [],
- [#if HAVE_SYS_PARAM_H
-@@ -110,6 +113,12 @@
- LIBS=$tar_save_LIBS
+-timestamp='2004-08-29'
++timestamp='2003-06-18'
  
- AC_CHECK_FUNCS(fsync lstat mkfifo readlink strerror symlink setlocale utimes)
-+AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \
-+               setxattr  fsetxattr  lsetxattr \
-+               listxattr flistxattr llistxattr,
-+               AC_DEFINE(HAVE_XATTRS,,[Define if we have a working extended attributes]),)
-+AC_CHECK_LIB(selinux, getfilecon)
-+AC_CHECK_LIB(acl, acl_get_fd)
- AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>])
- AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>])
- AC_CHECK_DECLS([time],,, [#include <time.h>])
---- tar-1.15.1/configure.xattrs	2006-10-01 08:32:13.000000000 +0200
-+++ tar-1.15.1/configure	2006-10-01 08:32:13.000000000 +0200
-@@ -5317,6 +5317,456 @@
- done
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -70,7 +70,7 @@
+ version="\
[...8054 lines suppressed...]
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
++# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
++# serial 4
+ 
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -689,27 +576,16 @@
+ fi
+ ])
+ 
++# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-
+-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
++#
+ # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+ # created by `make install' are always world readable, even if the
+ # installer happens to have an overly restrictive umask (e.g. 077).
+@@ -763,26 +639,15 @@
+ fi
+ AC_SUBST([mkdir_p])])
+ 
+-# Helper functions for option handling.                    -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 2
++# serial 3
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -807,28 +672,16 @@
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-#
+-# Check to make sure that the build environment is sane.
+-#
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
++# serial 4
+ 
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -871,25 +724,14 @@
+ fi
+ AC_MSG_RESULT(yes)])
+ 
+-# AM_PROG_INSTALL_STRIP
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# AM_PROG_INSTALL_STRIP
++# ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries.  This is especially
+ # annoying in cross-compiling environments, where the build's strip
+@@ -912,25 +754,13 @@
+ 
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-# Copyright (C) 2004  Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
+-# serial 1
++# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# serial 2
+ 
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/FC-5/tar.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tar.spec	2 Oct 2006 13:04:09 -0000	1.38
+++ tar.spec	10 Oct 2006 09:13:14 -0000	1.39
@@ -2,7 +2,7 @@
 Name: tar
 Epoch: 2
 Version: 1.15.1
-Release: 15.FC5
+Release: 16.FC5
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -113,6 +113,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Oct 10 2006 Peter Vrabec <pvrabec redhat com> 2:1.15.1-16.FC5
+- another fix of tar-1.15.1-xattrs.patch from James Antill
+
 * Mon Oct 02 2006 Peter Vrabec <pvrabec redhat com> 2:1.15.1-15.FC5
 - fix tar-1.15.1-xattrs.patch (#208701)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]