mykola/opnsense-ports
1
0
Fork 0
forked from Lainports/opnsense-ports
Code Pull requests Activity

Framework: sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2023-10-12 16:16:20 +02:00
parent ba778593f2
commit 31bd63ee9e
8 changed files with 46 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GIDs
View file

@ -769,7 +769,7 @@ selenium:*:824:
polw:*:825: polw:*:825:
statsd:*:826: statsd:*:826:
_tuptime:*:827: _tuptime:*:827:
# free: 828 cirrus:*:828:
# free: 829 # free: 829
# free: 830 # free: 830
# free: 831 # free: 831

4
MOVED
View file

@ -4433,7 +4433,6 @@ x11/sisctrl||2020-05-05|Has expired: Broken for more than 6 months
x11/xaniroc||2020-05-05|Has expired: Broken for more than 6 months x11/xaniroc||2020-05-05|Has expired: Broken for more than 6 months
x11/xmove||2020-05-05|Has expired: Broken for more than 6 months x11/xmove||2020-05-05|Has expired: Broken for more than 6 months
x11/xnodecor||2020-05-05|Has expired: Broken for more than 6 months x11/xnodecor||2020-05-05|Has expired: Broken for more than 6 months
x11/xvattr||2020-05-05|Has expired: Broken for more than 6 months
x11-clocks/tktz||2020-05-05|Has expired: Broken for more than 6 months x11-clocks/tktz||2020-05-05|Has expired: Broken for more than 6 months
x11-clocks/xtimer||2020-05-05|Has expired: Broken for more than 6 months x11-clocks/xtimer||2020-05-05|Has expired: Broken for more than 6 months
x11-themes/gnome-icons-dropline-neu||2020-05-05|Has expired: Broken for more than 6 months x11-themes/gnome-icons-dropline-neu||2020-05-05|Has expired: Broken for more than 6 months
@ -7941,3 +7940,6 @@ net/rubygem-octokit5|net/rubygem-octokit|2023-10-06|Use net/rubygem-octokit
games/minilens||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead) games/minilens||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead)
games/tanks-of-freedom||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead) games/tanks-of-freedom||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead)
devel/godot2|devel/godot|2023-10-08|Has expired: Requires legacy OpenSSL 1.1.1 so use devel/godot devel/godot2|devel/godot|2023-10-08|Has expired: Requires legacy OpenSSL 1.1.1 so use devel/godot
devel/py-jupyter-server-ydoc|devel/py-jupyter-collaboration|2023-10-11|Remove obsoleted port. Use devel/py-jupyter-collaboration instead
devel/py-packaging21|devel/py-packaging|2023-10-11|Remove obsoleted port. Use devel/py-packaging instead
devel/rubygem-google-protobuf323|devel/rubygem-google-protobuf|2023-10-11|Remove obsoleted port. Use devel/rubygem-google-protobuf instead

8
Mk/Scripts/dialog4ports.sh
View file

@ -10,8 +10,8 @@ if [ -z "${DIALOG4PORTS}" -o -z "${PORTSDIR}" -o -z "${MAKE}" ]; then
exit 1 exit 1
fi fi
: ${DIALOGPORT:=ports-mgmt/dialog4ports} : ${DIALOGPORT:=ports-mgmt/portconfig}
: ${DIALOGNAME:=dialog4ports} : ${DIALOGNAME:=portconfig}
OPTIONSFILE="$1" OPTIONSFILE="$1"
@ -42,9 +42,9 @@ fi
# Clear environment of PKGNAME or the dialog will show on older versions # Clear environment of PKGNAME or the dialog will show on older versions
# that do not understand -v. # that do not understand -v.
if ! env -u PKGNAME ${DIALOG4PORTS} -v > /dev/null 2>&1; then if ! env -u PKGNAME ${DIALOG4PORTS} -v > /dev/null 2>&1; then
exec $DIALOG4PORTS > $OPTIONSFILE 2>&1 exec env LC_ALL=C.UTF-8 $DIALOG4PORTS > $OPTIONSFILE 2>&1
fi fi
# Newer versions use stderr to work around a jail issue # Newer versions use stderr to work around a jail issue
# http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082383.html # http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082383.html
exec $DIALOG4PORTS 2> $OPTIONSFILE exec env LC_ALL=C.UTF-8 $DIALOG4PORTS 2> $OPTIONSFILE

2
Mk/bsd.commands.mk
View file

@ -33,7 +33,7 @@ DIALOG?= /usr/bin/dialog
.else .else
DIALOG?= /usr/bin/bsddialog DIALOG?= /usr/bin/bsddialog
.endif .endif
DIALOG4PORTS?= ${LOCALBASE}/bin/dialog4ports DIALOG4PORTS?= ${LOCALBASE}/bin/portconfig
DIFF?= /usr/bin/diff DIFF?= /usr/bin/diff
DIRNAME?= /usr/bin/dirname DIRNAME?= /usr/bin/dirname
EGREP?= /usr/bin/egrep EGREP?= /usr/bin/egrep

10
Mk/bsd.licenses.mk
View file

@ -645,7 +645,7 @@ ${_LICENSE_COOKIE}:
. if !defined(NO_LICENSES_DIALOGS) . if !defined(NO_LICENSES_DIALOGS)
# Dialog interface # Dialog interface
. if ${_LICENSE_COMB} == "single" . if ${_LICENSE_COMB} == "single"
@${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \ @${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \
--yes-label Accept --no-label Reject --yesno \ --yes-label Accept --no-label Reject --yesno \
"$$(${CAT} ${_LICENSE_FILE})" 21 76 "$$(${CAT} ${_LICENSE_FILE})" 21 76
@ -662,13 +662,13 @@ ${_LICENSE_COOKIE}:
done; \ done; \
menu_cmd="$${menu_cmd} REJECT \"Reject the licenses (all)\""; \ menu_cmd="$${menu_cmd} REJECT \"Reject the licenses (all)\""; \
while true; do \ while true; do \
${SH} -c "$${menu_cmd} 2>\"$${tmpfile}\""; \ ${SH} -c "${SETENV} LC_ALL=C.UTF-8 $${menu_cmd} 2>\"$${tmpfile}\""; \
result=$$(${CAT} "$${tmpfile}"); \ result=$$(${CAT} "$${tmpfile}"); \
case $${result} in \ case $${result} in \
REJECT) exit 1;; \ REJECT) exit 1;; \
VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \
file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \
${DIALOG} --textbox "$${file}" 21 75 ;; \ ${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --textbox "$${file}" 21 75 ;; \
USE_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^USE_//'); \ USE_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^USE_//'); \
${ECHO_CMD} $${name} > ${_LICENSE_COOKIE}; \ ${ECHO_CMD} $${name} > ${_LICENSE_COOKIE}; \
break ;; \ break ;; \
@ -680,7 +680,7 @@ ${_LICENSE_COOKIE}:
. for lic in ${_LICENSE_TO_ASK} . for lic in ${_LICENSE_TO_ASK}
@${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA} @${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA}
. endfor . endfor
@menu_cmd="${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \ @menu_cmd="${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \
trap '${RM} $$tmpfile' EXIT INT TERM; \ trap '${RM} $$tmpfile' EXIT INT TERM; \
tmpfile=$$(mktemp -t portlicenses); \ tmpfile=$$(mktemp -t portlicenses); \
for lic in ${_LICENSE_TO_ASK}; do \ for lic in ${_LICENSE_TO_ASK}; do \
@ -695,7 +695,7 @@ ${_LICENSE_COOKIE}:
REJECT) exit 1 ;; \ REJECT) exit 1 ;; \
VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \
file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \
${DIALOG} --textbox "$${file}" 21 75 ;; \ ${SETENV} LC_ALL=C.UTF-8 ${DIALOG} --textbox "$${file}" 21 75 ;; \
esac; \ esac; \
done done
. endif . endif

6
Templates/Makefile
View file

@ -1,9 +1,13 @@
PORTNAME= PORTNAME=
PORTVERSION= DISTVERSION=
CATEGORIES= CATEGORIES=
MASTER_SITES= MASTER_SITES=
MAINTAINER= MAINTAINER=
COMMENT= COMMENT=
WWW=
LICENSE=
LICENSE_FILE=
.include <bsd.port.mk> .include <bsd.port.mk>

2
UIDs
View file

@ -775,7 +775,7 @@ selenium:*:824:824::0:0:Selenium Daemon User:/usr/local/selenium:/bin/sh
polw:*:825:825::0:0:Policyd-weight Cache Owner:/nonexistent:/sbin/nologin polw:*:825:825::0:0:Policyd-weight Cache Owner:/nonexistent:/sbin/nologin
statsd:*:826:826::0:0:Statsd Daemon:/nonexistent:/sbin/nologin statsd:*:826:826::0:0:Statsd Daemon:/nonexistent:/sbin/nologin
_tuptime:*:827:827::0:0:Tuptime:/var/lib/tuptime:/usr/sbin/nologin _tuptime:*:827:827::0:0:Tuptime:/var/lib/tuptime:/usr/sbin/nologin
# free: 828 cirrus:*:828:828::0:0:Cirrus CI:/usr/local/cirrus:/bin/sh
# free: 829 # free: 829
# free: 830 # free: 830
# free: 831 # free: 831

24
UPDATING
View file

@ -5,6 +5,30 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades. you update your ports collection, before attempting any port upgrades.
20231011:
AFFECTS: users of www/caddy
AUTHOR: adamw@FreeBSD.org
The default admin endpoint has changed from localhost:2019 to
/var/run/caddy/caddy.sock. Using a Unix socket is more secure,
allowing it to be secured by filesystem permissions rather than
requiring a firewall.
If you only control caddy from the rc(8) script (service caddy ...),
you don't need to do anything. If you access the API yourself, you
will want to update your scripts to use the new socket.
To use the old endpoint, add the following to /etc/rc.conf:
caddy_admin="localhost:2019"
20231009:
AFFECTS: users of net/ntpd-rs
AUTHOR: mikael@freebsd.org
In 1.0.0 the configuration has been completely reworked, please check the
documentation for details. Configuration will not automatically migrate.
20231004: 20231004:
AFFECTS: www/gitlab-ce AFFECTS: www/gitlab-ce
AUTHOR: mfechner@FreeBSD.org AUTHOR: mfechner@FreeBSD.org