From c5c15884dfef11379720bf360599b11a33d49ac0 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 6 Aug 2009 14:30:46 +0200 Subject: [PATCH] maint: move selinux-at module from gl/ to gnulib * gl/lib/selinux-at.c: Remove file. * gl/lib/selinux-at.h: Likewise. * gl/modules/selinux-at: Likewise. * gnulib: update to latest, to get the new module. --- gl/lib/selinux-at.c | 88 --------------------------------------------------- gl/lib/selinux-at.h | 23 -------------- gl/modules/selinux-at | 33 ------------------- gnulib | 2 +- 4 files changed, 1 insertion(+), 145 deletions(-) delete mode 100644 gl/lib/selinux-at.c delete mode 100644 gl/lib/selinux-at.h delete mode 100644 gl/modules/selinux-at diff --git a/gl/lib/selinux-at.c b/gl/lib/selinux-at.c deleted file mode 100644 index 18e6b0f40..000000000 --- a/gl/lib/selinux-at.c +++ /dev/null @@ -1,88 +0,0 @@ -/* openat-style fd-relative functions for SE Linux - Copyright (C) 2007, 2009 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 3 of the License, 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, see . */ - -/* written by Jim Meyering */ - -#include - -#include "selinux-at.h" -#include "openat.h" - -#include -#include -#include -#include - -#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ -#include "save-cwd.h" - -#include "openat-priv.h" - -#define AT_FUNC_NAME getfileconat -#define AT_FUNC_F1 getfilecon -#define AT_FUNC_F2 getfilecon -#define AT_FUNC_USE_F1_COND 1 -#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t *con -#define AT_FUNC_POST_FILE_ARGS , con -#include "at-func.c" -#undef AT_FUNC_NAME -#undef AT_FUNC_F1 -#undef AT_FUNC_F2 -#undef AT_FUNC_USE_F1_COND -#undef AT_FUNC_POST_FILE_PARAM_DECLS -#undef AT_FUNC_POST_FILE_ARGS - -#define AT_FUNC_NAME lgetfileconat -#define AT_FUNC_F1 lgetfilecon -#define AT_FUNC_F2 lgetfilecon -#define AT_FUNC_USE_F1_COND 1 -#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t *con -#define AT_FUNC_POST_FILE_ARGS , con -#include "at-func.c" -#undef AT_FUNC_NAME -#undef AT_FUNC_F1 -#undef AT_FUNC_F2 -#undef AT_FUNC_USE_F1_COND -#undef AT_FUNC_POST_FILE_PARAM_DECLS -#undef AT_FUNC_POST_FILE_ARGS - -#define AT_FUNC_NAME setfileconat -#define AT_FUNC_F1 setfilecon -#define AT_FUNC_F2 setfilecon -#define AT_FUNC_USE_F1_COND 1 -#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t con -#define AT_FUNC_POST_FILE_ARGS , con -#include "at-func.c" -#undef AT_FUNC_NAME -#undef AT_FUNC_F1 -#undef AT_FUNC_F2 -#undef AT_FUNC_USE_F1_COND -#undef AT_FUNC_POST_FILE_PARAM_DECLS -#undef AT_FUNC_POST_FILE_ARGS - -#define AT_FUNC_NAME lsetfileconat -#define AT_FUNC_F1 lsetfilecon -#define AT_FUNC_F2 lsetfilecon -#define AT_FUNC_USE_F1_COND 1 -#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t con -#define AT_FUNC_POST_FILE_ARGS , con -#include "at-func.c" -#undef AT_FUNC_NAME -#undef AT_FUNC_F1 -#undef AT_FUNC_F2 -#undef AT_FUNC_USE_F1_COND -#undef AT_FUNC_POST_FILE_PARAM_DECLS -#undef AT_FUNC_POST_FILE_ARGS diff --git a/gl/lib/selinux-at.h b/gl/lib/selinux-at.h deleted file mode 100644 index 212e25252..000000000 --- a/gl/lib/selinux-at.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Prototypes for openat-style fd-relative SELinux functions - Copyright (C) 2007, 2009 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 3 of the License, 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, see . */ - -#include -#include - -int getfileconat (int fd, char const *file, security_context_t *con); -int lgetfileconat (int fd, char const *file, security_context_t *con); -int setfileconat (int fd, char const *file, security_context_t con); -int lsetfileconat (int fd, char const *file, security_context_t con); diff --git a/gl/modules/selinux-at b/gl/modules/selinux-at deleted file mode 100644 index d1675fe63..000000000 --- a/gl/modules/selinux-at +++ /dev/null @@ -1,33 +0,0 @@ -Description: -openat-style fd-relative functions for SE Linux - -Files: -lib/selinux-at.c -lib/selinux-at.h - -Depends-on: -selinux-h - -configure.ac: -# FIXME: put this in an .m4 file? -# For runcon. -AC_CHECK_HEADERS([selinux/flask.h]) -AC_LIBOBJ([selinux-at]) -gl_save_LIBS=$LIBS - LIB_SELINUX= - AC_SEARCH_LIBS([setfilecon], [selinux], - [test "$ac_cv_search_setfilecon" = "none required" || - LIB_SELINUX=$ac_cv_search_setfilecon]) - AC_SUBST(LIB_SELINUX) -LIBS=$gl_save_LIBS - -Makefile.am: - -Include: -selinux-at.h - -License: -LGPL - -Maintainer: -Jim Meyering diff --git a/gnulib b/gnulib index 8eda5d5dd..27aa23055 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 8eda5d5ddd593f97e1ca524ef4c87d178f5c5d92 +Subproject commit 27aa230554a630b52c2ce1540f6274c0aa4eaed1 -- 2.11.4.GIT