Browse Source

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Revert r359267. This is not the correct solution and I should have done a clean buildworld.
  bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB
  pkgbase: Move telnetd and ftpd pam file to the utilities package
  pkgbase: Move device.hints from the runtime to the bootloader package
remotes/github/hardened/current/tmpfs_extattr
HardenedBSD Sync Service 4 months ago
parent
commit
4694234955
3 changed files with 3 additions and 6 deletions
  1. +1
    -1
      etc/Makefile
  2. +0
    -2
      lib/libpam/pam.d/Makefile
  3. +2
    -3
      release/scripts/mtree-to-plist.awk

+ 1
- 1
etc/Makefile View File

@@ -93,7 +93,7 @@ distribution:
.if ${MK_BOOT} != "no"
.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-T "package=runtime" \
-T "package=bootloader,config" \
${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
${DESTDIR}/boot/device.hints
.endif


+ 0
- 2
lib/libpam/pam.d/Makefile View File

@@ -26,7 +26,6 @@ ATPACKAGE+= at
.if ${MK_FTP} != "no"
CONFGROUPS+= FTP
FTP+= ftpd
FTPPACKAGE+= ftp

afterinstallconfig:
${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd ${DESTDIR}${CONFDIR}/ftp
@@ -35,7 +34,6 @@ afterinstallconfig:
.if ${MK_TELNET} != "no"
CONFGROUPS+= TELNET
TELNET+= telnetd
TELNETPACKAGE+= telnet
.endif

.include <bsd.prog.mk>

+ 2
- 3
release/scripts/mtree-to-plist.awk View File

@@ -28,9 +28,6 @@
tags=tags""_kernconf
}
}
if ($1 ~ /^\/boot\//) {
tags="package=bootloader"
}
if (length(tags) == 0)
next
if (tags ~ /package=/) {
@@ -39,6 +36,8 @@
for (i in a) {
if (a[i] ~ /^package=/) {
pkgname=a[i]
if ($1 ~ /^\/boot\//)
pkgname="bootloader"
gsub(/package=/, "", pkgname)
} else if (a[i] == "config") {
type="config"


Loading…
Cancel
Save