From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 2/2] dhcp: version bump 4.1.2 -> 4.4.2
Date: Mon, 17 May 2021 23:02:44 +0200 [thread overview]
Message-ID: <20210517210244.ibowowrvjed4bj3o@pengutronix.de> (raw)
In-Reply-To: <20210517205908.5785-2-rhi@pengutronix.de>
On Mon, May 17, 2021 at 10:59:08PM +0200, Roland Hieber wrote:
> diff --git a/rules/dhcp.make b/rules/dhcp.make
> index 5452f4676adc..5cdc7be214ca 100644
> --- a/rules/dhcp.make
> +++ b/rules/dhcp.make
> @@ -3,6 +3,7 @@
> # Copyright (C) 2003 by Benedikt Spranger
> # 2009 by Wolfram Sang, Pengutronix
> # 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
> +# 2021 by Roland Hieber, Pengutronix <rhi@pengutronix.de>
> #
> # For further information about the PTXdist project and license conditions
> # see the README file.
> @@ -16,17 +17,21 @@ PACKAGES-$(PTXCONF_DHCP) += dhcp
> #
> # Paths and names
> #
> -DHCP_VERSION := 4.1.2
> -DHCP_MD5 := 23bc6016297aa831dc9f321403e30ddc
> +DHCP_VERSION := 4.4.2
> +DHCP_MD5 := 2afdaf8498dc1edaf3012efdd589b3e1
> DHCP := dhcp-$(DHCP_VERSION)
> DHCP_SUFFIX := tar.gz
> DHCP_URL := \
> + https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)/$(DHCP).$(DHCP_SUFFIX) \
> https://ftp.isc.org/isc/dhcp/$(DHCP).$(DHCP_SUFFIX) \
> https://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$(DHCP).$(DHCP_SUFFIX)
> DHCP_SOURCE := $(SRCDIR)/$(DHCP).$(DHCP_SUFFIX)
> DHCP_DIR := $(BUILDDIR)/$(DHCP)
> -DHCP_LICENSE := ISC
> -
> +DHCP_LICENSE := MPL-2.0 AND BSD-3-Clause AND ISC
> +DHCP_LICENSE_FILES := \
> + file://LICENSE;md5=b9c6e660b3d9260de9a342d2fb77540a \
> + file://server/ldap.c;startline=6;endline=35;md5=8e5f9d2cd6b641d599871fd2430708c4 \
> + file://server/ldap_casa.c;startline=35;endline=48;md5=d2ea64a00aeacb447c6634d984486afe
Hmm, the last two files are not compiled in currently because LDAP is
disabled, but they carry the BSD and ISC license notices, so I opted to
include them in the LICENSE_FILES so they don't get lost later in case
someone wants to enable LDAP.
- Roland
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -35,13 +40,36 @@ DHCP_LICENSE := ISC
> #
> # autoconf
> #
> -DHCP_AUTOCONF := \
> +DHCP_CONF_TOOL := autoconf
> +DHCP_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> - --$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-dhcpv6
> -
> -# overwrite CFLAGS to remove -Werror
> -DHCP_MAKE_OPT := \
> - CFLAGS="-g -O2 -Wall -fno-strict-aliasing"
> + --disable-debug \
> + --enable-failover \
> + --disable-execute \
> + --enable-tracing \
> + --enable-delayed-ack \
> + --$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-dhcpv6 \
> + --disable-dhcpv4o6 \
> + --disable-relay-port \
> + --enable-paranoia \
> + --enable-early-chroot \
> + --disable-ipv4-pktinfo \
> + --enable-use-sockets \
> + --disable-log-pid \
> + --disable-binary-leases \
> + --disable-kqueue \
> + --disable-epoll \
> + --disable-devpoll \
> + --disable-libtool \
> + --disable-bind-install \
> + --without-atf \
> + --with-randomdev=/dev/random \
> + --with-libbind=$(SYSROOT)/usr \
> + --without-bind-extra-config \
> + --without-ldap \
> + --without-ldapcrypto \
> + --without-ldap-gssapi \
> + --without-ldapcasa
>
> # ----------------------------------------------------------------------------
> # Target-Install
> --
> 2.29.2
>
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-05-17 21:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 20:59 [ptxdist] [PATCH 1/2] bind: new package Roland Hieber
2021-05-17 20:59 ` [ptxdist] [PATCH 2/2] dhcp: version bump 4.1.2 -> 4.4.2 Roland Hieber
2021-05-17 21:02 ` Roland Hieber [this message]
2021-05-21 10:01 ` [ptxdist] [PATCH 1/2] bind: new package Michael Olbrich
2021-05-24 18:37 ` Roland Hieber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210517210244.ibowowrvjed4bj3o@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox