Skip to content

Commit

Permalink
Framework: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed Jan 12, 2023
1 parent 247bb12 commit de31cfd
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion GIDs
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ _arti:*:311:
_sphinx:*:312:
_fastdfs:*:313:
promscale:*:314:
# free: 315
lavinmq:*:315:
# free: 316
# free: 317
# free: 318
Expand Down
5 changes: 5 additions & 0 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,11 @@ _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \
# make -C /usr/ports/category/port/.
.CURDIR:= ${.CURDIR:tA}

# Ensure .CURDIR doesn't contain a colon, which breaks makefile targets
.if ${.CURDIR:S/:/\:/g} != ${.CURDIR}
.error The current directory path contains ':', this is not supported
.endif

# make sure bmake treats -V as expected
.MAKE.EXPAND_VARIABLES= yes

Expand Down
7 changes: 6 additions & 1 deletion Mk/bsd.port.subdir.mk
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ MOVEDFILE?= MOVED
# make -C /usr/ports/category/port/.
.CURDIR:= ${.CURDIR:tA}

# Ensure .CURDIR doesn't contain a colon, which breaks makefile targets
.if ${.CURDIR:S/:/\:/g} != ${.CURDIR}
.error The current directory path contains ':', this is not supported
.endif

.include "${PORTSDIR}/Mk/bsd.commands.mk"

.MAIN: all
Expand Down Expand Up @@ -505,7 +510,7 @@ _PORTSEARCH= \
} \
}' ${MOVEDDIR}/${MOVEDFILE}; \
fi \
fi
fi

search:
@${_PORTSEARCH}
Expand Down
2 changes: 1 addition & 1 deletion UIDs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ _arti:*:311:311::0:0:Arti Daemon:/nonexistent:/usr/sbin/nologin
_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin
_fastdfs:*:313:313::0:0:FastDFS Owner:/nonexistent:/usr/sbin/nologin
promscale:*:314:314::0:0:Promscale:/nonexistent:/usr/sbin/nologin
# free: 315
lavinmq:*:315:315::0:0:LavinMQ user:/nonexistent:/usr/sbin/nologin
# free: 316
# free: 317
# free: 318
Expand Down
8 changes: 8 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ 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.

20230111:
AFFECTS: users of sysutils/graylog
AUTHOR: [email protected]

Graylog 5.x and higher effectively constrains ElasticSearch
dependencies, and in most cases will force a migration to
OpenSearch 2.x, now available in ports. Plan accordingly.

20230104:
AFFECTS: users of mail/spamassassin
AUTHOR: [email protected]
Expand Down

0 comments on commit de31cfd

Please sign in to comment.