ports/83934: net/delegate update to 8.11.5
NAKAMURA, Takeshi
1yen at sh.rim.or.jp
Sat Jul 23 01:10:05 UTC 2005
>Number: 83934
>Category: ports
>Synopsis: net/delegate update to 8.11.5
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 23 01:10:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: NAKAMURA, Takeshi
>Release: FreeBSD 5.4-RELEASE-p4 i386
>Organization:
CRC Systems
>Environment:
>Description:
update
>How-To-Repeat:
>Fix:
use this patch
diff -Nru net/delegate.old/Makefile net/delegate/Makefile
--- net/delegate.old/Makefile Sat Jul 23 09:42:02 2005
+++ net/delegate/Makefile Fri Jul 15 07:17:18 2005
@@ -6,19 +6,27 @@
#
PORTNAME= delegate
-PORTVERSION= 8.11.3
+PORTVERSION= 8.11.5
CATEGORIES= net www
-MASTER_SITES= ftp://www.delegate.org/pub/DeleGate/ \
- ftp://ftp.delegate.org/pub/DeleGate/
+MASTER_SITES= ftp://ftp.delegate.org/pub/DeleGate/ \
+ ftp://adsl.delegate.org/pub/DeleGate/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= gioria at FreeBSD.org
COMMENT= General purpose TCP/IP proxy system
+.if !defined(ADMIN)
+IS_INTERACTIVE= yes
+.endif
USE_BZIP2= yes
-IS_INTERACTIVE= YES
-PORTDOCS= Manual.htm tutor-jp.htm tutor-en.htm
-PLIST_FILES= sbin/delegated etc/rc.d/delegated.sh-dist
+NO_CDROM= yes
+PORTDOCS= Manual.htm tutor-jp.htm tutor-en.htm jpconv.htm
+PLIST_TEMPALTE= ${PKGDIR}/pkg-plist
+PLIST= ${WRKDIR}/pkg-plist
+PKGMESSAGE_TEMPLATE= ${PKGDIR}/pkg-message
+PKGMESSAGE= ${WRKDIR}/pkg-message
+USE_REINPLACE= yes
+USE_RC_SUBR= yes
pre-everything::
.if !defined(FORCE_BUILD) || ${FORCE_BUILD}!="YES"
@@ -45,16 +53,38 @@
@${ECHO_MSG} "*********************************************************************"
.endif
+post-extract:
+ ${REINPLACE_CMD} -e "/^ADMIN/s/=/?=/" ${WRKSRC}/src/Makefile
+ ${SED} -e "s|%%PREFIX%%|${PREFIX}|" \
+ -e "s|%%RC_SUBR%%|${RC_SUBR}|" \
+ ${FILESDIR}/delegated.sh > ${WRKDIR}/delegated.sh-dist
+.if defined(ADMIN)
+ ${REINPLACE_CMD} -e "s|delegate-master at your.host.domain|${ADMIN}|" \
+ ${WRKDIR}/delegated.sh-dist
+.else
+ @${ECHO_MSG} 'You can set the ADMIN and ADMINPASS.'
+ @${ECHO_MSG} 'looks like "make ADMIN=delegate-master at example.net"'
+.endif
+
+pre-install:
+ ${CP} ${PLIST_TEMPALTE} ${PLIST}
+ ${TEST} -f ${PREFIX}/etc/rc.d/delegated.sh && \
+ ${REINPLACE_CMD} -e '/delegated.sh$$/d' ${PLIST} || ${TRUE}
+ ${SED} -e "s|%%DOCSDIR%%|${DOCSDIR}|" \
+ ${PKGMESSAGE_TEMPLATE} > ${PKGMESSAGE}
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${FILESDIR}/delegated.sh \
- ${PREFIX}/etc/rc.d/delegated.sh-dist
+ ${INSTALL_SCRIPT} ${WRKDIR}/delegated.sh-dist \
+ ${PREFIX}/etc/rc.d
+
+ ${TEST} -f ${PREFIX}/etc/rc.d/delegated.sh || \
+ ${INSTALL_SCRIPT} ${WRKDIR}/delegated.sh-dist ${PREFIX}/etc/rc.d/delegated.sh || ${TRUE}
+
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/$f ${DOCSDIR}
-.endfor
+ ${MKDIR} ${DOCSDIR}
+ cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
- @${CAT} ${PKGMESSAGE}
+ ${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -Nru net/delegate.old/distinfo net/delegate/distinfo
--- net/delegate.old/distinfo Sat Jul 23 09:42:02 2005
+++ net/delegate/distinfo Fri Jul 15 06:30:25 2005
@@ -1,2 +1,2 @@
-MD5 (delegate8.11.3.tar.bz2) = 2a82b5681536e517a9b4f3154abad0e4
-SIZE (delegate8.11.3.tar.bz2) = 1059921
+MD5 (delegate8.11.5.tar.bz2) = 58a3b10cd6dcecb8256b08eb6cc62efa
+SIZE (delegate8.11.5.tar.bz2) = 1062120
diff -Nru net/delegate.old/files/delegated.sh net/delegate/files/delegated.sh
--- net/delegate.old/files/delegated.sh Sun Oct 29 22:41:28 2000
+++ net/delegate/files/delegated.sh Sat Mar 19 16:34:17 2005
@@ -1,13 +1,35 @@
#!/bin/sh
-umask 027
-if [ -x /usr/local/sbin/delegated ]; then
- echo -n ' delegated'
- /usr/local/sbin/delegated -P8080 -Txt \
- ADMIN=delegate-master at your.host.domain \
- CHARCODE=JIS \
- CACHEDIR=/var/spool/delegate/cache \
- EXPIRE=7d \
- RELIABLE=hostname \
- > /dev/null 2>&1
-fi
+# PROVIDE: delegate
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# These can be overridden in your /etc/rc.conf.
+#
+delegate_enable=${delegate_enable:-"NO"}
+delegate_dgroot=${delegate_dgroot:-"/var/spool/delegate"}
+delegate_pidfile=${delegate_pidfile:-"${delegate_dgroot}/run/delegated.pid"}
+delegate_owner=${delegate_owner:-"nobody:nobody"}
+delegate_admin=${delegate_admin:-"delegate-master at your.host.domain"}
+delegate_flags=${delegate_flags:-"-P8080 -Txt PIDFILE=${delegate_pidfile} \
+ ADMIN=${delegate_admin}\
+ CHARCODE=guess \
+ DGROOT=${delegate_dgroot} \
+ EXPIRE=7d \
+ RELIABLE=localhost >/dev/null 2>&1"}
+
+. %%RC_SUBR%%
+
+name="delegate"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/delegated"
+
+
+start_precmd="chown -R ${delegate_owner} ${delegate_dgroot}"
+
+load_rc_config $name
+
+run_rc_command "$1"
diff -Nru net/delegate.old/pkg-message net/delegate/pkg-message
--- net/delegate.old/pkg-message Sun Feb 22 05:12:10 2004
+++ net/delegate/pkg-message Fri Mar 18 09:48:37 2005
@@ -8,13 +8,13 @@
*********************************************************************
----------------------------------------------------------------------
-Now, edit the sample script in /usr/local/share/examples/delegate directory
-and copy it into /usr/local/etc/rc.d.
-Especially, don't forget to specify correct value for the MANAGER.
-
You can also run an interactive configuration session by executing
delegated with no argument.
-Consult /usr/local/share/doc/delegate/Manual.htm for configuration
+Consult %%DOCSDIR%%/delegate/Manual.htm for configuration
information.
+
+HOW TO BOOT:
+ To run delagate from startup, add delegate_enable="YES"
+ and delegate_admin="admin at example.net" in your /etc/rc.conf.
----------------------------------------------------------------------
diff -Nru net/delegate.old/pkg-plist net/delegate/pkg-plist
--- net/delegate.old/pkg-plist Thu Jan 1 09:00:00 1970
+++ net/delegate/pkg-plist Fri Mar 18 17:50:04 2005
@@ -0,0 +1,4 @@
+ at unexec %D/etc/rc.d/delegated.sh stop || true
+sbin/delegated
+etc/rc.d/delegated.sh
+etc/rc.d/delegated.sh-dist
>Release-Note:
>Audit-Trail:
>Unformatted:
System: FreeBSD 5.4-RELEASE-p4 i386
<machine, os, target, libraries (multiple lines)>
More information about the freebsd-ports-bugs
mailing list