Framework: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2018-11-10 09:27:38 +01:00
parent d22f88f2c8
commit 1c2ef78c69
9 changed files with 44 additions and 10 deletions

1
MOVED
View file

@ -10623,3 +10623,4 @@ science/fvm|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, m
science/mei|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, mei and ncs
x11-wm/cde|x11/cde|2018-11-03|Recategorise
misc/rumprun||2018-11-06|Has expired: "fails with current compilers"
security/ossec-hids-client|security/ossec-hids-agent|2018-10-29|Agent is the name used in documentation

View file

@ -611,7 +611,7 @@ proxydeps_suggest_uses() {
elif [ ${pkg} = "devel/readline" ]; then
warn "you need USES+=readline"
# ssl
elif [ ${pkg} = "security/openssl" -o ${pkg} = "security/openssl-devel" \
elif [ ${pkg} = "security/openssl" -o ${pkg} = "security/openssl111" \
-o ${pkg} = "security/libressl" -o ${pkg} = "security/libressl-devel" \
]; then
warn "you need USES=ssl"

View file

@ -74,8 +74,8 @@ KDE_FRAMEWORKS_VERSION?= 5.51.0
KDE_FRAMEWORKS_BRANCH?= stable
# Current KDE applications.
KDE_APPLICATIONS_VERSION?= 18.08.2
KDE_APPLICATIONS_SHLIB_VER?= 5.9.2
KDE_APPLICATIONS_VERSION?= 18.08.3
KDE_APPLICATIONS_SHLIB_VER?= 5.9.3
KDE_APPLICATIONS_BRANCH?= stable
# Upstream moves old software to Attic/. Specify the newest applications release there.
# Only the major version is used for the comparison.

View file

@ -20,7 +20,7 @@ _valid_pear_ARGS= env
# Sanity check
. for arg in ${pear_ARGS}
. if empty(_valid_pear_ARGS:M${arg})
IGNORE= Incorrect 'USES+= pear:${cmake_ARGS}' usage: argument [${arg}] is not recognized
IGNORE= Incorrect 'USES+= pear:${pear_ARGS}' usage: argument [${arg}] is not recognized
. endif
. endfor

View file

@ -10,7 +10,7 @@
#
# DEFAULT_VERSIONS+= ssl=<openssl variant>
#
# Variants being base, openssl, openssl-devel, openssl111, libressl, and libressl-devel.
# Variants being base, openssl, openssl111, libressl, and libressl-devel.
#
# The Makefile sets these variables:
# OPENSSLBASE - "/usr" or ${LOCALBASE}

View file

@ -88,7 +88,7 @@ PYTHON3_DEFAULT?= 3.6
RUBY_DEFAULT?= 2.4
# Possible values: 4.6, 4.7, 4.8
SAMBA_DEFAULT?= 4.7
# Possible values: base, openssl, openssl-devel, openssl111, libressl, libressl-devel
# Possible values: base, openssl, openssl111, libressl, libressl-devel
.if !defined(SSL_DEFAULT)
# If no preference was set, check for an installed base version
# but give an installed port preference over it.

View file

@ -1553,7 +1553,8 @@ FLAVORS:= ${FLAVOR} ${FLAVORS:N${FLAVOR}}
.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
_DID_FLAVORS_HELPERS= yes
_FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
_FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX \
DEPRECATED EXPIRATION_DATE
_FLAVOR_HELPERS_APPEND= CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \
FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \

6
UIDs
View file

@ -912,9 +912,9 @@ zookeeper:*:962:962::0:0:zookeeper user:/nonexistent:/usr/sbin/nologin
fluentd:*:963:963::0:0:fluentd user:/nonexistent:/usr/sbin/nologin
git_daemon:*:964:964::0:0:git daemon:/nonexistent:/usr/sbin/nologin
elasticsearch:*:965:965::0:0:elasticsearch user:/nonexistent:/usr/sbin/nologin
ossec:*:966:966::0:0:OSSEC user:/usr/local/ossec-hids:/usr/sbin/nologin
ossecm:*:967:966::0:0:OSSEC mail user:/usr/local/ossec-hids:/usr/sbin/nologin
ossecr:*:968:966::0:0:OSSEC rem user:/usr/local/ossec-hids:/usr/sbin/nologin
ossec:*:966:966::0:0:OSSEC user:/nonexistent:/usr/sbin/nologin
ossecm:*:967:966::0:0:OSSEC mail user:/nonexistent:/usr/sbin/nologin
ossecr:*:968:966::0:0:OSSEC rem user:/nonexistent:/usr/sbin/nologin
kippo:*:969:969::0:0:kippo user:/nonexistent:/usr/sbin/nologin
colord:*:970:970::0:0:colord color management daemon:/nonexistent:/usr/sbin/nologin
shibd:*:971:971::0:0:Shibboleth SAML daemon:/nonexistent:/usr/sbin/nologin

View file

@ -5,6 +5,38 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20181109
AFFECTS: users of security/ossec-hids-server
AUTHOR: dominik.lisiak@bemsoft.pl
The "ossechids_enable" rc variable has been renamed to "ossec_hids_enable".
If using database output, you need to recreate database using new schema
provided in /usr/local/share/doc/ossec-hids.
20181109
AFFECTS: users of security/ossec-hids-local
AUTHOR: dominik.lisiak@bemsoft.pl
The "ossechids_enable" rc variable has been renamed to "ossec_hids_enable".
If using database output, you need to recreate database using new schema
provided in /usr/local/share/doc/ossec-hids.
20181109
AFFECTS: users of security/ossec-hids-client
AUTHOR: dominik.lisiak@bemsoft.pl
The ossec-hids-client port has been renamed to ossec-hids-agent.
Portmaster users will need to run this command:
portmaster -o security/ossec-hids-agent security/ossec-hids-client
If the switch doesn't happen automatically for you, just delete the
ossec-hids-client package and install ossec-hids-agent.
The "ossechids_enable" rc variable has been renamed to "ossec_hids_enable".
20181104:
AFFECTS: users of sysutils/ansible*
AUTHOR: lifanov@FreeBSD.org