rpms/libcap-ng/devel libcap-ng-0.6.5-device.patch, NONE, 1.1 libcap-ng.spec, 1.17, 1.18
Steve Grubb
sgrubb at fedoraproject.org
Thu Jun 17 18:46:44 UTC 2010
Author: sgrubb
Update of /cvs/pkgs/rpms/libcap-ng/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22089
Modified Files:
libcap-ng.spec
Added Files:
libcap-ng-0.6.5-device.patch
Log Message:
* Thu June 17 2010 Steve Grubb <sgrubb at redhat.com> 0.6.4-3
- Only open regular files in filecap
libcap-ng-0.6.5-device.patch:
filecap.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
--- NEW FILE libcap-ng-0.6.5-device.patch ---
diff -urp libcap-ng-0.6.5.orig/utils/filecap.c libcap-ng-0.6.5/utils/filecap.c
--- libcap-ng-0.6.5.orig/utils/filecap.c 2010-06-17 13:19:21.000000000 -0400
+++ libcap-ng-0.6.5/utils/filecap.c 2010-06-17 14:25:07.000000000 -0400
@@ -41,12 +41,15 @@ static void usage(void)
exit(1);
}
-static int check_file(const char *file,
- const struct stat *sb_unused __attribute__ ((unused)),
- int flag_unused __attribute__ ((unused)),
+static int check_file(const char *fpath,
+ const struct stat *sb,
+ int typeflag_unused __attribute__ ((unused)),
struct FTW *s_unused __attribute__ ((unused)))
{
- int fd = open(file, O_RDONLY);
+ if (S_ISREG(sb->st_mode) == 0)
+ return FTW_CONTINUE;
+
+ int fd = open(fpath, O_RDONLY);
if (fd >= 0) {
capng_results_t rc;
@@ -58,7 +61,7 @@ static int check_file(const char *file,
header = 1;
printf("%-20s capabilities\n", "file");
}
- printf("%s ", file);
+ printf("%s ", fpath);
if (rc == CAPNG_FULL)
printf("full");
else
@@ -68,7 +71,7 @@ static int check_file(const char *file,
}
close(fd);
}
- return 0;
+ return FTW_CONTINUE;
}
Index: libcap-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/devel/libcap-ng.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libcap-ng.spec 24 May 2010 17:39:00 -0000 1.17
+++ libcap-ng.spec 17 Jun 2010 18:46:43 -0000 1.18
@@ -3,11 +3,12 @@
Summary: An alternate posix capabilities library
Name: libcap-ng
Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://people.redhat.com/sgrubb/libcap-ng
Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
+Patch1: libcap-ng-0.6.5-device.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kernel-headers >= 2.6.11
BuildRequires: libattr-devel
@@ -51,6 +52,7 @@ lets you set the file system based capab
%prep
%setup -q
+%patch1 -p1
%build
%configure --libdir=/%{_lib}
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_mandir}/man8/*
%changelog
+* Thu June 17 2010 Steve Grubb <sgrubb at redhat.com> 0.6.4-3
+- Only open regular files in filecap
+
* Mon May 24 2010 Steve Grubb <sgrubb at redhat.com> 0.6.4-2
- In utils subpackage added a requires statement.
More information about the scm-commits
mailing list