Attachment 153142 Details for Bug 188374 – update to 0.7.1.2

[patch] update to 0.7.1.2

3proxy.patch (text/plain), 6.83 KB, created by Pavel Timofeev on 2015-02-18 10:51:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-02-18 10:51:22 UTC

Size: 6.83 KB

patch

obsolete

>diff -ruN ./Makefile /usr/home/timp/temp/3proxy_new/Makefile
>--- ./Makefile	2015-02-18 13:45:39.565349047 +0300
>+++ /usr/home/timp/temp/3proxy_new/Makefile	2015-02-18 13:24:21.551418183 +0300
>@@ -2,11 +2,11 @@
> # $FreeBSD: head/net/3proxy/Makefile 367152 2014-09-03 04:29:13Z sunpoet $
> 
> PORTNAME=	3proxy
>-PORTVERSION=	0.6.1
>-PORTREVISION=	1
>+PORTVERSION=	0.7.1.2
> CATEGORIES=	net
> MASTER_SITES=	http://3proxy.ru/${PORTVERSION}/ \
> 		http://security.nnov.ru/soft/3proxy/${PORTVERSION}/
>+WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
>@@ -21,7 +21,7 @@
> MAKE_ENV=	PTHREAD_LIBS=-pthread
> MAKEFILE=	Makefile.unix
> USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
>-USE_RC_SUBR=	3proxy
>+USE_RC_SUBR=	threeproxy
> USES=		tar:tgz
> 
> PORTDOCS=	Readme
>diff -ruN ./distinfo /usr/home/timp/temp/3proxy_new/distinfo
>--- ./distinfo	2015-02-18 13:45:39.565349047 +0300
>+++ /usr/home/timp/temp/3proxy_new/distinfo	2015-02-18 13:24:21.552418890 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (3proxy-0.6.1.tgz) = 10f8804258791e80353a334dc9b80473a02c6dda939de76451e655f643aadd7f
>-SIZE (3proxy-0.6.1.tgz) = 480160
>+SHA256 (3proxy-0.7.1.2.tgz) = e1157aab3ff8215a3b1f35c61a9d6011e60ad38b52d9f74a1fc4cae14ba16a31
>+SIZE (3proxy-0.7.1.2.tgz) = 478532
>diff -ruN ./files/3proxy.in /usr/home/timp/temp/3proxy_new/files/3proxy.in
>--- ./files/3proxy.in	2015-02-18 13:45:39.564348814 +0300
>+++ /usr/home/timp/temp/3proxy_new/files/3proxy.in	1970-01-01 03:00:00.000000000 +0300
>@@ -1,29 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: head/net/3proxy/files/3proxy.in 340872 2014-01-24 00:14:07Z mat $
>-
>-# PROVIDE: threeproxy
>-# REQUIRE: DAEMON
>-# BEFORE: LOGIN
>-# KEYWORD: shutdown
>-
>-# Define these threeproxy_* variables in one of these files:
>-#	/etc/rc.conf
>-#	/etc/rc.conf.local
>-#	/etc/rc.conf.d/threeproxy
>-#
>-# DO NOT CHANGE THESE DEFAULT VALUES HERE
>-
>-threeproxy_enable=${threeproxy_enable-"NO"}
>-threeproxy_flags=${threeproxy_flags-"%%PREFIX%%/etc/3proxy.cfg"}
>-
>-. /etc/rc.subr
>-
>-name="threeproxy"
>-rcvar=threeproxy_enable
>-command="%%PREFIX%%/bin/3proxy"
>-
>-load_rc_config $name
>-
>-start_cmd="echo \"Starting ${name}.\";	${command} ${threeproxy_flags}"
>-
>-run_rc_command "$1"
>diff -ruN ./files/patch-Makefile.unix /usr/home/timp/temp/3proxy_new/files/patch-Makefile.unix
>--- ./files/patch-Makefile.unix	2015-02-18 13:45:39.564348814 +0300
>+++ /usr/home/timp/temp/3proxy_new/files/patch-Makefile.unix	2015-02-18 13:24:21.550417464 +0300
>@@ -1,26 +1,26 @@
>---- Makefile.unix.orig	2007-04-10 20:29:25.000000000 +0400
>-+++ Makefile.unix	2009-03-23 13:53:24.000000000 +0300
>+--- Makefile.unix.orig	2015-02-18 13:14:25.211448033 +0300
>++++ Makefile.unix	2015-02-18 13:15:31.043552706 +0300
> @@ -9,18 +9,18 @@
>- # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
>- 
>- BUILDDIR =
>--CC = gcc
>-+CC ?= gcc
>- 
>- # you may need -L/usr/pkg/lib for older NetBSD versions
>--CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
>-+CFLAGS = -Wall -c %%CFLAGS%% ${PTHREAD_CFLAGS} -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
>- COUT = -o 
>--LN = gcc
>--LDFLAGS = -Wall -O2 -pthread
>-+LN ?= ${CC}
>-+LDFLAGS = -Wall ${PTHREAD_LIBS}
>- # -lpthreads may be reuqired on some platforms instead of -pthreads
>- # -ldl or -lld may be required for some platforms
>- DCFLAGS = -fpic
>- DLFLAGS = -shared
>--DLSUFFICS = .ld.so
>-+DLSUFFICS = .so
>- LIBS =
>- LNOUT = -o 
>- EXESUFFICS =
>+ # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
>+ 
>+ BUILDDIR =
>+-CC = gcc
>++CC ?= gcc
>+ 
>+ # you may need -L/usr/pkg/lib for older NetBSD versions
>+-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
>++CFLAGS = -Wall -c %%CFLAGS%% ${PTHREAD_CFLAGS} -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
>+ COUT = -o 
>+-LN = gcc
>+-LDFLAGS = -Wall -O2 -pthread
>++LN ?= ${CC}
>++LDFLAGS = -Wall ${PTHREAD_LIBS}
>+ # -lpthreads may be reuqired on some platforms instead of -pthreads
>+ # -ldl or -lld may be required for some platforms
>+ DCFLAGS = -fpic
>+ DLFLAGS = -shared
>+-DLSUFFICS = .ld.so
>++DLSUFFICS = .so
>+ LIBS =
>+ LNOUT = -o 
>+ EXESUFFICS =
>diff -ruN ./files/patch-cfg-3proxy.cfg.sample /usr/home/timp/temp/3proxy_new/files/patch-cfg-3proxy.cfg.sample
>--- ./files/patch-cfg-3proxy.cfg.sample	2015-02-18 13:45:39.564348814 +0300
>+++ /usr/home/timp/temp/3proxy_new/files/patch-cfg-3proxy.cfg.sample	2015-02-18 13:24:21.550417464 +0300
>@@ -1,22 +1,22 @@
>---- cfg/3proxy.cfg.sample.orig	Mon May 30 11:16:19 2005
>-+++ cfg/3proxy.cfg.sample	Mon May 30 11:17:18 2005
>+--- cfg/3proxy.cfg.sample.orig	2015-02-18 13:18:10.602433754 +0300
>++++ cfg/3proxy.cfg.sample	2015-02-18 13:19:50.319430619 +0300
> @@ -30,15 +30,15 @@
>- # this example shows you how to include passwd file. For included files
>- # <CR> and <LF> are treated as field separators.
>- 
>--#daemon
>-+daemon
>- # now we will not depend on any console (daemonize). daemon must be given
>- # before any significant command on *nix.
>- 
>--service
>-+#service
>- # service is required under NT if you want 3proxy to start as service
>- 
>--#log /usr/local/etc/3proxy/logs/3proxy.log D
>--log c:\3proxy\logs\3proxy.log D
>-+log /var/log/3proxy.log D
>-+#log c:\3proxy\logs\3proxy.log D
>- # log allows to specify log file location and rotation, D means logfile
>- # is created daily
>- 
>+ # this example shows you how to include passwd file. For included files
>+ # <CR> and <LF> are treated as field separators.
>+ 
>+-#daemon
>++daemon
>+ # now we will not depend on any console (daemonize). daemon must be given
>+ # before any significant command on *nix.
>+ 
>+-service
>++#service
>+ # service is required under NT if you want 3proxy to start as service
>+ 
>+-#log /usr/local/etc/3proxy/logs/3proxy.log D
>+-log c:\3proxy\logs\3proxy.log D
>++log /var/log/3proxy.log D
>++#log c:\3proxy\logs\3proxy.log D
>+ # log allows to specify log file location and rotation, D means logfile
>+ # is created daily
>+ 
>diff -ruN ./files/threeproxy.in /usr/home/timp/temp/3proxy_new/files/threeproxy.in
>--- ./files/threeproxy.in	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/home/timp/temp/3proxy_new/files/threeproxy.in	2015-02-18 13:24:21.551418183 +0300
>@@ -0,0 +1,29 @@
>+#!/bin/sh
>+# $FreeBSD: head/net/3proxy/files/3proxy.in 340872 2014-01-24 00:14:07Z mat $
>+
>+# PROVIDE: threeproxy
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
>+
>+# Define these threeproxy_* variables in one of these files:
>+#	/etc/rc.conf
>+#	/etc/rc.conf.local
>+#	/etc/rc.conf.d/threeproxy
>+#
>+# DO NOT CHANGE THESE DEFAULT VALUES HERE
>+
>+threeproxy_enable=${threeproxy_enable-"NO"}
>+threeproxy_flags=${threeproxy_flags-"%%PREFIX%%/etc/3proxy.cfg"}
>+
>+. /etc/rc.subr
>+
>+name="threeproxy"
>+rcvar=threeproxy_enable
>+command="%%PREFIX%%/bin/3proxy"
>+
>+load_rc_config $name
>+
>+start_cmd="echo \"Starting ${name}.\";	${command} ${threeproxy_flags}"
>+
>+run_rc_command "$1"

Actions: View | Diff

Attachments on bug 188374: 141553 | 146068 | 146716 | 153142 | 153143 | 155089 | 155118 | 157205 | 157213 | 157726