Skip to content

Commit

Permalink
Framework: partially sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Jan 22, 2020
1 parent 26d1e0e commit 0452d79
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion GIDs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ operator:*:5:amanda
mail:*:6:postfix,clamav
ftp:*:14:
smmsp:*:25:
video:*:44:
video:*:44:lightdm
bind:*:53:
rdfdb:*:55:
spamd:*:58:
Expand Down
3 changes: 1 addition & 2 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -13266,9 +13266,7 @@ net/librouteros||2019-10-16|Has expired: Unfetchable, unmaintained
net/nettest||2019-10-16|Has expired: Unfetchable, unmaintained
net/py-netstring||2019-10-16|Has expired: Unfetchable, unmaintained
net/radiusd-cistron||2019-10-16|Has expired: Unfetchable, unmaintained
net/rtptools||2019-10-16|Has expired: Unfetchable, unmaintained
net/smbldap-tools||2019-10-16|Has expired: Unfetchable, unmaintained
net/tcptrace||2019-10-16|Has expired: Unfetchable, unmaintained
net/wackford-squeers||2019-10-16|Has expired: Unfetchable, unmaintained
net/wmnet2||2019-10-16|Has expired: Unfetchable, unmaintained
net-im/pidgin-birthday-reminder||2019-10-16|Has expired: Unfetchable, unmaintained
Expand Down Expand Up @@ -13752,3 +13750,4 @@ x11-toolkits/soqt-devel|x11-toolkits/soqt|2020-01-17|This is now the stable vers
graphics/py-pivy-devel|graphics/py-pivy|2020-01-17|This is now the stable version
net/py-coherence||2020-01-18|fails with python-3.X, and python-2.7 is EOLed (GH bug#32)
net/py-upnp-inspector||2020-01-18|Missing dependency: net/py-coherence is python-2.7-only
security/py-pymacaroons-pynacl|security/py-pymacaroons|2020-01-20|Rename to match upstream naming
6 changes: 3 additions & 3 deletions Mk/Scripts/smart_makepatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ std_patch_filename() {
patchdir_files_list() {
if [ -d "${PATCHDIR}" ]; then
(cd ${PATCHDIR} && \
find ./* -type f -name "patch-*" -maxdepth 0 \
find . -type f -name "patch-*" -maxdepth 0 \
2>/dev/null | sed -e 's,^\./,,; /\.orig$/d'
)
fi;
Expand Down Expand Up @@ -186,7 +186,7 @@ regenerate_patches() {
local ORIG
local new_list
new_list=$(cd "${PATCH_WRKSRC}" && \
find -s ./* -type f -name '*.orig' 2>/dev/null)
find -s . -type f -name '*.orig' 2>/dev/null)
(cd "${PATCH_WRKSRC}" && for F in ${new_list}; do
ORIG=${F#./}
NEW=${ORIG%.orig}
Expand Down Expand Up @@ -216,7 +216,7 @@ stage_patches() {
local P
local name
local patch_list
patch_list=$(cd ${REGENNED} && find ./* -name "patch-*" 2>/dev/null)
patch_list=$(cd ${REGENNED} && find . -name "patch-*" 2>/dev/null)
for P in ${patch_list}; do
P=${P#./}
name=$(get_patch_name ${P})
Expand Down
4 changes: 2 additions & 2 deletions Mk/Uses/blaslapack.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ _BLASLIB= blas
LAPACKLIB= -llapack
.elif ${blaslapack_ARGS} == openblas
LIB_DEPENDS+= libopenblas.so:math/openblas
_BLASLIB= openblasp
LAPACKLIB= -lopenblasp
_BLASLIB= openblas
LAPACKLIB= -lopenblas
.else
IGNORE= USES=blaslapack: invalid arguments: ${blaslapack_ARGS}
.endif
Expand Down
2 changes: 1 addition & 1 deletion Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ NOTPHONY?=
FLAVORS?=
FLAVOR?=
OVERLAYS?=
REWARNFILE?= ${WRKDIR}/reinplace_warnings.txt
REWARNFILE= ${WRKDIR}/reinplace_warnings.txt
# Disallow forced FLAVOR as make argument since we cannot change it to the
# proper default.
.if empty(FLAVOR) && !empty(.MAKEOVERRIDES:MFLAVOR)
Expand Down

0 comments on commit 0452d79

Please sign in to comment.