Update net/3proxy to 0.7 and add stage support Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->osa Over to maintainer (via the GNATS Auto Assign Tool)
Hi! Any progress here?
Created attachment 146068 [details] 0.7.1.1 shar file Stages The rc script was renamed from 3proxy to threeproxy. It has to be mentioned in UPDATING when it will be commited. Rename happened for matching rc.conf variable and to avoid problems when distribution extracts to dir with same name as rc script (3proxy).
Created attachment 146716 [details] update to 0.7.1.1 Based on today's changes in ports tree. The rc script was renamed from 3proxy to threeproxy. It has to be mentioned in UPDATING when it's commited. Rename happened for matching rc.conf variable and to avoid problems when distribution extracts to dir with same name as rc script (3proxy).
Created attachment 153142 [details] update to 0.7.1.2
Created attachment 153143 [details] poudriere log
Hi! I'm also tried to make port 0.7.1.2 There is problem with carriage return at files. Workaround: pre-patch: # Fixing the end-of-lines: @for f in `${FIND} ${WRKSRC}/.. -type f` ; do \ ${TR} -d '\r' < $$f > $$f.rmcr && \ ${CAT} $$f.rmcr > $$f && ${RM} $$f.rmcr; done And, it must be renamed rc script from 3proxy to threeproxy? Just rename source dir. post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Created attachment 155089 [details] Patch 0.6.1 to 0.7.1.2 rc script named 3proxy
(In reply to igorz from comment #7) Great! But look at the initial date of this PR. Nobody has time to look and commit it =(
Created attachment 155118 [details] Patch 0.6.1 to 0.7.1.2, sources from GitHub
Why does 3proxy conflict with libproxy ? Is there a way to avoid this conflict ? If I try to test 3proxy on a box with my general set of ports, I have to pkg delete libproxy which leads to approx. 20 pkgs to be deleted, among them eclipse, filezilla, and some others. This causes people to avoid testing it.
(In reply to Kurt Jaeger from comment #11) Due to the file bin/proxy. I'll ask the developer 3proxy. Or make a patch, rename bin/proxy in httppr or something like that.
Thanks, that is a good approach.
Can we force it somehow?
This patch without bin/proxy prevents conflict with the libproxy. bin/3proxy is fully functional without it. And without icqpr msnpr pop3p smtpp socks tcppm udppm. They are needed in the package?
Created attachment 157205 [details] without bin/proxy prevents conflict with the libproxy
(In reply to Igor Zabelin from comment #15) Are you sure it's fully functional without it? Can you use 3proxy as HTTP proxy without bin/proxy? I don't think so.
(In reply to timp87 from comment #17) I thought so too. But the developer pointed me to it when I asked him to rename bin/proxy. From man 3proxy: Each gateway is started from configuration file like independant service proxy(8) socks(8) pop3p(8) tcppm(8) udppm(8) ftppr(8) dnspr but 3proxy is not a kind of wrapper or superserver for this daemons. It just has same code compiled in, but provides much more functionality.
(In reply to Igor Zabelin from comment #18) Interesting! If so, could you please make a patch with cut that parts down?
Created attachment 157213 [details] Patch 0.6.1 to 0.7.1.2, without separate binaries Now it is a small useful utility. No additional elements that are not normally used.
(In reply to Igor Zabelin from comment #20) Great! But I would not touch man pages, because there is no other way to know how to work with 3proxy as 'socks or 'proxy'. And 3proxy man page itself is useless.
(In reply to timp87 from comment #21) man 3proxy.cfg
(In reply to Igor Zabelin from comment #22) It works! Kurt, your turn!
testing@work
A commit references this bug: Author: pi Date: Thu May 28 18:05:39 UTC 2015 New revision: 387751 URL: https://svnweb.freebsd.org/changeset/ports/387751 Log: net/3proxy: 0.6.1 -> 0.7.1.2 The CONFLICT with libproxy was resolved by removing the conflicting files. 0.7.1.2 - Increased limits for header / request size in HTTP proxy - Increased system failures handling on insufficient resources 0.7.1.1 - Warnings added for most common misconfigurations - ftppr NLSD command supported - Ignore NTLM handshake if NTLM is not enabled - memcpy replaced with memmove for overlapped region - better EINTR handling on *nix - FTP proxy debugging output removed, binding for data connection corrected - memory leak fixed in ldapauth plugin PR: 188374 Submitted by: igorz@yandex.ru, timp87@gmail.com Changes: head/net/3proxy/Makefile head/net/3proxy/distinfo head/net/3proxy/files/patch-man head/net/3proxy/pkg-descr head/net/3proxy/pkg-plist
Committed, many thanks for your patience!
Looks like this change broke inetd mode. proxy(8) lists -I as enabling inetd mode, but neither 3proxy(8) nor 3proxy.cfg(3) mention inetd mode at all. Can we get these binaries back, perhaps with a rename to avoid the conflict?
(In reply to cyberleo from comment #27) Yes, of course. We can import a previous patch provided by Igor Zabelin. Kurt, looks like you should do something with your poudriere =)
I'll try to make a new patch. Rename proxy to httppr.
I'll rename to "htproxy" as in Fedora RPMs.
Created attachment 157726 [details] Patch 0.7.1.2, rename bin/proxy to bin/httppr rename bin/proxy to bin/httppr patched man pages
renamed to httppr htproxy used by www/httest
A commit references this bug: Author: pi Date: Sun Jun 14 13:20:03 UTC 2015 New revision: 389630 URL: https://svnweb.freebsd.org/changeset/ports/389630 Log: net/3proxy: bring back some files, renamed to avoid conflicts - rename bin/proxy to bin/httppr (similar to fedora RPMs) - patched man pages PR: 188374 Submitted by: Igor Zabelin <igorz@yandex.ru> Changes: head/net/3proxy/Makefile head/net/3proxy/files/patch-man head/net/3proxy/pkg-plist
Committed, thanks.