summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2016-07-18 09:33:21 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-07-18 09:33:21 -0300
commit2413e73c32fc36470885ae548631e081d66f4201 (patch)
tree7c3fe0e8181e96d0ae79a1a79baba752a165df84
parent[AArch64] Regenerate libm-test-ulps (diff)
downloadglibc-2413e73c32fc36470885ae548631e081d66f4201.tar.gz
glibc-2413e73c32fc36470885ae548631e081d66f4201.tar.bz2
glibc-2413e73c32fc36470885ae548631e081d66f4201.zip
Don't install the internal header grp-merge.h
grp-merge.h was introduced in Stephen Gallagher's patch adding the "group merging" feature to NSS. It declares two functions, __copy_grp and __merge_grp, both of which are tagged 'internal_function', which means that nobody can even compile the contents of the header without access to libc-symbols.h, which is not installed. (Also, these functions are GLIBC_PRIVATE exports from libc.so.) Hence I believe grp-merge.h should not be installed either. This really needs to be in 2.24, so that no released version of the library installs this header. I hope that what I did to the ChangeLog diff will allow it to be applied without hassle. * grp/Makefile: Don't install the internal header grp-merge.h.
-rw-r--r--ChangeLog4
-rw-r--r--grp/Makefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 12a13cb5da..94b023c15f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-18 Zack Weinberg <zackw@panix.com>
+
+ * grp/Makefile: Don't install the internal header grp-merge.h.
+
2016-07-18 Szabolcs Nagy <szabolcs.nagy@arm.com>
* sysdeps/aarch64/libm-test-ulps: Regenerated.
diff --git a/grp/Makefile b/grp/Makefile
index b4d52e2928..3807bfa8c4 100644
--- a/grp/Makefile
+++ b/grp/Makefile
@@ -22,7 +22,7 @@ subdir := grp
include ../Makeconfig
-headers := grp.h grp-merge.h
+headers := grp.h
routines := fgetgrent initgroups setgroups \
getgrent getgrgid getgrnam putgrent \