Skip to content

Commit

Permalink
Remove cap_random(3).
Browse files Browse the repository at this point in the history
Now that we have a way to obtain entropy in capability mode
(getrandom(2)), libcap_random is obsolete.  Remove it.

Bump __FreeBSD_version in case anything happens to use it, though I've
found no consumers.

Reviewed by:	delphij, emaste, oshogbo
Relnotes:	yes
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D21033
  • Loading branch information
markjdb committed Jul 24, 2019
1 parent 7f3f6aa commit a76f78d
Show file tree
Hide file tree
Showing 11 changed files with 6 additions and 323 deletions.
5 changes: 5 additions & 0 deletions ObsoleteFiles.inc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
# xargs -n1 | sort | uniq -d;
# done

# 20190722: cap_random(3) removed
OLD_FILES+=lib/casper/libcap_random.so.1
OLD_FILES+=usr/include/casper/cap_random.h
OLD_FILES+=usr/share/man/man3/cap_random.3.gz
OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz
# 20190708: vm_page_hold() and _unhold() removed
OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz
# 20190618: sys/capability.h removed (sys/capsicum.h is the one to use)
Expand Down
1 change: 0 additions & 1 deletion lib/libcasper/libcasper/libcasper.3
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ functions always succeed.
.Xr cap_dns 3 ,
.Xr cap_grp 3 ,
.Xr cap_pwd 3 ,
.Xr cap_random 3 ,
.Xr cap_sysctl 3 ,
.Xr cap_syslog 3 ,
.Xr libcasper_service 3 ,
Expand Down
1 change: 0 additions & 1 deletion lib/libcasper/services/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ SUBDIR= cap_dns
SUBDIR+= cap_fileargs
SUBDIR+= cap_grp
SUBDIR+= cap_pwd
SUBDIR+= cap_random
SUBDIR+= cap_sysctl
SUBDIR+= cap_syslog

Expand Down
29 changes: 0 additions & 29 deletions lib/libcasper/services/cap_random/Makefile

This file was deleted.

19 changes: 0 additions & 19 deletions lib/libcasper/services/cap_random/Makefile.depend

This file was deleted.

98 changes: 0 additions & 98 deletions lib/libcasper/services/cap_random/cap_random.3

This file was deleted.

119 changes: 0 additions & 119 deletions lib/libcasper/services/cap_random/cap_random.c

This file was deleted.

51 changes: 0 additions & 51 deletions lib/libcasper/services/cap_random/cap_random.h

This file was deleted.

3 changes: 0 additions & 3 deletions share/mk/src.libnames.mk
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ _LIBRARIES= \
cap_fileargs \
cap_grp \
cap_pwd \
cap_random \
cap_sysctl \
cap_syslog \
com_err \
Expand Down Expand Up @@ -260,7 +259,6 @@ _DP_cap_dns= nv
_DP_cap_fileargs= nv
_DP_cap_grp= nv
_DP_cap_pwd= nv
_DP_cap_random= nv
_DP_cap_sysctl= nv
_DP_cap_syslog= nv
.if ${MK_OFED} != "no"
Expand Down Expand Up @@ -599,7 +597,6 @@ LIBCASPERDIR= ${OBJTOP}/lib/libcasper/libcasper
LIBCAP_DNSDIR= ${OBJTOP}/lib/libcasper/services/cap_dns
LIBCAP_GRPDIR= ${OBJTOP}/lib/libcasper/services/cap_grp
LIBCAP_PWDDIR= ${OBJTOP}/lib/libcasper/services/cap_pwd
LIBCAP_RANDOMDIR= ${OBJTOP}/lib/libcasper/services/cap_random
LIBCAP_SYSCTLDIR= ${OBJTOP}/lib/libcasper/services/cap_sysctl
LIBCAP_SYSLOGDIR= ${OBJTOP}/lib/libcasper/services/cap_syslog
LIBBSDXMLDIR= ${OBJTOP}/lib/libexpat
Expand Down
2 changes: 1 addition & 1 deletion sys/sys/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
#define __FreeBSD_version 1300036 /* Master, propagated to newvers */
#define __FreeBSD_version 1300037 /* Master, propagated to newvers */

/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Expand Down
1 change: 0 additions & 1 deletion targets/pseudo/userland/lib/Makefile.depend
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ DIRDEPS+= \
lib/libcasper/services/cap_dns \
lib/libcasper/services/cap_grp \
lib/libcasper/services/cap_pwd \
lib/libcasper/services/cap_random \
lib/libcasper/services/cap_sysctl \

.endif
Expand Down

0 comments on commit a76f78d

Please sign in to comment.