Date: Sat, 30 Sep 2023 02:23:41 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c79462cc5740 - main - www/polipo: Remove expired port Message-ID: <202309300223.38U2Nf7q093600@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=c79462cc5740be8abe06939dbe6ed5c077a99fe1 commit c79462cc5740be8abe06939dbe6ed5c077a99fe1 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-09-29 23:26:02 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-09-30 02:22:45 +0000 www/polipo: Remove expired port 2023-09-30 www/polipo: No longer maintained upstream --- MOVED | 1 + www/Makefile | 1 - www/polipo/Makefile | 59 --------------------------- www/polipo/distinfo | 2 - www/polipo/files/400.polipo.in | 21 ---------- www/polipo/files/patch-paths | 86 --------------------------------------- www/polipo/files/pkg-deinstall.in | 31 -------------- www/polipo/files/pkg-install.in | 68 ------------------------------- www/polipo/files/pkg-message.in | 20 --------- www/polipo/files/polipo.in | 47 --------------------- www/polipo/pkg-descr | 2 - www/polipo/pkg-plist | 7 ---- 12 files changed, 1 insertion(+), 344 deletions(-) diff --git a/MOVED b/MOVED index a63c5ad001df..0f97aa9dcd41 100644 --- a/MOVED +++ b/MOVED @@ -7863,3 +7863,4 @@ deskutils/budgie-trash-applet||2023-09-29|Has expired: Merged into newer x11/bud x11-fonts/sourcecodepro-ttf|x11-fonts/source-code-pro-ttf|2023-09-30|Move x11-fonts/sourcecodepro-ttf to x11-fonts/source-code-pro-ttf x11-fonts/sourceserifpro-ttf|x11-fonts/source-serif-ttf|2023-09-30|Move x11-fonts/sourceserifpro-ttf to x11-fonts/source-serif-ttf www/pserv||2023-09-30|Has expired: Abandonware, last release in 2005. Consider migrating to www/apache24 , www/lighttpd or www/nginx +www/polipo||2023-09-30|Has expired: No longer maintained upstream diff --git a/www/Makefile b/www/Makefile index 4e64538d0589..c0eb2f1293ce 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1435,7 +1435,6 @@ SUBDIR += pmwiki SUBDIR += pnews SUBDIR += podcastamatic - SUBDIR += polipo SUBDIR += pomerium SUBDIR += pound SUBDIR += privatebin diff --git a/www/polipo/Makefile b/www/polipo/Makefile deleted file mode 100644 index e899d10bcfc7..000000000000 --- a/www/polipo/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -PORTNAME= polipo -PORTVERSION= 1.1.1 -PORTREVISION= 3 -CATEGORIES= www -MASTER_SITES= http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/ - -MAINTAINER= frank@pinky.sax.de -COMMENT= Small and fast caching web proxy -WWW= http://www.pps.jussieu.fr/~jch/software/polipo/ - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= No longer maintained upstream -EXPIRATION_DATE=2023-09-30 - -USES= cpe makeinfo -CPE_VENDOR= ${PORTNAME}_project -USE_RC_SUBR= polipo - -INFO= polipo - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.pre.mk> - -DOCSDIR= ${DATADIR}/www/doc -PORTDOCS= * - -SUB_FILES= pkg-message pkg-install pkg-deinstall 400.polipo -SUB_LIST+= USER=${PUSER} GROUP=${PGRP} DESTDIR=${DESTDIR} PCONFIGDIR=${PCONFIGDIR} \ - PCACHEDIR=${PCACHEDIR} PPIDDIR=${PPIDDIR} PPIDFILE=${PPIDFILE} \ - PLOGFILE=${PLOGFILE} -PLIST_SUB+= PCACHEDIR=${PCACHEDIR} - -# polipo installation options, propagated to install scripts -PUSER?= polipo -PGRP?= polipo -PCONFIGDIR?= ${PREFIX}/etc/polipo/ -PCACHEDIR?= /var/cache/polipo -PPIDDIR?= /var/run/polipo/ -PPIDFILE= ${PPIDDIR}polipo.pid -PLOGFILE?= /var/log/polipo -MAKE_ENV+= DISK_CACHE_ROOT=${PCACHEDIR} - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily/ \ - ${STAGEDIR}${PCONFIGDIR} \ - ${STAGEDIR}${PCACHEDIR} \ - ${STAGEDIR}${DOCSDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${STAGEDIR}${PREFIX}/etc/periodic/daily/ - ${INSTALL_MAN} ${WRKSRC}/polipo.man ${STAGEDIR}${PREFIX}/man/man1/polipo.1 - ${INSTALL_DATA} ${WRKSRC}/config.sample ${WRKSRC}/forbidden.sample ${STAGEDIR}${PCONFIGDIR} - ${INSTALL_DATA} ${WRKSRC}/polipo.info ${STAGEDIR}${PREFIX}/${INFO_PATH} - ${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/localindex.html ${STAGEDIR}${DATADIR}/www/index.html - -.include <bsd.port.post.mk> diff --git a/www/polipo/distinfo b/www/polipo/distinfo deleted file mode 100644 index e7cc953fb868..000000000000 --- a/www/polipo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (polipo-1.1.1.tar.gz) = a259750793ab79c491d05fcee5a917faf7d9030fb5d15e05b3704e9c9e4ee015 -SIZE (polipo-1.1.1.tar.gz) = 182891 diff --git a/www/polipo/files/400.polipo.in b/www/polipo/files/400.polipo.in deleted file mode 100644 index 47d6352faf20..000000000000 --- a/www/polipo/files/400.polipo.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# control file for periodic/daily -# polipo expiry -# -# - -if [ -r %%PREFIX%%/etc/rc.d/polipo ] -then - echo "" - echo "polipo expiry:" - %%PREFIX%%/etc/rc.d/polipo expire -fi -if [ -r %%PREFIX%%/etc/rc.d/polipo.sh ] -then - echo "" - echo "polipo expiry:" - %%PREFIX%%/etc/rc.d/polipo.sh expire -fi - -exit 0 diff --git a/www/polipo/files/patch-paths b/www/polipo/files/patch-paths deleted file mode 100644 index 17c70ca5c524..000000000000 --- a/www/polipo/files/patch-paths +++ /dev/null @@ -1,86 +0,0 @@ ---- Makefile Tue Jun 29 02:07:35 2004 -+++ Makefile Mon Dec 27 15:35:40 2004 -@@ -2,8 +2,8 @@ - BINDIR = $(PREFIX)/bin - MANDIR = $(PREFIX)/man - INFODIR = $(PREFIX)/info --LOCAL_ROOT = /usr/share/polipo/www --DISK_CACHE_ROOT = /var/cache/polipo -+LOCAL_ROOT = $(PREFIX)/share/polipo/www -+DISK_CACHE_ROOT ?= /var/cache/polipo - - # CDEBUGFLAGS = -O - -@@ -47,7 +47,8 @@ - - DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) - --CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) -+CFLAGS ?= $(CDEBUGFLAGS) -+CFLAGS += $(MD5INCLUDES) $(DEFINES) $(EXTRA_DEFINES) - - SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ - config.c local.c http.c client.c server.c auth.c tunnel.c \ ---- config.sample Mon Sep 6 23:31:57 2004 -+++ config.sample Mon Dec 27 15:35:40 2004 -@@ -65,6 +65,11 @@ - - # localDocumentRoot = "" - -+# Access rights for new cache files. -+diskCacheFilePermissions=0640 -+# Access rights for new directories. -+diskCacheDirectoryPermissions=0750 -+ - - ### Domain Name System - ### ****************** ---- forbidden.c Sat Sep 11 00:31:24 2004 -+++ forbidden.c Mon Dec 27 15:35:40 2004 -@@ -158,8 +158,8 @@ - } - - if(forbiddenFile == NULL) { -- if(access("/etc/polipo/forbidden", F_OK) >= 0) -- forbiddenFile = internAtom("/etc/polipo/forbidden"); -+ if(access("/usr/local/etc/polipo/forbidden", F_OK) >= 0) -+ forbiddenFile = internAtom("/usr/local/etc/polipo/forbidden"); - } - - if(have_forbiddenDomains) { ---- main.c Tue Oct 5 23:41:49 2004 -+++ main.c Mon Dec 27 15:35:40 2004 -@@ -106,8 +106,8 @@ - } - - if(configFile == NULL) { -- if(access("/etc/polipo/config", F_OK) >= 0) -- configFile = internAtom("/etc/polipo/config"); -+ if(access("/usr/local/etc/polipo/config", F_OK) >= 0) -+ configFile = internAtom("/usr/local/etc/polipo/config"); - if(configFile && access(configFile->string, F_OK) < 0) { - releaseAtom(configFile); - configFile = NULL; ---- polipo.man Tue Jun 29 02:07:35 2004 -+++ polipo.man Mon Dec 27 15:35:40 2004 -@@ -43,16 +43,16 @@ - Change the value of a configuration variable. - .SH FILES - .TP --.B /etc/polipo/config -+.B /usr/local/etc/polipo/config - The default location of Polipo's configuration file. - .TP --.B /etc/polipo/forbidden -+.B /usr/local/etc/polipo/forbidden - The default location of the list of forbidden URLs. - .TP - .B /var/cache/polipo/ - The default location of the on-disk cache. - .TP --.B /usr/share/polipo/www/ -+.B /usr/local/share/polipo/www/ - The default root of the local web space. - .SH SIGNALS - .TP - diff --git a/www/polipo/files/pkg-deinstall.in b/www/polipo/files/pkg-deinstall.in deleted file mode 100644 index 9acb39352c2a..000000000000 --- a/www/polipo/files/pkg-deinstall.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -POLIPOUSER=%%USER%% -POLIPOGROUP=%%GROUP%% - -PCONFIGDIR=%%PCONFIGDIR%% -PPIDDIR=%%PPIDDIR%% -POLIPOCACHE=%%PCACHEDIR%% -POLIPOLOG=%%PLOGFILE%% -POLIPOPID=%%PPIDFILE%% -POLIPODATA=%%DATADIR%% - - -if pw usershow "${POLIPOUSER}" 2>/dev/null 1>&2; then - echo "---> To delete ${POLIPOUSER} user permanently, use 'pw userdel \"${POLIPOUSER}\"'" -fi - -if [ -d "$PPIDDIR" ]; then - rm -r "$PPIDDIR" || exit 1 -fi - -if fgrep "${POLIPOLOG}" "/etc/newsyslog.conf" 2>/dev/null 1>&2; then - echo "---> You should remove from /etc/newsyslog.conf the \"${POLIPOLOG}\" entry manually." -fi - -exit 0 diff --git a/www/polipo/files/pkg-install.in b/www/polipo/files/pkg-install.in deleted file mode 100644 index 0c8986608ff0..000000000000 --- a/www/polipo/files/pkg-install.in +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -POLIPOUSER=%%USER%% -POLIPOGROUP=%%GROUP%% -UID=173 -GID=${UID} - -POLIPOCACHE=%%PCACHEDIR%% -POLIPOLOG=%%PLOGFILE%% -PPIDDIR=%%PPIDDIR%% -POLIPOPID=%%PPIDFILE%% - -if [ "$2" = "PRE-INSTALL" ]; then - - if fgrep "polipo" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then - if ! fgrep "polipo.pid" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then - echo "==> ERROR: Previous installation left an invalid entry in %%DESTDIR%%/etc/newsyslog.conf." - echo "==> Please remove the polipo line from this file and try again." - exit 1 - fi - fi - - if ! pw groupshow "$POLIPOGROUP" 2>/dev/null 1>&2; then - if pw groupadd $POLIPOGROUP -g ${GID} ; then - echo "=> Added group \"$POLIPOGROUP\"." - else - echo "=> Adding group \"$POLIPOGROUP\" failed..." - exit 1 - fi - fi - - if ! pw usershow "$POLIPOUSER" 2>/dev/null 1>&2; then - if pw useradd $POLIPOUSER -u ${UID} -g $POLIPOGROUP -h - \ - -s "/sbin/nologin" -d "/nonexistent" \ - -c "polipo web cache"; \ - then - echo "=> Added user \"$POLIPOUSER\"." - else - echo "=> Adding user \"$POLIPOUSER\" failed..." - exit 1 - fi - fi - -elif [ "$2" = "POST-INSTALL" ]; then - - if [ ! -d "%%DESTDIR%%$PPIDDIR" ]; then - mkdir -p "%%DESTDIR%%$PPIDDIR" || exit 1 - chgrp "$POLIPOGROUP" "%%DESTDIR%%$PPIDDIR" || exit 1 - chmod g+w "%%DESTDIR%%$PPIDDIR" || exit 1 - fi - - if [ ! -f "%%DESTDIR%%$POLIPOLOG" ]; then - touch "%%DESTDIR%%$POLIPOLOG" || exit 1 - chown "$POLIPOUSER" "%%DESTDIR%%$POLIPOLOG" || exit 1 - chmod u=rw,g=r,o= "%%DESTDIR%%$POLIPOLOG" || exit 1 - fi - - if ! fgrep "${POLIPOLOG}" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then - echo "Add a line to /etc/newsyslog.conf (or /usr/local/etc/newsyslog.conf.d/polipo.conf if" - echo "supported on your system) to enable automatic log file rotation:" - echo - echo "${POLIPOLOG} ${POLIPOUSER}: 640 3 100 * J ${POLIPOPID} 30" - echo - fi - -fi - -exit 0 diff --git a/www/polipo/files/pkg-message.in b/www/polipo/files/pkg-message.in deleted file mode 100644 index f7eeaf2b7985..000000000000 --- a/www/polipo/files/pkg-message.in +++ /dev/null @@ -1,20 +0,0 @@ -[ -{ type: install - message: <<EOM -To complete the polipo installation you should: - -1. copy the configuration file example and modify it if desired - cd %%PCONFIGDIR%% - cp config.sample config - vi config - -2. enable automatic polipo startup with entry in %%DESTDIR%%/etc/rc.conf.local or %%DESTDIR%%/etc/rc.conf - polipo_enable="YES" - -3. start polipo - %%DESTDIR%%%%PREFIX%%/etc/rc.d/polipo start - -4. point your browser to the new proxy server, the default port is 8123 -EOM -} -] diff --git a/www/polipo/files/polipo.in b/www/polipo/files/polipo.in deleted file mode 100644 index 2cbbb13d94ad..000000000000 --- a/www/polipo/files/polipo.in +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -# PROVIDE: polipo -# REQUIRE: NETWORK -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable polipo: -# polipo_enable="YES" -# polipo_flags="<set as needed>" - -. /etc/rc.subr - -name=polipo -rcvar=polipo_enable - -polipo_enable=${polipo_enable:-"NO"} -polipo_user=%%USER%% -polipo_group=%%GROUP%% -pidfile=%%PPIDFILE%% -config_file=%%PCONFIGDIR%%config -required_files=$config_file - -command="%%PREFIX%%/bin/polipo" -config_args="-c ${config_file}" -command_args="$config_args daemonise=true pidFile=${pidfile}" -start_precmd="rm -f ${pidfile}" - -extra_commands=expire - -expire_cmd=expire_cmd -expire_cmd () { - if [ $rc_pid ]; then - kill -USR1 $rc_pid - # allow polipo to write out all files - sleep 5 - fi - su -m ${polipo_user} -c "${command} ${config_args} -x" - if [ $rc_pid ]; then - kill -USR2 $rc_pid - fi -} - - -load_rc_config $name - -run_rc_command "$1" - diff --git a/www/polipo/pkg-descr b/www/polipo/pkg-descr deleted file mode 100644 index 4013dba5753a..000000000000 --- a/www/polipo/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Polipo is a small and fast caching web proxy (a web cache, an HTTP proxy) -designed to be used by one person or a small group of people. diff --git a/www/polipo/pkg-plist b/www/polipo/pkg-plist deleted file mode 100644 index 5462987c86a9..000000000000 --- a/www/polipo/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/polipo -@sample etc/polipo/config.sample -@sample etc/polipo/forbidden.sample -etc/periodic/daily/400.polipo -man/man1/polipo.1.gz -%%DATADIR%%/www/index.html -@dir(polipo,polipo,0770) %%PCACHEDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309300223.38U2Nf7q093600>