rpms/attr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

synced with devel

Browse source
This commit is contained in:
Kamil Dudka 2009-11-26 18:46:54 +00:00
commit b0ac91befe
5 changed files with 67 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

14
attr-2.2.0-multilib.patch
View file

@ -1,11 +1,13 @@
--- attr-2.2.0/include/buildmacros.multilib 2003-01-28 19:00:05.000000000 -0500
+++ attr-2.2.0/include/buildmacros 2003-01-28 19:04:13.000000000 -0500
@@ -103,8 +103,6 @@
../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
diff --git a/include/buildmacros b/include/buildmacros
index ab89182..17423c0 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
fi
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

20
attr-2.4.32-build.patch
View file

@ -1,6 +1,8 @@
--- attr-2.4.32/include/builddefs.in.build 2006-06-20 08:51:25.000000000 +0200
+++ attr-2.4.32/include/builddefs.in 2006-07-05 16:25:44.000000000 +0200
@@ -25,14 +25,14 @@
diff --git a/include/builddefs.in b/include/builddefs.in
index 6df0f5a..575a6df 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -40,14 +40,14 @@ PKG_RELEASE = @pkg_release@
PKG_VERSION = @pkg_version@
PKG_PLATFORM = @pkg_platform@
PKG_DISTRIBUTION= @pkg_distribution@
@ -23,14 +25,16 @@
CC = @cc@
AWK = @awk@
--- attr-2.4.32/include/buildmacros.build 2006-07-05 16:23:30.000000000 +0200
+++ attr-2.4.32/include/buildmacros 2006-07-05 16:23:30.000000000 +0200
@@ -26,7 +26,7 @@
diff --git a/include/buildmacros b/include/buildmacros
index ab89182..3118a17 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
$(LFILES:.l=.o) \
$(YFILES:%.y=%.tab.o)
-INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL = $(TOPDIR)/install-sh
-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL = $(TOPDIR)/include/install-sh
SHELL = /bin/sh
IMAGES_DIR = $(TOPDIR)/all-images

67
attr-2.4.43-leak.patch
View file

@ -1,33 +1,34 @@
diff -up attr-2.4.43/libattr/attr_copy_action.c.leak attr-2.4.43/libattr/attr_copy_action.c
--- attr-2.4.43/libattr/attr_copy_action.c.leak 2008-06-30 07:22:50.000000000 +0200
+++ attr-2.4.43/libattr/attr_copy_action.c 2009-02-17 09:50:38.000000000 +0100
@@ -53,7 +53,7 @@ free_attr_actions(void)
static int
attr_parse_attr_conf(struct error_context *ctx)
{
- char *text, *t;
+ char *text = NULL, *t;
size_t size_guess = 4096, len;
FILE *file;
char *pattern = NULL;
@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_contex
return 0;
repeat:
- text = malloc(size_guess + 1);
- if (!text)
- goto fail;
-
if ((file = fopen(ATTR_CONF, "r")) == NULL) {
if (errno == ENOENT)
return 0;
goto fail;
}
+
+ text = malloc(size_guess + 1);
+ if (!text)
+ goto fail;
+
len = fread(text, 1, size_guess, file);
if (ferror(file))
goto fail;
diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
index 0d7aca5..dc94224 100644
--- a/libattr/attr_copy_action.c
+++ b/libattr/attr_copy_action.c
@@ -53,7 +53,7 @@ free_attr_actions(void)
static int
attr_parse_attr_conf(struct error_context *ctx)
{
- char *text, *t;
+ char *text = NULL, *t;
size_t size_guess = 4096, len;
FILE *file;
char *pattern = NULL;
@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_context *ctx)
return 0;
repeat:
- text = malloc(size_guess + 1);
- if (!text)
- goto fail;
-
if ((file = fopen(ATTR_CONF, "r")) == NULL) {
if (errno == ENOENT)
return 0;
goto fail;
}
+
+ text = malloc(size_guess + 1);
+ if (!text)
+ goto fail;
+
len = fread(text, 1, size_guess, file);
if (ferror(file))
goto fail;

20
attr.spec
View file

@ -1,10 +1,10 @@
Summary: Utilities for managing filesystem extended attributes
Name: attr
Version: 2.4.43
Release: 4%{?dist}
Version: 2.4.44
Release: 1%{?dist}
Conflicts: xfsdump < 2.0.0
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_%{version}-1.tar.gz
Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr-%{version}.src.tar.gz
Patch1: attr-2.2.0-multilib.patch
Patch2: attr-2.4.32-build.patch
Patch3: attr-2.4.43-leak.patch
@ -55,9 +55,9 @@ you'll also want to install attr.
# because we don't want to drag perl into the base. Users advanced
# enough to have used ACLs before they were added to the distro can
# figure out how to chmod and how to install perl. :-)
%patch1 -p1 -b .multilib
%patch2 -p1 -b .build
%patch3 -p1 -b .leak
%patch1 -p1
%patch2 -p1
%patch3 -p1
autoconf
@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libattr -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root)
%defattr(-,root,root,-)
%doc doc
%{_bindir}/attr
%{_bindir}/getfattr
@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/attr.5*
%files -n libattr-devel
%defattr(-,root,root)
%defattr(-,root,root,-)
/%{_lib}/libattr.so
%{_includedir}/attr
%{_libdir}/libattr.*
@ -109,9 +109,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/attr_*.3.*
%files -n libattr
%defattr(-,root,root,-)
/%{_lib}/libattr.so.*
%changelog
* Thu Nov 26 2009 Kamil Dudka <kdudka@redhat.com> 2.4.44-1
- new upstream release
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.43-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

2
sources
View file

@ -1 +1 @@
91583a14bcbd637adaa9b07ea49c5d4b attr_2.4.43-1.tar.gz
adeefe65c5ad1febe46da185c5bfd5d4 attr-2.4.44.src.tar.gz