From bf87957ec0d238f2a6f7f774f85e1b4af63ec05a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:44:23 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for attr --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 9cf70ecdca07f9e9cedb76fd27df6f2db5c08255 Mon Sep 17 00:00:00 2001 From: Zdenek Prikryl Date: Wed, 18 Feb 2009 16:43:18 +0000 Subject: [PATCH 2/4] Fixed memory leaks (#485473) --- attr-2.4.43-leak.patch | 33 +++++++++++++++++++++++++++++++++ attr.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 attr-2.4.43-leak.patch diff --git a/attr-2.4.43-leak.patch b/attr-2.4.43-leak.patch new file mode 100644 index 0000000..f7fb16c --- /dev/null +++ b/attr-2.4.43-leak.patch @@ -0,0 +1,33 @@ +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/attr.spec b/attr.spec index 4a30535..5ad8425 100644 --- a/attr.spec +++ b/attr.spec @@ -1,12 +1,13 @@ Summary: Utilities for managing filesystem extended attributes Name: attr Version: 2.4.43 -Release: 1%{?dist} +Release: 2%{?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 Patch1: attr-2.2.0-multilib.patch Patch2: attr-2.4.32-build.patch +Patch3: attr-2.4.43-leak.patch License: GPLv2+ URL: http://oss.sgi.com/projects/xfs/ Group: System Environment/Base @@ -56,6 +57,7 @@ you'll also want to install attr. # figure out how to chmod and how to install perl. :-) %patch1 -p1 -b .multilib %patch2 -p1 -b .build +%patch3 -p1 -b .leak autoconf @@ -110,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libattr.so.* %changelog +* Wed Feb 18 2009 Zdenek Prikryl 2.4.43-2 +- Fixed memory leaks (#485473) + * Wed Jul 16 2008 Zdenek Prikryl 2.4.43-1 - New version 2.4.43 From cbb157322cbdc681036aab5dbaf6624091584754 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:49 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4e25e0a..5a1b053 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: attr -# $Id: Makefile,v 1.1 2004/09/09 03:14:35 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:37:35 notting Exp $ NAME := attr SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 50a8fdae9128e4b39b20028dc4f1591f36d7fe8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:28:19 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5a1b053..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: attr -# $Id: Makefile,v 1.2 2007/10/15 18:37:35 notting Exp $ -NAME := attr -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10