From nobody Sat Jul 08 15:27:32 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QyvK02Dthz4m7kZ; Sat, 8 Jul 2023 15:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyvK01mWkz3trN; Sat, 8 Jul 2023 15:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688830052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CnwrOtVzL2SFEKUPkxTW2hI0bRemqnaTJejD3zcuvyI=; b=Be7ENSYsnMVFC6q/l7zs4LQGpoZjC5KnTEc0jso/v24tXZ6vtR9VPcI7vsSxwbXPR32lis 6sW75/08p7GzbQv0Oaou62Yr5C4LKlOOGrpSzQRyVN4sMZ8HBt4jl7EOhKPk3wRpVfzbPu WfjEi5kMHaa7DDywS9/coykpNXdbv8nQHWQo6M2w5Wyavm2a3QRRDNz31eXNQwsMtt2aDe U6cnyC7D3hM8YaW+Sdfrf7tgTpzudkQ/wO93J3b9PWguH9BEyM8xtWRscVaN6Wwt91Orwh jxFc3BTML7JWI4cVjYqohLn+nlCCXjr91woiezKqbfgoehNBR+lm2bxyNbAnRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688830052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CnwrOtVzL2SFEKUPkxTW2hI0bRemqnaTJejD3zcuvyI=; b=qyAJquocIzlJIpVZsjuSXKLRcYLjll7Vber682xG2aIx9/uTnUSbQmkUXq/w/u5xhB09as x5AU2nYNKoS7fC28RjxOzuXLN7X4Jo1OgtgnlgPGvZpzS6NgPaR8Am4dCyt4zeIgHGYlkf FY6aDKW1K5r9oAOJCVV21u3pm/aUUly67zgiwbz4so00VY4AJq1/wAPoiZGuhDBbKACJz8 Z40q1ZS8No/MpeNkOQBbv5HwyWsn17nhvoYCMWk03Q5w1UJGCMPu+yAIZQlExTBfliJs8k xL0kMoOdguc1vst8Dobde+StvQTGV4MBDUVn9MWuxnZsyXAuoTACYl2RmuSPWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688830052; a=rsa-sha256; cv=none; b=ErKe1ilxxlU1MGF5IWUOXsUK4AQBHNWeGJy61pGa4q7MXHxacSLjQ2njwNSZpefht2yk6I pcuRWFw4BOKogMUjrx8BGQTfh4LcSYMF7ybS7FdOdZMcj75Fb0Npw2c90m1cGVGiBU0ll2 9GloxR0y9Q/J3T62xW8zou7oPm0gi9T6zdzw/9NU2SRUn0pH2jMZK9aM+EOsjjrNojZWFz EhTuZapnt/Lz6ooEubGoORHdhGi48MocBtaa9tP193jn72pSAAr3is2jz7u9zSXG+4x6UE gbh8L/x/Q8DYrjlZcycP5uLfnGPBdk8zBd6XAiNvCbZzGkvr3Q6CWNb0A7uMig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QyvK00r1HzRFW; Sat, 8 Jul 2023 15:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 368FRWY8049205; Sat, 8 Jul 2023 15:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 368FRWCs049204; Sat, 8 Jul 2023 15:27:32 GMT (envelope-from git) Date: Sat, 8 Jul 2023 15:27:32 GMT Message-Id: <202307081527.368FRWCs049204@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 1c726b0975fb - main - net/nuster: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c726b0975fb58b8527cc9e98f3cd2c848c5bba0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c726b0975fb58b8527cc9e98f3cd2c848c5bba0 commit 1c726b0975fb58b8527cc9e98f3cd2c848c5bba0 Author: Rene Ladan AuthorDate: 2023-07-08 15:26:59 +0000 Commit: Rene Ladan CommitDate: 2023-07-08 15:27:25 +0000 net/nuster: Remove expired port 2023-07-08 net/nuster: Do not support OpenSSL 3 and upstream last release was in 2020 --- MOVED | 1 + net/Makefile | 1 - net/nuster/Makefile | 75 ------------- net/nuster/distinfo | 3 - net/nuster/files/nuster.in | 122 ---------------------- net/nuster/files/patch-include-common-hathreads.h | 11 -- net/nuster/pkg-descr | 4 - 7 files changed, 1 insertion(+), 216 deletions(-) diff --git a/MOVED b/MOVED index 39dc3401318e..4033b7411fe7 100644 --- a/MOVED +++ b/MOVED @@ -7763,3 +7763,4 @@ sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs devel/ocaml-sexplib|devel/ocaml-sexplib0|2023-07-05|Project renamed +net/nuster||2023-07-08|Has expired: Does not support OpenSSL 3 and upstream last release was in 2020 diff --git a/net/Makefile b/net/Makefile index 3c190239cb5a..52ccafd5fdfe 100644 --- a/net/Makefile +++ b/net/Makefile @@ -552,7 +552,6 @@ SUBDIR += ntpsec SUBDIR += ntraceroute SUBDIR += nusoap - SUBDIR += nuster SUBDIR += nxproxy SUBDIR += nyancat SUBDIR += nylon diff --git a/net/nuster/Makefile b/net/nuster/Makefile deleted file mode 100644 index b9a759cd6116..000000000000 --- a/net/nuster/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -PORTNAME= nuster -PORTVERSION= 5.0.4.21 -DISTVERSIONPREFIX= v -CATEGORIES= net www - -MAINTAINER= felix@userspace.com.au -COMMENT= Web caching proxy server based on haproxy -WWW= https://github.com/jiangwenyuan/nuster - -LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi - -DEPRECATED= Do not support OpenSSL 3 and upstream last release was in 2020 -EXPIRATION_DATE= 2023-07-08 -BROKEN_SSL= openssl30 openssl31 -BROKEN_SSL_REASON= Requires deprecated OpenSSL routines - -USES= compiler:c++11-lang gmake -USE_RC_SUBR= nuster -USE_GITHUB= yes -GH_ACCOUNT= jiangwenyuan - -MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ - USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \ - CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" - -PLIST_FILES= sbin/nuster \ - sbin/nusterlog \ - man/man1/nuster.1.gz - -OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX -OPTIONS_RADIO= PCRE -OPTIONS_RADIO_PCRE= DPCRE SPCRE -DPCRE_DESC= Link dynamically -SPCRE_DESC= Link statically -DEVICEATLAS_DESC= DeviceAtlas Device Detection support -PROMEX_DESC= Enable Prometheus exporter -OPTIONS_DEFAULT= SPCRE OPENSSL - -DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre -DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1 -SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre -SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 -DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c -DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include -PROMEX_MAKE_ARGS= EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" -OPENSSL_USES= ssl -OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC} -OPENSSL_VARS= BROKEN_SSL="openssl30 openssl31" \ - BROKEN_SSL_REASON="error: token is not a valid binary operator in a preprocessor subexpression" -LUA_USES= lua:53 -LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} - -PORTDOCS= * -PORTEXAMPLES= * - -.include - -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -MAKE_ARGS+= USE_REGPARM=1 -.endif - -post-build: - cd ${WRKSRC}/contrib/halog && ${MAKE_CMD} ${MAKE_ENV} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/nuster - ${INSTALL_PROGRAM} ${WRKSRC}/contrib/halog/halog ${STAGEDIR}${PREFIX}/sbin/nusterlog - ${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/nuster.1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) - -.include diff --git a/net/nuster/distinfo b/net/nuster/distinfo deleted file mode 100644 index f1d034e9fc68..000000000000 --- a/net/nuster/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1587540722 -SHA256 (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 0aa3b5cadf077e6d74a7eff0a673238b698e462e330978f300d5541d4bfd688b -SIZE (jiangwenyuan-nuster-v5.0.4.21_GH0.tar.gz) = 2784325 diff --git a/net/nuster/files/nuster.in b/net/nuster/files/nuster.in deleted file mode 100644 index ae81b7b49bad..000000000000 --- a/net/nuster/files/nuster.in +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -# PROVIDE: nuster -# REQUIRE: DAEMON LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable nuster: -# -# nuster_enable (bool): default: "NO" -# Set to "YES" to enable nuster -# nuster_pidfile (str): default: /var/run/nuster.pid -# Set to the full path of the pid file -# nuster_config (str): default: %%PREFIX%%/etc/nuster.conf -# Set to the full path of the config file -# nuster_flags (str): default: Autogenerated using pidfile and config options -# Set to override with your own options -# nuster_profiles (str): default: empty -# Set to space-separated list of profiles: for each profile separate nuster -# process will be spawned, with nuster-${profile}.conf config file. -# You can override default pidfile and config file for each profile with -# nuster_${profile}_config and nuster_${profile}_pidfile. - -. /etc/rc.subr - -name="nuster" -rcvar=nuster_enable -command="%%PREFIX%%/sbin/nuster" -extra_commands="reload configtest hardstop hardreload" -reload_cmd="nuster_reload" -hardreload_cmd="nuster_reload" -hardreload_precmd="def_hardreload_option" -stop_cmd="nuster_stop" -hardstop_cmd="nuster_stop" -hardstop_precmd="def_hardstop_signal" - -: ${nuster_enable:="NO"} -: ${nuster_config:="%%PREFIX%%/etc/${name}.conf"} -pidfile=${nuster_pidfile:-"/var/run/nuster.pid"} - -def_hardreload_option() -{ - reload_opt="-st" -} - -def_hardstop_signal() -{ - sig_stop="TERM" -} - -load_rc_config $name - -is_valid_profile() { - local profile - for profile in $nuster_profiles; do - if [ "$profile" = "$1" ]; then - return 0 - fi - done - return 1 -} - -if [ -n "$2" ]; then - profile=$2 - if ! is_valid_profile $profile; then - echo "$0: no such profile ($profile) defined in ${name}_profiles." - exit 1 - fi - eval nuster_config="\${nuster_${profile}_config:-%%PREFIX%%/etc/nuster-${profile}.conf}" - eval pidfile="\${nuster_${profile}_pidfile:-/var/run/nuster-${profile}.pid}" -else - if [ "x${nuster_profiles}" != "x" -a "x$1" != "x" ]; then - for profile in ${nuster_profiles}; do - echo "===> ${name} profile: ${profile}" - %%PREFIX%%/etc/rc.d/nuster $1 ${profile} - retcode="$?" - if [ ${retcode} -ne 0 ]; then - failed="${profile} (${retcode}) ${failed:-}" - else - success="${profile} ${success:-}" - fi - done - exit 0 - fi -fi - -: ${nuster_flags:="-q -f ${nuster_config} -p ${pidfile}"} -configtest_cmd="$command -c -f $nuster_config" -start_precmd="$command -q -c -f $nuster_config" -required_files=$nuster_config -sig_stop=SIGUSR1 -reload_opt="-sf" - -nuster_reload() -{ - ${command} -q -c -f ${nuster_config} - if [ $? -ne 0 ]; then - err 1 "Error found in ${nuster_config} - not reloading current process!" - fi - rc_pid=$(check_pidfile ${pidfile} ${command}) - if [ $rc_pid ]; then - ${command} ${nuster_flags} $reload_opt $(cat ${pidfile}) - else - _run_rc_notrunning - return 1 - fi -} - -nuster_stop() -{ - rc_pid=$(check_pidfile ${pidfile} ${command}) - if [ $rc_pid ]; then - rc_pid=$(cat ${pidfile}) - kill -$sig_stop $rc_pid - wait_for_pids $rc_pid - else - _run_rc_notrunning - return 1 - fi -} - -run_rc_command "$1" diff --git a/net/nuster/files/patch-include-common-hathreads.h b/net/nuster/files/patch-include-common-hathreads.h deleted file mode 100644 index 7c8dc57522b2..000000000000 --- a/net/nuster/files/patch-include-common-hathreads.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/common/hathreads.h.orig 2018-08-15 11:14:35 UTC -+++ include/common/hathreads.h -@@ -113,7 +113,7 @@ extern THREAD_LOCAL unsigned long tid_bi - /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to - * have a header file regrouping all functions dealing with threads. */ - --#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__) -+#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__)) - /* gcc < 4.7 */ - - #define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i) diff --git a/net/nuster/pkg-descr b/net/nuster/pkg-descr deleted file mode 100644 index b868daf0dc16..000000000000 --- a/net/nuster/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Nuster is a simple yet powerful web caching proxy server based on HAProxy. It -is 100% compatible with HAProxy, and takes full advantage of the ACL -functionality of HAProxy to provide fine-grained caching policy based on the -content of request, response or server status.