From nobody Sun Jun 30 10:58:27 2024 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 4WBmPJ1NSqz5PgM2; Sun, 30 Jun 2024 10:58:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBmPJ0qyJz4g6H; Sun, 30 Jun 2024 10:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719745108; 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=cGfiq6ml3U6XmwegBcwffkZZWeO7Q5XSqp0Wuoejr6w=; b=sIcEImcDkpm/4IrETxrXHvwgH6ZZ//z0H8JLaryVuz1wRKBWsg16ZO6WP4wDC/RvWBzIJp F1GPJtpsZH2CLDUc5YE8smpMMyXJiKiB3lXY4Sof6Ibr90n/wIyp6DEp64FBGM5Wl4X6Xq BUXLx36wRAgwAbCCmw9k+99VR1Q6aI+TFbsDoNv6hFv1Zd6wRz9RF9Emh8VzKw21lTz0T4 bPffeQPVPwvPeZucik6026CdBVKYvSzu9/KoDhk1sfBb0WoXX+dMeMPv1XQpEc75csOgUl z5GZEMbW2BcZQSHiLznW0s6rGs609uzq0Hro4LGtDgA5ePfZUMFAm0GdeeUgDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719745108; a=rsa-sha256; cv=none; b=Ez79uxGP83gait/PJ6dCfIw3FCkhaIcszVElf9NvD4DLBHhpoQo5WLoyjhl7eETbWne6IN ysESsK3CBUQhLv7LJYe85yyeDxAS2EGUftjEI7SIjlkiW4tWX1PSNqVhdTyxNUvL3kI1F9 PXBfjqzhqx8pqSeZffcSH9autO0CGy+r3iw6/GshWzk6qGxp3OqMNMdTGj5uMWL2yQDKkb ZE8ix3RbB4T18vvvSNXDIKxL1vkxU5ZPwUg/ZGJ+D+unlTTugGdDGRQeAspU8B3f2JVu5/ DL4Km9OUgUu1W53de7Zqb3uBmaxGNGiW0Vxeh+Zsm5vrRsisklATIiECOXMsLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719745108; 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=cGfiq6ml3U6XmwegBcwffkZZWeO7Q5XSqp0Wuoejr6w=; b=ZF+s5U6zQ2mS4z3+tqvphjEjxyleXn9aBBkSYPW/uJ3BU5aooStgTgPHsod1goT+/JN5Zk +6YTF5eWSlmNVpQU16hCM5BekT7Cm5EdNy9jjRZjVfGB80ZZBLRYAso3h3kBO5OKuZfgMo bhVbsD0l0gnACfZOT/npMoR+Nz34+ScsbKv9ZaaZV4PfANmlD1XzOMU4NmoCNofNt1yPhp SW73ZAVIfY56PApJR/f0SU/YisrYV04ow3Mi9sG3ZYXVpGsIw0O8bdxMd83qWIg71fU2bU WZnXN9/bUo4Z4RHWOrCKZ3pClvhN+yZ7LV0fqC8MDasUUytvi6Qs3wjOtrzR3A== 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 4WBmPJ0QzzzJxd; Sun, 30 Jun 2024 10:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45UAwRvF003655; Sun, 30 Jun 2024 10:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45UAwRs6003652; Sun, 30 Jun 2024 10:58:27 GMT (envelope-from git) Date: Sun, 30 Jun 2024 10:58:27 GMT Message-Id: <202406301058.45UAwRs6003652@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: 7df36e301fc1 - main - www/adzap: 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 7df36e301fc1b32dac98fc23b3d6b1d494671908 Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=7df36e301fc1b32dac98fc23b3d6b1d494671908 commit 7df36e301fc1b32dac98fc23b3d6b1d494671908 Author: Rene Ladan AuthorDate: 2024-06-30 10:58:12 +0000 Commit: Rene Ladan CommitDate: 2024-06-30 10:58:12 +0000 www/adzap: Remove expired port 2024-06-30 www/adzap: Obsolete, no longer provides reasonable amount of filtering --- MOVED | 1 + www/Makefile | 1 - www/adzap/Makefile | 47 --------- www/adzap/distinfo | 2 - www/adzap/files/adzap.conf.in | 31 ------ www/adzap/files/patch-scripts-wrapzap | 23 ----- .../files/patch-scripts_squid_redirect-nodata | 107 --------------------- www/adzap/files/pkg-message.in | 17 ---- www/adzap/pkg-descr | 5 - www/adzap/pkg-plist | 3 - 10 files changed, 1 insertion(+), 236 deletions(-) diff --git a/MOVED b/MOVED index 30b7a93ab276..0ec22ccb92a3 100644 --- a/MOVED +++ b/MOVED @@ -3349,3 +3349,4 @@ net-im/climm||2024-06-27|ICQ Service closed in 2024-06-24 multimedia/emby-server-devel|multimedia/emby-server|2024-06-28|Beta port removed: please use the release port multimedia/emby-server devel/go-protobuf||2024-06-30|Has expired: Upstream officially deprecated this project www/py-django-ldapdb||2024-06-30|Has expired: not compatible with Django >= 4.x, upstream no longer maintained +www/adzap||2024-06-30|Has expired: Obsolete, no longer provides reasonable amount of filtering diff --git a/www/Makefile b/www/Makefile index af16d214f5b9..665450d3d16b 100644 --- a/www/Makefile +++ b/www/Makefile @@ -21,7 +21,6 @@ SUBDIR += UniversalFeedCreator SUBDIR += adguardhome SUBDIR += adjuster - SUBDIR += adzap SUBDIR += alef-webfont SUBDIR += amfora SUBDIR += amphetadesk diff --git a/www/adzap/Makefile b/www/adzap/Makefile deleted file mode 100644 index 97020af53e72..000000000000 --- a/www/adzap/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -PORTNAME= adzap -PORTVERSION= 20110915 -PORTREVISION= 2 -CATEGORIES= www perl5 -MASTER_SITES= http://adzapper.sourceforge.net/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Filter out animated ad banners from web pages -WWW= https://adzapper.sourceforge.net/ - -LICENSE= BSD3CLAUSE - -DEPRECATED= Obsolete, no longer provides reasonable amount of filtering -EXPIRATION_DATE=2024-06-30 - -USES= perl5 shebangfix -SHEBANG_FILES= scripts/squid_redirect-nodata scripts/wrapzap scripts/zapchain -USE_PERL5= run -NO_BUILD= yes -NO_ARCH= yes - -SUB_FILES= adzap.conf pkg-message - -PORTDOCS= index.html update-instructions.txt TODO my-bsd-license.html -PORTEXAMPLES= * - -OPTIONS_DEFINE= DOCS EXAMPLES - -post-patch: - @${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/scripts/wrapzap - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect-nodata ${STAGEDIR}${PREFIX}/libexec/squid_redirect - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/wrapzap ${STAGEDIR}${PREFIX}/libexec/adzap - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/zapchain ${STAGEDIR}${PREFIX}/libexec/ - -do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${CP} -R ${WRKSRC}/zaps ${STAGEDIR}${EXAMPLESDIR} - ${CP} -R ${WRKSRC}/rc ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKDIR}/adzap.conf ${STAGEDIR}${EXAMPLESDIR} - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include diff --git a/www/adzap/distinfo b/www/adzap/distinfo deleted file mode 100644 index 4d803b07cb4a..000000000000 --- a/www/adzap/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (adzap-20110915.tar.gz) = 30a66419b4e77631d303ca5ba76ad3a64fabbed1cdab01bee02f0d790431ce7a -SIZE (adzap-20110915.tar.gz) = 128132 diff --git a/www/adzap/files/adzap.conf.in b/www/adzap/files/adzap.conf.in deleted file mode 100644 index 4217a34182cd..000000000000 --- a/www/adzap/files/adzap.conf.in +++ /dev/null @@ -1,31 +0,0 @@ -# example adzap configuration file -# copy this file over to ${PREFIX}/etc/adzap.conf, -# then modify this to match your install - -ZAP_MODE=CLEAR # or "CLEAR" -ZAP_BASE=http://adzapper.sourceforge.net/zaps # a local web server will be better -ZAP_BASE_SSL=https://adzapper.sourceforge.net/zaps # this can probably be ignored -ZAP_PREMATCH= # pathname of extra pattern file - # for patterns to preempt the stock - # zapper -ZAP_POSTMATCH= # pathname of extra pattern file - # for patterns in addition to the - # stock zapper; this is the one to - # which you should add new ads - -STUBURL_AD=$ZAP_BASE/ad.gif -STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif -STUBURL_ADBG=$ZAP_BASE/adbg.gif -STUBURL_ADJS=$ZAP_BASE/no-op.js -STUBURL_ADHTML=$ZAP_BASE/no-op.html -STUBURL_ADMP3=$ZAP_BASE/ad.mp3 -STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html -STUBURL_ADSWF=$ZAP_BASE/ad.swf -STUBURL_COUNTER=$ZAP_BASE/counter.gif -STUBURL_COUNTERJS=$ZAP_BASE/no-op-counter.js -STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html -STUBURL_WEBBUG=$ZAP_BASE/webbug.gif -STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js -STUBURL_WEBBUGHTML=$ZAP_BASE/webbug.html - -STUBURL_PRINT= # off by default, set to 1 diff --git a/www/adzap/files/patch-scripts-wrapzap b/www/adzap/files/patch-scripts-wrapzap deleted file mode 100644 index 42e1691d5a29..000000000000 --- a/www/adzap/files/patch-scripts-wrapzap +++ /dev/null @@ -1,23 +0,0 @@ ---- scripts/wrapzap.orig Fri Nov 25 14:36:00 2005 -+++ scripts/wrapzap Fri Nov 25 15:39:42 2005 -@@ -16,9 +16,9 @@ - # - - # modify this to match your install --zapper=/usr/local/bin/squid_redirect -+zapper=%%PREFIX%%/libexec/squid_redirect - --ZAP_MODE= # or "CLEAR" -+ZAP_MODE=blank # or blank - ZAP_BASE=http://adzapper.sourceforge.net/zaps # a local web server will be better - ZAP_BASE_SSL=https://adzapper.sourceforge.net/zaps # this can probably be ignored - -@@ -50,6 +50,8 @@ - STUBURL_WEBBUGHTML=$ZAP_BASE/webbug.html - - STUBURL_PRINT= # off by default, set to 1 -+ -+. %%PREFIX%%/etc/adzap.conf - - export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH ZAP_MATCH ZAP_NO_CHANGE - export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUBURL_ADMP3 \ diff --git a/www/adzap/files/patch-scripts_squid_redirect-nodata b/www/adzap/files/patch-scripts_squid_redirect-nodata deleted file mode 100644 index 253c8def2e42..000000000000 --- a/www/adzap/files/patch-scripts_squid_redirect-nodata +++ /dev/null @@ -1,107 +0,0 @@ ---- scripts/squid_redirect-nodata.orig -+++ scripts/squid_redirect-nodata -@@ -31,7 +31,7 @@ use bytes; - - use POSIX ":sys_wait_h"; - use Socket; --require 'flush.pl'; -+use IO::Handle; - - $::IOSIZE=1024; - -@@ -232,7 +232,7 @@ while (defined ($_=)) - { - if (defined $::LogFile) - { print LOGFILE $_; -- flush(LOGFILE); -+ LOGFILE->flush(); - } - chomp; - -@@ -259,7 +259,7 @@ while (defined ($_=)) - } - } - -- flush(STDOUT); -+ STDOUT->flush(); - } - - exit 0; -@@ -789,14 +788,16 @@ sub proxy_forkchild($$$) - } - - # dispatch request and headers -- printflush(GCHILD_WRITE,"$method $uri $v1 $v2\n") -+ print GCHILD_WRITE "$method $uri $v1 $v2\n" - || die "tell grandchild the request: $!"; -+ GCHILD_WRITE->flush(); - - print PROXY "$method $uri HTTP/$v1.$v2\r\n"; - for my $H (@hdrs) - { print PROXY $H->[0], ":", $H->[1], "\r\n"; - } -- printflush(PROXY,"\r\n"); -+ print PROXY "\r\n"; -+ PROXY->flush(); - ##warn "[$$]: sent rq to proxy\n"; - - proxy_copybody(CONN,PROXY,$method,$persist,\@hdrs) -@@ -965,8 +966,9 @@ sub proxy_grandchild($) - } - - warn "[$child:$$]: pass response to parent\n"; -- printflush(TOCHILD,($persist ? PERSIST : CLOSE)." $code $info") -+ print TOCHILD ($persist ? PERSIST : CLOSE)." $code $info" - || die "[$child:$$]: print(TOCHILD) fails: $!"; -+ TOCHILD->flush(); - warn "[$child:$$]: told parent, passing response to client\n"; - - # copy to child -@@ -974,7 +976,8 @@ sub proxy_grandchild($) - for my $H (@hdrs) - { print CONN $H->[0], ":", $H->[1], "\r\n"; - } -- printflush(CONN,"\r\n"); -+ print CONN "\r\n"; -+ CONN->flush(); - - # see RFC2616 section 10 - if ( -@@ -1050,11 +1053,13 @@ sub proxy_copycl($$$) - ) - { - ##warn "[$$]: read ".length($_)." bytes of request body\n"; -- if (! printflush($to,$_)) -- { warn "$::cmd: [$$]: printflush($to,..): $!"; -+ $to->autoflush(1); -+ if (! print $to $_) -+ { warn "$::cmd: [$$]: print $to ..): $!"; - $ok=0; - last COPY; - } -+ $to->autoflush(0); - $cl-=length if defined $cl; - } - warn "[$$]: finished unchunked body, ok=$ok"; -@@ -1083,10 +1088,10 @@ sub proxy_copychunked($$) - { print $to $_; - $chunksize-=length; - } -- flush($to); -+ $to->flush(); - } - -- flush($to); -+ $to->flush(); - - # pass trailer headers - while (defined($_=<$from>) && !/^\r?\n/) -@@ -1096,7 +1101,7 @@ sub proxy_copychunked($$) - { ##warn "[$$]: final trailer: $_"; - print $to $_; - } -- flush($to); -+ $to->flush(); - - return (1,""); - } diff --git a/www/adzap/files/pkg-message.in b/www/adzap/files/pkg-message.in deleted file mode 100644 index 0215bb84229c..000000000000 --- a/www/adzap/files/pkg-message.in +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <