Date: Mon, 26 May 2008 18:56:29 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/124000: [patch] update net/isc-dhcp3-server to 3.0.7 and reset maintainer Message-ID: <20080526085629.A70953E7@k7.mavetju> Resent-Message-ID: <200805260900.m4Q90Bfd053626@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124000
>Category: ports
>Synopsis: [patch] update net/isc-dhcp3-server to 3.0.7 and reset maintainer
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 26 09:00:11 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 6.3-RELEASE-p2 i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.3-RELEASE-p2 FreeBSD 6.3-RELEASE-p2 #0: Mon May 12 11:35:35 EST 2008 edwin@k7.mavetju:/usr/src/sys/i386/compile/k7 i386
>Description:
- Update to version 3.0.7
- Remove support for LDAP and DHCPLEASEQUERY patches due to absence
of patches.
- Reset maintainership (or is Joerg still alive?)
>How-To-Repeat:
>Fix:
Index: isc-dhcp3-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/isc-dhcp3-server/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- isc-dhcp3-server/Makefile 4 Dec 2007 01:28:43 -0000 1.122
+++ isc-dhcp3-server/Makefile 26 May 2008 08:22:45 -0000
@@ -7,8 +7,7 @@
#
PORTNAME= dhcp
-PORTVERSION= 3.0.5
-PORTREVISION= 1
+PORTVERSION= 3.0.7
PORTREVISION= ${DHCP_PORTREVISION}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
@@ -17,10 +16,10 @@
PKGNAMESUFFIX= 3-${SUBSYS}
DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
-MAINTAINER= Joerg.Pulz@frm2.tum.de
+MAINTAINER= ports@FreeBSD.org
COMMENT?= The ISC Dynamic Host Configuration Protocol server
-PORTREVISION_SERVER= 2
+PORTREVISION_SERVER= 0
PORTREVISION_CLIENT= 0
PORTREVISION_RELAY= 0
PORTREVISION_DEVEL= 0
@@ -35,11 +34,8 @@
OPTIONS= DHCP_PARANOIA "add -user, -group and -chroot options" on \
DHCP_JAIL "add -chroot and -jail options" on \
DHCP_SOCKETS "use sockets instead of /dev/bpf (jail-only)" off \
- DHCP_LDAP "add experimental LDAP backend support" off \
- DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \
OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \
- OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off \
- DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off
+ OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off
.endif
# PORTREVISION handling
@@ -55,30 +51,6 @@
.include <bsd.port.pre.mk>
-.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
-# Based on patch from Brian Masney :
-PATCH_SITES= http://www.newwave.net/~masneyb/:ldap \
- ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:ldap
-PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch:ldap
-PATCH_DIST_STRIP= -p1
-
-USE_PERL5_RUN= yes
-USE_OPENLDAP= yes
-
-.if !defined(WITHOUT_DHCP_LDAP_SSL)
-USE_OPENSSL= yes
-# hack to get bsd.openssl.mk included at this late state
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-.endif
-.endif
-
-.if ${SUBSYS} == server && defined(WITH_DHCP_LQ)
-# Based on patch from Dmitry Sukhodoev :
-PATCH_SITES+= http://bingo.ru/~raven/FreeBSD/patches/:dlq \
- ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:dlq
-PATCHFILES+= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch:dlq
-.endif
-
# Global variables
#
@@ -159,11 +131,6 @@
USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases
-.if defined(WITH_DHCP_LDAP)
-PORTDOCS+= README.ldap
-LDAP_SCRIPT= contrib/dhcpd-conf-to-ldap.pl
-LDAP_SCHEMA= contrib/dhcp.schema
-.endif
.elif ${SUBSYS} == relay
BIN_FILES= dhcrelay
USE_RC_SUBR= isc-dhcrelay
@@ -177,11 +144,7 @@
DATADIR= /var/db
PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}"
-.if defined(WITH_DHCP_LDAP)
-PLIST_SUB+= LDAP=""
-.else
PLIST_SUB+= LDAP="@comment "
-.endif
REINPLACE_SUB= PREFIX=${PREFIX}
.if ${OSVERSION} >= 502100
SUB_LIST+= NOLOGIN=/usr/sbin/nologin
@@ -220,8 +183,7 @@
post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \
- patch-pkgmessage patch-site-conf \
- patch-dlq
+ patch-pkgmessage patch-site-conf
patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -242,15 +204,6 @@
@${ECHO_CMD} CFLAGS += -DUSE_SOCKETS >> ${WRKSRC}/site.conf
.endif
.endif
-.if defined(WITH_DHCP_LDAP)
- @${ECHO_CMD} CFLAGS += -I${LOCALBASE}/include >> ${WRKSRC}/site.conf
- @${ECHO_CMD} LIBS += -L${LOCALBASE}/lib >> ${WRKSRC}/site.conf
-.if !defined(WITHOUT_DHCP_LDAP_SSL)
- @${ECHO_CMD} CFLAGS += -DUSE_SSL -I${OPENSSLINC} >> ${WRKSRC}/site.conf
- @${ECHO_CMD} LIBS += -L${OPENSSLLIB} >> ${WRKSRC}/site.conf
- @${ECHO_CMD} LIBS += -lcrypto -lssl >> ${WRKSRC}/site.conf
-.endif
-.endif
.endif
patch-makefile-conf:
@@ -271,21 +224,8 @@
.if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${MSG_FILE} > ${PKGMESSAGE}
-.if defined(WITH_DHCP_LDAP)
- @${REINPLACE_CMD} -e 's|^%%LDAP%%||g' ${PKGMESSAGE}
-.else
@${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE}
.endif
-.endif
-
-patch-dlq:
-.if ${SUBSYS} == server && defined(WITH_DHCP_LQ)
-.if defined(WITH_DHCP_LDAP)
- @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq-ldap
-.else
- @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq
-.endif
-.endif
# Post-install
#
@@ -297,7 +237,7 @@
parallel-post-install: \
strip-binary-files \
- install-doc-files install-ldap-files install-sample-files \
+ install-doc-files install-sample-files \
create-conf-files create-data-files
strip-binary-files:
@@ -318,13 +258,6 @@
.endfor
.endif
-install-ldap-files:
-.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
- @${INSTALL_SCRIPT} ${WRKSRC}/${LDAP_SCRIPT} ${PREFIX}/bin
- @${MKDIR} ${SCHEMA_DIR}
- @${INSTALL_DATA} ${WRKSRC}/${LDAP_SCHEMA} ${SCHEMA_DIR}
-.endif
-
install-sample-files:
.for f in ${SAMP_FILES}
@${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX}
Index: isc-dhcp3-server/distinfo
===================================================================
RCS file: /home/pcvs/ports/net/isc-dhcp3-server/distinfo,v
retrieving revision 1.59
diff -u -r1.59 distinfo
--- isc-dhcp3-server/distinfo 26 Feb 2007 22:20:58 -0000 1.59
+++ isc-dhcp3-server/distinfo 26 May 2008 08:22:45 -0000
@@ -1,9 +1,3 @@
-MD5 (dhcp-3.0.5.tar.gz) = ce5d30d4645e4eab1f54561b487d1ec7
-SHA256 (dhcp-3.0.5.tar.gz) = dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
-SIZE (dhcp-3.0.5.tar.gz) = 876591
-MD5 (dhcp-3.0.5-ldap-patch) = 41cde9e9a768bf12390288465ef30bbd
-SHA256 (dhcp-3.0.5-ldap-patch) = e700472acb890b504ae5199500a0e87ca1da607946b2f3a8a8958f82d0a277c0
-SIZE (dhcp-3.0.5-ldap-patch) = 192308
-MD5 (dhcp-3.0.5-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.5-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.5-dlq-patch) = 7655
+MD5 (dhcp-3.0.7.tar.gz) = 426bfa1712ababaff4be6dadee9c1982
+SHA256 (dhcp-3.0.7.tar.gz) = 9ec6fbd37b4705fd8eed782b64790a246c56b5fd1d5e7de3109b6c23f41b9c50
+SIZE (dhcp-3.0.7.tar.gz) = 888829
Index: isc-dhcp3-server/files/patch-client::dhclient.c
===================================================================
RCS file: /home/pcvs/ports/net/isc-dhcp3-server/files/patch-client::dhclient.c,v
retrieving revision 1.5
diff -u -r1.5 patch-client::dhclient.c
--- isc-dhcp3-server/files/patch-client::dhclient.c 7 May 2006 20:34:01 -0000 1.5
+++ isc-dhcp3-server/files/patch-client::dhclient.c 26 May 2008 08:22:45 -0000
@@ -1,5 +1,5 @@
---- client/dhclient.c.orig Thu Apr 27 23:38:29 2006
-+++ client/dhclient.c Sat May 6 17:34:55 2006
+--- client/dhclient.c.orig 2008-01-22 17:28:23.000000000 +0000
++++ client/dhclient.c 2008-05-26 08:17:53.000000000 +0000
@@ -38,6 +38,13 @@
#include "dhcpd.h"
#include "version.h"
@@ -75,7 +75,7 @@
if (interfaces) {
interface_reference (&tmp -> next,
interfaces, MDL);
-@@ -375,6 +410,16 @@
+@@ -373,6 +408,16 @@
INTERFACE_AUTOMATIC)) !=
INTERFACE_REQUESTED))
continue;
@@ -92,7 +92,7 @@
script_init (ip -> client,
"PREINIT", (struct string_list *)0);
if (ip -> client -> alias)
-@@ -417,8 +462,13 @@
+@@ -415,8 +460,13 @@
client -> state = S_INIT;
/* Set up a timeout to start the initialization
process. */
@@ -106,7 +106,7 @@
}
}
}
-@@ -476,9 +526,9 @@
+@@ -474,9 +524,9 @@
log_info (arr);
log_info (url);
@@ -119,7 +119,7 @@
"[-pf pid-file] [-e VAR=val]");
log_fatal (" [-sf script-file] [interface]");
}
-@@ -879,6 +929,15 @@
+@@ -877,6 +927,15 @@
/* Write out the new lease. */
write_client_lease (client, client -> new, 0, 0);
@@ -135,7 +135,7 @@
/* Replace the old active lease with the new one. */
if (client -> active)
destroy_client_lease (client -> active);
-@@ -893,6 +952,12 @@
+@@ -891,6 +950,12 @@
piaddr (client -> active -> address),
(long)(client -> active -> renewal - cur_time));
client -> state = S_BOUND;
@@ -148,7 +148,7 @@
reinitialize_interfaces ();
go_daemon ();
if (client -> config -> do_forward_update) {
-@@ -1357,6 +1422,11 @@
+@@ -1376,6 +1441,11 @@
int interval;
int increase = 1;
@@ -160,7 +160,7 @@
/* Figure out how long it's been since we started transmitting. */
interval = cur_time - client -> first_sending;
-@@ -1457,6 +1527,9 @@
+@@ -1476,6 +1546,9 @@
struct client_lease *loop;
struct client_lease *lp;
@@ -170,7 +170,7 @@
loop = lp = client -> active;
log_info ("No DHCPOFFERS received.");
-@@ -1489,6 +1562,10 @@
+@@ -1508,6 +1581,10 @@
log_info ("bound: renewal in %ld %s.",
(long)(client -> active -> renewal -
cur_time), "seconds");
@@ -181,7 +181,7 @@
add_timeout (client -> active -> renewal,
state_bound, client, 0, 0);
} else {
-@@ -1496,6 +1573,11 @@
+@@ -1515,6 +1592,11 @@
log_info ("bound: immediate renewal.");
state_bound (client);
}
@@ -193,7 +193,7 @@
reinitialize_interfaces ();
go_daemon ();
return;
-@@ -1541,6 +1623,12 @@
+@@ -1560,6 +1642,12 @@
}
log_info ("No working leases in persistent database - sleeping.");
@@ -206,7 +206,7 @@
script_init (client, "FAIL", (struct string_list *)0);
if (client -> alias)
script_write_params (client, "alias_", client -> alias);
-@@ -1682,6 +1770,18 @@
+@@ -1701,6 +1789,18 @@
client -> packet.secs = htons (65535);
}
@@ -225,7 +225,7 @@
log_info ("DHCPREQUEST on %s to %s port %d",
client -> name ? client -> name : client -> interface -> name,
inet_ntoa (destination.sin_addr),
-@@ -1703,6 +1803,16 @@
+@@ -1722,6 +1822,16 @@
from, &destination,
(struct hardware *)0);
@@ -242,10 +242,10 @@
add_timeout (cur_time + client -> interval,
send_request, client, 0, 0);
}
-@@ -2600,6 +2710,13 @@
- wstatus = 0;
- }
- } else {
+@@ -2624,6 +2734,13 @@
+ */
+ if (leaseFile != NULL)
+ fclose(leaseFile);
+ if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) {
+ dup2(i, STDIN_FILENO);
+ dup2(i, STDOUT_FILENO);
@@ -256,7 +256,7 @@
execve (scriptName, argv, envp);
log_error ("execve (%s, ...): %m", scriptName);
exit (0);
-@@ -2786,8 +2903,10 @@
+@@ -2810,8 +2927,10 @@
case S_STOPPED:
break;
}
@@ -267,7 +267,7 @@
}
}
}
-@@ -3015,7 +3134,9 @@
+@@ -3039,7 +3158,9 @@
break;
case server_awaken:
@@ -277,7 +277,7 @@
break;
}
}
-@@ -3153,3 +3274,265 @@
+@@ -3177,3 +3298,265 @@
data_string_forget (&ddns_dhcid, MDL);
return rcode;
}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080526085629.A70953E7>