Framework: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2018-05-25 06:44:39 +02:00
parent 45cef49f0e
commit 5fcc6cda3f
5 changed files with 50 additions and 5 deletions

2
GIDs
View File

@ -164,7 +164,7 @@ bs:*:220:
opensips:*:221:
rtpproxy:*:222:
mqttwarn:*:223:
# free: 224
payara:*:224:
postgrey:*:225:
sqlgrey:*:226:
_hfm:*:227:

3
MOVED
View File

@ -5854,7 +5854,6 @@ net/pcnfsd||2014-04-11|Has expired: Unmaintained since 1997
cad/chipmunk||2014-04-11|Has expired: Unmaintained since 1999
graphics/comix||2014-04-11|Has expired: Insists on installing in /usr/local, and uses nautilus2 which is deprecated
www/mambo||2014-04-11|Has expired: Broken for more than 6 months
devel/lua-rds-parser||2014-04-11|Has expired: Broken for more than 6 months
japanese/exmh2||2014-04-11|Has expired: Unmaintained since 1999
net/freewais-sf||2014-04-11|Has expired: Unmaintained since 1999
editors/elvis||2014-04-11|Has expired: Unmaintained since 1999
@ -10193,3 +10192,5 @@ www/p5-CGI_Lite|www/p5-CGI-Lite|2018-05-20|Rename to match upstream naming
www/mod_proxy_uwsgi|www/apache24|2018-05-22|Module has been merged into Apache 2.4
devel/p5-reaper|devel/p5-Reaper|2018-05-22|Rename to match upstream naming
textproc/py-pyelasticsearch||2018-05-22|Has expired: Not depended upon anymore
net/corosync|net/corosync2|2018-05-24|There are now multiple versions of corosync
net/pacemaker|net/pacemaker1|2018-05-24|There are now multiple versions of pacemaker

42
Mk/Uses/corosync.mk Normal file
View File

@ -0,0 +1,42 @@
# $FreeBSD$
#
# Provide support for corosync ports
#
# Feature: corosync
# Usage: USES=coroync
#
# MAINTAINER: dpejesh@yahoo.com
.if !defined(_INCLUDE_USES_COROSYNC_MK)
_INCLUDE_USES_COROSYNC_MK= yes
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
_VALID_COROSYNC_VER= 2 3
.if ! ${_VALID_COROSYNC_VER:M${COROSYNC_DEFAULT}}
IGNORE= Invalid corosync default version ${COROSYNC_DEFAULT}; valid versions are ${_VALID_COROSYNC_VER}
.endif
.if exists(${LOCALBASE}/sbin/corosync)
_COROSYNC_INSTALLED_VER!= ${LOCALBASE}/sbin/corosync -v 2>/dev/null
_COROSYNC_INSTALLED_VER:= ${_COROSYNC_INSTALLED_VER:M'*':C/'//g}
_COROSYNC_INSTALLED_VER_MAJOR= ${_COROSYNC_INSTALLED_VER:C/([0-9]*).[0-9]*.*/\1/g}
_COROSYNC_INSTALLED_VER_MINOR= ${_COROSYNC_INSTALLED_VER:C/[0-9]*.([0-9]*).*/\1/g}
# Currently corosync 3 is tagged 2.99.x so this is a temporary
# work around until the final version is released.
. if ${_COROSYNC_INSTALLED_VER_MAJOR} == 2 && ${_COROSYNC_INSTALLED_VER_MINOR} == 99
_COROSYNC_INSTALLED_VER_MAJOR= 3
_COROSYNC_INSTALLED_VER_MINOR= 0
. endif
. if ${COROSYNC_DEFAULT} != ${_COROSYNC_INSTALLED_VER_MAJOR}
IGNORE= DEFAULT_VERSIONS=corosync=${COROSYNC_DEFAULT} but ${_COROSYNC_INSTALLED_VER} is installed
. endif
.endif
BUILD_DEPENDS+= corosync:net/corosync${COROSYNC_DEFAULT}
RUN_DEPENDS+= corosync:net/corosync${COROSYNC_DEFAULT}
.endif

View File

@ -15,8 +15,8 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes
LOCALBASE?= /usr/local
.for lang in APACHE BDB EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA \
MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
LINUX LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
.if defined(${lang}_DEFAULT)
ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
.endif
@ -32,6 +32,8 @@ ${_l:tu}_DEFAULT= ${lang:C/.*=//g}
APACHE_DEFAULT?= 2.4
# Possible values: 48, 5, 6
BDB_DEFAULT?= 5
# Possible values: 2, 3
COROSYNC_DEFAULT?= 2
# Possible_values: full canna nox devel_full devel_nox
#EMACS_DEFAULT?= let the flavor be the default if not explicitly set
# Possible values: 2.5

2
UIDs
View File

@ -169,7 +169,7 @@ bs:*:220:220::0:0:Big Sister:/usr/local/bigsister:/bin/sh
opensips:*:221:221::0:0:OpenSIPS user:/nonexistent:/usr/sbin/nologin
rtpproxy:*:222:222::0:0:& user:/nonexistent:/sbin/nologin
mqttwarn:*:223:223::0:0:mqttwarn:/nonexistent:/sbin/nologin
# free: 224
payara:*:224:224::0:0:Payara Application Server user:/nonexistent:/usr/sbin/nologin
postgrey:*:225:225::0:0:Postgrey Owner:/nonexistent:/usr/sbin/nologin
sqlgrey:*:226:226::0:0:SQLgrey Owner:/nonexistent:/usr/sbin/nologin
_hfm:*:227:227::0:0:hfm daemon:/nonexistent:/usr/sbin/nologin