Date: Sat, 3 Jun 2023 11:09:15 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c951b352ec8c - main - net/haproxy18: Remove expired port Message-ID: <202306031109.353B9FO1025766@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=c951b352ec8c0542bca1e3ba6840e2e3d358daa0 commit c951b352ec8c0542bca1e3ba6840e2e3d358daa0 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-06-03 11:09:07 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-06-03 11:09:07 +0000 net/haproxy18: Remove expired port 2023-06-02 net/haproxy18: Upstream EOL reached on 2022-12-31 --- MOVED | 1 + net/Makefile | 1 - net/haproxy18/Makefile | 65 ----------- net/haproxy18/distinfo | 3 - net/haproxy18/files/haproxy.in | 130 --------------------- .../files/patch-include-common-hathreads.h | 11 -- net/haproxy18/pkg-descr | 4 - net/haproxy18/pkg-plist | 106 ----------------- 8 files changed, 1 insertion(+), 320 deletions(-) diff --git a/MOVED b/MOVED index 25601d774567..061783758252 100644 --- a/MOVED +++ b/MOVED @@ -7612,3 +7612,4 @@ sysutils/bareos18-traymonitor|sysutils/bareos19-traymonitor|2023-06-01|Has expir net-mgmt/nagircbot||2023-06-01|Has expired: Broken for more than a year and fails to build on all supported release mail/spamdyke||2023-06-01|Has expired: Broken for more than a year and last upstream release was in 2015 net/haproxy17||2023-06-03|Has expired: Upstream EOL reached on 2021-03-31 +net/haproxy18||2023-06-03|Has expired: Upstream EOL reached on 2022-12-31 diff --git a/net/Makefile b/net/Makefile index 963827b799ef..219224bd6c51 100644 --- a/net/Makefile +++ b/net/Makefile @@ -245,7 +245,6 @@ SUBDIR += hanstunnel SUBDIR += haproxy SUBDIR += haproxy-devel - SUBDIR += haproxy18 SUBDIR += haproxy20 SUBDIR += haproxy22 SUBDIR += haproxy24 diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile deleted file mode 100644 index ecd739c09a69..000000000000 --- a/net/haproxy18/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -PORTNAME= haproxy -DISTVERSION= 1.8.31 -CATEGORIES= net www -MASTER_SITES= http://www.haproxy.org/download/1.8/src/ -PKGNAMESUFFIX= 18 - -MAINTAINER= demon@FreeBSD.org -COMMENT= Reliable, high performance TCP/HTTP load balancer -WWW= https://www.haproxy.org - -LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi - -DEPRECATED= Upstream EOL reached on 2022-12-31 -EXPIRATION_DATE= 2023-06-02 - -CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy20 - -USES= cpe gmake -USE_RC_SUBR= haproxy - -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}" - -OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS -OPTIONS_RADIO= PCRE -OPTIONS_RADIO_PCRE= DPCRE SPCRE -DPCRE_DESC= Link dynamically -SPCRE_DESC= Link statically -DEVICEATLAS_DESC= DeviceAtlas Device Detection support -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 -OPENSSL_USES= ssl -OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC} -OPENSSL_VARS= IGNORE_SSL="openssl30 openssl31" \ - IGNORE_SSL_REASON="Fails to build with OpenSSL 3.0.0 and later" -LUA_USES= lua:53 -LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} - -.include <bsd.port.pre.mk> - -.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/ - ${INSTALL_PROGRAM} ${WRKSRC}/contrib/halog/halog ${STAGEDIR}${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) - -.include <bsd.port.post.mk> diff --git a/net/haproxy18/distinfo b/net/haproxy18/distinfo deleted file mode 100644 index e28059439690..000000000000 --- a/net/haproxy18/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1670610855 -SHA256 (haproxy-1.8.31.tar.gz) = 7fc2ff38c665e19bdc10de48de5512dbc5548efe7555a655a13a90afa481eaeb -SIZE (haproxy-1.8.31.tar.gz) = 2219503 diff --git a/net/haproxy18/files/haproxy.in b/net/haproxy18/files/haproxy.in deleted file mode 100644 index e9eb2147c412..000000000000 --- a/net/haproxy18/files/haproxy.in +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - -# PROVIDE: haproxy -# REQUIRE: DAEMON LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable haproxy: -# -# haproxy_enable (bool): default: "NO" -# Set to "YES" to enable haproxy -# haproxy_pidfile (str): default: /var/run/haproxy.pid -# Set to the full path of the pid file -# haproxy_config (str): default: %%PREFIX%%/etc/haproxy.conf -# Set to the full path of the config file -# haproxy_flags (str): default: Autogenerated using pidfile and config options -# Set to override with your own options -# haproxy_profiles (str): default: empty -# Set to space-separated list of profiles: for each profile separate haproxy -# process will be spawned, with haproxy-${profile}.conf config file. -# You can override default pidfile and config file for each profile with -# haproxy_${profile}_config and haproxy_${profile}_pidfile. - -. /etc/rc.subr - -name="haproxy" -rcvar=haproxy_enable -command="%%PREFIX%%/sbin/haproxy" -extra_commands="reload configtest hardstop hardreload softreload" -reload_cmd="haproxy_reload" -hardreload_cmd="haproxy_reload" -hardreload_precmd="def_hardreload_option" -softreload_cmd="haproxy_reload" -softreload_precmd="def_softreload_option" -stop_cmd="haproxy_stop" -hardstop_cmd="haproxy_stop" -hardstop_precmd="def_hardstop_signal" - -: ${haproxy_enable:="NO"} -: ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"} -: ${haproxy_socket:="/var/run/${name}/socket"} -pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"} - -def_hardreload_option() -{ - reload_opt="-st" -} - -def_softreload_option() -{ - reload_opt="-x ${haproxy_socket} -sf" -} - -def_hardstop_signal() -{ - sig_stop="TERM" -} - -load_rc_config $name - -is_valid_profile() { - local profile - for profile in $haproxy_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 haproxy_config="\${haproxy_${profile}_config:-%%PREFIX%%/etc/haproxy-${profile}.conf}" - eval pidfile="\${haproxy_${profile}_pidfile:-/var/run/haproxy-${profile}.pid}" -else - if [ "x${haproxy_profiles}" != "x" -a "x$1" != "x" ]; then - for profile in ${haproxy_profiles}; do - echo "===> ${name} profile: ${profile}" - %%PREFIX%%/etc/rc.d/haproxy $1 ${profile} - retcode="$?" - if [ ${retcode} -ne 0 ]; then - failed="${profile} (${retcode}) ${failed:-}" - else - success="${profile} ${success:-}" - fi - done - exit 0 - fi -fi - -: ${haproxy_flags:="-q -f ${haproxy_config} -p ${pidfile}"} -configtest_cmd="$command -c -f $haproxy_config" -start_precmd="$command -q -c -f $haproxy_config" -required_files=$haproxy_config -sig_stop=SIGUSR1 -reload_opt="-sf" - -haproxy_reload() -{ - ${command} -q -c -f ${haproxy_config} - if [ $? -ne 0 ]; then - err 1 "Error found in ${haproxy_config} - not reloading current process!" - fi - rc_pid=$(check_pidfile ${pidfile} ${command}) - if [ $rc_pid ]; then - ${command} ${haproxy_flags} $reload_opt $(cat ${pidfile}) - else - _run_rc_notrunning - return 1 - fi -} - -haproxy_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/haproxy18/files/patch-include-common-hathreads.h b/net/haproxy18/files/patch-include-common-hathreads.h deleted file mode 100644 index eddbc9a6e072..000000000000 --- a/net/haproxy18/files/patch-include-common-hathreads.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/common/hathreads.h.orig 2018-02-17 18:17:22.219400000 +0000 -+++ include/common/hathreads.h 2018-02-17 18:18:44.598422000 +0000 -@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit - /* 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/haproxy18/pkg-descr b/net/haproxy18/pkg-descr deleted file mode 100644 index da6bc0e2c38c..000000000000 --- a/net/haproxy18/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -HAProxy is a free, very fast and reliable solution offering high -availability, load balancing, and proxying for TCP and HTTP-based -applications. It is particularly suited for web sites crawling under -very high loads while needing persistence or Layer7 processing. diff --git a/net/haproxy18/pkg-plist b/net/haproxy18/pkg-plist deleted file mode 100644 index b34d1ddf0dd0..000000000000 --- a/net/haproxy18/pkg-plist +++ /dev/null @@ -1,106 +0,0 @@ -man/man1/haproxy.1.gz -sbin/halog -sbin/haproxy -%%PORTDOCS%%%%DOCSDIR%%/51Degrees-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/DeviceAtlas-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/SPOE.txt -%%PORTDOCS%%%%DOCSDIR%%/WURFL-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/acl.fig -%%PORTDOCS%%%%DOCSDIR%%/architecture.txt -%%PORTDOCS%%%%DOCSDIR%%/close-options.txt -%%PORTDOCS%%%%DOCSDIR%%/coding-style.txt -%%PORTDOCS%%%%DOCSDIR%%/configuration.txt -%%PORTDOCS%%%%DOCSDIR%%/cookie-options.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/binding-possibilities.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffer-redesign.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffers.fig -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-reuse.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-sharing.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/dynamic-buffers.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/entities-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http2.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/rate-shaping.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt -%%PORTDOCS%%%%DOCSDIR%%/gpl.txt -%%PORTDOCS%%%%DOCSDIR%%/haproxy.1 -%%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-operations.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-ops.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/entities-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/filters.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/list.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.png -%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.dia -%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/sequence.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig -%%PORTDOCS%%%%DOCSDIR%%/intro.txt -%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt -%%PORTDOCS%%%%DOCSDIR%%/linux-syn-cookies.txt -%%PORTDOCS%%%%DOCSDIR%%/lua-api/Makefile -%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.fig -%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.png -%%PORTDOCS%%%%DOCSDIR%%/lua-api/conf.py -%%PORTDOCS%%%%DOCSDIR%%/lua-api/index.rst -%%PORTDOCS%%%%DOCSDIR%%/lua.txt -%%PORTDOCS%%%%DOCSDIR%%/management.txt -%%PORTDOCS%%%%DOCSDIR%%/netscaler-client-ip-insertion-protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/network-namespaces.txt -%%PORTDOCS%%%%DOCSDIR%%/peers.txt -%%PORTDOCS%%%%DOCSDIR%%/peers-v2.0.txt -%%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/queuing.fig -%%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2ansi -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debugfind -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/408.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/500.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/502.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.init -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.spec -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.vim -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.haproxy -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/seamless_reload.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306031109.353B9FO1025766>