Re: tinyproxy 1.6.4 - 1.8.3
another go, keep /etc/tinyproxy/ -f -- a satisfied virgin is a virgin no longer. Index: Makefile === RCS file: /cvs/ports/www/tinyproxy/Makefile,v retrieving revision 1.20 diff -u -p -u -r1.20 Makefile --- Makefile22 Nov 2010 08:36:54 - 1.20 +++ Makefile5 Mar 2012 18:37:01 - @@ -1,38 +1,38 @@ # $OpenBSD: Makefile,v 1.20 2010/11/22 08:36:54 espie Exp $ -COMMENT= lightweight HTTP/SSL proxy +COMMENT = lightweight HTTP/SSL proxy -VERSION= 1.6.4 -DISTNAME= tinyproxy-${VERSION} -CATEGORIES=www net - -HOMEPAGE= https://www.banu.com/tinyproxy/ -MASTER_SITES= https://www.banu.com/pub/tinyproxy/1.6/ -MAINTAINER=frantisek holop min...@obiit.org - -# GPLv3 -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP=Yes -PERMIT_DISTFILES_CDROM=Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB= c - -SEPARATE_BUILD=concurrent -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-config=${SYSCONFDIR}/tinyproxy/tinyproxy.conf -USE_GROFF =Yes - -REGRESS_TARGET=check - -do-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/src/tinyproxy ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.8 ${PREFIX}/man/man8 - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tinyproxy +V =1.8.3 +DISTNAME = tinyproxy-${V} +CATEGORIES = www net + +HOMEPAGE = https://www.banu.com/tinyproxy/ +MAINTAINER = frantisek holop min...@obiit.org + +# GPLv2+ +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes + +BUILD_DEPENDS =textproc/asciidoc + +SEPARATE_BUILD = concurrent +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS += A2X=${LOCALBASE}/bin/a2x.py \ + --localstatedir=/var + +WANTLIB = c + +MASTER_SITES = https://www.banu.com/pub/tinyproxy/1.8/ + +REGRESS_TARGET = check + +SYSCONFDIR = ${BASESYSCONFDIR}/tinyproxy + +post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tinyproxy - ${INSTALL_DATA} ${WRKSRC}/doc/{debug,default,stats}.html \ - ${PREFIX}/share/doc/tinyproxy - ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.conf \ + ${INSTALL_DATA} ${WRKBUILD}/etc/tinyproxy.conf \ ${PREFIX}/share/examples/tinyproxy .include bsd.port.mk Index: distinfo === RCS file: /cvs/ports/www/tinyproxy/distinfo,v retrieving revision 1.8 diff -u -p -u -r1.8 distinfo --- distinfo11 Apr 2009 23:54:12 - 1.8 +++ distinfo5 Mar 2012 18:37:01 - @@ -1,5 +1,5 @@ -MD5 (tinyproxy-1.6.4.tar.gz) = MVe5FZqNAF9CSM9NTWxl4g== -RMD160 (tinyproxy-1.6.4.tar.gz) = CpFVkch/LTB1/nzyk0uYknZooXw= -SHA1 (tinyproxy-1.6.4.tar.gz) = Gv3WqY6LH4arK2Z8DRXBJp7ao1w= -SHA256 (tinyproxy-1.6.4.tar.gz) = 2a0jShscCA4qyTRJ5TGGEf/XJ3EzUrbqn/d9EKcbAkI= -SIZE (tinyproxy-1.6.4.tar.gz) = 316567 +MD5 (tinyproxy-1.8.3.tar.gz) = 7Kkn9/apzoOUsrJWNhl4pw== +RMD160 (tinyproxy-1.8.3.tar.gz) = QcrkyPzJllCnbXvtUqN5qd0PrvA= +SHA1 (tinyproxy-1.8.3.tar.gz) = 6/S9pg/y0P3xhGRn8Hs7vZ75D68= +SHA256 (tinyproxy-1.8.3.tar.gz) = aCQWyPD3M6gQbIe7OVxjEiJWl1H+Rhe8OB0EmbDwwBc= +SIZE (tinyproxy-1.8.3.tar.gz) = 266744 Index: patches/patch-doc_tinyproxy_conf === RCS file: patches/patch-doc_tinyproxy_conf diff -N patches/patch-doc_tinyproxy_conf --- patches/patch-doc_tinyproxy_conf11 Apr 2009 23:54:12 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,47 +0,0 @@ -$OpenBSD: patch-doc_tinyproxy_conf,v 1.2 2009/04/11 23:54:12 sthen Exp $ doc/tinyproxy.conf.origSun Aug 24 06:58:43 2008 -+++ doc/tinyproxy.conf Tue Mar 24 03:09:09 2009 -@@ -6,8 +6,8 @@ - # Name of the user the tinyproxy daemon should switch to after the port - # has been bound. - # --User nobody --Group nogroup -+User _tinyproxy -+Group _tinyproxy - - # - # Port to listen on. -@@ -40,25 +40,25 @@ Timeout 600 - # /usr/share/tinyproxy - # /etc/tinyproxy - # --# ErrorFile 404 /usr/share/tinyproxy/404.html --# ErrorFile 400 /usr/share/tinyproxy/400.html --# ErrorFile 503 /usr/share/tinyproxy/503.html --# ErrorFile 403 /usr/share/tinyproxy/403.html --# ErrorFile 408 /usr/share/tinyproxy/408.html -+# ErrorFile 404 /usr/local/share/tinyproxy/404.html -+# ErrorFile 400 /usr/local/share/tinyproxy/400.html -+# ErrorFile 503 /usr/local/share/tinyproxy/503.html -+# ErrorFile 403 /usr/local/share/tinyproxy/403.html -+# ErrorFile 408 /usr/local/share/tinyproxy/408.html - - # - # DefaultErrorFile: The HTML file that gets sent if there is no - # HTML file defined with an ErrorFile keyword for the HTTP error - # that has occured. - # --DefaultErrorFile
Re: tinyproxy 1.6.4 - 1.8.3
On Mon, Mar 5, 2012 at 6:42 PM, frantisek holop min...@obiit.org wrote: another go, keep /etc/tinyproxy/ haven't tested it yet but looks good. i will put it in my server and see how it goes. f.-
Re: tinyproxy 1.6.4 - 1.8.3
hmm, on Sat, Mar 03, 2012 at 05:21:56PM +, Federico Schwindt said that [..] the port i sent does as mainstream. (nobody commented otherwise, i will do as requested) and? how much more are we going to wait? i am sorry, it's not clear to me at the moment what is expected of me. nobody from the port wizards said they would prefer to keep the old layout, so the last update i sent follows mainstream. (the less changes from mainstream the better, right?) i thought that's the end of the story. -f -- mosquito: designed by god to make flies seem better.
Re: tinyproxy 1.6.4 - 1.8.3
On Sun, Mar 4, 2012 at 5:52 PM, frantisek holop min...@obiit.org wrote: hmm, on Sat, Mar 03, 2012 at 05:21:56PM +, Federico Schwindt said that [..] the port i sent does as mainstream. (nobody commented otherwise, i will do as requested) and? how much more are we going to wait? i am sorry, it's not clear to me at the moment what is expected of me. nobody from the port wizards said they would prefer to keep the old layout, so the last update i sent follows mainstream. (the less changes from mainstream the better, right?) i thought that's the end of the story. Both sthen and myself gave you reasons to keep the configuration under /etc/tinyproxy/. f.-
Re: tinyproxy 1.6.4 - 1.8.3
[..] the port i sent does as mainstream. (nobody commented otherwise, i will do as requested) and? how much more are we going to wait? f.-
Re: tinyproxy 1.6.4 - 1.8.3
here is another try. no /var/run directory in package, added rc_pre -f -- the best way to keep your word is not to give it. tinyproxy.tgz Description: application/tar-gz
Re: tinyproxy 1.6.4 - 1.8.3
On Sun, Feb 26, 2012 at 06:54:02PM +0100, frantisek holop wrote: here is another try. no /var/run directory in package, added rc_pre Can you post a diff please. -- Antoine
Re: tinyproxy 1.6.4 - 1.8.3
using cvs diff -uN -f -- let me show you the world in my eyes. Index: Makefile === RCS file: /cvs/ports/www/tinyproxy/Makefile,v retrieving revision 1.20 diff -u -p -u -r1.20 Makefile --- Makefile22 Nov 2010 08:36:54 - 1.20 +++ Makefile26 Feb 2012 18:32:11 - @@ -1,38 +1,34 @@ # $OpenBSD: Makefile,v 1.20 2010/11/22 08:36:54 espie Exp $ -COMMENT= lightweight HTTP/SSL proxy +COMMENT = lightweight HTTP/SSL proxy -VERSION= 1.6.4 -DISTNAME= tinyproxy-${VERSION} -CATEGORIES=www net - -HOMEPAGE= https://www.banu.com/tinyproxy/ -MASTER_SITES= https://www.banu.com/pub/tinyproxy/1.6/ -MAINTAINER=frantisek holop min...@obiit.org - -# GPLv3 -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP=Yes -PERMIT_DISTFILES_CDROM=Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB= c - -SEPARATE_BUILD=concurrent -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-config=${SYSCONFDIR}/tinyproxy/tinyproxy.conf -USE_GROFF =Yes - -REGRESS_TARGET=check - -do-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/src/tinyproxy ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.8 ${PREFIX}/man/man8 - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tinyproxy +V =1.8.3 +DISTNAME = tinyproxy-${V} +CATEGORIES = www net + +HOMEPAGE = https://www.banu.com/tinyproxy/ +MASTER_SITES = https://www.banu.com/pub/tinyproxy/1.8/ +MAINTAINER = frantisek holop min...@obiit.org + +# GPLv2+ +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes + +BUILD_DEPENDS =textproc/asciidoc + +SEPARATE_BUILD = concurrent +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS += A2X=${LOCALBASE}/bin/a2x.py \ + --localstatedir=/var + +WANTLIB = c +REGRESS_TARGET = check + +post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tinyproxy - ${INSTALL_DATA} ${WRKSRC}/doc/{debug,default,stats}.html \ - ${PREFIX}/share/doc/tinyproxy - ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.conf \ + ${INSTALL_DATA} ${WRKBUILD}/etc/tinyproxy.conf \ ${PREFIX}/share/examples/tinyproxy .include bsd.port.mk Index: distinfo === RCS file: /cvs/ports/www/tinyproxy/distinfo,v retrieving revision 1.8 diff -u -p -u -r1.8 distinfo --- distinfo11 Apr 2009 23:54:12 - 1.8 +++ distinfo26 Feb 2012 18:32:11 - @@ -1,5 +1,5 @@ -MD5 (tinyproxy-1.6.4.tar.gz) = MVe5FZqNAF9CSM9NTWxl4g== -RMD160 (tinyproxy-1.6.4.tar.gz) = CpFVkch/LTB1/nzyk0uYknZooXw= -SHA1 (tinyproxy-1.6.4.tar.gz) = Gv3WqY6LH4arK2Z8DRXBJp7ao1w= -SHA256 (tinyproxy-1.6.4.tar.gz) = 2a0jShscCA4qyTRJ5TGGEf/XJ3EzUrbqn/d9EKcbAkI= -SIZE (tinyproxy-1.6.4.tar.gz) = 316567 +MD5 (tinyproxy-1.8.3.tar.gz) = 7Kkn9/apzoOUsrJWNhl4pw== +RMD160 (tinyproxy-1.8.3.tar.gz) = QcrkyPzJllCnbXvtUqN5qd0PrvA= +SHA1 (tinyproxy-1.8.3.tar.gz) = 6/S9pg/y0P3xhGRn8Hs7vZ75D68= +SHA256 (tinyproxy-1.8.3.tar.gz) = aCQWyPD3M6gQbIe7OVxjEiJWl1H+Rhe8OB0EmbDwwBc= +SIZE (tinyproxy-1.8.3.tar.gz) = 266744 Index: patches/patch-doc_tinyproxy_conf === RCS file: patches/patch-doc_tinyproxy_conf diff -N patches/patch-doc_tinyproxy_conf --- patches/patch-doc_tinyproxy_conf11 Apr 2009 23:54:12 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,47 +0,0 @@ -$OpenBSD: patch-doc_tinyproxy_conf,v 1.2 2009/04/11 23:54:12 sthen Exp $ doc/tinyproxy.conf.origSun Aug 24 06:58:43 2008 -+++ doc/tinyproxy.conf Tue Mar 24 03:09:09 2009 -@@ -6,8 +6,8 @@ - # Name of the user the tinyproxy daemon should switch to after the port - # has been bound. - # --User nobody --Group nogroup -+User _tinyproxy -+Group _tinyproxy - - # - # Port to listen on. -@@ -40,25 +40,25 @@ Timeout 600 - # /usr/share/tinyproxy - # /etc/tinyproxy - # --# ErrorFile 404 /usr/share/tinyproxy/404.html --# ErrorFile 400 /usr/share/tinyproxy/400.html --# ErrorFile 503 /usr/share/tinyproxy/503.html --# ErrorFile 403 /usr/share/tinyproxy/403.html --# ErrorFile 408 /usr/share/tinyproxy/408.html -+# ErrorFile 404 /usr/local/share/tinyproxy/404.html -+# ErrorFile 400 /usr/local/share/tinyproxy/400.html -+# ErrorFile 503 /usr/local/share/tinyproxy/503.html -+# ErrorFile 403 /usr/local/share/tinyproxy/403.html -+# ErrorFile 408 /usr/local/share/tinyproxy/408.html - - # - # DefaultErrorFile: The HTML file that gets sent if there is no - # HTML file defined with an ErrorFile keyword for the HTTP error - # that has occured. - # --DefaultErrorFile /usr/share/tinyproxy/default.html -+DefaultErrorFile /usr/local/share/tinyproxy/default.html - - # - # StatFile: The HTML file that gets sent when a request
Re: tinyproxy 1.6.4 - 1.8.3
On Thu, Feb 23, 2012 at 9:52 AM, frantisek holop min...@obiit.org wrote: hmm, on Thu, Feb 23, 2012 at 09:33:49AM +, Stuart Henderson said that On 2012/02/22 23:26, frantisek holop wrote: -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf oh *why* do they needlessly break people's installations like this... do you want me to override it to the old location? i think Federico's patch did this as well. (i personally am not fan of /etc/ subdirectories for 1 file configs.) if you're not going to keep it in /etc/tinyproxy/ you also need to update the manpages. btw your diff is almost what i sent you and i've been using since 2 months ago. f.-
Re: tinyproxy 1.6.4 - 1.8.3
hmm, on Sun, Feb 26, 2012 at 10:20:23PM +, Federico Schwindt said that On Thu, Feb 23, 2012 at 9:52 AM, frantisek holop min...@obiit.org wrote: hmm, on Thu, Feb 23, 2012 at 09:33:49AM +, Stuart Henderson said that On 2012/02/22 23:26, frantisek holop wrote: -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf oh *why* do they needlessly break people's installations like this... do you want me to override it to the old location? i think Federico's patch did this as well. (i personally am not fan of /etc/ subdirectories for 1 file configs.) if you're not going to keep it in /etc/tinyproxy/ you also need to update the manpages. the port i sent does as mainstream. (nobody commented otherwise, i will do as requested) btw your diff is almost what i sent you and i've been using since 2 months ago. it is. gradually all the other things fell away. -f -- if r is reverse, how come d is forward?
Re: tinyproxy 1.6.4 - 1.8.3
hmm, on Thu, Feb 23, 2012 at 07:54:41AM +0100, Antoine Jacoutot said that On Wed, Feb 22, 2012 at 11:26:27PM +0100, frantisek holop wrote: hi there, please find attached my update for tinyproxy. -the license is now GPLv2 (was v3) -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf i hope it's not a big problem that it's not in patch format... thanks to Federico G. Schwindt for prodding and something to compare to. i think that creating /var/run/tinyproxy is better at install time, and not in the rc script because otherwise running the daemon manually fails. No that is wrong. /var/run is removed at every reboot, so please keep the rc script the way it was. ok. can it stay in the package as well for the reason above? i see no harm in it.. -f -- reality is just another illusion.
Re: tinyproxy 1.6.4 - 1.8.3
On 2012/02/22 23:26, frantisek holop wrote: -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf oh *why* do they needlessly break people's installations like this...
Re: tinyproxy 1.6.4 - 1.8.3
On Thu, Feb 23, 2012 at 10:26:39AM +0100, frantisek holop wrote: hmm, on Thu, Feb 23, 2012 at 07:54:41AM +0100, Antoine Jacoutot said that On Wed, Feb 22, 2012 at 11:26:27PM +0100, frantisek holop wrote: hi there, please find attached my update for tinyproxy. -the license is now GPLv2 (was v3) -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf i hope it's not a big problem that it's not in patch format... thanks to Federico G. Schwindt for prodding and something to compare to. i think that creating /var/run/tinyproxy is better at install time, and not in the rc script because otherwise running the daemon manually fails. No that is wrong. /var/run is removed at every reboot, so please keep the rc script the way it was. ok. can it stay in the package as well for the reason above? i see no harm in it.. No. If you need to start something manually then you are supposed to do all required steps manually. And what happens when you pkg_add your stuff, reboot then try to start it manually? You will _have_ to recreate manually /var/run/... anyway. So please remove this from the pkg. -- Antoine
Re: tinyproxy 1.6.4 - 1.8.3
hmm, on Thu, Feb 23, 2012 at 09:33:49AM +, Stuart Henderson said that On 2012/02/22 23:26, frantisek holop wrote: -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf oh *why* do they needlessly break people's installations like this... do you want me to override it to the old location? i think Federico's patch did this as well. (i personally am not fan of /etc/ subdirectories for 1 file configs.) -f -- i'm so broke i can't even pay attention.
tinyproxy 1.6.4 - 1.8.3
hi there, please find attached my update for tinyproxy. -the license is now GPLv2 (was v3) -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf i hope it's not a big problem that it's not in patch format... thanks to Federico G. Schwindt for prodding and something to compare to. i think that creating /var/run/tinyproxy is better at install time, and not in the rc script because otherwise running the daemon manually fails. please test and commit -f -- you will become rich and famous unless you don't. tinyproxy-1.8.3.tgz Description: application/tar-gz
Re: tinyproxy 1.6.4 - 1.8.3
On Wed, Feb 22, 2012 at 11:26:27PM +0100, frantisek holop wrote: hi there, please find attached my update for tinyproxy. -the license is now GPLv2 (was v3) -configuration moved upstream from /etc/tinyproxy/ to /etc/tinyproxy.conf i hope it's not a big problem that it's not in patch format... thanks to Federico G. Schwindt for prodding and something to compare to. i think that creating /var/run/tinyproxy is better at install time, and not in the rc script because otherwise running the daemon manually fails. No that is wrong. /var/run is removed at every reboot, so please keep the rc script the way it was. -- Antoine