Commit 453f6aea authored by Mike Hibler's avatar Mike Hibler

Move the old DHCP 3.0 port over to our set of ports.

It has been removed entirely from the FreeBSD ports tree and we still need
it because it has a dhclient which takes multiple interfaces on the command
line (the current version just takes one interface). We should move to the
new version, but I am not up to that yet...
parent 0406be70
#
# XXX hacked up Emulab version of isc-dhcp30-server/Makefile to be standalone
# for dhcp30-client. We have no local mods to this version of dhcp, we just
# need a dhclient program that works on multiple interfaces at once, hence we
# keep this version alive.
# From:
#
# ex:ts=8
# Ports collection makefile for: dhcp
# Date created: 7 Mar 1996
# Whom: se
#
# $FreeBSD: ports/net/isc-dhcp30-server/Makefile,v 1.135 2009/07/22 00:11:47 jpaetzel Exp $
#
PORTNAME= dhcp
PORTVERSION= 3.0.7
PORTREVISION= ${DHCP_PORTREVISION}
CATEGORIES= misc net
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
PKGNAMEPREFIX= isc-
PKGNAMESUFFIX= 30-client
DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= jpaetzel@FreeBSD.org
COMMENT?= The ISC Dynamic Host Configuration Protocol server
PORTREVISION_SERVER= 5
PORTREVISION_CLIENT= 1
PORTREVISION_RELAY= 0
PORTREVISION_DEVEL= 0
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
# PORTREVISION handling
DHCP_PORTREVISION= ${PORTREVISION_CLIENT}
.include <bsd.port.pre.mk>
# Global variables
#
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --subsys client
ALL_TARGET= all.client
INSTALL_TARGET= install.client
SCRIPTS_ENV+= PKG_PREFIX=${PREFIX}
MAN5= dhclient.conf.5 dhclient.leases.5
MAN8= dhclient.8 dhclient-script.8
MAN5+= dhcp-eval.5 dhcp-options.5
MSG_FILE= ${.CURDIR}/pkg-message
DESCR= ${.CURDIR}/pkg-descr
PKGINSTALL= ${.CURDIR}/pkg-install
PKGDEINSTALL= ${PKGINSTALL}
PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST= ${.CURDIR}/pkg-plist
# Local variables
#
# for instance, possible versions are:
# 1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2
# which have to become:
# 1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2.3, 1.2
# so, the magic things are:
VERSION=
PATCHLEVEL=
.if ${PORTVERSION:R:E:M[br]*} != ""
RELEASE= ${PORTVERSION:R:R}
VERSION= ${PORTVERSION:R:E:S/b/beta/:S/r/rc/}
PATCHLEVEL= pl${PORTVERSION:E}
.elif ${PORTVERSION:E:M[br]*} != ""
RELEASE= ${PORTVERSION:R}
VERSION= ${PORTVERSION:E:S/b/beta/:S/r/rc/}
#.elif ${PORTVERSION:R:E} != ""
#RELEASE= ${PORTVERSION:R}
#PATCHLEVEL= pl${PORTVERSION:E}
.else
RELEASE= ${PORTVERSION}
.endif
PATCH_SUBDIRS= common minires dst omapip
PATCH_SUBDIRS+= client
.if !defined(NOPORTDOCS)
PORTDOCS= LICENSE README RELNOTES
.endif
BIN_FILES= dhclient
LOCAL_CONF_FILES= dhclient.conf
SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases
SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
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 !defined(WITHOUT_DHCP_PARANOIA)
SUB_LIST+= PARANOIA=YES
.else
SUB_LIST+= PARANOIA=NO
.endif
.if !defined(WITHOUT_DHCP_JAIL)
SUB_LIST+= JAIL=YES
.else
SUB_LIST+= JAIL=NO
.endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
# Post-extract
#
post-extract: extract-omshell extract-script
extract-omshell:
@${MKDIR} ${WRKSRC}/omshell
@${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell
@${CP} ${FILESDIR}/omshell::Makefile.dist \
${WRKSRC}/omshell/Makefile.dist
extract-script:
@${CP} ${FILESDIR}/client::scripts::freebsd ${WRKSRC}/client/scripts/freebsd
# Post-patch
#
post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf
patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${WRKSRC}/client/dhclient.conf \
${WRKSRC}/client/scripts/freebsd
patch-site-conf:
@${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf
patch-makefile-conf:
@${REINPLACE_CMD} -e 's|^DEBUG[ ]*=|# DEBUG ?=|g' \
${WRKSRC}/Makefile.conf
patch-makefiles-dist:
.for subdir in ${PATCH_SUBDIRS}
@${REINPLACE_CMD} -e 's|^CFLAGS[ ]*=|CFLAGS +=|g' \
${WRKSRC}/${subdir}/Makefile.dist
.endfor
# temporary hack - no patch file needed for this typo.
patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
patch-pkgmessage:
@${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
# Post-install
#
POST-INSTALL= parallel-post-install install-rc-script configure-package \
display-message
.ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL}
parallel-post-install: \
strip-binary-files \
install-doc-files install-sample-files \
create-conf-files create-data-files
strip-binary-files:
.for f in ${BIN_FILES}
.if exists(${PREFIX}/bin/${f})
@${STRIP_CMD} ${PREFIX}/bin/${f}
.endif
.if exists(${PREFIX}/sbin/${f})
@${STRIP_CMD} ${PREFIX}/sbin/${f}
.endif
.endfor
install-doc-files:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
install-sample-files:
.for f in ${SAMP_FILES}
@${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX}
.endfor
create-conf-files:
.for f in ${LOCAL_CONF_FILES}
.if !exists(${CONF_DIR}/${f})
@${TOUCH} ${CONF_DIR}/${f}
.endif
.endfor
create-data-files:
.for f in ${DATA_FILES}
.if !exists(${DATADIR}/${f})
@${TOUCH} ${DATADIR}/${f}
.endif
.endfor
configure-package:
display-message:
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.post.mk>
MD5 (dhcp-3.0.7.tar.gz) = 426bfa1712ababaff4be6dadee9c1982
SHA256 (dhcp-3.0.7.tar.gz) = 9ec6fbd37b4705fd8eed782b64790a246c56b5fd1d5e7de3109b6c23f41b9c50
SIZE (dhcp-3.0.7.tar.gz) = 888829
--- server/Makefile.dist.orig Tue Jun 14 09:37:50 2005
+++ server/Makefile.dist Tue Jun 14 09:37:50 2005
@@ -25,9 +25,9 @@
CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5
SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
- omapi.c mdb.c stables.c salloc.c ddns.c
+ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c
OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \
- omapi.o mdb.o stables.o salloc.o ddns.o
+ omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o
PROG = dhcpd
MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
--- server/Makefile.dist.orig Tue Jun 14 09:39:39 2005
+++ server/Makefile.dist Tue Jun 14 09:39:39 2005
@@ -25,9 +25,9 @@
CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5
SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
- ldap.c ldap_casa.c omapi.c mdb.c stables.c salloc.c ddns.c
+ ldap.c ldap_casa.c omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c
OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \
- ldap.o ldap_casa.o omapi.o mdb.o stables.o salloc.o ddns.o
+ ldap.o ldap_casa.o omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o
PROG = dhcpd
MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
This diff is collapsed.
#! /bin/sh
#
# $FreeBSD: ports/net/isc-dhcp30-server/files/isc-dhcrelay.in,v 1.3 2009/07/15 16:55:51 dougb Exp $
#
# PROVIDE: dhcrelay
# REQUIRE: DAEMON
#
# Add the following line to /etc/rc.conf to enable dhcrelay:
#
# dhcrelay_enable="YES"
#
# override these variables in /etc/rc.conf
dhcrelay_enable=${dhcrelay_enable:-"NO"}
# dhcrelay_flags=${dhcrelay_flags:-} # command option(s)
# dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s)
# dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s)
dhcrelay_precmd ()
{
local ifaces
dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf
if [ -f ${dhcrelay_rcconf} ]; then
warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead."
. ${dhcrelay_rcconf}
if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then
warn "dhcrelay_options is obsolete, use dhcrelay_flags instead."
rc_flags=${dhcrelay_options}
fi
fi
if [ -z "${dhcrelay_servers}" ]; then
err 1 "no dhcrelay server(s) configured."
fi
ifaces=
for iface in ${dhcrelay_ifaces}; do
ifaces="${ifaces} -i ${iface}"
done
rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}"
}
. %%RC_SUBR%%
name=dhcrelay
rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
start_precmd=${name}_precmd
load_rc_config ${name}
run_rc_command "$1"
# Makefile.dist
#
# Copyright (c) 1996-2002 Internet Software Consortium.
# Use is subject to license terms which appear in the file named
# ISC-LICENSE that should have accompanied this file when you
# received it. If a file named ISC-LICENSE did not accompany this
# file, or you are not sure the one you have is correct, you may
# obtain an applicable copy of the license at:
#
# http://www.isc.org/isc-license-1.0.html.
#
# This file is part of the ISC DHCP distribution. The documentation
# associated with this file is listed in the file DOCUMENTATION,
# included in the top-level directory of this release.
#
# Support and other services are available for ISC products - see
# http://www.isc.org for more information.
#
CATMANPAGES = omshell.cat1
SEDMANPAGES = omshell.man1
SRCS = omshell.c
OBJS = omshell.o
PROG = omshell
MAN = omshell.1
INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes
CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
../omapip/libomapi.a ../dst/libdst.a
all: $(PROG) $(CATMANPAGES)
$(PROG): $(OBJS) $(DHCPCTLLIBS)
$(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS)
install: all $(CATMANPAGES)
for dir in $(USRMANDIR) $(USERBINDIR); do \
foo=""; \
for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
foo=$${foo}/$$bar; \
if [ ! -d $$foo ]; then \
mkdir $$foo; \
chmod 755 $$foo; \
fi; \
done; \
done
$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
depend:
$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
clean:
-rm -f $(OBJS)
realclean: clean
-rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #*
distclean: realclean
-rm -f Makefile
links:
@for foo in $(SRCS) $(MAN); do \
if [ ! -b $$foo ]; then \
rm -f $$foo; \
fi; \
ln -s $(TOP)/omshell/$$foo $$foo; \
done
omshell.cat1: omshell.man1
nroff -man omshell.man1 >omshell.cat1
omshell.man1: omshell.1
sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
# Dependencies (semi-automatically-generated)
--- Makefile.orig Fri Nov 8 00:10:07 2002
+++ Makefile Mon Apr 28 15:04:50 2003
@@ -38,59 +38,59 @@
# ``http://www.nominum.com''.
#
-all:
+all all.devel all.server all.relay all.client:
@sysname=`./configure --print-sysname`; \
if [ ! -d work.$$sysname ]; then \
echo No build directory for $$sysname - please run ./configure.; \
else \
- (cd work.$$sysname; make all); \
+ (cd work.$$sysname; make $@); \
fi
-install:
+install install.devel install.server install.relay install.client:
@sysname=`./configure --print-sysname`; \
if [ ! -d work.$$sysname ]; then \
echo No build directory for $$sysname - please run ./configure.; \
else \
- (cd work.$$sysname; make install); \
+ (cd work.$$sysname; make $@); \
fi
-depend:
+depend depend.devel depend.server depend.relay depend.client:
@sysname=`./configure --print-sysname`; \
if [ ! -d work.$$sysname ]; then \
echo No build directory for $$sysname - please run ./configure.; \
else \
- (cd work.$$sysname; make depend); \
+ (cd work.$$sysname; make $@); \
fi
-clean:
+clean clean.devel clean.server clean.relay clean.client:
@sysname=`./configure --print-sysname`; \
if [ ! -d work.$$sysname ]; then \
echo No build directory for $$sysname - please run ./configure.; \
else \
- (cd work.$$sysname; make clean); \
+ (cd work.$$sysname; make $@); \
fi
-realclean:
+realclean realclean.devel realclean.server realclean.relay realclean.client:
@sysname=`./configure --print-sysname`; \
if [ ! -d work.$$sysname ]; then \
echo No build directory for $$sysname - please run ./configure.; \
else \
- (cd work.$$sysname; make realclean); \
+ (cd work.$$sysname; make $@); \
fi
-distclean:
+distclean distclean.devel distclean.server distclean.relay distclean.client:
@sysname=`./configure --print-sysname`; \
if [ ! -d work.$$sysname ]; then \
echo No build directory for $$sysname - please run ./configure.; \
else \
- (cd work.$$sysname; make distclean); \
+ (cd work.$$sysname; make $@); \
fi
-links:
+links links.devel links.server links.relay links.client:
@sysname=`./configure --print-sysname`; \
if [ ! -d work.$$sysname ]; then \
echo No build directory for $$sysname - please run ./configure.; \
else \
- (cd work.$$sysname; make links); \
+ (cd work.$$sysname; make $@); \
fi
--- Makefile.dist.orig Fri Nov 8 00:10:08 2002
+++ Makefile.dist Tue Apr 29 00:07:43 2003
@@ -17,47 +17,200 @@
# http://www.isc.org for more information.
#
-SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl
+COMMON_SUBDIRS= common
+DEVEL_SUBDIRS= $(MINIRES) dst omapip dhcpctl
+SERVER_SUBDIRS= omshell server
+RELAY_SUBDIRS= relay
+CLIENT_SUBDIRS= client
+
+DEVEL_BUILD_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
+SERVER_BUILD_SUBDIRS= ${SERVER_SUBDIRS}
+RELAY_BUILD_SUBDIRS= ${RELAY_SUBDIRS}
+CLIENT_BUILD_SUBDIRS= ${CLIENT_SUBDIRS}
+
+DEVEL_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
+SERVER_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${SERVER_SUBDIRS}
+RELAY_INSTALL_SUBDIRS= ${RELAY_SUBDIRS}
+CLIENT_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${CLIENT_SUBDIRS}
-all:
- @for dir in ${SUBDIRS}; do \
+all: all.server all.relay all.client
+
+all.devel:
+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \
+ echo "Making all in $$dir"; \
+ (cd $$dir; $(MAKE) all) || exit 1; \
+ done
+
+all.server: all.devel
+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \
+ echo "Making all in $$dir"; \
+ (cd $$dir; $(MAKE) all) || exit 1; \
+ done
+
+all.relay: all.devel
+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \
+ echo "Making all in $$dir"; \
+ (cd $$dir; $(MAKE) all) || exit 1; \
+ done
+
+all.client: all.devel
+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \
echo "Making all in $$dir"; \
(cd $$dir; $(MAKE) all) || exit 1; \
- done
+ done
+
+install: install.devel install.server install.relay install.client
+
+install.devel:
+ @for dir in ${DEVEL_INSTALL_SUBDIRS}; do \
+ echo "Installing in $$dir"; \
+ (cd $$dir; $(MAKE) install) || exit 1; \
+ done
-install:
- @for dir in ${SUBDIRS}; do \
+install.server:
+ @for dir in ${SERVER_INSTALL_SUBDIRS}; do \
echo "Installing in $$dir"; \
(cd $$dir; $(MAKE) install) || exit 1; \
- done
+ done
-depend:
- @for dir in ${SUBDIRS}; do \
+install.relay:
+ @for dir in ${RELAY_INSTALL_SUBDIRS}; do \
+ echo "Installing in $$dir"; \
+ (cd $$dir; $(MAKE) install) || exit 1; \
+ done
+
+install.client:
+ @for dir in ${CLIENT_INSTALL_SUBDIRS}; do \
+ echo "Installing in $$dir"; \
+ (cd $$dir; $(MAKE) install) || exit 1; \
+ done
+
+depend: depend.server depend.relay depend.client
+
+depend.devel:
+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \
+ echo "Making dependencies in $$dir"; \
+ (cd $$dir; $(MAKE) depend) || exit 1; \
+ done
+
+depend.server: depend.devel
+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \
+ echo "Making dependencies in $$dir"; \
+ (cd $$dir; $(MAKE) depend) || exit 1; \
+ done
+
+depend.relay: depend.devel
+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \
echo "Making dependencies in $$dir"; \
(cd $$dir; $(MAKE) depend) || exit 1; \
- done
+ done
+
+depend.client: depend.devel
+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \
+ echo "Making dependencies in $$dir"; \
+ (cd $$dir; $(MAKE) depend) || exit 1; \
+ done
+
+clean: clean.server clean.relay clean.client
+
+clean.devel:
+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \
+ echo "Cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) clean) || exit 1; \
+ done
+
+clean.server: clean.devel
+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \
+ echo "Cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) clean) || exit 1; \
+ done
+
+clean.relay: clean.devel
+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \
+ echo "Cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) clean) || exit 1; \
+ done
-clean:
- @for dir in ${SUBDIRS}; do \
+clean.client: clean.devel
+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \
echo "Cleaning in $$dir"; \
(cd $$dir; $(MAKE) clean) || exit 1; \
- done
+ done
+
+realclean: realclean.server realclean.relay realclean.client
+
+realclean.devel:
+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \
+ echo "Really cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) realclean) || exit 1; \
+ done
-realclean:
- @for dir in ${SUBDIRS}; do \
+realclean.server: realclean.devel
+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \
echo "Really cleaning in $$dir"; \
(cd $$dir; $(MAKE) realclean) || exit 1; \
- done
+ done
-distclean:
- @for dir in ${SUBDIRS}; do \
+realclean.relay: realclean.devel
+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \
+ echo "Really cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) realclean) || exit 1; \
+ done
+
+realclean.client: realclean.devel
+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \
+ echo "Really cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) realclean) || exit 1; \
+ done
+
+distclean: distclean.server distclean.relay distclean.client
+
+distclean.devel:
+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \
echo "Really, really cleaning in $$dir"; \
(cd $$dir; $(MAKE) distclean) || exit 1; \
- done
- @rm -f Makefile
+ done
+
+distclean.server: distclean.devel
+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \
+ echo "Really, really cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) distclean) || exit 1; \
+ done
+
+distclean.relay: distclean.devel
+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \
+ echo "Really, really cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) distclean) || exit 1; \
+ done
+
+distclean.client: distclean.devel
+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \
+ echo "Really, really cleaning in $$dir"; \
+ (cd $$dir; $(MAKE) distclean) || exit 1; \
+ done
+
+links: links.server links.relay links.client
+
+links.devel:
+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \
+ echo "Making links in $$dir"; \
+ (cd $$dir; $(MAKE) links) || exit 1; \
+ done
+
+links.server: links.devel
+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \
+ echo "Making links in $$dir"; \
+ (cd $$dir; $(MAKE) links) || exit 1; \
+ done
+
+links.relay: links.devel
+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \
+ echo "Making links in $$dir"; \
+ (cd $$dir; $(MAKE) links) || exit 1; \
+ done
-links:
- @for dir in ${SUBDIRS}; do \
+links.client: links.devel
+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \
echo "Making links in $$dir"; \
(cd $$dir; $(MAKE) links) || exit 1; \
- done
+ done
--- client/clparse.c.orig Sat May 6 17:42:49 2006
+++ client/clparse.c Sat May 6 17:43:12 2006
@@ -777,7 +777,7 @@
interface_dereference(&ip, MDL);
return 0;
}
- strcpy(ip->name, name);
+ strlcpy (ip -> name, name, IFNAMSIZ);
if (dummy_interfaces) {