git: 82bfc34f8bfe - main - security/tor-devel: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 02 Dec 2023 12:57:32 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=82bfc34f8bfe8a8338629ef653b8dfcb9294a675
commit 82bfc34f8bfe8a8338629ef653b8dfcb9294a675
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2023-12-02 12:57:22 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2023-12-02 12:57:22 +0000
security/tor-devel: Remove expired port
2023-11-30 security/tor-devel: Ignored for more than a year and security/tor is more recent than this
---
MOVED | 1 +
security/Makefile | 1 -
security/tor-devel/Makefile | 132 ---------------------
security/tor-devel/distinfo | 3 -
.../tor-devel/files/patch-doc_asciidoc-helper.sh | 12 --
security/tor-devel/files/pkg-message.in | 26 ----
security/tor-devel/files/tor.in | 130 --------------------
security/tor-devel/pkg-descr | 14 ---
security/tor-devel/pkg-plist | 21 ----
9 files changed, 1 insertion(+), 339 deletions(-)
diff --git a/MOVED b/MOVED
index fabe33589e6d..e8fb3332a804 100644
--- a/MOVED
+++ b/MOVED
@@ -8139,3 +8139,4 @@ java/wildfly13||2023-12-02|Has expired: End of life upstream
astro/xeartk||2023-12-02|Has expired: Depends on expired astro/tkgeomap
math/py-piranha||2023-12-02|Has expired: BROKEN for more than a year and last upstream activity was in 2018
games/abstreet||2023-12-02|Has expired: BROKEN for more than a year and issue does not seem to be resolvable soon
+security/tor-devel||2023-12-02|Has expired: Ignored for more than a year and security/tor is more recent than this
diff --git a/security/Makefile b/security/Makefile
index 875350239c4c..0a196540712e 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1315,7 +1315,6 @@
SUBDIR += tls-check
SUBDIR += tlsc
SUBDIR += tor
- SUBDIR += tor-devel
SUBDIR += totp-cli
SUBDIR += tpm-quote-tools
SUBDIR += tpm-tools
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
deleted file mode 100644
index cb52b8c3c0f4..000000000000
--- a/security/tor-devel/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-PORTNAME= tor
-DISTVERSION= 0.4.7.6-rc
-CATEGORIES= security net
-MASTER_SITES= TOR
-PKGNAMESUFFIX= -devel
-
-MAINTAINER= yuri@FreeBSD.org
-COMMENT= Anonymizing overlay network for TCP
-WWW= https://www.torproject.org/
-
-LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKSRC}/LICENSE
-
-DEPRECATED= Ignored for more than a year and security/tor is more recent than this
-EXPIRATION_DATE= 2023-11-30
-IGNORE= TorProject didn't release any development version at this time
-
-USES= compiler:c11 cpe gmake pkgconfig # should be compiler:c99 or compiler:gnu99
-USE_CSTD= gnu99 # until this bug report is closed: https://trac.torproject.org/projects/tor/ticket/27900
-
-CPE_VENDOR= torproject
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" \
- --with-libevent-dir=${LOCALBASE} # probably not needed
-CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
- TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
- TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
-
-OPTIONS_DEFINE= MANPAGES DOCS STATIC_TOR TCMALLOC
-OPTIONS_GROUP= COMPRESSION TRACING
-OPTIONS_GROUP_COMPRESSION= ZSTD LZMA
-OPTIONS_GROUP_TRACING= LTTNG USDT LOG_DEBUG
-OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
-OPTIONS_SUB= yes
-STATIC_TOR_DESC= Build a static tor
-COMPRESSION_DESC= Supported compression libraries
-TRACING_DESC= Tracing
-
-USE_RC_SUBR= tor
-SUB_FILES= pkg-message
-SUB_LIST= USER="${USERS}" GROUP="${GROUPS}"
-PLIST_SUB= USER="${USERS}" GROUP="${GROUPS}"
-
-GROUPS= _tor
-USERS= _tor
-
-CONFLICTS_INSTALL= tor
-
-STATIC_TOR_USES= ssl:build
-STATIC_TOR_USES_OFF= ssl
-
-# compression options
-ZSTD_CONFIGURE_ENABLE= zstd
-ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
-LZMA_CONFIGURE_ENABLE= lzma
-
-# tracing options
-LTTNG_DESC= Build with LTTng-UST instrumentation
-LTTNG_USES= localbase
-LTTNG_CONFIGURE_ENABLE= tracing-instrumentation-lttng
-LTTNG_LIB_DEPENDS= liblttng-ust.so:sysutils/lttng-ust
-USDT_DESC= Build with tracing USDT instrumentation
-USDT_CONFIGURE_ENABLE= tracing-instrumentation-usdt
-USDT_LIB_DEPENDS= liblttng-ust.so:sysutils/lttng-ust
-USDT_BROKEN= error: use of undeclared identifier 'tor_circuit': https://gitlab.torproject.org/tpo/core/tor/-/issues/40174#note_2714275
-LOG_DEBUG_DESC= Build with tracing event to debug log
-LOG_DEBUG_CONFIGURE_ENABLE= tracing-instrumentation-log-debug
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+= asciidoc:textproc/asciidoc
-.else
-CONFIGURE_ARGS+= --disable-asciidoc
-.endif
-
-.if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
-empty(PORT_OPTIONS:MSTATIC_TOR)
-CONFIGURE_ARGS+= --enable-gcc-hardening
-.else
-CONFIGURE_ARGS+= --disable-gcc-hardening
-.endif
-
-.if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS += ${LOCALBASE}/lib/libevent.a:devel/libevent
-CONFIGURE_ARGS+= --enable-static-tor \
- --with-zlib-dir=/usr/lib --disable-linker-hardening
-TOR_LIBEVENT_LIBS= ${LOCALBASE}/lib/libevent.a
-. if ${PORT_OPTIONS:MZSTD}
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libzstd.a:archivers/zstd
-TOR_ZSTD_LIBS= ${LOCALBASE}/lib/libzstd.a
-LDFLAGS+= -lelf # needed by libexecinfo.a
-. endif
-.else
-CONFIGURE_ARGS+= --enable-linker-hardening
-LIB_DEPENDS+= libevent.so:devel/libevent
-TOR_LIBEVENT_LIBS= -levent
-. if ${PORT_OPTIONS:MZSTD}
-LIB_DEPENDS+= libzstd.so:archivers/zstd
-TOR_ZSTD_LIBS= -lzstd
-. endif
-.endif
-
-.if ${PORT_OPTIONS:MTCMALLOC}
-CONFIGURE_ARGS+= --with-malloc=tcmalloc
-.if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools # for static 'tor' executable
-RUN_DEPENDS+= google-perftool>0:devel/google-perftools # for a still-dynamic 'tor-gencert' executable
-LDFLAGS+= -lc++ -lm # required by libtcmalloc.a and isn't cocered by google-perftools' `pkg-config --libs libtcmalloc` output
-.else
-LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools
-.endif
-.endif
-
-PORTSCOUT= limit:^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[a-z].*$$
-
-post-patch:
- @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \
- ${WRKSRC}/src/config/torrc.*.in \
- ${WRKSRC}/doc/man/tor.1.* \
- ${WRKSRC}/doc/man/tor.html.in
-
-post-install:
- @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
-
-check regression-test test: build
- @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
- ${MAKE_ARGS} check
-
-.include <bsd.port.mk>
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
deleted file mode 100644
index 16834fbee58a..000000000000
--- a/security/tor-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1664698372
-SHA256 (tor-0.4.7.6-rc.tar.gz) = 41fcb2bd8e9462d23eaabaa0fc21c12b83f30f752b5c7dc967da0ea45f6b404f
-SIZE (tor-0.4.7.6-rc.tar.gz) = 7883100
diff --git a/security/tor-devel/files/patch-doc_asciidoc-helper.sh b/security/tor-devel/files/patch-doc_asciidoc-helper.sh
deleted file mode 100644
index 62d8ee71fe0a..000000000000
--- a/security/tor-devel/files/patch-doc_asciidoc-helper.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/asciidoc-helper.sh.orig 2022-03-02 04:01:16 UTC
-+++ doc/asciidoc-helper.sh
-@@ -12,9 +12,6 @@ if [ $# != 3 ]; then
- exit 1
- fi
-
--SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')"
--export SOURCE_DATE_EPOCH
--
- output=$3
-
- if [ "$1" = "html" ]; then
diff --git a/security/tor-devel/files/pkg-message.in b/security/tor-devel/files/pkg-message.in
deleted file mode 100644
index b2e391ffc96d..000000000000
--- a/security/tor-devel/files/pkg-message.in
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-{ type: install
- message: <<EOM
-To enable the tor server, set tor_enable="YES" in your /etc/rc.conf
-and edit %%PREFIX%%/etc/tor/torrc as desired. (However, note that the
-%%PREFIX%%/etc/rc.d/tor rc.subr script can override some torrc
-options: see that script for details.) To use the torify script, install
-the net/torsocks port.
-
-Tor users are strongly advised to prevent traffic analysis that
-exploits sequential IP IDs by setting:
-
-sysctl net.inet.ip.random_id=1
-
-(see sysctl.conf(5)).
-
-In order to run additional, independent instances of tor on the same machine
-set tor_instances="inst1 inst2 ..." in your /etc/rc.conf, and create the
-corresponding additional configuration files %%PREFIX%%/etc/tor/torrc@inst1, ...
-
-Alternatively, you can use the extended instance definition to specify all
-instance parameteres explicitly:
-inst_name{:inst_conf:inst_user:inst_group:inst_pidfile:inst_data_dir}
-EOM
-}
-]
diff --git a/security/tor-devel/files/tor.in b/security/tor-devel/files/tor.in
deleted file mode 100644
index 0e1c8f3cae02..000000000000
--- a/security/tor-devel/files/tor.in
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: tor
-# REQUIRE: DAEMON FILESYSTEMS
-# BEFORE: LOGIN
-#
-# Add the following lines to /etc/rc.conf to enable tor.
-# All these options will overide any settings in your local torrc as
-# they are command line options.
-#
-# tor_enable (bool): Set it to "YES" to enable tor. Default: NO
-# tor_instances (str): List of instances. Default: ""
-# tor_conf (str): Points to your torrc file.
-# Default: %%PREFIX%%/etc/tor/torrc
-# tor_user (str): Tor daemon user. Default: %%USER%%
-# tor_group (str): Tor group. Default: %%GROUP%%
-# tor_pidfile (str): Tor pid file. Default: /var/run/tor/tor.pid
-# tor_datadir (str): Tor datadir. Default: /var/db/tor
-# tor_disable_default_instance (str): Doesn't run the default instance.
-# Only valid when tor_instances is used.
-# Default: NO
-# tor_setuid (str): Runtime setuid. Default: NO
-#
-# The instance definition that tor_instances expects:
-# inst_name{:inst_conf:inst_user:inst_group:inst_pidfile:inst_data_dir}
-#
-
-. /etc/rc.subr
-
-name="tor"
-rcvar=tor_enable
-exit_code=0
-
-load_rc_config ${name}
-
-: ${tor_enable="NO"}
-: ${tor_instances=""}
-: ${tor_conf="%%PREFIX%%/etc/tor/torrc"}
-: ${tor_user="%%USER%%"}
-: ${tor_group="%%GROUP%%"}
-: ${tor_pidfile="/var/run/tor/tor.pid"}
-: ${tor_datadir="/var/db/tor"}
-: ${tor_disable_default_instance="NO"}
-: ${tor_setuid="NO"}
-
-instance=${slave_instance}
-if [ -n "${instance}" ]; then
- inst_def=${instance}
- inst_name=${inst_def%%:*}
- [ "${inst_name}" != "main" ] || err 1 "${name} instance can't be named 'main'"
- inst_def=${inst_def#$inst_name}
- if [ -n "$inst_def" ]; then
- # extended instance: parameters are set explicitly
- inst_def=${inst_def#:}
- tor_conf=${inst_def%%:*}
- inst_def=${inst_def#$tor_conf:}
- tor_user=${inst_def%%:*}
- inst_def=${inst_def#$tor_user:}
- tor_group=${inst_def%%:*}
- inst_def=${inst_def#$tor_group:}
- tor_pidfile=${inst_def%%:*}
- tor_datadir=${inst_def#$tor_pidfile:}
- if [ -z "${tor_conf}" -o -z "${tor_user}" -o -z "${tor_group}" -o -z "${tor_pidfile}" -o -z "${tor_datadir}" ]; then
- warn "invalid tor instance ${inst_name} settings: ${instance}"
- exit 1
- fi
- else
- # regular instance: default parameters are used
- tor_conf=${tor_conf}@${inst_name}
- tor_pidfile=${tor_pidfile}@${inst_name}
- tor_datadir=${tor_datadir}/instance@${inst_name}
- fi
- if ! [ -r ${tor_conf} ]; then
- warn "tor instance ${inst_name} config file ${tor_conf} doesn't exist or isn't readable"
- warn "you can copy the sample config %%PREFIX%%/etc/tor/torrc.sample and modify it"
- exit 1
- fi
- if ! [ -d ${tor_datadir} ]; then
- mkdir -p ${tor_datadir} &&
- chown ${tor_user}:${tor_group} ${tor_datadir} &&
- chmod 0700 ${tor_datadir} &&
- echo "${name}: created the instance data directory ${tor_datadir}"
- fi
-fi
-
-if [ -z "${instance}" -a -n "${tor_instances}" ]; then
- inst_only="$2"
- inst_done=0
- for i in ${tor_instances}; do
- inst_name=${i%%:*}
- if [ -z "${inst_only}" -o "${inst_name}" = "${inst_only}" ]; then
- echo -n "${name} instance ${inst_name}: "
- if ! slave_instance=${i} %%PREFIX%%/etc/rc.d/tor "$1"; then
- exit_code=1
- fi
- inst_done=$((inst_done+1))
- fi
- done
- if [ -z "${inst_only}" -o "${inst_only}" = "main" ]; then
- checkyesno tor_disable_default_instance && return $exit_code
- echo -n "${name} main instance: "
- elif [ -n "${inst_only}" ]; then
- [ $inst_done -gt 0 ] || err 1 "${name} instance '$inst_only' isn't defined"
- return $exit_code
- fi
-fi
-
-required_files=${tor_conf}
-required_dirs=${tor_datadir}
-pidfile=${tor_pidfile}
-command="%%PREFIX%%/bin/${name}"
-command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}"
-extra_commands="reload"
-
-# clear user setting in conf file: it should be done through the command line
-if grep -q "^User ${tor_user}$" ${tor_conf}; then
- sed -i '' -e "s/^User ${tor_user}$//" ${tor_conf}
-fi
-
-if [ $tor_setuid = "YES" ]; then
- command_args="${command_args} --User ${tor_user}"
- tor_user="root"
- tor_group="wheel"
-fi
-
-if ! run_rc_command "$1"; then
- exit_code=1
-fi
-
-return $exit_code
diff --git a/security/tor-devel/pkg-descr b/security/tor-devel/pkg-descr
deleted file mode 100644
index 7805936a39ec..000000000000
--- a/security/tor-devel/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Tor: an anonymizing overlay network for TCP
-
-Tor is a connection-based low-latency anonymous communication system which
-addresses many flaws in the original onion routing design.
-
-Tor is a toolset for a wide range of organizations and people that
-want to improve their safety and security on the Internet. Using
-Tor can help you anonymize web browsing and publishing, instant
-messaging, IRC, SSH, and more. Tor also provides a platform on which
-software developers can build new applications with built-in
-anonymity, safety, and privacy features.
-
-Remember that this is development code -- DON'T RELY ON THE CURRENT TOR
-NETWORK FOR ANONYMITY!
diff --git a/security/tor-devel/pkg-plist b/security/tor-devel/pkg-plist
deleted file mode 100644
index 307f0ed87ac1..000000000000
--- a/security/tor-devel/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/tor
-bin/tor-gencert
-bin/tor-print-ed-signing-cert
-bin/tor-resolve
-bin/torify
-@sample etc/tor/torrc.sample
-%%MANPAGES%%man/man1/tor-gencert.1.gz
-%%MANPAGES%%man/man1/tor-print-ed-signing-cert.1.gz
-%%MANPAGES%%man/man1/tor-resolve.1.gz
-%%MANPAGES%%man/man1/tor.1.gz
-%%MANPAGES%%man/man1/torify.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/tor-gencert.html
-%%PORTDOCS%%%%DOCSDIR%%/tor-print-ed-signing-cert.html
-%%PORTDOCS%%%%DOCSDIR%%/tor-resolve.html
-%%PORTDOCS%%%%DOCSDIR%%/tor.html
-%%PORTDOCS%%%%DOCSDIR%%/torify.html
-%%DATADIR%%/geoip
-%%DATADIR%%/geoip6
-@dir(%%USER%%,%%GROUP%%,700) /var/run/tor
-@dir(%%USER%%,%%GROUP%%,700) /var/log/tor
-@dir(%%USER%%,%%GROUP%%,700) /var/db/tor