Sign in

src / upstream-forks / libacl

Open in Gitea

autohell to CMake

Sander committed on 2026-06-08 · a9663b5

26 files changed +261 −583

  • + CMakeLists.txt
  • + README.md
  • + cmake/aclConfig.cmake.in
  • + cmake/config.h.in
  • − Makefile.am
  • − README
  • − autogen.sh
  • − configure.ac
  • − doc/Makemodule.am
  • − examples/Makemodule.am
  • − include/Makemodule.am
  • − libacl/Makemodule.am
  • − libmisc/Makemodule.am
  • − m4/.gitignore
  • − m4/package_attrdev.m4
  • − m4/visibility_hidden.m4
  • − man/Makemodule.am
  • − man/man1/Makemodule.am
  • − man/man3/Makemodule.am
  • − man/man5/Makemodule.am
  • − po/.gitignore
  • − po/Makevars
  • − po/update-potfiles
  • − test/Makemodule.am
  • − tools/Makemodule.am
  • • .gitignore
1diff --git a/.gitignore b/.gitignore
2index 71d529c..ddf87ed 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1,12 +1,7 @@
6 *~
7-*.la
8-*.lo
9-*.mo
10 *.o
11 *.pc
12-.dirstamp
13-.deps/
14-.libs/
15+*.mo
16
17 /Logs/
18
19@@ -15,23 +10,7 @@
20 /getfacl
21 /setfacl
22
23-/ABOUT-NLS
24-/aclocal.m4
25-/autom4te.cache/
26-/build-aux/
27-/config.*
28-/configure
29-/configure.lineno
30-/libtool
31-/m4/
32-Makefile
33-Makefile.in
34-stamp-h1
35-
36 *.log
37 *.trs
38
39-/include/acl
40-/include/config.h
41-/include/config.h.in
42-/include/sys
43+/build/
44diff --git a/CMakeLists.txt b/CMakeLists.txt
45new file mode 100644
46index 0000000..8c7cd8f
47--- /dev/null
48+++ b/CMakeLists.txt
49@@ -0,0 +1,239 @@
50+cmake_minimum_required(VERSION 3.16)
51+
52+project(acl
53+ VERSION 2.3.2
54+ DESCRIPTION "A library for POSIX Access Control Lists"
55+ LANGUAGES C)
56+
57+option(BUILD_STATIC "Also build a static libacl.a alongside the shared library" ON)
58+
59+include(GNUInstallDirs)
60+include(CMakePackageConfigHelpers)
61+include(CheckCSourceCompiles)
62+include(CheckIncludeFile)
63+include(TestBigEndian)
64+
65+set(CMAKE_REQUIRED_FLAGS "-Werror")
66+check_c_source_compiles("
67+int foo __attribute__ ((visibility (\"hidden\"))) = 1;
68+int bar __attribute__ ((visibility (\"protected\"))) = 1;
69+int main(void) { return 0; }
70+" HAVE_VISIBILITY_ATTRIBUTE)
71+unset(CMAKE_REQUIRED_FLAGS)
72+
73+if(HAVE_VISIBILITY_ATTRIBUTE)
74+ set(ACL_EXPORT_DEFINE "__attribute__ ((visibility (\"default\"))) extern")
75+else()
76+ set(ACL_EXPORT_DEFINE "extern")
77+endif()
78+
79+test_big_endian(WORDS_BIGENDIAN)
80+
81+check_include_file("attr/error_context.h" HAVE_ATTR_ERROR_CONTEXT_H)
82+if(NOT HAVE_ATTR_ERROR_CONTEXT_H)
83+ message(FATAL_ERROR "attr/error_context.h not found - install the extended attributes (attr) development package")
84+endif()
85+
86+find_library(ATTR_LIBRARY NAMES attr libattr.so.1)
87+if(NOT ATTR_LIBRARY)
88+ message(FATAL_ERROR "libattr not found - install the extended attributes (attr) development package")
89+endif()
90+
91+configure_file(
92+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in"
93+ "${CMAKE_CURRENT_BINARY_DIR}/include/config.h"
94+ @ONLY)
95+
96+# libacl's sources include their public headers as <acl/libacl.h> and
97+# <sys/acl.h>; reproduce the include/acl and include/sys symlinks that
98+# configure.ac sets up via AC_CONFIG_COMMANDS so those includes resolve
99+# to our own headers without installing them first.
100+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include")
101+foreach(_alias acl sys)
102+ if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/include/${_alias}")
103+ file(CREATE_LINK
104+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
105+ "${CMAKE_CURRENT_BINARY_DIR}/include/${_alias}"
106+ SYMBOLIC)
107+ endif()
108+endforeach()
109+
110+add_library(misc OBJECT
111+ libmisc/uid_gid_lookup.c
112+ libmisc/high_water_alloc.c
113+ libmisc/next_line.c
114+ libmisc/quote.c
115+ libmisc/unquote.c
116+ libmisc/walk_tree.c)
117+
118+set_target_properties(misc PROPERTIES POSITION_INDEPENDENT_CODE ON)
119+
120+target_include_directories(misc PRIVATE
121+ "${CMAKE_CURRENT_BINARY_DIR}/include"
122+ "${CMAKE_CURRENT_SOURCE_DIR}/include")
123+
124+target_compile_definitions(misc PRIVATE _GNU_SOURCE)
125+
126+set(ACL_SOURCES
127+ libacl/acl_add_perm.c
128+ libacl/acl_calc_mask.c
129+ libacl/acl_clear_perms.c
130+ libacl/acl_copy_entry.c
131+ libacl/acl_copy_ext.c
132+ libacl/acl_copy_int.c
133+ libacl/acl_create_entry.c
134+ libacl/acl_delete_def_file.c
135+ libacl/acl_delete_entry.c
136+ libacl/acl_delete_perm.c
137+ libacl/acl_dup.c
138+ libacl/acl_free.c
139+ libacl/acl_from_text.c
140+ libacl/acl_get_entry.c
141+ libacl/acl_get_fd.c
142+ libacl/acl_get_file.c
143+ libacl/acl_get_perm.c
144+ libacl/acl_get_permset.c
145+ libacl/acl_get_qualifier.c
146+ libacl/acl_get_tag_type.c
147+ libacl/acl_init.c
148+ libacl/acl_set_fd.c
149+ libacl/acl_set_file.c
150+ libacl/acl_set_permset.c
151+ libacl/acl_set_qualifier.c
152+ libacl/acl_set_tag_type.c
153+ libacl/acl_size.c
154+ libacl/acl_to_text.c
155+ libacl/acl_valid.c
156+ libacl/acl_check.c
157+ libacl/acl_cmp.c
158+ libacl/acl_entries.c
159+ libacl/acl_equiv_mode.c
160+ libacl/acl_error.c
161+ libacl/acl_extended_fd.c
162+ libacl/acl_extended_file.c
163+ libacl/acl_extended_file_nofollow.c
164+ libacl/acl_from_mode.c
165+ libacl/acl_to_any_text.c
166+ libacl/__acl_extended_file.c
167+ libacl/__acl_from_xattr.c
168+ libacl/__acl_reorder_obj_p.c
169+ libacl/__acl_to_any_text.c
170+ libacl/__acl_to_xattr.c
171+ libacl/__apply_mask_to_mode.c
172+ libacl/__libobj.c
173+ libacl/perm_copy_fd.c
174+ libacl/perm_copy_file.c)
175+
176+add_library(acl SHARED ${ACL_SOURCES} $<TARGET_OBJECTS:misc>)
177+add_library(acl::acl ALIAS acl)
178+set(ACL_TARGETS acl)
179+
180+if(BUILD_STATIC)
181+ add_library(acl_static STATIC ${ACL_SOURCES} $<TARGET_OBJECTS:misc>)
182+ add_library(acl::acl_static ALIAS acl_static)
183+ set_target_properties(acl_static PROPERTIES OUTPUT_NAME acl)
184+ list(APPEND ACL_TARGETS acl_static)
185+endif()
186+
187+# Mirrors exports' libtool version info (LT_CURRENT:LT_REVISION:LT_AGE,
188+# with LT_REVISION derived from PACKAGE_VERSION as MmPP).
189+set(ACL_LT_CURRENT 2)
190+set(ACL_LT_AGE 1)
191+set(_acl_lt_patch "${PROJECT_VERSION_PATCH}")
192+if(_acl_lt_patch LESS 10)
193+ set(_acl_lt_patch "0${_acl_lt_patch}")
194+endif()
195+set(ACL_LT_REVISION "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${_acl_lt_patch}")
196+math(EXPR ACL_SOVERSION "${ACL_LT_CURRENT} - ${ACL_LT_AGE}")
197+
198+set_target_properties(acl PROPERTIES
199+ OUTPUT_NAME acl
200+ VERSION "${ACL_SOVERSION}.${ACL_LT_AGE}.${ACL_LT_REVISION}"
201+ SOVERSION "${ACL_SOVERSION}")
202+
203+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
204+ target_link_options(acl PRIVATE
205+ "LINKER:--version-script,${CMAKE_CURRENT_SOURCE_DIR}/exports")
206+ set_target_properties(acl PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/exports")
207+endif()
208+
209+foreach(_acl_target ${ACL_TARGETS})
210+ set_target_properties(${_acl_target} PROPERTIES
211+ C_VISIBILITY_PRESET hidden
212+ VISIBILITY_INLINES_HIDDEN ON)
213+
214+ target_include_directories(${_acl_target} PRIVATE
215+ "${CMAKE_CURRENT_BINARY_DIR}/include"
216+ "${CMAKE_CURRENT_SOURCE_DIR}/include")
217+
218+ target_include_directories(${_acl_target} PUBLIC
219+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
220+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
221+
222+ target_compile_definitions(${_acl_target} PRIVATE _GNU_SOURCE)
223+
224+ # libacl's sources rely on perm_copy.h being force-included to provide the
225+ # HAVE_ACL_* feature defines that the rest of config.h would normally supply.
226+ target_compile_options(${_acl_target} PRIVATE
227+ -include "${CMAKE_CURRENT_SOURCE_DIR}/libacl/perm_copy.h")
228+
229+ target_link_libraries(${_acl_target} PRIVATE ${ATTR_LIBRARY})
230+endforeach()
231+
232+# Public headers are installed as <prefix>/include/acl/libacl.h and
233+# <prefix>/include/sys/acl.h, with the EXPORT macro substituted by "extern"
234+# (the same subst_install_header transform that include/Makemodule.am performs).
235+set(_acl_installed_headers_dir "${CMAKE_CURRENT_BINARY_DIR}/include-installed")
236+foreach(_acl_header_spec "libacl.h:acl" "acl.h:sys")
237+ string(REPLACE ":" ";" _acl_header_spec "${_acl_header_spec}")
238+ list(GET _acl_header_spec 0 _acl_header_name)
239+ list(GET _acl_header_spec 1 _acl_header_subdir)
240+ set(_acl_header_out "${_acl_installed_headers_dir}/${_acl_header_subdir}/${_acl_header_name}")
241+ file(READ "${CMAKE_CURRENT_SOURCE_DIR}/include/${_acl_header_name}" _acl_header_content)
242+ string(REPLACE "EXPORT" "extern" _acl_header_content "${_acl_header_content}")
243+ file(WRITE "${_acl_header_out}" "${_acl_header_content}")
244+ install(FILES "${_acl_header_out}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${_acl_header_subdir}")
245+endforeach()
246+
247+# install
248+
249+install(TARGETS ${ACL_TARGETS}
250+ EXPORT aclTargets
251+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
252+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
253+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
254+
255+install(EXPORT aclTargets
256+ NAMESPACE acl::
257+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/acl")
258+
259+write_basic_package_version_file(
260+ "${CMAKE_CURRENT_BINARY_DIR}/aclConfigVersion.cmake"
261+ VERSION "${PROJECT_VERSION}"
262+ COMPATIBILITY SameMajorVersion)
263+
264+configure_package_config_file(
265+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/aclConfig.cmake.in"
266+ "${CMAKE_CURRENT_BINARY_DIR}/aclConfig.cmake"
267+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/acl")
268+
269+install(FILES
270+ "${CMAKE_CURRENT_BINARY_DIR}/aclConfig.cmake"
271+ "${CMAKE_CURRENT_BINARY_DIR}/aclConfigVersion.cmake"
272+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/acl")
273+
274+# pkgconfig
275+
276+set(prefix "${CMAKE_INSTALL_PREFIX}")
277+set(exec_prefix "\${prefix}")
278+set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
279+set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
280+set(PACKAGE_VERSION "${PROJECT_VERSION}")
281+
282+configure_file(
283+ "${CMAKE_CURRENT_SOURCE_DIR}/libacl.pc.in"
284+ "${CMAKE_CURRENT_BINARY_DIR}/libacl.pc"
285+ @ONLY)
286+
287+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libacl.pc"
288+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
289diff --git a/Makefile.am b/Makefile.am
290deleted file mode 100644
291index e19a80d..0000000
292--- a/Makefile.am
293+++ /dev/null
294@@ -1,36 +0,0 @@
295-ACLOCAL_AMFLAGS = -I m4
296-
297-EXTRA_DIST = \
298- exports
299-
300-SUBDIRS = po
301-
302-AM_CPPFLAGS = \
303- -I$(top_builddir)/include \
304- -I$(top_srcdir)/include \
305- -DLOCALEDIR=\"$(localedir)\"
306-
307-pkgconfdir = $(libdir)/pkgconfig
308-sysincludedir = $(includedir)/sys
309-
310-pkgconf_DATA = libacl.pc
311-pkginclude_HEADERS =
312-sysinclude_HEADERS =
313-bin_PROGRAMS =
314-lib_LTLIBRARIES =
315-noinst_HEADERS =
316-noinst_LTLIBRARIES =
317-dist_doc_DATA =
318-dist_man_MANS =
319-
320-update-po:
321- $(MAKE) -C po $@
322-
323-include doc/Makemodule.am
324-include examples/Makemodule.am
325-include include/Makemodule.am
326-include libacl/Makemodule.am
327-include libmisc/Makemodule.am
328-include man/Makemodule.am
329-include test/Makemodule.am
330-include tools/Makemodule.am
331diff --git a/README b/README
332deleted file mode 100644
333index 474c99f..0000000
334--- a/README
335+++ /dev/null
336@@ -1,10 +0,0 @@
337-Access control list package README
338-__________________________________
339-
340-Package home: https://savannah.nongnu.org/projects/acl
341-
342-See the file doc/INSTALL for build, installation and post-
343-install configuration steps.
344-
345-Refer to the acl(5) manual page for general access control list
346-information and references to other related manual pages.
347diff --git a/README.md b/README.md
348new file mode 100644
349index 0000000..d451939
350--- /dev/null
351+++ b/README.md
352@@ -0,0 +1,5 @@
353+# Access control list
354+
355+upstream source: https://savannah.nongnu.org/projects/acl
356+
357+Replaced GNU Autohell, now using CMake.
358diff --git a/autogen.sh b/autogen.sh
359deleted file mode 100755
360index 01b2211..0000000
361--- a/autogen.sh
362+++ /dev/null
363@@ -1,6 +0,0 @@
364-#!/bin/sh -ex
365-po/update-potfiles
366-autopoint --force
367-am_libdir=$(automake --print-libdir)
368-cp "${am_libdir}/INSTALL" doc/
369-exec autoreconf -f -i
370diff --git a/cmake/aclConfig.cmake.in b/cmake/aclConfig.cmake.in
371new file mode 100644
372index 0000000..787a394
373--- /dev/null
374+++ b/cmake/aclConfig.cmake.in
375@@ -0,0 +1,5 @@
376+@PACKAGE_INIT@
377+
378+include("${CMAKE_CURRENT_LIST_DIR}/aclTargets.cmake")
379+
380+check_required_components(acl)
381diff --git a/cmake/config.h.in b/cmake/config.h.in
382new file mode 100644
383index 0000000..7bd3ba4
384--- /dev/null
385+++ b/cmake/config.h.in
386@@ -0,0 +1,10 @@
387+/* Minimal generated configuration header for the libacl CMake build.
388+ Mirrors the subset of include/config.h (normally produced by autoconf)
389+ that libacl's sources actually rely on. */
390+
391+#cmakedefine HAVE_VISIBILITY_ATTRIBUTE 1
392+#cmakedefine WORDS_BIGENDIAN 1
393+#cmakedefine HAVE_ATTR_ERROR_CONTEXT_H 1
394+
395+/* Visibility attribute for API symbols */
396+#define EXPORT @ACL_EXPORT_DEFINE@
397diff --git a/configure.ac b/configure.ac
398deleted file mode 100644
399index 96fd96a..0000000
400--- a/configure.ac
401+++ /dev/null
402@@ -1,74 +0,0 @@
403-# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
404-#
405-# This program is free software: you can redistribute it and/or modify it
406-# under the terms of the GNU General Public License as published by
407-# the Free Software Foundation, either version 2 of the License, or
408-# (at your option) any later version.
409-#
410-# This program is distributed in the hope that it will be useful,
411-# but WITHOUT ANY WARRANTY; without even the implied warranty of
412-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
413-# GNU General Public License for more details.
414-#
415-# You should have received a copy of the GNU General Public License
416-# along with this program. If not, see <http://www.gnu.org/licenses/>.
417-#
418-
419-AC_PREREQ([2.69])
420-AC_INIT([acl], [2.3.2], [acl-devel@nongnu.org])
421-AC_CONFIG_AUX_DIR([build-aux])
422-AC_CONFIG_MACRO_DIR([m4])
423-AC_CONFIG_HEADERS([include/config.h])
424-AC_PREFIX_DEFAULT(/usr)
425-
426-AM_INIT_AUTOMAKE([-Wall foreign 1.15 dist-xz subdir-objects])
427-AM_SILENT_RULES([yes])
428-
429-AC_PROG_CC
430-AM_PROG_CC_C_O
431-AC_USE_SYSTEM_EXTENSIONS
432-AC_FUNC_GCC_VISIBILITY
433-AC_C_BIGENDIAN
434-AC_SYS_LARGEFILE
435-
436-AM_PROG_AR
437-LT_INIT
438-
439-dnl Minimal version supporting AM_GNU_GETTEXT_REQUIRE_VERSION.
440-AM_GNU_GETTEXT_VERSION([0.19.6])
441-dnl Require at least the following version, but use the latest available one.
442-AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
443-AM_GNU_GETTEXT([external])
444-
445-AC_ARG_ENABLE([debug],
446- [AS_HELP_STRING([--enable-debug], [Enable extra debugging])])
447-AS_IF([test "x$enable_debug" = "xyes"],
448- [CPPFLAGS="$CPPFLAGS -DDEBUG"],
449- [CPPFLAGS="$CPPFLAGS -DNDEBUG"])
450-
451-dnl Automatically increment the revision for every release.
452-set -- $(IFS=.; echo ${PACKAGE_VERSION})
453-AS_IF([test $# -ne 3 -o ${#1} -gt 1 -o ${#2} -gt 1 -o ${#3} -gt 2],
454- [AC_MSG_ERROR([This PACKAGE_VERSION breaks LT_REVISION])])
455-LT_REVISION=$(printf "%d%d%02d" "$1" "$2" "$3")
456-AC_SUBST(LT_REVISION)
457-
458-AC_PACKAGE_NEED_ATTR_ERROR_H
459-AC_PACKAGE_NEED_GETXATTR_LIBATTR
460-
461-AC_CONFIG_COMMANDS([include/acl],
462- [dnl
463- rm -rf include/acl
464- $as_ln_s "$ac_abs_top_srcdir/include" include/acl
465- ])
466-AC_CONFIG_COMMANDS([include/sys],
467- [dnl
468- rm -rf include/sys
469- $as_ln_s "$ac_abs_top_srcdir/include" include/sys
470- ])
471-AC_CONFIG_FILES([
472- libacl.pc
473- Makefile
474- po/Makefile.in
475-])
476-AC_OUTPUT
477diff --git a/doc/Makemodule.am b/doc/Makemodule.am
478deleted file mode 100644
479index b8dd578..0000000
480--- a/doc/Makemodule.am
481+++ /dev/null
482@@ -1,10 +0,0 @@
483-dist_doc_DATA += \
484- doc/CHANGES \
485- doc/COPYING \
486- doc/COPYING.LGPL \
487- doc/extensions.txt \
488- doc/libacl.txt
489-
490-EXTRA_DIST += \
491- doc/INSTALL \
492- doc/TODO
493diff --git a/examples/Makemodule.am b/examples/Makemodule.am
494deleted file mode 100644
495index e18991a..0000000
496--- a/examples/Makemodule.am
497+++ /dev/null
498@@ -1,7 +0,0 @@
499-EXTRA_DIST += \
500- examples/copy-acl.c \
501- examples/copyperm.c \
502- examples/get-acl.c \
503- examples/Makefile \
504- examples/README \
505- examples/set-acl.c
506diff --git a/include/Makemodule.am b/include/Makemodule.am
507deleted file mode 100644
508index 89bc669..0000000
509--- a/include/Makemodule.am
510+++ /dev/null
511@@ -1,24 +0,0 @@
512-noinst_HEADERS += \
513- include/libacl.h \
514- include/acl.h \
515- include/acl_ea.h \
516- include/misc.h \
517- include/walk_tree.h
518-
519-SUBST_INSTALL_HEADER = \
520- subst_install_header() { \
521- file=`echo "$$1" | sed -e 's,^.*/,,'`; \
522- $(SED) -e "s/\<EXPORT\>/extern/" < "$$1" > "include/$$file.t" || exit 1; \
523- $(MKDIR_P) "$$2" || exit 1; \
524- $(INSTALL_HEADER) "include/$$file.t" "$$2/$$file" || exit 1; \
525- $(RM) "include/$$file.t"; \
526- }; \
527- subst_install_header
528-
529-install-libacl_h: include/libacl.h
530- $(SUBST_INSTALL_HEADER) "$<" "$(DESTDIR)$(pkgincludedir)"
531-install-acl_h: include/acl.h
532- $(SUBST_INSTALL_HEADER) "$<" "$(DESTDIR)$(sysincludedir)"
533-install-data-local: install-libacl_h install-acl_h
534-uninstall-local:
535- -rm -f "$(DESTDIR)$(pkgincludedir)/libacl.h" "$(DESTDIR)$(sysincludedir)/acl.h"
536diff --git a/libacl/Makemodule.am b/libacl/Makemodule.am
537deleted file mode 100644
538index 604f829..0000000
539--- a/libacl/Makemodule.am
540+++ /dev/null
541@@ -1,83 +0,0 @@
542-lib_LTLIBRARIES += libacl.la
543-
544-# No other library exports version info, otherwise we'd have to add
545-# "libacl_" prefix to all these variables.
546-LT_CURRENT = 2
547-# The configure script will set this for us automatically.
548-#LT_REVISION =
549-LT_AGE = 1
550-LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
551-
552-CFILES = $(POSIX_CFILES) $(LIBACL_CFILES) $(INTERNAL_CFILES) \
553- libacl/perm_copy_fd.c \
554- libacl/perm_copy_file.c
555-HFILES = \
556- libacl/libobj.h \
557- libacl/libacl.h \
558- libacl/byteorder.h \
559- libacl/__acl_from_xattr.h \
560- libacl/__acl_to_xattr.h \
561- libacl/perm_copy.h \
562- libacl/__acl_extended_file.h
563-
564-POSIX_CFILES = \
565- libacl/acl_add_perm.c \
566- libacl/acl_calc_mask.c \
567- libacl/acl_clear_perms.c \
568- libacl/acl_copy_entry.c \
569- libacl/acl_copy_ext.c \
570- libacl/acl_copy_int.c \
571- libacl/acl_create_entry.c \
572- libacl/acl_delete_def_file.c \
573- libacl/acl_delete_entry.c \
574- libacl/acl_delete_perm.c \
575- libacl/acl_dup.c \
576- libacl/acl_free.c \
577- libacl/acl_from_text.c \
578- libacl/acl_get_entry.c \
579- libacl/acl_get_fd.c \
580- libacl/acl_get_file.c \
581- libacl/acl_get_perm.c \
582- libacl/acl_get_permset.c \
583- libacl/acl_get_qualifier.c \
584- libacl/acl_get_tag_type.c \
585- libacl/acl_init.c \
586- libacl/acl_set_fd.c \
587- libacl/acl_set_file.c \
588- libacl/acl_set_permset.c \
589- libacl/acl_set_qualifier.c \
590- libacl/acl_set_tag_type.c \
591- libacl/acl_size.c \
592- libacl/acl_to_text.c \
593- libacl/acl_valid.c
594-
595-LIBACL_CFILES = \
596- libacl/acl_check.c \
597- libacl/acl_cmp.c \
598- libacl/acl_entries.c \
599- libacl/acl_equiv_mode.c \
600- libacl/acl_error.c \
601- libacl/acl_extended_fd.c \
602- libacl/acl_extended_file.c \
603- libacl/acl_extended_file_nofollow.c \
604- libacl/acl_from_mode.c \
605- libacl/acl_to_any_text.c \
606- libacl/__acl_extended_file.c
607-
608-INTERNAL_CFILES = \
609- libacl/__acl_from_xattr.c \
610- libacl/__acl_reorder_obj_p.c \
611- libacl/__acl_to_any_text.c \
612- libacl/__acl_to_xattr.c \
613- libacl/__apply_mask_to_mode.c \
614- libacl/__libobj.c
615-
616-libacl_la_DEPENDENCIES = exports libmisc.la
617-libacl_la_SOURCES = $(CFILES) $(HFILES)
618-## Since libacl translates its error messages, we have to link libintl.
619-## See the AM_GNU_GETTEXT documentation for details.
620-libacl_la_LIBADD = -lattr libmisc.la $(LTLIBINTL)
621-libacl_la_CFLAGS = $(AM_CFLAGS) -include $(srcdir)/libacl/perm_copy.h
622-libacl_la_LDFLAGS = \
623- -Wl,--version-script,$(top_srcdir)/exports \
624- -version-info $(LTVERSION)
625diff --git a/libmisc/Makemodule.am b/libmisc/Makemodule.am
626deleted file mode 100644
627index 2bb7bf0..0000000
628--- a/libmisc/Makemodule.am
629+++ /dev/null
630@@ -1,9 +0,0 @@
631-noinst_LTLIBRARIES += libmisc.la
632-
633-libmisc_la_SOURCES = \
634- libmisc/uid_gid_lookup.c \
635- libmisc/high_water_alloc.c \
636- libmisc/next_line.c \
637- libmisc/quote.c \
638- libmisc/unquote.c \
639- libmisc/walk_tree.c
640diff --git a/m4/.gitignore b/m4/.gitignore
641deleted file mode 100644
642index 73d27ec..0000000
643--- a/m4/.gitignore
644+++ /dev/null
645@@ -1,3 +0,0 @@
646-!.gitignore
647-!package_attrdev.m4
648-!visibility_hidden.m4
649diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4
650deleted file mode 100644
651index 1891bb2..0000000
652--- a/m4/package_attrdev.m4
653+++ /dev/null
654@@ -1,82 +0,0 @@
655-dnl Copyright (C) 2003, 2004, 2006, 2007 Silicon Graphics, Inc.
656-dnl
657-dnl This program is free software: you can redistribute it and/or modify it
658-dnl under the terms of the GNU General Public License as published by
659-dnl the Free Software Foundation, either version 2 of the License, or
660-dnl (at your option) any later version.
661-dnl
662-dnl This program is distributed in the hope that it will be useful,
663-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
664-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
665-dnl GNU General Public License for more details.
666-dnl
667-dnl You should have received a copy of the GNU General Public License
668-dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
669-AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
670- [ AC_CHECK_HEADERS([attr/error_context.h])
671- if test "$ac_cv_header_attr_error_context_h" != "yes"; then
672- echo
673- echo 'FATAL ERROR: attr/error_context.h does not exist.'
674- echo 'Install the extended attributes (attr) development package.'
675- echo 'Alternatively, run "make install-dev" from the attr source.'
676- exit 1
677- fi
678- ])
679-
680-AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_H],
681- [ have_attributes_h=false
682- AC_CHECK_HEADERS([attr/attributes.h sys/attributes.h], [have_attributes_h=true], )
683- if test "$have_attributes_h" = "false"; then
684- echo
685- echo 'FATAL ERROR: attributes.h does not exist.'
686- echo 'Install the extended attributes (attr) development package.'
687- echo 'Alternatively, run "make install-dev" from the attr source.'
688- exit 1
689- fi
690- ])
691-
692-AC_DEFUN([AC_PACKAGE_WANT_ATTRLIST_LIBATTR],
693- [ AC_CHECK_LIB(attr, attr_list, [have_attr_list=true], [have_attr_list=false])
694- AC_SUBST(have_attr_list)
695- ])
696-
697-AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR],
698- [ AC_CHECK_LIB(attr, getxattr,, [
699- echo
700- echo 'FATAL ERROR: could not find a valid Extended Attributes library.'
701- echo 'Install the extended attributes (attr) development package.'
702- echo 'Alternatively, run "make install-lib" from the attr source.'
703- exit 1
704- ])
705- libattr="-lattr"
706- test -f `pwd`/../attr/libattr/libattr.la && \
707- libattr="`pwd`/../attr/libattr/libattr.la"
708- AC_SUBST(libattr)
709- ])
710-
711-AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR],
712- [ AC_CHECK_LIB(attr, attr_get,, [
713- echo
714- echo 'FATAL ERROR: could not find a valid Extended Attributes library.'
715- echo 'Install the extended attributes (attr) development package.'
716- echo 'Alternatively, run "make install-lib" from the attr source.'
717- exit 1
718- ])
719- libattr="-lattr"
720- test -f `pwd`/../attr/libattr/libattr.la && \
721- libattr="`pwd`/../attr/libattr/libattr.la"
722- AC_SUBST(libattr)
723- ])
724-
725-AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_MACROS],
726- [ AC_MSG_CHECKING([macros in attr/attributes.h])
727- AC_TRY_LINK([
728-#include <sys/types.h>
729-#include <attr/attributes.h>],
730- [ int x = ATTR_SECURE; ], [ echo ok ], [
731- echo
732- echo 'FATAL ERROR: could not find a current attributes header.'
733- echo 'Upgrade the extended attributes (attr) development package.'
734- echo 'Alternatively, run "make install-dev" from the attr source.'
735- exit 1 ])
736- ])
737diff --git a/m4/visibility_hidden.m4 b/m4/visibility_hidden.m4
738deleted file mode 100644
739index dbd57d4..0000000
740--- a/m4/visibility_hidden.m4
741+++ /dev/null
742@@ -1,40 +0,0 @@
743-dnl Copyright (C) 2003, 2008 Silicon Graphics, Inc.
744-dnl
745-dnl This program is free software: you can redistribute it and/or modify it
746-dnl under the terms of the GNU General Public License as published by
747-dnl the Free Software Foundation, either version 2 of the License, or
748-dnl (at your option) any later version.
749-dnl
750-dnl This program is distributed in the hope that it will be useful,
751-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
752-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
753-dnl GNU General Public License for more details.
754-dnl
755-dnl You should have received a copy of the GNU General Public License
756-dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
757-AC_DEFUN([AC_FUNC_GCC_VISIBILITY],
758- [AC_CACHE_CHECK(whether __attribute__((visibility())) is supported,
759- libc_cv_visibility_attribute,
760- [cat > conftest.c <<EOF
761- int foo __attribute__ ((visibility ("hidden"))) = 1;
762- int bar __attribute__ ((visibility ("protected"))) = 1;
763-EOF
764- libc_cv_visibility_attribute=no
765- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
766- >/dev/null 2>&1; then
767- if grep '\.hidden.*foo' conftest.s >/dev/null; then
768- if grep '\.protected.*bar' conftest.s >/dev/null; then
769- libc_cv_visibility_attribute=yes
770- fi
771- fi
772- fi
773- rm -f conftest.[cs]
774- ])
775- if test $libc_cv_visibility_attribute = yes; then
776- AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE, [], [GCC supports visibility attributes])
777- AC_DEFINE(EXPORT, [__attribute__ ((visibility ("default"))) extern], [Visibility attribute for API symbols])
778- CFLAGS="${CFLAGS} -fvisibility=hidden"
779- else
780- AC_DEFINE(EXPORT, [extern], [Visibility attribute for API symbols])
781- fi
782- ])
783diff --git a/man/Makemodule.am b/man/Makemodule.am
784deleted file mode 100644
785index c18576c..0000000
786--- a/man/Makemodule.am
787+++ /dev/null
788@@ -1,3 +0,0 @@
789-include man/man1/Makemodule.am
790-include man/man3/Makemodule.am
791-include man/man5/Makemodule.am
792diff --git a/man/man1/Makemodule.am b/man/man1/Makemodule.am
793deleted file mode 100644
794index f80e26a..0000000
795--- a/man/man1/Makemodule.am
796+++ /dev/null
797@@ -1,4 +0,0 @@
798-dist_man_MANS += \
799- man/man1/chacl.1 \
800- man/man1/getfacl.1 \
801- man/man1/setfacl.1
802diff --git a/man/man3/Makemodule.am b/man/man3/Makemodule.am
803deleted file mode 100644
804index c0c4825..0000000
805--- a/man/man3/Makemodule.am
806+++ /dev/null
807@@ -1,40 +0,0 @@
808-dist_man_MANS += \
809- man/man3/acl_add_perm.3 \
810- man/man3/acl_calc_mask.3 \
811- man/man3/acl_check.3 \
812- man/man3/acl_clear_perms.3 \
813- man/man3/acl_cmp.3 \
814- man/man3/acl_copy_entry.3 \
815- man/man3/acl_copy_ext.3 \
816- man/man3/acl_copy_int.3 \
817- man/man3/acl_create_entry.3 \
818- man/man3/acl_delete_def_file.3 \
819- man/man3/acl_delete_entry.3 \
820- man/man3/acl_delete_perm.3 \
821- man/man3/acl_dup.3 \
822- man/man3/acl_entries.3 \
823- man/man3/acl_equiv_mode.3 \
824- man/man3/acl_error.3 \
825- man/man3/acl_extended_fd.3 \
826- man/man3/acl_extended_file.3 \
827- man/man3/acl_extended_file_nofollow.3 \
828- man/man3/acl_free.3 \
829- man/man3/acl_from_mode.3 \
830- man/man3/acl_from_text.3 \
831- man/man3/acl_get_entry.3 \
832- man/man3/acl_get_fd.3 \
833- man/man3/acl_get_file.3 \
834- man/man3/acl_get_perm.3 \
835- man/man3/acl_get_permset.3 \
836- man/man3/acl_get_qualifier.3 \
837- man/man3/acl_get_tag_type.3 \
838- man/man3/acl_init.3 \
839- man/man3/acl_set_fd.3 \
840- man/man3/acl_set_file.3 \
841- man/man3/acl_set_permset.3 \
842- man/man3/acl_set_qualifier.3 \
843- man/man3/acl_set_tag_type.3 \
844- man/man3/acl_size.3 \
845- man/man3/acl_to_any_text.3 \
846- man/man3/acl_to_text.3 \
847- man/man3/acl_valid.3
848diff --git a/man/man5/Makemodule.am b/man/man5/Makemodule.am
849deleted file mode 100644
850index 7d053b8..0000000
851--- a/man/man5/Makemodule.am
852+++ /dev/null
853@@ -1,2 +0,0 @@
854-dist_man_MANS += \
855- man/man5/acl.5
856diff --git a/po/.gitignore b/po/.gitignore
857deleted file mode 100644
858index 8fe225b..0000000
859--- a/po/.gitignore
860+++ /dev/null
861@@ -1,12 +0,0 @@
862-*.gmo
863-*.sed
864-*.sin
865-acl.pot
866-Makefile.in.in
867-Makevars.template
868-POTFILES
869-POTFILES.in
870-Rules-quot
871-en@boldquot.*
872-en@quot.*
873-stamp-po
874diff --git a/po/Makevars b/po/Makevars
875deleted file mode 100644
876index 4b17ab3..0000000
877--- a/po/Makevars
878+++ /dev/null
879@@ -1,41 +0,0 @@
880-# Makefile variables for PO directory in any package using GNU gettext.
881-
882-# Usually the message domain is the same as the package name.
883-DOMAIN = $(PACKAGE)
884-
885-# These two variables depend on the location of this directory.
886-subdir = po
887-top_builddir = ..
888-
889-# These options get passed to xgettext.
890-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
891-
892-# This is the copyright holder that gets inserted into the header of the
893-# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
894-# package. (Note that the msgstr strings, extracted from the package's
895-# sources, belong to the copyright holder of the package.) Translators are
896-# expected to transfer the copyright for their translations to this person
897-# or entity, or to disclaim their copyright. The empty string stands for
898-# the public domain; in this case the translators are expected to disclaim
899-# their copyright.
900-COPYRIGHT_HOLDER = Silicon Graphics, Inc.
901-
902-# This is the email address or URL to which the translators shall report
903-# bugs in the untranslated strings:
904-# - Strings which are not entire sentences, see the maintainer guidelines
905-# in the GNU gettext documentation, section 'Preparing Strings'.
906-# - Strings which use unclear terms or require additional context to be
907-# understood.
908-# - Strings which make invalid assumptions about notation of date, time or
909-# money.
910-# - Pluralisation problems.
911-# - Incorrect English spelling.
912-# - Incorrect formatting.
913-# It can be your email address, or a mailing list address where translators
914-# can write to without being subscribed, or the URL of a web page through
915-# which the translators can contact you.
916-MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
917-
918-# This is the list of locale categories, beyond LC_MESSAGES, for which the
919-# message catalogs shall be used. It is usually empty.
920-EXTRA_LOCALE_CATEGORIES =
921diff --git a/po/update-potfiles b/po/update-potfiles
922deleted file mode 100755
923index 8934182..0000000
924--- a/po/update-potfiles
925+++ /dev/null
926@@ -1,13 +0,0 @@
927-#!/bin/sh -e
928-
929-(
930-echo "# updated automatically by $0"
931-echo
932-find \
933- include \
934- libacl \
935- libmisc \
936- tools \
937- -name '*.[ch]' \
938- | grep -v include/config.h | LC_ALL=C sort
939-) > po/POTFILES.in
940diff --git a/test/Makemodule.am b/test/Makemodule.am
941deleted file mode 100644
942index e1d715d..0000000
943--- a/test/Makemodule.am
944+++ /dev/null
945@@ -1,38 +0,0 @@
946-XFAIL_TESTS = \
947- test/nfs/nfsacl.test \
948- test/nfs/nfs-dir.test
949-TESTS = \
950- test/cp.test \
951- test/getfacl-lfs.test \
952- test/getfacl-noacl.test \
953- test/getfacl-recursive.test \
954- test/malformed-restore.test \
955- test/misc.test \
956- test/sbits-restore.test \
957- test/setfacl-X.test \
958- test/utf8-filenames.test \
959- test/root/getfacl.test \
960- test/root/permissions.test \
961- test/root/restore.test \
962- test/root/setfacl.test \
963- $(XFAIL_TESTS)
964-
965-EXTRA_DIST += \
966- test/make-tree \
967- test/malformed-restore-double-owner.acl \
968- test/run \
969- test/runwrapper \
970- test/sort-getfacl-output \
971- test/test.passwd \
972- test/test.group \
973- $(TESTS)
974-
975-check_LTLIBRARIES = libtestlookup.la
976-
977-libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c
978-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\"
979-libtestlookup_la_LDFLAGS = -rpath $(abs_builddir)
980-
981-# Make sure translations don't break tests when matching output.
982-AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH"; export LC_MESSAGES=C;
983-TEST_LOG_COMPILER = $(srcdir)/test/runwrapper
984diff --git a/tools/Makemodule.am b/tools/Makemodule.am
985deleted file mode 100644
986index 5475234..0000000
987--- a/tools/Makemodule.am
988+++ /dev/null
989@@ -1,23 +0,0 @@
990-tools_ldadd = libacl.la libmisc.la $(LTLIBINTL)
991-
992-bin_PROGRAMS += chacl
993-chacl_SOURCES = tools/chacl.c
994-chacl_LDADD = $(tools_ldadd)
995-
996-bin_PROGRAMS += getfacl
997-getfacl_SOURCES = \
998- tools/getfacl.c \
999- tools/user_group.c \
1000- tools/user_group.h
1001-getfacl_LDADD = $(tools_ldadd)
1002-
1003-bin_PROGRAMS += setfacl
1004-setfacl_SOURCES = \
1005- tools/do_set.c \
1006- tools/do_set.h \
1007- tools/parse.c \
1008- tools/parse.h \
1009- tools/sequence.c \
1010- tools/sequence.h \
1011- tools/setfacl.c
1012-setfacl_LDADD = $(tools_ldadd)