FreeBSD Bugzilla – Attachment 250866 Details for
Bug 279211
www/ffproxy: take MAINTAINER, move to VCS, upgradew to 1.73, remove DEPRECIATION
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
git diff against www/ffproxy
0001-www-ffproxy-take-MAINTAINER-move-to-VCS-upgradew-to-.patch (text/plain), 8.37 KB, created by
Chris Hutchinson
on 2024-05-22 04:57:58 UTC
(
hide
)
Description:
git diff against www/ffproxy
Filename:
MIME Type:
Creator:
Chris Hutchinson
Created:
2024-05-22 04:57:58 UTC
Size:
8.37 KB
patch
obsolete
>From 34475abf7939b78f96806e0857ca8da33a81f1b7 Mon Sep 17 00:00:00 2001 >From: Chris Hutchinson <portmaster@BSDforge.com> >Date: Tue, 21 May 2024 21:42:02 -0700 >Subject: [PATCH] www/ffproxy: take MAINTAINER, move to VCS, upgradew to 1.73, > remove DEPRECIATION modified: www/ffproxy/Makefile modified: > www/ffproxy/distinfo deleted: www/ffproxy/files/patch-Makefile.in > deleted: www/ffproxy/files/patch-dbs.h deleted: > www/ffproxy/files/patch-request.c deleted: > www/ffproxy/files/patch-socket.c modified: www/ffproxy/pkg-descr > modified: www/ffproxy/pkg-plist > >--- > www/ffproxy/Makefile | 15 +++------ > www/ffproxy/distinfo | 5 +-- > www/ffproxy/files/patch-Makefile.in | 20 ------------ > www/ffproxy/files/patch-dbs.h | 7 ----- > www/ffproxy/files/patch-request.c | 47 ----------------------------- > www/ffproxy/files/patch-socket.c | 35 --------------------- > www/ffproxy/pkg-descr | 15 ++++----- > www/ffproxy/pkg-plist | 2 +- > 8 files changed, 17 insertions(+), 129 deletions(-) > delete mode 100644 www/ffproxy/files/patch-Makefile.in > delete mode 100644 www/ffproxy/files/patch-dbs.h > delete mode 100644 www/ffproxy/files/patch-request.c > delete mode 100644 www/ffproxy/files/patch-socket.c > >diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile >index 5adf60d4210c..25b0f03e0fe0 100644 >--- a/www/ffproxy/Makefile >+++ b/www/ffproxy/Makefile >@@ -1,21 +1,16 @@ > PORTNAME= ffproxy >-PORTVERSION= 1.6 >-PORTREVISION= 1 >+DISTVERSION= 1.72 > CATEGORIES= www >-MASTER_SITES= http://${PORTNAME}.sourceforge.net/${PORTNAME}/ \ >- http://www.nevm.de/${PORTNAME}/ >+MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= portmaster@BSDforge.com > COMMENT= Filtering HTTP proxy server >-WWW= https://ffproxy.sourceforge.net >+WWW= https://codeberg.org/BSDforge/ffproxy > > LICENSE= GPLv2+ > LICENSE_FILE= ${WRKSRC}/COPYING > >-DEPRECATED= Abandoned upstream, last update in 2006. Consider using www/squid >-EXPIRATION_DATE=2024-06-30 >- > GNU_CONFIGURE= yes >-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share >+WRKSRC= ${WRKDIR}/${PORTNAME} > > .include <bsd.port.mk> >diff --git a/www/ffproxy/distinfo b/www/ffproxy/distinfo >index 98839d68b714..94d4f81eda9e 100644 >--- a/www/ffproxy/distinfo >+++ b/www/ffproxy/distinfo >@@ -1,2 +1,3 @@ >-SHA256 (ffproxy-1.6.tar.gz) = 45103673dd59295e0dd85ec5e235b1e9aace57d66c284101d865c197cb54c380 >-SIZE (ffproxy-1.6.tar.gz) = 77535 >+TIMESTAMP = 1716348681 >+SHA256 (ffproxy-1.72.tar.gz) = f7dda759ae20f47f86361f55fa3a23cb6b2fbd631b89f8aca7264f6b6d7fa156 >+SIZE (ffproxy-1.72.tar.gz) = 78395 >diff --git a/www/ffproxy/files/patch-Makefile.in b/www/ffproxy/files/patch-Makefile.in >deleted file mode 100644 >index 5adc85773c0c..000000000000 >--- a/www/ffproxy/files/patch-Makefile.in >+++ /dev/null >@@ -1,20 +0,0 @@ >---- Makefile.in.orig 2005-01-05 15:50:10 UTC >-+++ Makefile.in >-@@ -48,7 +48,7 @@ man: >- conf: >- sed -e 's|_BASE_|$(pkgdatadir)|g' sample.config.s \ >- > sample.config || cp sample.config.s sample.config >-- cp sample.config ffproxy.conf >-+ cp sample.config ffproxy.conf.sample >- >- installdirs: mkinstalldirs >- $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \ >-@@ -73,7 +73,7 @@ install_man: man >- $(INSTALL_DATA) ffproxy.8 $(DESTDIR)$(mandir)/man8 >- >- install_config: conf >-- $(INSTALL_DATA) ffproxy.conf $(DESTDIR)$(sysconfdir) >-+ $(INSTALL_DATA) ffproxy.conf.sample $(DESTDIR)$(sysconfdir) >- >- install_sample: conf >- $(INSTALL_DATA) sample.config $(DESTDIR)$(pkgdatadir) >diff --git a/www/ffproxy/files/patch-dbs.h b/www/ffproxy/files/patch-dbs.h >deleted file mode 100644 >index 1cd9aa823100..000000000000 >--- a/www/ffproxy/files/patch-dbs.h >+++ /dev/null >@@ -1,7 +0,0 @@ >---- dbs.h.orig 2002-07-25 12:24:10 UTC >-+++ dbs.h >-@@ -1,3 +1,4 @@ >-+#include <unistd.h> >- #include <regex.h> >- >- extern regex_t *a_ip[]; >diff --git a/www/ffproxy/files/patch-request.c b/www/ffproxy/files/patch-request.c >deleted file mode 100644 >index 283c4db11c69..000000000000 >--- a/www/ffproxy/files/patch-request.c >+++ /dev/null >@@ -1,47 +0,0 @@ >---- request.c.orig 2004-12-31 08:59:54 UTC >-+++ request.c >-@@ -49,7 +49,7 @@ >- >- static int read_header(int, struct req *); >- static char sgetc(int); >--static size_t getline(int, char[], int); >-+static size_t get_line(int, char[], int); >- static int do_request(int, struct req *); >- >- void >-@@ -63,7 +63,7 @@ keep_alive: >- (void) memset(&r, 0, sizeof(r)); >- r.cl = clinfo; >- >-- if (getline(cl, buf, sizeof(buf)) < 1) >-+ if (get_line(cl, buf, sizeof(buf)) < 1) >- *buf = '\0'; >- >- if ((http_url(&r, buf)) == 0) { >-@@ -189,7 +189,7 @@ read_header(int cl, struct req * r) >- char *b, *p; >- >- i = 0; >-- while ((len = getline(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { >-+ while ((len = get_line(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { >- b = buf; >- while (isspace((int) *b) && *(b++) != '\0'); >- if (*b == '\0') >-@@ -228,7 +228,7 @@ sgetc(int s) >- } >- >- static size_t >--getline(int s, char buf[], int len) >-+get_line(int s, char buf[], int len) >- { >- int c; >- size_t i; >-@@ -493,7 +493,7 @@ do_request(int cl, struct req * r) >- } >- if (r->type != CONNECT) { >- i = 0; >-- while ((len = getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { >-+ while ((len = get_line(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { >- DEBUG(("do_request() => got remote header line: (%s)", buf)); >- r->header[i] = (char *) my_alloc(len + 1); >- (void) strcpy(r->header[i++], buf); >diff --git a/www/ffproxy/files/patch-socket.c b/www/ffproxy/files/patch-socket.c >deleted file mode 100644 >index 6bbae4d3e680..000000000000 >--- a/www/ffproxy/files/patch-socket.c >+++ /dev/null >@@ -1,35 +0,0 @@ >---- socket.c.orig 2004-12-31 08:59:54 UTC >-+++ socket.c >-@@ -58,7 +58,7 @@ void >- open_socket(void) >- { >- extern struct cfg config; >-- struct sockaddr claddr; >-+ struct sockaddr_storage claddr; >- struct addrinfo hints[2], *res; >- struct clinfo *clinfo; >- struct pollfd s[2]; >-@@ -135,7 +135,6 @@ open_socket(void) >- if (config.bind_ipv6) >- info("waiting for requests on %s port %d (IPv6)", *config.ipv6 ? config.ipv6 : "(any)", config.port); >- >-- claddr_len = sizeof(claddr); >- config.ccount = 0; >- cl = 0; >- isipv4 = config.bind_ipv4; >-@@ -160,13 +159,14 @@ open_socket(void) >- } >- } else >- st = s[0].fd; >-+ claddr_len = sizeof(claddr); >- if ((cl = accept(st, (struct sockaddr *) & claddr, &claddr_len)) == -1) { >- DEBUG(("open_socket() => accept() failed")); >- continue; >- } >- >- DEBUG(("open_socket() => connection, checking access")); >-- clinfo = identify(&claddr, (socklen_t) isipv4 ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)); >-+ clinfo = identify((struct sockaddr *)&claddr, claddr_len); >- if (check_access(clinfo) != 0) { >- DEBUG(("open_socket() => no access")); >- if (config.logrequests) >diff --git a/www/ffproxy/pkg-descr b/www/ffproxy/pkg-descr >index 6d105d68a040..8c42daff768e 100644 >--- a/www/ffproxy/pkg-descr >+++ b/www/ffproxy/pkg-descr >@@ -1,7 +1,8 @@ >-ffproxy is a filtering HTTP proxy server. It is able to filter >-by host, URL, and header. Custom header entries can be filtered >-and added. It can even drop its privileges and optionally >-chroot() to some directory. Logging to syslog() is supported, >-as is using another auxiliary proxy server. Contacting IPv6 >-servers is supported and allows transparent IPv6 over IPv4 >-browsing. >+ffproxy -- Fast Filtering Proxy, is a filtering HTTP/HTTPS proxy server. >+It's capable of filtering by host, URL, and header. Custom header >+entries can be created for filtering. It can also drop privileges and >+optionally chroot(8) to a chosen directory. Logging to syslog(3) is >+supported, as is using another auxiliary proxy server. An HTTP accelerator >+feature (acting as a front-end to an HTTP server) is also included. >+Contacting IPv6 servers as well as binding to IPv6 is supported which >+allows transparent IPv6 over IPv4 browsing (and vice versa). >diff --git a/www/ffproxy/pkg-plist b/www/ffproxy/pkg-plist >index a0c195df4b91..0f38e607914e 100644 >--- a/www/ffproxy/pkg-plist >+++ b/www/ffproxy/pkg-plist >@@ -3,7 +3,7 @@ bin/ffproxy > share/man/man5/ffproxy.conf.5.gz > share/man/man7/ffproxy.quick.7.gz > share/man/man8/ffproxy.8.gz >-%%DATADIR%%/db/access.dyndns >+%%DATADIR%%/db/access.dyn-dns > %%DATADIR%%/db/access.host > %%DATADIR%%/db/access.ip > %%DATADIR%%/db/filter.header.add >-- >2.43.0 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=250866">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 279211
: 250866