From: Schantl Stefan <Stevee@ipfire.org>
Date: Sat, 6 Nov 2010 18:42:27 +0000 (+0100)
Subject: libcap-ng: Update to 0.6.5.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba3c038fa9aba1fe310868ec934ea426409fa27c;p=ipfire-3.x.git

libcap-ng: Update to 0.6.5.

This fixes #84.
---

diff --git a/pkgs/core/libcap-ng/libcap-ng.nm b/pkgs/core/libcap-ng/libcap-ng.nm
index daca254e2..189f2a083 100644
--- a/pkgs/core/libcap-ng/libcap-ng.nm
+++ b/pkgs/core/libcap-ng/libcap-ng.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = libcap-ng
-PKG_VER        = 0.6.4
+PKG_VER        = 0.6.5
 PKG_REL        = 0
 
 PKG_MAINTAINER =
diff --git a/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch b/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch
deleted file mode 100644
index 7effd72f1..000000000
--- a/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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;
- }
- 
-