ports/50674: [MAINTAINER UPDATE] ftp/frox to 0.7.7
Sergey Matveychuk
sem at ciam.ru
Mon Apr 7 11:50:25 UTC 2003
>Number: 50674
>Category: ports
>Synopsis: [MAINTAINER UPDATE] ftp/frox to 0.7.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 07 04:50:23 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Sergey Matveychuk
>Release: FreeBSD 5.0-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD sem-home.ciam.ru 5.0-RELEASE-p2 FreeBSD 5.0-RELEASE-p2 #1: Tue Mar 4 00:57:30 MSK 2003 root at sem-home.ciam.ru:/usr/src/sys/i386/compile/SEM-HOME i386
>Description:
* Update to 0.7.7
* Move from minium build to maximum (change WITH_ to WITHOUT_) by default
* Allow to build with local-cache and virus-scan features
* make startup script more smarter
>How-To-Repeat:
>Fix:
diff -ruN frox.orig/Makefile frox/Makefile
--- frox.orig/Makefile Sat Feb 22 23:02:10 2003
+++ frox/Makefile Mon Apr 7 15:26:19 2003
@@ -6,7 +6,7 @@
#
PORTNAME= frox
-PORTVERSION= 0.7.4
+PORTVERSION= 0.7.7
CATEGORIES= ftp
MASTER_SITES= http://www.hollo.org/frox/download/ \
http://frox.sourceforge.net/download/ \
@@ -29,13 +29,19 @@
CONFIGURE_ARGS= --enable-configfile=${PREFIX}/etc/frox.conf
-.if defined(WITH_HTTP_CACHE)
-CONFIGURE_ARGS+= --enable-http-cache
-.endif
.if defined(WITH_IPFILTER)
CONFIGURE_ARGS+= --enable-ipfilter
.endif
-.if defined(WITH_CCP)
+.if defined(WITH_VIRUS_SCAN)
+CONFIGURE_ARGS+= --enable-virus-scan
+.endif
+.if !defined(WITHOUT_HTTP_CACHE)
+CONFIGURE_ARGS+= --enable-http-cache
+.endif
+.if !defined(WITHOUT_LOCAL_CACHE)
+CONFIGURE_ARGS+= --enable-local-cache
+.endif
+.if !defined(WITHOUT_CCP)
CONFIGURE_ARGS+= --enable-ccp
.endif
.if defined(RUN_AS_ROOT)
@@ -46,11 +52,14 @@
@${ECHO} ""
@${ECHO} "You can use the following build options:"
@${ECHO} ""
- @${ECHO} " WITH_HTTP_CACHE=yes enable http-cache (like squid) using;"
- @${ECHO} " WITH_IPFILTER=yes force use ipfilter instead of ipfw;"
- @${ECHO} " WITH_CCP=yes enable ftp-proxy style command control programs;"
- @${ECHO} " RUN_AS_ROOT=yes allow frox running as root (not recomended)"
- @${ECHO} " for using port number <1024."
+ @${ECHO} " WITH_IPFILTER=yes use ipfilter instead of ipfw;"
+ @${ECHO} " WITH_VIRUS_SCAN=yes enable to run external virus scaner on each"
+ @${ECHO} " download (experimental);"
+ @${ECHO} " WITHOUT_HTTP_CACHE=yes disable use of external cache;"
+ @${ECHO} " WITHOUT_LOCAL_CACHE=yes disable use of local cache;"
+ @${ECHO} " WITHOUT_CCP=yes disable ftp-proxy style command control programs;"
+ @${ECHO} " RUN_AS_ROOT=yes allow frox running as root for using"
+ @${ECHO} " port number <1024 (not recomended)."
@${ECHO} ""
pre-patch:
diff -ruN frox.orig/distinfo frox/distinfo
--- frox.orig/distinfo Sun Jun 23 11:36:16 2002
+++ frox/distinfo Mon Apr 7 14:17:08 2003
@@ -1 +1 @@
-MD5 (frox-0.7.4.tar.bz2) = b7f1665635aaf5bc72b82809ee7c4f98
+MD5 (frox-0.7.7.tar.bz2) = 177f241ad8e5541a87a7a7834d522d8a
diff -ruN frox.orig/files/frox.sh frox/files/frox.sh
--- frox.orig/files/frox.sh Sun Jun 23 11:36:16 2002
+++ frox/files/frox.sh Mon Apr 7 15:03:22 2003
@@ -8,12 +8,12 @@
case "$1" in
start)
[ -x ${PREFIX}/sbin/frox -a -f ${PREFIX}/etc/frox.conf ]
- grep -q '^ *# *FromInetd *yes' ${PREFIX}/etc/frox.conf && \
+ ! grep -iq '^[[:space:]]*frominetd[[:space:]]*yes' ${PREFIX}/etc/frox.conf && \
${PREFIX}/sbin/frox && \
echo -n ' frox'
;;
stop)
- kill `cat /var/run/frox.pid` && echo -n ' frox'
+ [ -f /var/run/frox.pid ] && kill `cat /var/run/frox.pid` && echo -n ' frox'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff -ruN frox.orig/files/patch-aa frox/files/patch-aa
--- frox.orig/files/patch-aa Sun Jun 23 11:36:16 2002
+++ frox/files/patch-aa Mon Apr 7 15:08:05 2003
@@ -1,6 +1,6 @@
---- src/frox.conf.orig Wed Jun 12 08:01:44 2002
-+++ src/frox.conf Wed Jun 12 08:12:27 2002
-@@ -18,6 +18,7 @@
+--- src/frox.conf.orig Sat Apr 5 17:30:35 2003
++++ src/frox.conf Mon Apr 7 15:05:51 2003
+@@ -18,16 +18,13 @@
# commented out to listen on all local IPs.
#
# Listen firewall.localnet
@@ -8,17 +8,17 @@
Listen 192.168.2.1
# Port to listen on. Must be supplied.
-@@ -26,7 +27,8 @@
-
- # If specified then bind to this device
#
--BindToDevice eth0
-+# DON'T USE: It's not supported for FreeBSD
-+#BindToDevice eth0
+ Port 2121
+-# If specified then bind to this device
+-#
+-BindToDevice eth0
+-
# Whether to run from inetd. You should still define Port above, but
# it isn't used for much.
-@@ -39,7 +41,7 @@
+ #
+@@ -44,7 +41,7 @@
# comment this out and copy resolver libraries into the chroot jail instead.
# See FAQ section 3.2 for details.
#
@@ -27,7 +27,7 @@
# Another ftp proxy to forward on to. Frox will contact this ftp
# proxy, and send it a login name of the form "user at host:port" where
-@@ -54,8 +56,8 @@
+@@ -64,8 +61,8 @@
# you really want to run as root (not a good idea) you must say so
# specifically, and have compiled with --enable-run-as-root.
#
@@ -38,7 +38,7 @@
# This is frox's working directory - it must be specified. Temporary
# files and sockets will be created here. If you are using local
-@@ -64,8 +66,8 @@
+@@ -74,8 +71,8 @@
# also chroot to this dir on startup. To avoid this you must specifically
# set DontChroot to Yes.
#
diff -ruN frox.orig/pkg-message frox/pkg-message
--- frox.orig/pkg-message Sun Jun 23 11:36:16 2002
+++ frox/pkg-message Mon Apr 7 15:30:54 2003
@@ -5,8 +5,7 @@
%%PREFIX%%/etc/rc.d/frox.sh start
Or you can run frox with inetd this way:
-* uncomment 'FromInetd yes' in your %%PREFIX%%/etc/frox.conf (so frox
-would not run on startup by %%PREFIX%%/etc/rc.d/frox.sh)
+* uncomment 'FromInetd yes' in your %%PREFIX%%/etc/frox.conf
* add this line in /etc/inetd.conf:
frox stream tcp nowait nobody %%PREFIX%%/sbin/frox frox
* and assign port number for frox you want in /etc/services (e.g. 2121):
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list