sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-24 22:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 3.0.5rc1

Browse source 
- New USE_RC_SUBR order
- Stop daemons on ports deinstall. (Add note in UPDATING about this)

PR:		ports/102489
Submitted by:	maintainer
This commit is contained in:
Sergey Matveychuk 2006-08-25 12:02:58 +00:00
parent eefc3f4c5f
commit 20b17ff3de
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=171378
33 changed files with 173 additions and 392 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
UPDATING
View file

@ -8,6 +8,19 @@ upgrades.
20060818:
AFFECTS: users of net/isc-dhcp3-server or net/isc-dhcp3-relay
AUTHOR: Joerg.Pulz@frm2.tum.de
Starting with version 3.0.5rc1 of the ISC DHCPD package, any running
"dhcpd" or "dhcrelay" processes are stopped automatically when the port
gets deinstalled.
Please remember to start the services again manually, in case you upgrade
from version 3.0.5rc1 or newer to any other version.
Due to the better use of the USE_RC_SUBR framework, the rc script name may
change from isc-dhcpd.sh or isc-dhcrelay.sh to isc-dhcpd or isc-dhcrelay
depending on the FreeBSD version you use.
20060818: 20060818:
AFFECTS: users of www/gallery2 AFFECTS: users of www/gallery2
AUTHOR: miwi@FreeBSD.org AUTHOR: miwi@FreeBSD.org

5
net/isc-dhcp3-relay/pkg-plist
View file

@ -1,3 +1,4 @@
@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp3-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $ @comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp3-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
etc/rc.d/isc-dhcrelay.sh @unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay sbin/dhcrelay

41
net/isc-dhcp3-server/Makefile
View file

@ -7,8 +7,7 @@
# #
PORTNAME= dhcp PORTNAME= dhcp
PORTVERSION= 3.0.4 PORTVERSION= 3.0.5.r1
PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server COMMENT?= The ISC Dynamic Host Configuration Protocol server
USE_RC_SUBR= yes
SUBSYS?= server SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server .elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell BIN_FILES= dhcpd omshell
RC_FILES= isc-dhcpd USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP) .if defined(WITH_DHCP_LDAP)
@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif .endif
.elif ${SUBSYS} == relay .elif ${SUBSYS} == relay
BIN_FILES= dhcrelay BIN_FILES= dhcrelay
RC_FILES= isc-dhcrelay USE_RC_SUBR= isc-dhcrelay
.endif .endif
SAMP_SUFX= .sample SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc CONF_DIR= ${PREFIX}/etc
RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db DATADIR= /var/db
@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment " PLIST_SUB+= LDAP="@comment "
.endif .endif
REINPLACE_SUB= PREFIX=${PREFIX} REINPLACE_SUB= PREFIX=${PREFIX}
RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100 .if ${OSVERSION} >= 502100
RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else .else
RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin SUB_LIST+= NOLOGIN=/sbin/nologin
.endif .endif
.if !defined(WITHOUT_DHCP_PARANOIA) .if !defined(WITHOUT_DHCP_PARANOIA)
RCSCRIPTS_SUB+= PARANOIA=YES SUB_LIST+= PARANOIA=YES
.else .else
RCSCRIPTS_SUB+= PARANOIA=NO SUB_LIST+= PARANOIA=NO
.endif .endif
.if !defined(WITHOUT_DHCP_JAIL) .if !defined(WITHOUT_DHCP_JAIL)
RCSCRIPTS_SUB+= JAIL=YES SUB_LIST+= JAIL=YES
.else .else
RCSCRIPTS_SUB+= JAIL=NO SUB_LIST+= JAIL=NO
.endif .endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}" DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \ post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \ patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \ patch-pkgmessage patch-site-conf \
patch-rc-scripts patch-dlq patch-dlq
patch-scripts: patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages: patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3 @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
patch-rc-scripts:
.for f in ${RC_FILES}
@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
.endfor
patch-pkgmessage: patch-pkgmessage:
.if ${SUBSYS} != devel .if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -283,12 +272,13 @@ patch-dlq:
# Post-install # Post-install
# #
POST-INSTALL= parallel-post-install configure-package display-message POST-INSTALL= parallel-post-install install-rc-script configure-package \
display-message
.ORDER: ${POST-INSTALL} .ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL} post-install: ${POST-INSTALL}
parallel-post-install: \ parallel-post-install: \
strip-binary-files install-startup-files \ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \ install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files create-conf-files create-data-files
@ -302,11 +292,6 @@ strip-binary-files:
.endif .endif
.endfor .endfor
install-startup-files:
.for f in ${RC_FILES}
@${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
.endfor
install-doc-files: install-doc-files:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

18
net/isc-dhcp3-server/distinfo
View file

@ -1,9 +1,9 @@
MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151 MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
SIZE (dhcp-3.0.4.tar.gz) = 883245 SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
SIZE (dhcp-3.0.4-ldap-patch) = 154663 SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108 SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
SIZE (dhcp-3.0.4-dlq-patch) = 7655 SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655

4
net/isc-dhcp3-server/files/isc-dhcpd.sh.sample → net/isc-dhcp3-server/files/isc-dhcpd.in
View file

@ -18,7 +18,7 @@ name=dhcpd
paranoia=%%PARANOIA%% # compiled in paranoia? paranoia=%%PARANOIA%% # compiled in paranoia?
jail=%%JAIL%% # compiled in jail? jail=%%JAIL%% # compiled in jail?
load_rc_config $name load_rc_config ${name}
# override these variables in /etc/rc.conf # override these variables in /etc/rc.conf
dhcpd_enable=${dhcpd_enable:-"NO"} dhcpd_enable=${dhcpd_enable:-"NO"}
@ -697,7 +697,7 @@ dhcpd_uninstall ()
fi fi
} }
rcvar=$(set_rcvar) rcvar=${name}_enable
load_rc_config ${name} load_rc_config ${name}
__dhcpd_uninstall="NO" # internal use only __dhcpd_uninstall="NO" # internal use only

2
net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample → net/isc-dhcp3-server/files/isc-dhcrelay.in
View file

@ -47,7 +47,7 @@ dhcrelay_precmd ()
. %%RC_SUBR%% . %%RC_SUBR%%
name=dhcrelay name=dhcrelay
rcvar=$(set_rcvar) rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name} command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid pidfile=/var/run/${name}.pid

53
net/isc-dhcp3-server/files/patch-server::dhcp.c
View file

@ -1,53 +0,0 @@
--- server/dhcp.c.orig Wed Feb 22 23:43:27 2006
+++ server/dhcp.c Mon May 22 01:39:59 2006
@@ -2442,6 +2442,7 @@
offered_lease_time =
state -> offered_expiry - cur_time;
+ state -> expiry = 0;
putULong ((unsigned char *)&state -> expiry,
(unsigned long)offered_lease_time);
i = DHO_DHCP_LEASE_TIME;
@@ -2452,7 +2453,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> expiry,
- sizeof state -> expiry,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2463,6 +2464,7 @@
/* Renewal time is lease time * 0.5. */
offered_lease_time /= 2;
+ state -> renewal = 0;
putULong ((unsigned char *)&state -> renewal,
(unsigned long)offered_lease_time);
i = DHO_DHCP_RENEWAL_TIME;
@@ -2474,7 +2476,7 @@
if (make_const_data (&oc -> expression,
(unsigned char *)
&state -> renewal,
- sizeof state -> renewal,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2486,6 +2488,7 @@
/* Rebinding time is lease time * 0.875. */
offered_lease_time += (offered_lease_time / 2
+ offered_lease_time / 4);
+ state -> rebind = 0;
putULong ((unsigned char *)&state -> rebind,
(unsigned)offered_lease_time);
i = DHO_DHCP_REBINDING_TIME;
@@ -2496,7 +2499,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> rebind,
- sizeof state -> rebind,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,

12
net/isc-dhcp3-server/pkg-install
View file

@ -9,10 +9,18 @@
case $2 in case $2 in
POST-INSTALL) POST-INSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
fi
;; ;;
DEINSTALL) DEINSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
fi
;; ;;
POST-DEINSTALL|PRE-INSTALL) POST-DEINSTALL|PRE-INSTALL)
;; ;;

3
net/isc-dhcp3-server/pkg-plist
View file

@ -1,8 +1,9 @@
@comment $FreeBSD$ @comment $FreeBSD$
@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl %%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample etc/dhcpd.conf.sample
etc/rc.d/isc-dhcpd.sh
sbin/dhcpd sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema %%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%% %%LDAP%%@dirrm %%SCHEMA_DIR%%

5
net/isc-dhcp30-relay/pkg-plist
View file

@ -1,3 +1,4 @@
@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $ @comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
etc/rc.d/isc-dhcrelay.sh @unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay sbin/dhcrelay

41
net/isc-dhcp30-server/Makefile
View file

@ -7,8 +7,7 @@
# #
PORTNAME= dhcp PORTNAME= dhcp
PORTVERSION= 3.0.4 PORTVERSION= 3.0.5.r1
PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server COMMENT?= The ISC Dynamic Host Configuration Protocol server
USE_RC_SUBR= yes
SUBSYS?= server SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server .elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell BIN_FILES= dhcpd omshell
RC_FILES= isc-dhcpd USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP) .if defined(WITH_DHCP_LDAP)
@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif .endif
.elif ${SUBSYS} == relay .elif ${SUBSYS} == relay
BIN_FILES= dhcrelay BIN_FILES= dhcrelay
RC_FILES= isc-dhcrelay USE_RC_SUBR= isc-dhcrelay
.endif .endif
SAMP_SUFX= .sample SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc CONF_DIR= ${PREFIX}/etc
RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db DATADIR= /var/db
@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment " PLIST_SUB+= LDAP="@comment "
.endif .endif
REINPLACE_SUB= PREFIX=${PREFIX} REINPLACE_SUB= PREFIX=${PREFIX}
RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100 .if ${OSVERSION} >= 502100
RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else .else
RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin SUB_LIST+= NOLOGIN=/sbin/nologin
.endif .endif
.if !defined(WITHOUT_DHCP_PARANOIA) .if !defined(WITHOUT_DHCP_PARANOIA)
RCSCRIPTS_SUB+= PARANOIA=YES SUB_LIST+= PARANOIA=YES
.else .else
RCSCRIPTS_SUB+= PARANOIA=NO SUB_LIST+= PARANOIA=NO
.endif .endif
.if !defined(WITHOUT_DHCP_JAIL) .if !defined(WITHOUT_DHCP_JAIL)
RCSCRIPTS_SUB+= JAIL=YES SUB_LIST+= JAIL=YES
.else .else
RCSCRIPTS_SUB+= JAIL=NO SUB_LIST+= JAIL=NO
.endif .endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}" DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \ post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \ patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \ patch-pkgmessage patch-site-conf \
patch-rc-scripts patch-dlq patch-dlq
patch-scripts: patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages: patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3 @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
patch-rc-scripts:
.for f in ${RC_FILES}
@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
.endfor
patch-pkgmessage: patch-pkgmessage:
.if ${SUBSYS} != devel .if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -283,12 +272,13 @@ patch-dlq:
# Post-install # Post-install
# #
POST-INSTALL= parallel-post-install configure-package display-message POST-INSTALL= parallel-post-install install-rc-script configure-package \
display-message
.ORDER: ${POST-INSTALL} .ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL} post-install: ${POST-INSTALL}
parallel-post-install: \ parallel-post-install: \
strip-binary-files install-startup-files \ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \ install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files create-conf-files create-data-files
@ -302,11 +292,6 @@ strip-binary-files:
.endif .endif
.endfor .endfor
install-startup-files:
.for f in ${RC_FILES}
@${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
.endfor
install-doc-files: install-doc-files:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

18
net/isc-dhcp30-server/distinfo
View file

@ -1,9 +1,9 @@
MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151 MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
SIZE (dhcp-3.0.4.tar.gz) = 883245 SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
SIZE (dhcp-3.0.4-ldap-patch) = 154663 SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108 SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
SIZE (dhcp-3.0.4-dlq-patch) = 7655 SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655

4
net/isc-dhcp31-server/files/isc-dhcpd.sh.sample → net/isc-dhcp30-server/files/isc-dhcpd.in
View file

@ -18,7 +18,7 @@ name=dhcpd
paranoia=%%PARANOIA%% # compiled in paranoia? paranoia=%%PARANOIA%% # compiled in paranoia?
jail=%%JAIL%% # compiled in jail? jail=%%JAIL%% # compiled in jail?
load_rc_config $name load_rc_config ${name}
# override these variables in /etc/rc.conf # override these variables in /etc/rc.conf
dhcpd_enable=${dhcpd_enable:-"NO"} dhcpd_enable=${dhcpd_enable:-"NO"}
@ -697,7 +697,7 @@ dhcpd_uninstall ()
fi fi
} }
rcvar=$(set_rcvar) rcvar=${name}_enable
load_rc_config ${name} load_rc_config ${name}
__dhcpd_uninstall="NO" # internal use only __dhcpd_uninstall="NO" # internal use only

2
net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample → net/isc-dhcp30-server/files/isc-dhcrelay.in
View file

@ -47,7 +47,7 @@ dhcrelay_precmd ()
. %%RC_SUBR%% . %%RC_SUBR%%
name=dhcrelay name=dhcrelay
rcvar=$(set_rcvar) rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name} command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid pidfile=/var/run/${name}.pid

53
net/isc-dhcp30-server/files/patch-server::dhcp.c
View file

@ -1,53 +0,0 @@
--- server/dhcp.c.orig Wed Feb 22 23:43:27 2006
+++ server/dhcp.c Mon May 22 01:39:59 2006
@@ -2442,6 +2442,7 @@
offered_lease_time =
state -> offered_expiry - cur_time;
+ state -> expiry = 0;
putULong ((unsigned char *)&state -> expiry,
(unsigned long)offered_lease_time);
i = DHO_DHCP_LEASE_TIME;
@@ -2452,7 +2453,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> expiry,
- sizeof state -> expiry,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2463,6 +2464,7 @@
/* Renewal time is lease time * 0.5. */
offered_lease_time /= 2;
+ state -> renewal = 0;
putULong ((unsigned char *)&state -> renewal,
(unsigned long)offered_lease_time);
i = DHO_DHCP_RENEWAL_TIME;
@@ -2474,7 +2476,7 @@
if (make_const_data (&oc -> expression,
(unsigned char *)
&state -> renewal,
- sizeof state -> renewal,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2486,6 +2488,7 @@
/* Rebinding time is lease time * 0.875. */
offered_lease_time += (offered_lease_time / 2
+ offered_lease_time / 4);
+ state -> rebind = 0;
putULong ((unsigned char *)&state -> rebind,
(unsigned)offered_lease_time);
i = DHO_DHCP_REBINDING_TIME;
@@ -2496,7 +2499,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> rebind,
- sizeof state -> rebind,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,

12
net/isc-dhcp30-server/pkg-install
View file

@ -9,10 +9,18 @@
case $2 in case $2 in
POST-INSTALL) POST-INSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
fi
;; ;;
DEINSTALL) DEINSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
fi
;; ;;
POST-DEINSTALL|PRE-INSTALL) POST-DEINSTALL|PRE-INSTALL)
;; ;;

3
net/isc-dhcp30-server/pkg-plist
View file

@ -1,8 +1,9 @@
@comment $FreeBSD$ @comment $FreeBSD$
@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl %%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample etc/dhcpd.conf.sample
etc/rc.d/isc-dhcpd.sh
sbin/dhcpd sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema %%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%% %%LDAP%%@dirrm %%SCHEMA_DIR%%

5
net/isc-dhcp31-relay/pkg-plist
View file

@ -1,3 +1,4 @@
@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $ @comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
etc/rc.d/isc-dhcrelay.sh @unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay sbin/dhcrelay

41
net/isc-dhcp31-server/Makefile
View file

@ -7,8 +7,7 @@
# #
PORTNAME= dhcp PORTNAME= dhcp
PORTVERSION= 3.0.4 PORTVERSION= 3.0.5.r1
PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server COMMENT?= The ISC Dynamic Host Configuration Protocol server
USE_RC_SUBR= yes
SUBSYS?= server SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server .elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell BIN_FILES= dhcpd omshell
RC_FILES= isc-dhcpd USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP) .if defined(WITH_DHCP_LDAP)
@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif .endif
.elif ${SUBSYS} == relay .elif ${SUBSYS} == relay
BIN_FILES= dhcrelay BIN_FILES= dhcrelay
RC_FILES= isc-dhcrelay USE_RC_SUBR= isc-dhcrelay
.endif .endif
SAMP_SUFX= .sample SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc CONF_DIR= ${PREFIX}/etc
RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db DATADIR= /var/db
@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment " PLIST_SUB+= LDAP="@comment "
.endif .endif
REINPLACE_SUB= PREFIX=${PREFIX} REINPLACE_SUB= PREFIX=${PREFIX}
RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100 .if ${OSVERSION} >= 502100
RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else .else
RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin SUB_LIST+= NOLOGIN=/sbin/nologin
.endif .endif
.if !defined(WITHOUT_DHCP_PARANOIA) .if !defined(WITHOUT_DHCP_PARANOIA)
RCSCRIPTS_SUB+= PARANOIA=YES SUB_LIST+= PARANOIA=YES
.else .else
RCSCRIPTS_SUB+= PARANOIA=NO SUB_LIST+= PARANOIA=NO
.endif .endif
.if !defined(WITHOUT_DHCP_JAIL) .if !defined(WITHOUT_DHCP_JAIL)
RCSCRIPTS_SUB+= JAIL=YES SUB_LIST+= JAIL=YES
.else .else
RCSCRIPTS_SUB+= JAIL=NO SUB_LIST+= JAIL=NO
.endif .endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}" DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \ post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \ patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \ patch-pkgmessage patch-site-conf \
patch-rc-scripts patch-dlq patch-dlq
patch-scripts: patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages: patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3 @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
patch-rc-scripts:
.for f in ${RC_FILES}
@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
.endfor
patch-pkgmessage: patch-pkgmessage:
.if ${SUBSYS} != devel .if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -283,12 +272,13 @@ patch-dlq:
# Post-install # Post-install
# #
POST-INSTALL= parallel-post-install configure-package display-message POST-INSTALL= parallel-post-install install-rc-script configure-package \
display-message
.ORDER: ${POST-INSTALL} .ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL} post-install: ${POST-INSTALL}
parallel-post-install: \ parallel-post-install: \
strip-binary-files install-startup-files \ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \ install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files create-conf-files create-data-files
@ -302,11 +292,6 @@ strip-binary-files:
.endif .endif
.endfor .endfor
install-startup-files:
.for f in ${RC_FILES}
@${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
.endfor
install-doc-files: install-doc-files:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

18
net/isc-dhcp31-server/distinfo
View file

@ -1,9 +1,9 @@
MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151 MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
SIZE (dhcp-3.0.4.tar.gz) = 883245 SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
SIZE (dhcp-3.0.4-ldap-patch) = 154663 SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108 SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
SIZE (dhcp-3.0.4-dlq-patch) = 7655 SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655

4
net/isc-dhcp40-server/files/isc-dhcpd.sh.sample → net/isc-dhcp31-server/files/isc-dhcpd.in
View file

@ -18,7 +18,7 @@ name=dhcpd
paranoia=%%PARANOIA%% # compiled in paranoia? paranoia=%%PARANOIA%% # compiled in paranoia?
jail=%%JAIL%% # compiled in jail? jail=%%JAIL%% # compiled in jail?
load_rc_config $name load_rc_config ${name}
# override these variables in /etc/rc.conf # override these variables in /etc/rc.conf
dhcpd_enable=${dhcpd_enable:-"NO"} dhcpd_enable=${dhcpd_enable:-"NO"}
@ -697,7 +697,7 @@ dhcpd_uninstall ()
fi fi
} }
rcvar=$(set_rcvar) rcvar=${name}_enable
load_rc_config ${name} load_rc_config ${name}
__dhcpd_uninstall="NO" # internal use only __dhcpd_uninstall="NO" # internal use only

2
net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample → net/isc-dhcp31-server/files/isc-dhcrelay.in
View file

@ -47,7 +47,7 @@ dhcrelay_precmd ()
. %%RC_SUBR%% . %%RC_SUBR%%
name=dhcrelay name=dhcrelay
rcvar=$(set_rcvar) rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name} command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid pidfile=/var/run/${name}.pid

53
net/isc-dhcp31-server/files/patch-server::dhcp.c
View file

@ -1,53 +0,0 @@
--- server/dhcp.c.orig Wed Feb 22 23:43:27 2006
+++ server/dhcp.c Mon May 22 01:39:59 2006
@@ -2442,6 +2442,7 @@
offered_lease_time =
state -> offered_expiry - cur_time;
+ state -> expiry = 0;
putULong ((unsigned char *)&state -> expiry,
(unsigned long)offered_lease_time);
i = DHO_DHCP_LEASE_TIME;
@@ -2452,7 +2453,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> expiry,
- sizeof state -> expiry,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2463,6 +2464,7 @@
/* Renewal time is lease time * 0.5. */
offered_lease_time /= 2;
+ state -> renewal = 0;
putULong ((unsigned char *)&state -> renewal,
(unsigned long)offered_lease_time);
i = DHO_DHCP_RENEWAL_TIME;
@@ -2474,7 +2476,7 @@
if (make_const_data (&oc -> expression,
(unsigned char *)
&state -> renewal,
- sizeof state -> renewal,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2486,6 +2488,7 @@
/* Rebinding time is lease time * 0.875. */
offered_lease_time += (offered_lease_time / 2
+ offered_lease_time / 4);
+ state -> rebind = 0;
putULong ((unsigned char *)&state -> rebind,
(unsigned)offered_lease_time);
i = DHO_DHCP_REBINDING_TIME;
@@ -2496,7 +2499,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> rebind,
- sizeof state -> rebind,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,

12
net/isc-dhcp31-server/pkg-install
View file

@ -9,10 +9,18 @@
case $2 in case $2 in
POST-INSTALL) POST-INSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
fi
;; ;;
DEINSTALL) DEINSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
fi
;; ;;
POST-DEINSTALL|PRE-INSTALL) POST-DEINSTALL|PRE-INSTALL)
;; ;;

3
net/isc-dhcp31-server/pkg-plist
View file

@ -1,8 +1,9 @@
@comment $FreeBSD$ @comment $FreeBSD$
@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl %%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample etc/dhcpd.conf.sample
etc/rc.d/isc-dhcpd.sh
sbin/dhcpd sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema %%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%% %%LDAP%%@dirrm %%SCHEMA_DIR%%

5
net/isc-dhcp40-relay/pkg-plist
View file

@ -1,3 +1,4 @@
@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $ @comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
etc/rc.d/isc-dhcrelay.sh @unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay sbin/dhcrelay

41
net/isc-dhcp40-server/Makefile
View file

@ -7,8 +7,7 @@
# #
PORTNAME= dhcp PORTNAME= dhcp
PORTVERSION= 3.0.4 PORTVERSION= 3.0.5.r1
PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server COMMENT?= The ISC Dynamic Host Configuration Protocol server
USE_RC_SUBR= yes
SUBSYS?= server SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server .elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell BIN_FILES= dhcpd omshell
RC_FILES= isc-dhcpd USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP) .if defined(WITH_DHCP_LDAP)
@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif .endif
.elif ${SUBSYS} == relay .elif ${SUBSYS} == relay
BIN_FILES= dhcrelay BIN_FILES= dhcrelay
RC_FILES= isc-dhcrelay USE_RC_SUBR= isc-dhcrelay
.endif .endif
SAMP_SUFX= .sample SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc CONF_DIR= ${PREFIX}/etc
RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db DATADIR= /var/db
@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment " PLIST_SUB+= LDAP="@comment "
.endif .endif
REINPLACE_SUB= PREFIX=${PREFIX} REINPLACE_SUB= PREFIX=${PREFIX}
RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100 .if ${OSVERSION} >= 502100
RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else .else
RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin SUB_LIST+= NOLOGIN=/sbin/nologin
.endif .endif
.if !defined(WITHOUT_DHCP_PARANOIA) .if !defined(WITHOUT_DHCP_PARANOIA)
RCSCRIPTS_SUB+= PARANOIA=YES SUB_LIST+= PARANOIA=YES
.else .else
RCSCRIPTS_SUB+= PARANOIA=NO SUB_LIST+= PARANOIA=NO
.endif .endif
.if !defined(WITHOUT_DHCP_JAIL) .if !defined(WITHOUT_DHCP_JAIL)
RCSCRIPTS_SUB+= JAIL=YES SUB_LIST+= JAIL=YES
.else .else
RCSCRIPTS_SUB+= JAIL=NO SUB_LIST+= JAIL=NO
.endif .endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}" DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \ post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \ patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \ patch-pkgmessage patch-site-conf \
patch-rc-scripts patch-dlq patch-dlq
patch-scripts: patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages: patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3 @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
patch-rc-scripts:
.for f in ${RC_FILES}
@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
.endfor
patch-pkgmessage: patch-pkgmessage:
.if ${SUBSYS} != devel .if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@ -283,12 +272,13 @@ patch-dlq:
# Post-install # Post-install
# #
POST-INSTALL= parallel-post-install configure-package display-message POST-INSTALL= parallel-post-install install-rc-script configure-package \
display-message
.ORDER: ${POST-INSTALL} .ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL} post-install: ${POST-INSTALL}
parallel-post-install: \ parallel-post-install: \
strip-binary-files install-startup-files \ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \ install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files create-conf-files create-data-files
@ -302,11 +292,6 @@ strip-binary-files:
.endif .endif
.endfor .endfor
install-startup-files:
.for f in ${RC_FILES}
@${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
.endfor
install-doc-files: install-doc-files:
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}

18
net/isc-dhcp40-server/distinfo
View file

@ -1,9 +1,9 @@
MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151 MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
SIZE (dhcp-3.0.4.tar.gz) = 883245 SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
SIZE (dhcp-3.0.4-ldap-patch) = 154663 SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108 SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
SIZE (dhcp-3.0.4-dlq-patch) = 7655 SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655

4
net/isc-dhcp30-server/files/isc-dhcpd.sh.sample → net/isc-dhcp40-server/files/isc-dhcpd.in
View file

@ -18,7 +18,7 @@ name=dhcpd
paranoia=%%PARANOIA%% # compiled in paranoia? paranoia=%%PARANOIA%% # compiled in paranoia?
jail=%%JAIL%% # compiled in jail? jail=%%JAIL%% # compiled in jail?
load_rc_config $name load_rc_config ${name}
# override these variables in /etc/rc.conf # override these variables in /etc/rc.conf
dhcpd_enable=${dhcpd_enable:-"NO"} dhcpd_enable=${dhcpd_enable:-"NO"}
@ -697,7 +697,7 @@ dhcpd_uninstall ()
fi fi
} }
rcvar=$(set_rcvar) rcvar=${name}_enable
load_rc_config ${name} load_rc_config ${name}
__dhcpd_uninstall="NO" # internal use only __dhcpd_uninstall="NO" # internal use only

2
net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample → net/isc-dhcp40-server/files/isc-dhcrelay.in
View file

@ -47,7 +47,7 @@ dhcrelay_precmd ()
. %%RC_SUBR%% . %%RC_SUBR%%
name=dhcrelay name=dhcrelay
rcvar=$(set_rcvar) rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name} command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid pidfile=/var/run/${name}.pid

53
net/isc-dhcp40-server/files/patch-server::dhcp.c
View file

@ -1,53 +0,0 @@
--- server/dhcp.c.orig Wed Feb 22 23:43:27 2006
+++ server/dhcp.c Mon May 22 01:39:59 2006
@@ -2442,6 +2442,7 @@
offered_lease_time =
state -> offered_expiry - cur_time;
+ state -> expiry = 0;
putULong ((unsigned char *)&state -> expiry,
(unsigned long)offered_lease_time);
i = DHO_DHCP_LEASE_TIME;
@@ -2452,7 +2453,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> expiry,
- sizeof state -> expiry,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2463,6 +2464,7 @@
/* Renewal time is lease time * 0.5. */
offered_lease_time /= 2;
+ state -> renewal = 0;
putULong ((unsigned char *)&state -> renewal,
(unsigned long)offered_lease_time);
i = DHO_DHCP_RENEWAL_TIME;
@@ -2474,7 +2476,7 @@
if (make_const_data (&oc -> expression,
(unsigned char *)
&state -> renewal,
- sizeof state -> renewal,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,
@@ -2486,6 +2488,7 @@
/* Rebinding time is lease time * 0.875. */
offered_lease_time += (offered_lease_time / 2
+ offered_lease_time / 4);
+ state -> rebind = 0;
putULong ((unsigned char *)&state -> rebind,
(unsigned)offered_lease_time);
i = DHO_DHCP_REBINDING_TIME;
@@ -2496,7 +2499,7 @@
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data (&oc -> expression,
(unsigned char *)&state -> rebind,
- sizeof state -> rebind,
+ 4,
0, 0, MDL)) {
oc -> option = dhcp_universe.options [i];
save_option (&dhcp_universe,

12
net/isc-dhcp40-server/pkg-install
View file

@ -9,10 +9,18 @@
case $2 in case $2 in
POST-INSTALL) POST-INSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
fi
;; ;;
DEINSTALL) DEINSTALL)
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
fi
;; ;;
POST-DEINSTALL|PRE-INSTALL) POST-DEINSTALL|PRE-INSTALL)
;; ;;

3
net/isc-dhcp40-server/pkg-plist
View file

@ -1,8 +1,9 @@
@comment $FreeBSD$ @comment $FreeBSD$
@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl %%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample etc/dhcpd.conf.sample
etc/rc.d/isc-dhcpd.sh
sbin/dhcpd sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema %%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%% %%LDAP%%@dirrm %%SCHEMA_DIR%%