Development June 2019

development@lists.ipfire.org

14 participants
77 discussions

[PATCH] curl: Update to 7.65.1
by Stefan Schantl 22 Jun '19

22 Jun '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- curl/curl.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curl/curl.nm b/curl/curl.nm index da7512e31..8ff369aed 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,7 +4,7 @@ ############################################################################### name = curl -version = 7.64.1 +version = 7.65.1 release = 1 groups = Application/Internet -- 2.20.1

1 0

[PATCH] dhcp: Update to 4.4.1
by Stefan Schantl 22 Jun '19

22 Jun '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- dhcp/dhcp.nm | 9 +- ...essage.patch => 0001-change-bug-url.patch} | 26 +- dhcp/patches/0001-dhcp-remove-bind.patch | 261 ----------- ...=> 0002-additional-dhclient-options.patch} | 211 ++++----- dhcp/patches/0002-dhcp-sharedlib.patch | 140 ------ ...g-interfaces-requested-by-sbin-ifup.patch} | 22 +- ...OOTP-for-IBM-pSeries-systems-and-ma.patch} | 37 +- ...05-Change-default-requested-options.patch} | 22 +- ...=> 0006-Various-man-page-only-fixes.patch} | 116 +++-- .../0006-dhcp-dhclient-decline-backoff.patch | 63 --- ...ge-paths-to-conform-to-our-standards.patch | 54 +++ ...n-file-descriptors-are-closed-on-ex.patch} | 179 +++++--- ...9-Fix-garbage-in-format-string-error.patch | 27 ++ dhcp/patches/0010-Handle-null-timeout.patch | 32 ++ dhcp/patches/0010-dhcp-paths.patch | 38 -- ... 0011-Drop-unnecessary-capabilities.patch} | 186 ++++---- ...s-Static-Route-Option-for-DHCPv4-51.patch} | 150 +++--- dhcp/patches/0012-dhcp-garbage-chars.patch | 12 - ...0013-DHCPv6-over-PPP-support-626514.patch} | 104 +++-- .../0013-dhcp-add_timeout_when_NULL.patch | 14 - ....patch => 0014-IPoIB-support-660681.patch} | 165 ++++--- .../0014-dhcp-64_bit_lease_parse.patch | 75 --- ...-Add-GUID-DUID-to-dhcpd-logs-1064416.patch | 332 ++++++++++++++ ...16-Turn-on-creating-sending-of-DUID.patch} | 33 +- dhcp/patches/0016-dhcp-sendDecline.patch | 231 ---------- ...quest-release-via-correct-interface.patch} | 30 +- ...tion-for-iface-should-be-info-not-e.patch} | 25 +- dhcp/patches/0018-dhcp-honor-expired.patch | 49 -- ...UID_LLT-even-in-stateless-mode-11563.patch | 29 ++ ...ver-all-hwaddress-for-xid-uniqueness.patch | 101 +++++ ...ad-leases-DB-in-non-replay-mode-only.patch | 51 +++ dhcp/patches/0021-dhcp-IPoIB-log-id.patch | 165 ------- ...y-patch-for-systemd-support-1687040.patch} | 48 +- dhcp/patches/0022-dhcp-improved-xid.patch | 138 ------ dhcp/patches/0023-dhcp-duidv4.patch | 34 -- dhcp/patches/0025-dhcp-getifaddrs.patch | 429 ------------------ dhcp/patches/0027-dhcp-interval.patch | 25 - .../0030-dhcp-option97-pxe-client-id.patch | 217 --------- .../0031-dhcp-stateless-DUID-LLT.patch | 13 - .../0032-dhcp-dhclient-preinit6s.patch | 64 --- 40 files changed, 1409 insertions(+), 2548 deletions(-) rename dhcp/patches/{0003-dhcp-errwarn-message.patch => 0001-change-bug-url.patch} (76%) delete mode 100644 dhcp/patches/0001-dhcp-remove-bind.patch rename dhcp/patches/{0004-dhcp-dhclient-options.patch => 0002-additional-dhclient-options.patch} (69%) delete mode 100644 dhcp/patches/0002-dhcp-sharedlib.patch rename dhcp/patches/{0005-dhcp-release-by-ifup.patch => 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch} (80%) rename dhcp/patches/{0007-dhcp-unicast-bootp.patch => 0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch} (75%) rename dhcp/patches/{0008-dhcp-default-requested-options.patch => 0005-Change-default-requested-options.patch} (69%) rename dhcp/patches/{0009-dhcp-manpages.patch => 0006-Various-man-page-only-fixes.patch} (73%) delete mode 100644 dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch create mode 100644 dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch rename dhcp/patches/{0011-dhcp-CLOEXEC.patch => 0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch} (67%) create mode 100644 dhcp/patches/0009-Fix-garbage-in-format-string-error.patch create mode 100644 dhcp/patches/0010-Handle-null-timeout.patch delete mode 100644 dhcp/patches/0010-dhcp-paths.patch rename dhcp/patches/{0015-dhcp-capability.patch => 0011-Drop-unnecessary-capabilities.patch} (62%) rename dhcp/patches/{0017-dhcp-rfc3442-classless-static-routes.patch => 0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch} (76%) delete mode 100644 dhcp/patches/0012-dhcp-garbage-chars.patch rename dhcp/patches/{0019-dhcp-PPP.patch => 0013-DHCPv6-over-PPP-support-626514.patch} (64%) delete mode 100644 dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch rename dhcp/patches/{0020-dhcp-lpf-ib.patch => 0014-IPoIB-support-660681.patch} (77%) delete mode 100644 dhcp/patches/0014-dhcp-64_bit_lease_parse.patch create mode 100644 dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch rename dhcp/patches/{0024-dhcp-duid_uuid.patch => 0016-Turn-on-creating-sending-of-DUID.patch} (72%) delete mode 100644 dhcp/patches/0016-dhcp-sendDecline.patch rename dhcp/patches/{0026-dhcp-client-request-release-bind-iface.patch => 0017-Send-unicast-request-release-via-correct-interface.patch} (70%) rename dhcp/patches/{0028-dhcp-no-subnet-error2info.patch => 0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch} (70%) delete mode 100644 dhcp/patches/0018-dhcp-honor-expired.patch create mode 100644 dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch create mode 100644 dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch create mode 100644 dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch delete mode 100644 dhcp/patches/0021-dhcp-IPoIB-log-id.patch rename dhcp/patches/{0029-dhcp-sd_notify.patch => 0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch} (63%) delete mode 100644 dhcp/patches/0022-dhcp-improved-xid.patch delete mode 100644 dhcp/patches/0023-dhcp-duidv4.patch delete mode 100644 dhcp/patches/0025-dhcp-getifaddrs.patch delete mode 100644 dhcp/patches/0027-dhcp-interval.patch delete mode 100644 dhcp/patches/0030-dhcp-option97-pxe-client-id.patch delete mode 100644 dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch delete mode 100644 dhcp/patches/0032-dhcp-dhclient-preinit6s.patch diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm index eafb0b0fc..421c6ca4f 100644 --- a/dhcp/dhcp.nm +++ b/dhcp/dhcp.nm @@ -4,7 +4,7 @@ ############################################################################### name = dhcp -version = 4.3.5b1 +version = 4.4.1 release = 1 groups = Networking/Daemons @@ -37,6 +37,8 @@ build CFLAGS += -fno-strict-aliasing + PARALLELISMFLAGS = # No parallel build. + configure_options += \ --sysconfdir=%{sysconfdir}/dhcp \ --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \ @@ -50,8 +52,6 @@ build --with-relay-pid-file=/run/dhcrelay.pid \ --with-ldap \ --with-ldapcrypto \ - --with-libbind=/usr/include/ \ - --with-libbind-libs=/usr/lib/ \ --disable-static \ --enable-paranoia \ --enable-early-chroot \ @@ -59,9 +59,6 @@ build --with-systemd prepare_cmds - # Remove bundled BIND source - rm -rvf %{DIR_APP}/bind/bind.tar.gz - # Regenerate build environment autoreconf --verbose --force --install diff --git a/dhcp/patches/0003-dhcp-errwarn-message.patch b/dhcp/patches/0001-change-bug-url.patch similarity index 76% rename from dhcp/patches/0003-dhcp-errwarn-message.patch rename to dhcp/patches/0001-change-bug-url.patch index f42d1e980..150a3b2ba 100644 --- a/dhcp/patches/0003-dhcp-errwarn-message.patch +++ b/dhcp/patches/0001-change-bug-url.patch @@ -1,7 +1,18 @@ -diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c ---- dhcp-4.3.5/omapip/errwarn.c.errwarn 2016-09-27 21:16:50.000000000 +0200 -+++ dhcp-4.3.5/omapip/errwarn.c 2016-11-29 19:44:03.515031147 +0100 -@@ -49,6 +49,41 @@ void (*log_cleanup) (void); +From 31ef6eadb15c3773b81256a8617eccc7657fd2fd Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:09:57 +0100 +Subject: [PATCH 01/21] change bug url +Cc: pzhukov(a)redhat.com + +--- + omapip/errwarn.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 42 insertions(+), 5 deletions(-) + +diff --git a/omapip/errwarn.c b/omapip/errwarn.c +index e30f8a0..09a3004 100644 +--- a/omapip/errwarn.c ++++ b/omapip/errwarn.c +@@ -48,6 +48,41 @@ void (*log_cleanup) (void); static char mbuf [CVT_BUF_MAX + 1]; static char fbuf [CVT_BUF_MAX + 1]; @@ -43,7 +54,7 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c /* Log an error message, then exit... */ void log_fatal (const char * fmt, ... ) -@@ -75,11 +110,13 @@ void log_fatal (const char * fmt, ... ) +@@ -74,11 +109,13 @@ void log_fatal (const char * fmt, ... ) } log_error ("%s", ""); @@ -51,7 +62,7 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c - log_error ("than a configuration issue please read the section on submitting"); - log_error ("bugs on either our web page at www.isc.org or in the README file"); - log_error ("before submitting a bug. These pages explain the proper"); -- log_error ("process and the information we find helpful for debugging.."); +- log_error ("process and the information we find helpful for debugging."); + log_error ("This version of ISC DHCP is based on the release available"); + log_error ("on ftp.isc.org. Features have been added and other changes"); + log_error ("have been made to the base software release in order to make"); @@ -62,3 +73,6 @@ diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c log_error ("%s", ""); log_error ("exiting."); +-- +2.14.5 + diff --git a/dhcp/patches/0001-dhcp-remove-bind.patch b/dhcp/patches/0001-dhcp-remove-bind.patch deleted file mode 100644 index 46bd323d6..000000000 --- a/dhcp/patches/0001-dhcp-remove-bind.patch +++ /dev/null @@ -1,261 +0,0 @@ -diff -up dhcp-4.3.5b1/client/Makefile.am.remove-bind dhcp-4.3.5b1/client/Makefile.am ---- dhcp-4.3.5b1/client/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/Makefile.am 2016-09-12 17:00:22.797902248 +0200 -@@ -4,8 +4,6 @@ - # production code. Sadly, we are not there yet. - SUBDIRS = . tests - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' - -@@ -15,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c - scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt --dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind dhcp-4.3.5b1/common/tests/Makefile.am ---- dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/common/tests/Makefile.am 2016-09-12 17:07:42.168232452 +0200 -@@ -1,7 +1,5 @@ - SUBDIRS = . - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes - - EXTRA_DIST = Atffile -@@ -15,26 +13,26 @@ ATF_TESTS += alloc_unittest dns_unittest - alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c - alloc_unittest_LDADD = $(ATF_LDFLAGS) - alloc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - dns_unittest_LDADD = $(ATF_LDFLAGS) - dns_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - misc_unittest_LDADD = $(ATF_LDFLAGS) - misc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c - ns_name_unittest_LDADD = $(ATF_LDFLAGS) - ns_name_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - check: $(ATF_TESTS) - @if test $(top_srcdir) != ${top_builddir}; then \ -diff -up dhcp-4.3.5b1/configure.ac.remove-bind dhcp-4.3.5b1/configure.ac ---- dhcp-4.3.5b1/configure.ac.remove-bind 2016-08-26 20:24:41.000000000 +0200 -+++ dhcp-4.3.5b1/configure.ac 2016-09-12 17:00:22.798902249 +0200 -@@ -682,20 +682,33 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t - BINDDIR= - BINDSRCDIR= - AC_ARG_WITH(libbind, -- AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH -- (default is ./bind)]), -+ AS_HELP_STRING([--with-libbind=PATH],[bind includes are in PATH -+ (default is ./bind/includes)]), - use_libbind="$withval", use_libbind="no") - case "$use_libbind" in -+yes|no) -+ libbind="\${top_srcdir}/bind/include" -+ ;; -+*) -+ libbind="$use_libbind" -+ ;; -+esac -+ -+BIND9_LIBDIR='-L$(top_builddir)/bind/lib' -+AC_ARG_WITH(libbind-libs, -+ AC_HELP_STRING([--with-libbind-libs=PATH], -+ [bind9 export libraries are in PATH]), -+ [libbind_libs="$withval"], [libbind_libs='no']) -+case "$libbind_libs" in - yes) -- BINDDIR="\${top_srcdir}/bind" -- BINDSRCDIR="\${top_srcdir}/bind" -+ AC_MSG_ERROR([Specify path to bind9 libraries]) - ;; - no) -- BINDDIR="\${top_srcdir}/bind" -- BINDSRCDIR="\${top_srcdir}/bind" -+ BUNDLED_BIND=yes - ;; - *) -- BINDDIR="$use_libbind" -+ BIND9_LIBDIR="-L$libbind_libs" -+ BUNDLED_BIND=no - if test ! -d "$srcdir/bind"; then - # no bind directory, create it with a fake Makefile.in - # (AC_CONFIG_FILES and top Makefile refer to it so -@@ -709,8 +722,8 @@ EOF - fi - ;; - esac --AC_SUBST(BINDDIR) --AC_SUBST(BINDSRCDIR) -+AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes]) -+AC_SUBST([BIND9_LIBDIR]) - - # OpenLDAP support. - AC_ARG_WITH(ldap, -@@ -788,7 +801,7 @@ fi - CFLAGS="$CFLAGS $STD_CWARNINGS" - - # Try to add the bind and dhcp include directories --CFLAGS="$CFLAGS -I\$(top_srcdir)/includes -I$BINDDIR/include" -+CFLAGS="$CFLAGS -I$libbind" - - case "$host" in - *-darwin*) -diff -up dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.3.5b1/dhcpctl/Makefile.am ---- dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/dhcpctl/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,5 +1,3 @@ --BINDLIBDIR = @BINDDIR@/lib -- - bin_PROGRAMS = omshell - lib_LIBRARIES = libdhcpctl.a - noinst_PROGRAMS = cltest -@@ -8,12 +6,10 @@ EXTRA_DIST = $(man_MANS) - - omshell_SOURCES = omshell.c - omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c - - cltest_SOURCES = cltest.c - cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export -diff -up dhcp-4.3.5b1/Makefile.am.remove-bind dhcp-4.3.5b1/Makefile.am ---- dhcp-4.3.5b1/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -26,7 +26,13 @@ EXTRA_DIST = RELNOTES LICENSE \ - bind/Makefile.in bind/bind.tar.gz bind/version.tmp \ - common/tests/Atffile server/tests/Atffile - --SUBDIRS = @BINDSRCDIR@ includes tests common omapip client dhcpctl relay server -+if BUNDLED_BIND -+SUBDIRS = bind -+else -+SUBDIRS = -+endif -+ -+SUBDIRS += includes tests common omapip client dhcpctl relay server - - nobase_include_HEADERS = dhcpctl/dhcpctl.h - -diff -up dhcp-4.3.5b1/omapip/Makefile.am.remove-bind dhcp-4.3.5b1/omapip/Makefile.am ---- dhcp-4.3.5b1/omapip/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/omapip/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,5 +1,3 @@ --BINDLIBDIR = @BINDDIR@/lib -- - lib_LIBRARIES = libomapi.a - noinst_PROGRAMS = svtest - -@@ -12,6 +10,6 @@ man_MANS = omapi.3 - EXTRA_DIST = $(man_MANS) - - svtest_SOURCES = test.c --svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+svtest_LDADD = libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - -diff -up dhcp-4.3.5b1/relay/Makefile.am.remove-bind dhcp-4.3.5b1/relay/Makefile.am ---- dhcp-4.3.5b1/relay/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/relay/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -1,12 +1,9 @@ --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' - - sbin_PROGRAMS = dhcrelay - dhcrelay_SOURCES = dhcrelay.c - dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ -- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhcrelay.8 - EXTRA_DIST = $(man_MANS) - -diff -up dhcp-4.3.5b1/server/Makefile.am.remove-bind dhcp-4.3.5b1/server/Makefile.am ---- dhcp-4.3.5b1/server/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/Makefile.am 2016-09-12 17:00:22.798902249 +0200 -@@ -4,8 +4,6 @@ - # production code. Sadly, we are not there yet. - SUBDIRS = . tests - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' - - dist_sysconf_DATA = dhcpd.conf.example -@@ -15,10 +13,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c - dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c - - dhcpd_CFLAGS = $(LDAP_CFLAGS) --dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -- ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ -- $(BINDLIBDIR)/libisc.a $(LDAP_LIBS) -+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \ -+ $(LDAP_LIBS) - - man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind dhcp-4.3.5b1/server/tests/Makefile.am ---- dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/tests/Makefile.am 2016-09-12 17:00:22.799902249 +0200 -@@ -1,9 +1,7 @@ - SUBDIRS = . - --BINDLIBDIR = @BINDDIR@/lib -- - AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes --AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) -+AM_CPPFLAGS += -I$(top_srcdir) - AM_CPPFLAGS += -DLOCALSTATEDIR='"."' - - EXTRA_DIST = Atffile -@@ -20,9 +18,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa - ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c - - DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ -- $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ -- $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ -- $(BINDLIBDIR)/libisc.a -+ $(top_builddir)/dhcpctl/libdhcpctl.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ATF_TESTS = - if HAVE_ATF diff --git a/dhcp/patches/0004-dhcp-dhclient-options.patch b/dhcp/patches/0002-additional-dhclient-options.patch similarity index 69% rename from dhcp/patches/0004-dhcp-dhclient-options.patch rename to dhcp/patches/0002-additional-dhclient-options.patch index 8f0dfe98b..e11213041 100644 --- a/dhcp/patches/0004-dhcp-dhclient-options.patch +++ b/dhcp/patches/0002-additional-dhclient-options.patch @@ -1,6 +1,22 @@ -diff -up dhcp-4.3.4/client/clparse.c.options dhcp-4.3.4/client/clparse.c ---- dhcp-4.3.4/client/clparse.c.options 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/clparse.c 2016-04-29 12:06:13.485470579 +0200 +From 3a86bcb58a7c081df22b6f55e973d5e3c99065d8 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:19:47 +0100 +Subject: [PATCH 02/21] additional dhclient options +Cc: pzhukov(a)redhat.com + +--- + client/clparse.c | 10 +- + client/dhclient.8 | 27 ++++++ + client/dhclient.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++- + common/conflex.c | 2 + + includes/dhcpd.h | 3 + + includes/dhctoken.h | 1 + + 6 files changed, 308 insertions(+), 6 deletions(-) + +diff --git a/client/clparse.c b/client/clparse.c +index eaf48a8..7212e3a 100644 +--- a/client/clparse.c ++++ b/client/clparse.c @@ -189,6 +189,7 @@ isc_result_t read_client_conf () /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache) */ @@ -19,7 +35,7 @@ diff -up dhcp-4.3.4/client/clparse.c.options dhcp-4.3.4/client/clparse.c void parse_client_statement (cfile, ip, config) struct parse *cfile; -@@ -817,6 +819,12 @@ void parse_client_statement (cfile, ip, +@@ -817,6 +819,12 @@ void parse_client_statement (cfile, ip, config) parse_lease_id_format(cfile); break; @@ -32,10 +48,11 @@ diff -up dhcp-4.3.4/client/clparse.c.options dhcp-4.3.4/client/clparse.c default: lose = 0; -diff -up dhcp-4.3.4/client/dhclient.8.options dhcp-4.3.4/client/dhclient.8 ---- dhcp-4.3.4/client/dhclient.8.options 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/dhclient.8 2016-04-29 11:59:50.446590077 +0200 -@@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Pr +diff --git a/client/dhclient.8 b/client/dhclient.8 +index ebc750f..6d7fbdb 100644 +--- a/client/dhclient.8 ++++ b/client/dhclient.8 +@@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Protocol Client .B -w ] [ @@ -66,85 +83,16 @@ diff -up dhcp-4.3.4/client/dhclient.8.options dhcp-4.3.4/client/dhclient.8 +.I timeout +] +[ - .B -v + .B --dad-wait-time + .I seconds ] - [ -@@ -289,6 +316,69 @@ not to exit when it doesn't find any suc - program can then be used to notify the client when a network interface - has been added or removed, so that the client can attempt to configure an IP - address on that interface. -+ -+.TP -+.BI \-B -+Set the BOOTP broadcast flag in request packets so servers will always -+broadcast replies. -+ -+.TP -+.BI \-C\ <dhcp-client-identifier> -+Specify the dhcp-client-identifier option to send to the DHCP server. -+ -+.TP -+.BI \-H\ <host-name> -+Specify the host-name option to send to the DHCP server. The host-name -+string only contains the client's hostname prefix, to which the server will -+append the ddns-domainname or domain-name options, if any, to derive the -+fully qualified domain name of the client. The -+.B -H -+option cannot be used with the -+.B -F -+option. -+ -+.TP -+.BI \-F\ <fqdn.fqdn> -+Specify the fqdn.fqdn option to send to the DHCP server. This option cannot -+be used with the -+.B -H -+option. The fqdn.fqdn option must specify the complete domain name of the -+client host, which the server may use for dynamic DNS updates. -+ -+.TP -+.BI \-V\ <vendor-class-identifier> -+Specify the vendor-class-identifier option to send to the DHCP server. -+ -+.TP -+.BI \--request-options\ <option>[,<option>...] -+Specify the list of options the client is to request from the server. The -+option list must be a single string consisting of option names separated -+by at least one command and optional space characters. The default option -+list is: -+ -+.BR -+ subnet-mask, broadcast-address, time-offset, routers, -+.BR -+ domain-search, domain-name, domain-name-servers, host-name, -+.BR -+ nis-domain, nis-servers, ntp-servers, interface-mtu -+ -+.TP -+.B --request-options -+option does not append options to the default request, it overrides the -+default request list. Keep this in mind if you want to request an -+additional option besides the default request list. You will have to -+specify all option names for the -+.B --request-options -+parameter. -+ -+.TP -+.BI \--timeout\ <timeout> -+Specify the time after which -+.B dhclient -+will decide that no DHCP servers can be contacted when no responses have been -+received. -+ - .TP - .BI \-n - Do not configure any interfaces. This is most likely to be useful in -diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.options 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:12:14.182364093 +0200 -@@ -40,6 +40,12 @@ - #include <isc/file.h> - #include <dns/result.h> +diff --git a/client/dhclient.c b/client/dhclient.c +index 825ab00..26a333c 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -41,6 +41,12 @@ + #include <sys/wait.h> + #include <limits.h> +/* + * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define @@ -155,7 +103,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ -@@ -100,6 +106,10 @@ char *mockup_relay = NULL; +@@ -110,6 +116,10 @@ char *mockup_relay = NULL; char *progname = NULL; @@ -166,25 +114,27 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c void run_stateless(int exit_mode, u_int16_t port); static isc_result_t write_duid(struct data_string *duid); -@@ -177,7 +187,11 @@ usage(const char *sfmt, const char *sarg - " [-s server-addr] [-cf config-file]\n" - " [-df duid-file] [-lf lease-file]\n" - " [-pf pid-file] [--no-pid] [-e VAR=val]\n" -- " [-sf script-file] [interface]*", -+ " [-sf script-file] [interface]*\n" -+ " [-C <dhcp-client-identifier>] [-B]\n" -+ " [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n" -+ " [-V <vendor-class-identifier>]\n" -+ " [--request-options <request option list>]", - isc_file_basename(progname)); - } +@@ -183,8 +193,12 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; + " [-s server-addr] [-cf config-file]\n" \ + " [-df duid-file] [-lf lease-file]\n" \ + " [-pf pid-file] [--no-pid] [-e VAR=val]\n" \ +-" [-sf script-file] [interface]*" +- ++" [-sf script-file] [interface]*\n" \ ++" [-C <dhcp-client-identifier>] [-B]\n" \ ++" [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n" \ ++" [-V <vendor-class-identifier>]\n" \ ++" [--request-options <request option list>]" ++ + #define DHCLIENT_USAGEH "{--version|--help|-h}" -@@ -214,6 +228,16 @@ main(int argc, char **argv) { + static void +@@ -243,6 +257,16 @@ main(int argc, char **argv) { + #else progname = argv[0]; #endif - -+ char *dhcp_client_identifier_arg = NULL; -+ char *dhcp_host_name_arg = NULL; ++ char *dhcp_client_identifier_arg = NULL; ++ char *dhcp_host_name_arg = NULL; + char *dhcp_fqdn_arg = NULL; + char *dhcp_vendor_class_identifier_arg = NULL; + char *dhclient_request_options = NULL; @@ -196,10 +146,10 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c /* Initialize client globals. */ memset(&default_duid, 0, sizeof(default_duid)); -@@ -431,6 +455,88 @@ main(int argc, char **argv) { - strlen(PACKAGE_VERSION))); - IGNORE_RET(write(STDERR_FILENO, "\n", 1)); - exit(0); +@@ -558,6 +582,89 @@ main(int argc, char **argv) { + std_dhcid = 1; + } else if (!strcmp(argv[i], "-v")) { + quiet = 0; + } else if (!strcmp(argv[i], "-C")) { + if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) { + usage(use_noarg, argv[i-1]); @@ -282,10 +232,11 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c + } + + dhclient_request_options = argv[i]; ++ } else if (argv[i][0] == '-') { usage("Unknown command: %s", argv[i]); } else if (interfaces_requested < 0) { -@@ -630,6 +736,156 @@ main(int argc, char **argv) { +@@ -754,6 +861,156 @@ main(int argc, char **argv) { /* Parse the dhclient.conf file. */ read_client_conf(); @@ -442,7 +393,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c /* Parse the lease database. */ read_client_leases(); -@@ -3067,7 +3323,8 @@ void make_discover (client, lease) +@@ -3226,7 +3483,8 @@ void make_discover (client, lease) client -> packet.xid = random (); client -> packet.secs = 0; /* filled in by send_discover. */ @@ -452,7 +403,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c client -> packet.flags = 0; else client -> packet.flags = htons (BOOTP_BROADCAST); -@@ -3152,7 +3409,9 @@ void make_request (client, lease) +@@ -3311,7 +3569,9 @@ void make_request (client, lease) } else { memset (&client -> packet.ciaddr, 0, sizeof client -> packet.ciaddr); @@ -463,7 +414,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c client -> packet.flags = 0; else client -> packet.flags = htons (BOOTP_BROADCAST); -@@ -3215,7 +3474,8 @@ void make_decline (client, lease) +@@ -3374,7 +3634,8 @@ void make_decline (client, lease) client -> packet.hops = 0; client -> packet.xid = client -> xid; client -> packet.secs = 0; /* Filled in by send_request. */ @@ -473,10 +424,11 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c client -> packet.flags = 0; else client -> packet.flags = htons (BOOTP_BROADCAST); -diff -up dhcp-4.3.4/common/conflex.c.options dhcp-4.3.4/common/conflex.c ---- dhcp-4.3.4/common/conflex.c.options 2016-04-29 11:59:50.448590077 +0200 -+++ dhcp-4.3.4/common/conflex.c 2016-04-29 12:13:23.637342420 +0200 -@@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) +diff --git a/common/conflex.c b/common/conflex.c +index 045b655..71c0bf5 100644 +--- a/common/conflex.c ++++ b/common/conflex.c +@@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) { if (!strcasecmp(atom+1, "ig-endian")) { return TOKEN_BIG_ENDIAN; } @@ -485,10 +437,11 @@ diff -up dhcp-4.3.4/common/conflex.c.options dhcp-4.3.4/common/conflex.c break; case 'c': if (!strcasecmp(atom + 1, "ase")) -diff -up dhcp-4.3.4/includes/dhcpd.h.options dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.options 2016-04-29 11:59:50.448590077 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:14:05.361329401 +0200 -@@ -1246,6 +1246,9 @@ struct client_config { +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 5930e6a..018fa34 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -1269,6 +1269,9 @@ struct client_config { int lease_id_format; /* format for IDs in lease file, TOKEN_OCTAL or TOKEN_HEX */ @@ -498,16 +451,18 @@ diff -up dhcp-4.3.4/includes/dhcpd.h.options dhcp-4.3.4/includes/dhcpd.h }; /* Per-interface state used in the dhcp client... */ -diff -up dhcp-4.3.4/includes/dhctoken.h.options dhcp-4.3.4/includes/dhctoken.h ---- dhcp-4.3.4/includes/dhctoken.h.options 2016-04-29 11:59:50.449590076 +0200 -+++ dhcp-4.3.4/includes/dhctoken.h 2016-04-29 12:15:03.073300846 +0200 -@@ -373,7 +373,8 @@ enum dhcp_token { - TOKEN_BIG_ENDIAN = 675, - LEASE_ID_FORMAT = 676, +diff --git a/includes/dhctoken.h b/includes/dhctoken.h +index 5920f4f..7e7215a 100644 +--- a/includes/dhctoken.h ++++ b/includes/dhctoken.h +@@ -377,6 +377,7 @@ enum dhcp_token { TOKEN_HEX = 677, -- TOKEN_OCTAL = 678 -+ TOKEN_OCTAL = 678, -+ BOOTP_BROADCAST_ALWAYS = 679 + TOKEN_OCTAL = 678, + KEY_ALGORITHM = 679 ++ BOOTP_BROADCAST_ALWAYS = 680 }; #define is_identifier(x) ((x) >= FIRST_TOKEN && \ +-- +2.14.5 + diff --git a/dhcp/patches/0002-dhcp-sharedlib.patch b/dhcp/patches/0002-dhcp-sharedlib.patch deleted file mode 100644 index 3427f78f7..000000000 --- a/dhcp/patches/0002-dhcp-sharedlib.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -up dhcp-4.3.4/client/Makefile.am.sharedlib dhcp-4.3.4/client/Makefile.am ---- dhcp-4.3.4/client/Makefile.am.sharedlib 2016-04-29 11:48:30.389923087 +0200 -+++ dhcp-4.3.4/client/Makefile.am 2016-04-29 11:48:30.393923084 +0200 -@@ -13,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c - scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt --dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.4/common/tests/Makefile.am.sharedlib dhcp-4.3.4/common/tests/Makefile.am ---- dhcp-4.3.4/common/tests/Makefile.am.sharedlib 2016-04-29 11:48:30.394923084 +0200 -+++ dhcp-4.3.4/common/tests/Makefile.am 2016-04-29 11:54:16.890716651 +0200 -@@ -13,25 +13,25 @@ ATF_TESTS += alloc_unittest dns_unittest - alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c - alloc_unittest_LDADD = $(ATF_LDFLAGS) - alloc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - dns_unittest_LDADD = $(ATF_LDFLAGS) - dns_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c - misc_unittest_LDADD = $(ATF_LDFLAGS) - misc_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c - ns_name_unittest_LDADD = $(ATF_LDFLAGS) - ns_name_unittest_LDADD += ../libdhcp.a \ -- ../../omapip/libomapi.a \ -+ ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - check: $(ATF_TESTS) -diff -up dhcp-4.3.4/configure.ac.sharedlib dhcp-4.3.4/configure.ac ---- dhcp-4.3.4/configure.ac.sharedlib 2016-04-29 11:48:30.394923084 +0200 -+++ dhcp-4.3.4/configure.ac 2016-04-29 11:55:22.729691668 +0200 -@@ -47,7 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$c - # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. - AC_USE_SYSTEM_EXTENSIONS - --AC_PROG_RANLIB -+# Use libtool to simplify building of shared libraries -+AC_PROG_LIBTOOL - - AC_PATH_PROG(AR, ar) - AC_SUBST(AR) -diff -up dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib dhcp-4.3.4/dhcpctl/Makefile.am ---- dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib 2016-04-29 11:48:30.394923084 +0200 -+++ dhcp-4.3.4/dhcpctl/Makefile.am 2016-04-29 11:56:18.390670546 +0200 -@@ -1,15 +1,15 @@ - bin_PROGRAMS = omshell --lib_LIBRARIES = libdhcpctl.a -+lib_LTLIBRARIES = libdhcpctl.la - noinst_PROGRAMS = cltest - man_MANS = omshell.1 dhcpctl.3 - EXTRA_DIST = $(man_MANS) - - omshell_SOURCES = omshell.c --omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - --libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c -+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c - - cltest_SOURCES = cltest.c --cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export -diff -up dhcp-4.3.4/omapip/Makefile.am.sharedlib dhcp-4.3.4/omapip/Makefile.am ---- dhcp-4.3.4/omapip/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200 -+++ dhcp-4.3.4/omapip/Makefile.am 2016-04-29 11:57:33.709641969 +0200 -@@ -1,7 +1,7 @@ --lib_LIBRARIES = libomapi.a -+lib_LTLIBRARIES = libomapi.la - noinst_PROGRAMS = svtest - --libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ -+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ - errwarn.c listener.c dispatch.c generic.c support.c \ - handle.c message.c convert.c hash.c auth.c inet_addr.c \ - array.c trace.c toisc.c iscprint.c isclib.c -@@ -10,6 +10,6 @@ man_MANS = omapi.3 - EXTRA_DIST = $(man_MANS) - - svtest_SOURCES = test.c --svtest_LDADD = libomapi.a \ -+svtest_LDADD = libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - -diff -up dhcp-4.3.4/relay/Makefile.am.sharedlib dhcp-4.3.4/relay/Makefile.am ---- dhcp-4.3.4/relay/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200 -+++ dhcp-4.3.4/relay/Makefile.am 2016-04-29 11:48:30.395923083 +0200 -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst - - sbin_PROGRAMS = dhcrelay - dhcrelay_SOURCES = dhcrelay.c --dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhcrelay.8 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.4/server/Makefile.am.sharedlib dhcp-4.3.4/server/Makefile.am ---- dhcp-4.3.4/server/Makefile.am.sharedlib 2016-04-29 11:48:30.392923085 +0200 -+++ dhcp-4.3.4/server/Makefile.am 2016-04-29 11:48:30.395923083 +0200 -@@ -13,7 +13,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c - dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c - - dhcpd_CFLAGS = $(LDAP_CFLAGS) --dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \ -+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \ - $(LDAP_LIBS) - -diff -up dhcp-4.3.4/server/tests/Makefile.am.sharedlib dhcp-4.3.4/server/tests/Makefile.am ---- dhcp-4.3.4/server/tests/Makefile.am.sharedlib 2016-04-29 11:48:30.395923083 +0200 -+++ dhcp-4.3.4/server/tests/Makefile.am 2016-04-29 11:59:13.414604130 +0200 -@@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa - ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ - ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c - --DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ -- $(top_builddir)/dhcpctl/libdhcpctl.a \ -+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \ -+ $(top_builddir)/dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - - ATF_TESTS = diff --git a/dhcp/patches/0005-dhcp-release-by-ifup.patch b/dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch similarity index 80% rename from dhcp/patches/0005-dhcp-release-by-ifup.patch rename to dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch index 677eb5c75..294b7fe3d 100644 --- a/dhcp/patches/0005-dhcp-release-by-ifup.patch +++ b/dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch @@ -1,7 +1,18 @@ -diff -up dhcp-4.3.0a1/client/dhclient.c.ifup dhcp-4.3.0a1/client/dhclient.c ---- dhcp-4.3.0a1/client/dhclient.c.ifup 2013-12-19 14:53:08.817760677 +0100 -+++ dhcp-4.3.0a1/client/dhclient.c 2013-12-19 15:05:16.290518574 +0100 -@@ -521,9 +521,81 @@ main(int argc, char **argv) { +From 692fd8b16ef6f12a57596351e930c65c68597bac Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:21:14 +0100 +Subject: [PATCH 03/21] Handle releasing interfaces requested by /sbin/ifup +Cc: pzhukov(a)redhat.com + +--- + client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 72 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 26a333c..2a2e9e6 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -787,9 +787,81 @@ main(int argc, char **argv) { } } fclose(pidfd); @@ -83,3 +94,6 @@ diff -up dhcp-4.3.0a1/client/dhclient.c.ifup dhcp-4.3.0a1/client/dhclient.c if (!quiet) { log_info("%s %s", message, PACKAGE_VERSION); log_info(copyright); +-- +2.14.5 + diff --git a/dhcp/patches/0007-dhcp-unicast-bootp.patch b/dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch similarity index 75% rename from dhcp/patches/0007-dhcp-unicast-bootp.patch rename to dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch index abf89f237..e37948013 100644 --- a/dhcp/patches/0007-dhcp-unicast-bootp.patch +++ b/dhcp/patches/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch @@ -1,6 +1,19 @@ -diff -up dhcp-4.3.4/server/bootp.c.unicast dhcp-4.3.4/server/bootp.c ---- dhcp-4.3.4/server/bootp.c.unicast 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/server/bootp.c 2016-05-02 15:09:40.023243008 +0200 +From 9dc17d6086bf140efda84ce434664b60ce2191a1 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:22:41 +0100 +Subject: [PATCH 04/21] Support unicast BOOTP for IBM pSeries systems (and + maybe others) +Cc: pzhukov(a)redhat.com + +--- + server/bootp.c | 12 +++++++++++- + server/dhcp.c | 33 ++++++++++++++++++++++++++------- + 2 files changed, 37 insertions(+), 8 deletions(-) + +diff --git a/server/bootp.c b/server/bootp.c +index 26a7607..2212f31 100644 +--- a/server/bootp.c ++++ b/server/bootp.c @@ -52,6 +52,7 @@ void bootp (packet) char msgbuf [1024]; int ignorep; @@ -34,10 +47,11 @@ diff -up dhcp-4.3.4/server/bootp.c.unicast dhcp-4.3.4/server/bootp.c /* If it comes from a client that already knows its address and is not requesting a broadcast response, and we can -diff -up dhcp-4.3.4/server/dhcp.c.unicast dhcp-4.3.4/server/dhcp.c ---- dhcp-4.3.4/server/dhcp.c.unicast 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/server/dhcp.c 2016-05-02 15:10:13.255267511 +0200 -@@ -5132,6 +5132,7 @@ int locate_network (packet) +diff --git a/server/dhcp.c b/server/dhcp.c +index 6f3a91f..20f2a62 100644 +--- a/server/dhcp.c ++++ b/server/dhcp.c +@@ -5224,6 +5224,7 @@ int locate_network (packet) struct data_string data; struct subnet *subnet = (struct subnet *)0; struct option_cache *oc; @@ -45,7 +59,7 @@ diff -up dhcp-4.3.4/server/dhcp.c.unicast dhcp-4.3.4/server/dhcp.c #if defined(DHCPv6) && defined(DHCP4o6) if (dhcpv4_over_dhcpv6 && (packet->dhcp4o6_response != NULL)) { -@@ -5153,12 +5154,24 @@ int locate_network (packet) +@@ -5245,12 +5246,24 @@ int locate_network (packet) from the interface, if there is one. If not, fail. */ if (!oc && !packet -> raw -> giaddr.s_addr) { if (packet -> interface -> shared_network) { @@ -75,7 +89,7 @@ diff -up dhcp-4.3.4/server/dhcp.c.unicast dhcp-4.3.4/server/dhcp.c } /* If there's an option indicating link connection, and it's valid, -@@ -5185,7 +5198,10 @@ int locate_network (packet) +@@ -5277,7 +5290,10 @@ int locate_network (packet) data_string_forget (&data, MDL); } else { ia.len = 4; @@ -87,7 +101,7 @@ diff -up dhcp-4.3.4/server/dhcp.c.unicast dhcp-4.3.4/server/dhcp.c } /* If we know the subnet on which the IP address lives, use it. */ -@@ -5193,7 +5209,10 @@ int locate_network (packet) +@@ -5285,7 +5301,10 @@ int locate_network (packet) shared_network_reference (&packet -> shared_network, subnet -> shared_network, MDL); subnet_dereference (&subnet, MDL); @@ -99,3 +113,6 @@ diff -up dhcp-4.3.4/server/dhcp.c.unicast dhcp-4.3.4/server/dhcp.c } /* Otherwise, fail. */ +-- +2.14.5 + diff --git a/dhcp/patches/0008-dhcp-default-requested-options.patch b/dhcp/patches/0005-Change-default-requested-options.patch similarity index 69% rename from dhcp/patches/0008-dhcp-default-requested-options.patch rename to dhcp/patches/0005-Change-default-requested-options.patch index f57fa1fbd..89118b1b6 100644 --- a/dhcp/patches/0008-dhcp-default-requested-options.patch +++ b/dhcp/patches/0005-Change-default-requested-options.patch @@ -1,6 +1,19 @@ -diff -up dhcp-4.3.4/client/clparse.c.requested dhcp-4.3.4/client/clparse.c ---- dhcp-4.3.4/client/clparse.c.requested 2016-04-29 12:18:50.157151352 +0200 -+++ dhcp-4.3.4/client/clparse.c 2016-04-29 12:19:22.235137243 +0200 +From ac21c8b966620cbe79be3508c024ae30f93d6266 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:24:24 +0100 +Subject: [PATCH 05/21] Change default requested options +Cc: pzhukov(a)redhat.com + +Add NIS domain, NIS servers, NTP servers, interface-mtu and domain-search +to the list of default requested DHCP options +--- + client/clparse.c | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/client/clparse.c b/client/clparse.c +index 7212e3a..39b95a0 100644 +--- a/client/clparse.c ++++ b/client/clparse.c @@ -31,7 +31,7 @@ struct client_config top_level_config; @@ -42,3 +55,6 @@ diff -up dhcp-4.3.4/client/clparse.c.requested dhcp-4.3.4/client/clparse.c for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { if (default_requested_options[code] == NULL) log_fatal("Unable to find option definition for " +-- +2.14.5 + diff --git a/dhcp/patches/0009-dhcp-manpages.patch b/dhcp/patches/0006-Various-man-page-only-fixes.patch similarity index 73% rename from dhcp/patches/0009-dhcp-manpages.patch rename to dhcp/patches/0006-Various-man-page-only-fixes.patch index 24d6972af..286dde184 100644 --- a/dhcp/patches/0009-dhcp-manpages.patch +++ b/dhcp/patches/0006-Various-man-page-only-fixes.patch @@ -1,38 +1,21 @@ -diff -up dhcp-4.3.5b1/client/dhclient.conf.5.man dhcp-4.3.5b1/client/dhclient.conf.5 ---- dhcp-4.3.5b1/client/dhclient.conf.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/dhclient.conf.5 2016-09-12 17:09:23.243313514 +0200 -@@ -228,7 +228,8 @@ responding to the client send the client - options. Only the option names should be specified in the request - statement - not option parameters. By default, the DHCPv4 client - requests the subnet-mask, broadcast-address, time-offset, routers, --domain-name, domain-name-servers and host-name options while the DHCPv6 -+domain-search, domain-name, domain-name-servers, host-name, nis-domain, -+nis-servers, ntp-servers and interface-mtu options while the DHCPv6 - client requests the dhcp6 name-servers and domain-search options. Note - that if you enter a \'request\' statement, you over-ride these defaults - and these options will not be requested. -@@ -736,6 +737,17 @@ know the DHCP service(s) anycast MAC add - client. The \fIlink-type\fR and \fImac-address\fR parameters are configured - in a similar manner to the \fBhardware\fR statement. - .PP -+ \fBbootp-broadcast-always;\fR -+.PP -+The -+.B bootp-broadcast-always -+statement instructs dhclient to always set the bootp broadcast flag in -+request packets, so that servers will always broadcast replies. -+This is equivalent to supplying the dhclient -B argument, and has -+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. -+This option is provided as an extension to enable dhclient to work -+on IBM s390 Linux guests. -+.PP - .SH SAMPLE - The following configuration file was used on a laptop running NetBSD - 1.3, though the domains have been modified. -diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient-script.8 ---- dhcp-4.3.5b1/client/dhclient-script.8.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/client/dhclient-script.8 2016-09-12 17:08:09.516254385 +0200 -@@ -45,7 +45,7 @@ customizations are needed, they should b +From dd3053e6f45ac1f149869b7ded3f539d6c046114 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:25:53 +0100 +Subject: [PATCH 06/21] Various man-page-only fixes +Cc: pzhukov(a)redhat.com + +--- + client/dhclient-script.8 | 22 +++++++++++++++++++++- + client/dhclient.conf.5 | 14 +++++++++++++- + common/dhcp-options.5 | 15 +++++++++++++++ + server/dhcpd.conf.5 | 14 +++++++++----- + 4 files changed, 58 insertions(+), 7 deletions(-) + +diff --git a/client/dhclient-script.8 b/client/dhclient-script.8 +index 3553afd..0db5516 100644 +--- a/client/dhclient-script.8 ++++ b/client/dhclient-script.8 +@@ -43,7 +43,7 @@ customizations are needed, they should be possible using the enter and exit hooks provided (see HOOKS for details). These hooks will allow the user to override the default behaviour of the client in creating a .B /etc/resolv.conf @@ -41,7 +24,7 @@ diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient- .PP No standard client script exists for some operating systems, even though the actual client may work, so a pioneering user may well need to create -@@ -89,6 +89,26 @@ present. The +@@ -87,6 +87,26 @@ present. The .B ETCDIR/dhclient-exit-hooks script can modify the valid of exit_status to change the exit status of dhclient-script. @@ -68,10 +51,43 @@ diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient- .SH OPERATION When dhclient needs to invoke the client configuration script, it defines a set of variables in the environment, and then invokes -diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options.5 ---- dhcp-4.3.5b1/common/dhcp-options.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/common/dhcp-options.5 2016-09-12 17:08:09.517254386 +0200 -@@ -1013,6 +1013,21 @@ classless IP routing - it does not inclu +diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5 +index fa3b908..566a881 100644 +--- a/client/dhclient.conf.5 ++++ b/client/dhclient.conf.5 +@@ -228,7 +228,8 @@ responding to the client send the client its values for the specified + options. Only the option names should be specified in the request + statement - not option parameters. By default, the DHCPv4 client + requests the subnet-mask, broadcast-address, time-offset, routers, +-domain-name, domain-name-servers and host-name options while the DHCPv6 ++domain-search, domain-name, domain-name-servers, host-name, nis-domain, ++nis-servers, ntp-servers and interface-mtu options while the DHCPv6 + client requests the dhcp6 name-servers and domain-search options. Note + that if you enter a \'request\' statement, you over-ride these defaults + and these options will not be requested. +@@ -735,6 +736,17 @@ broadcast packets transmitted by DHCP clients, but is only useful if you + know the DHCP service(s) anycast MAC address prior to configuring your + client. The \fIlink-type\fR and \fImac-address\fR parameters are configured + in a similar manner to the \fBhardware\fR statement. ++.PP ++ \fBbootp-broadcast-always;\fR ++.PP ++The ++.B bootp-broadcast-always ++statement instructs dhclient to always set the bootp broadcast flag in ++request packets, so that servers will always broadcast replies. ++This is equivalent to supplying the dhclient -B argument, and has ++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. ++This option is provided as an extension to enable dhclient to work ++on IBM s390 Linux guests. + .PP + .SH SAMPLE + The following configuration file was used on a laptop running NetBSD +diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 +index 33d4804..d9e1197 100644 +--- a/common/dhcp-options.5 ++++ b/common/dhcp-options.5 +@@ -1068,6 +1068,21 @@ classless IP routing - it does not include a subnet mask. Since classless IP routing is now the most widely deployed routing standard, this option is virtually useless, and is not implemented by any of the popular DHCP clients, for example the Microsoft DHCP client. @@ -93,10 +109,11 @@ diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options .RE .PP .nf -diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 ---- dhcp-4.3.5b1/server/dhcpd.conf.5.man 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/dhcpd.conf.5 2016-09-12 17:10:11.205351980 +0200 -@@ -528,6 +528,9 @@ pool { +diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 +index 17330d4..89b5540 100644 +--- a/server/dhcpd.conf.5 ++++ b/server/dhcpd.conf.5 +@@ -527,6 +527,9 @@ pool { }; .fi .PP @@ -106,7 +123,7 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 The server currently does very little sanity checking, so if you configure it wrong, it will just fail in odd ways. I would recommend therefore that you either do failover or don't do failover, but don't -@@ -542,9 +545,9 @@ primary server might look like this: +@@ -541,9 +544,9 @@ primary server might look like this: failover peer "foo" { primary; address anthrax.rc.example.com; @@ -118,7 +135,7 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 max-response-delay 60; max-unacked-updates 10; mclt 3600; -@@ -1246,7 +1249,7 @@ the zone containing PTR records - for IS +@@ -1323,7 +1326,7 @@ the zone containing PTR records - for ISC BIND, something like this: .PP .nf key DHCP_UPDATER { @@ -127,7 +144,7 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 secret pRP5FapFoJ95JEL06sv4PQ==; }; -@@ -1269,7 +1272,7 @@ dhcpd.conf file: +@@ -1346,7 +1349,7 @@ dhcpd.conf file: .PP .nf key DHCP_UPDATER { @@ -136,7 +153,7 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 secret pRP5FapFoJ95JEL06sv4PQ==; }; -@@ -2742,7 +2745,8 @@ statement +@@ -2912,7 +2915,8 @@ statement The \fInext-server\fR statement is used to specify the host address of the server from which the initial boot file (specified in the \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should @@ -146,3 +163,6 @@ diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5 .RE .PP The +-- +2.14.5 + diff --git a/dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch b/dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch deleted file mode 100644 index 645f9314b..000000000 --- a/dhcp/patches/0006-dhcp-dhclient-decline-backoff.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.backoff dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.backoff 2016-04-29 12:16:26.976245611 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:16:26.979245609 +0200 -@@ -1423,6 +1423,8 @@ void state_init (cpp) - void *cpp; - { - struct client_state *client = cpp; -+ enum dhcp_state init_state = client->state; -+ struct timeval tv; - - ASSERT_STATE(state, S_INIT); - -@@ -1435,9 +1437,18 @@ void state_init (cpp) - client -> first_sending = cur_time; - client -> interval = client -> config -> initial_interval; - -- /* Add an immediate timeout to cause the first DHCPDISCOVER packet -- to go out. */ -- send_discover (client); -+ if (init_state != S_DECLINED) { -+ /* Add an immediate timeout to cause the first DHCPDISCOVER packet -+ to go out. */ -+ send_discover(client); -+ } else { -+ /* We've received an OFFER and it has been DECLINEd by dhclient-script. -+ * wait for a random time between 1 and backoff_cutoff seconds before -+ * trying again. */ -+ tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff); -+ tv . tv_usec = 0; -+ add_timeout(&tv, send_discover, client, 0, 0); -+ } - } - - /* -@@ -1734,6 +1745,7 @@ void bind_lease (client) - "try (declined). Exiting."); - exit(2); - } else { -+ client -> state = S_DECLINED; - state_init(client); - return; - } -@@ -4626,6 +4638,7 @@ void client_location_changed () - case S_INIT: - case S_REBINDING: - case S_STOPPED: -+ case S_DECLINED: - break; - } - client -> state = S_INIT; -diff -up dhcp-4.3.4/includes/dhcpd.h.backoff dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.backoff 2016-04-29 12:16:26.980245609 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:17:30.893203533 +0200 -@@ -1171,7 +1171,8 @@ enum dhcp_state { - S_BOUND = 5, - S_RENEWING = 6, - S_REBINDING = 7, -- S_STOPPED = 8 -+ S_STOPPED = 8, -+ S_DECLINED = 9 - }; - - /* Possible pending client operations. */ diff --git a/dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch b/dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch new file mode 100644 index 000000000..fb3348c1f --- /dev/null +++ b/dhcp/patches/0007-Change-paths-to-conform-to-our-standards.patch @@ -0,0 +1,54 @@ +From bf4e3f1d181b5b4e6225fe5726c02420157433cc Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:26:34 +0100 +Subject: [PATCH 07/21] Change paths to conform to our standards +Cc: pzhukov(a)redhat.com + +--- + doc/examples/dhcpd-dhcpv6.conf | 2 +- + includes/dhcpd.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/examples/dhcpd-dhcpv6.conf b/doc/examples/dhcpd-dhcpv6.conf +index 448a6a6..2357824 100644 +--- a/doc/examples/dhcpd-dhcpv6.conf ++++ b/doc/examples/dhcpd-dhcpv6.conf +@@ -43,7 +43,7 @@ option dhcp6.domain-search "test.example.com","example.com"; + option dhcp6.info-refresh-time 21600; + + # The path of the lease file +-dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases"; ++dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases"; + + # Static definition (must be global) + host myclient { +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 018fa34..3632a6b 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -1545,7 +1545,7 @@ typedef unsigned char option_mask [16]; + #else /* !DEBUG */ + + #ifndef _PATH_DHCPD_CONF +-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" ++#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" + #endif /* DEBUG */ + + #ifndef _PATH_DHCPD_DB +@@ -1567,11 +1567,11 @@ typedef unsigned char option_mask [16]; + #endif /* DEBUG */ + + #ifndef _PATH_DHCLIENT_CONF +-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" ++#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" + #endif + + #ifndef _PATH_DHCLIENT_SCRIPT +-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" ++#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script" + #endif + + #ifndef _PATH_DHCLIENT_PID +-- +2.14.5 + diff --git a/dhcp/patches/0011-dhcp-CLOEXEC.patch b/dhcp/patches/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch similarity index 67% rename from dhcp/patches/0011-dhcp-CLOEXEC.patch rename to dhcp/patches/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch index 309a87c1e..9759055dc 100644 --- a/dhcp/patches/0011-dhcp-CLOEXEC.patch +++ b/dhcp/patches/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch @@ -1,7 +1,32 @@ -diff -up dhcp-4.3.3b1/client/clparse.c.cloexec dhcp-4.3.3b1/client/clparse.c ---- dhcp-4.3.3b1/client/clparse.c.cloexec 2015-08-10 10:46:20.264755543 +0200 -+++ dhcp-4.3.3b1/client/clparse.c 2015-08-10 10:46:20.274755510 +0200 -@@ -247,7 +247,7 @@ int read_client_conf_file (const char *n +From 26d34bc8e55c39ef84d580b6453c65b5cbeab8ff Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:27:18 +0100 +Subject: [PATCH 08/21] Make sure all open file descriptors are closed-on-exec + for SELinux +Cc: pzhukov(a)redhat.com + +ISC-bug: #19148 +--- + client/clparse.c | 4 ++-- + client/dhclient.c | 28 ++++++++++++++-------------- + common/bpf.c | 2 +- + common/dlpi.c | 2 +- + common/nit.c | 2 +- + common/resolv.c | 2 +- + common/upf.c | 2 +- + omapip/trace.c | 6 +++--- + relay/dhcrelay.c | 10 +++++----- + server/confpars.c | 2 +- + server/db.c | 4 ++-- + server/dhcpd.c | 14 +++++++------- + server/ldap.c | 2 +- + 13 files changed, 40 insertions(+), 40 deletions(-) + +diff --git a/client/clparse.c b/client/clparse.c +index 39b95a0..44387ed 100644 +--- a/client/clparse.c ++++ b/client/clparse.c +@@ -288,7 +288,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip, int token; isc_result_t status; @@ -10,7 +35,7 @@ diff -up dhcp-4.3.3b1/client/clparse.c.cloexec dhcp-4.3.3b1/client/clparse.c return uerr2isc (errno); cfile = NULL; -@@ -323,7 +323,7 @@ void read_client_leases () +@@ -364,7 +364,7 @@ void read_client_leases () /* Open the lease file. If we can't open it, just return - we can safely trust the server to remember our state. */ @@ -19,10 +44,11 @@ diff -up dhcp-4.3.3b1/client/clparse.c.cloexec dhcp-4.3.3b1/client/clparse.c return; cfile = NULL; -diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c ---- dhcp-4.3.3b1/client/dhclient.c.cloexec 2015-08-10 10:46:20.260755556 +0200 -+++ dhcp-4.3.3b1/client/dhclient.c 2015-08-10 10:46:20.275755506 +0200 -@@ -153,11 +153,11 @@ main(int argc, char **argv) { +diff --git a/client/dhclient.c b/client/dhclient.c +index 2a2e9e6..a86ab9e 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -273,11 +273,11 @@ main(int argc, char **argv) { /* Make sure that file descriptors 0 (stdin), 1, (stdout), and 2 (stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ @@ -37,7 +63,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c if (fd == 2) log_perror = 0; /* No sense logging to /dev/null. */ else if (fd != -1) -@@ -519,7 +519,7 @@ main(int argc, char **argv) { +@@ -765,7 +765,7 @@ main(int argc, char **argv) { long temp; int e; @@ -46,7 +72,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c e = fscanf(pidfd, "%ld\n", &temp); oldpid = (pid_t)temp; -@@ -574,7 +574,7 @@ main(int argc, char **argv) { +@@ -820,7 +820,7 @@ main(int argc, char **argv) { strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx); sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name); @@ -55,7 +81,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c e = fscanf(pidfd, "%ld\n", &temp); oldpid = (pid_t)temp; -@@ -599,7 +599,7 @@ main(int argc, char **argv) { +@@ -845,7 +845,7 @@ main(int argc, char **argv) { int dhc_running = 0; char procfn[256] = ""; @@ -64,7 +90,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) { snprintf(procfn,256,"/proc/%u",dhcpid); dhc_running = (access(procfn, F_OK) == 0); -@@ -3120,7 +3120,7 @@ void rewrite_client_leases () +@@ -3808,7 +3808,7 @@ void rewrite_client_leases () if (leaseFile != NULL) fclose (leaseFile); @@ -73,7 +99,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c if (leaseFile == NULL) { log_error ("can't create %s: %m", path_dhclient_db); return; -@@ -3313,7 +3313,7 @@ write_duid(struct data_string *duid) +@@ -4003,7 +4003,7 @@ write_duid(struct data_string *duid) return DHCP_R_INVALIDARG; if (leaseFile == NULL) { /* XXX? */ @@ -82,7 +108,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c if (leaseFile == NULL) { log_error("can't create %s: %m", path_dhclient_db); return ISC_R_IOERROR; -@@ -3493,7 +3493,7 @@ int write_client_lease (client, lease, r +@@ -4207,7 +4207,7 @@ int write_client_lease (client, lease, rewrite, makesure) return 1; if (leaseFile == NULL) { /* XXX */ @@ -91,7 +117,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c if (leaseFile == NULL) { log_error ("can't create %s: %m", path_dhclient_db); return 0; -@@ -4011,9 +4011,9 @@ void go_daemon () +@@ -4786,9 +4786,9 @@ void detach () (void) close(2); /* Reopen them on /dev/null. */ @@ -104,7 +130,7 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c write_client_pid_file (); -@@ -4030,14 +4030,14 @@ void write_client_pid_file () +@@ -4806,14 +4806,14 @@ void write_client_pid_file () return; } @@ -121,10 +147,11 @@ diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c if (!pf) { close(pfdesc); log_error ("Can't fdopen %s: %m", path_dhclient_pid); -diff -up dhcp-4.3.3b1/common/bpf.c.cloexec dhcp-4.3.3b1/common/bpf.c ---- dhcp-4.3.3b1/common/bpf.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/bpf.c 2015-08-10 10:46:20.275755506 +0200 -@@ -95,7 +95,7 @@ int if_register_bpf (info) +diff --git a/common/bpf.c b/common/bpf.c +index 16076fe..67b6d64 100644 +--- a/common/bpf.c ++++ b/common/bpf.c +@@ -94,7 +94,7 @@ int if_register_bpf (info) for (b = 0; 1; b++) { /* %Audit% 31 bytes max. %2004.06.17,Safe% */ sprintf(filename, BPF_FORMAT, b); @@ -133,10 +160,11 @@ diff -up dhcp-4.3.3b1/common/bpf.c.cloexec dhcp-4.3.3b1/common/bpf.c if (sock < 0) { if (errno == EBUSY) { continue; -diff -up dhcp-4.3.3b1/common/dlpi.c.cloexec dhcp-4.3.3b1/common/dlpi.c ---- dhcp-4.3.3b1/common/dlpi.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/dlpi.c 2015-08-10 10:46:20.275755506 +0200 -@@ -804,7 +804,7 @@ dlpiopen(const char *ifname) { +diff --git a/common/dlpi.c b/common/dlpi.c +index 3990bf1..a941258 100644 +--- a/common/dlpi.c ++++ b/common/dlpi.c +@@ -817,7 +817,7 @@ dlpiopen(const char *ifname) { } *dp = '\0'; @@ -145,9 +173,10 @@ diff -up dhcp-4.3.3b1/common/dlpi.c.cloexec dhcp-4.3.3b1/common/dlpi.c } /* -diff -up dhcp-4.3.3b1/common/nit.c.cloexec dhcp-4.3.3b1/common/nit.c ---- dhcp-4.3.3b1/common/nit.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/nit.c 2015-08-10 10:46:20.275755506 +0200 +diff --git a/common/nit.c b/common/nit.c +index d822c15..a9132bc 100644 +--- a/common/nit.c ++++ b/common/nit.c @@ -75,7 +75,7 @@ int if_register_nit (info) struct strioctl sio; @@ -157,10 +186,11 @@ diff -up dhcp-4.3.3b1/common/nit.c.cloexec dhcp-4.3.3b1/common/nit.c if (sock < 0) log_fatal ("Can't open NIT device for %s: %m", info -> name); -diff -up dhcp-4.3.3b1/common/resolv.c.cloexec dhcp-4.3.3b1/common/resolv.c ---- dhcp-4.3.3b1/common/resolv.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/resolv.c 2015-08-10 10:46:20.276755503 +0200 -@@ -44,7 +44,7 @@ void read_resolv_conf (parse_time) +diff --git a/common/resolv.c b/common/resolv.c +index a01f520..b209e3f 100644 +--- a/common/resolv.c ++++ b/common/resolv.c +@@ -43,7 +43,7 @@ void read_resolv_conf (parse_time) struct domain_search_list *dp, *dl, *nd; isc_result_t status; @@ -169,9 +199,10 @@ diff -up dhcp-4.3.3b1/common/resolv.c.cloexec dhcp-4.3.3b1/common/resolv.c log_error ("Can't open %s: %m", path_resolv_conf); return; } -diff -up dhcp-4.3.3b1/common/upf.c.cloexec dhcp-4.3.3b1/common/upf.c ---- dhcp-4.3.3b1/common/upf.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/common/upf.c 2015-08-10 10:46:20.276755503 +0200 +diff --git a/common/upf.c b/common/upf.c +index 9785879..e0a524f 100644 +--- a/common/upf.c ++++ b/common/upf.c @@ -71,7 +71,7 @@ int if_register_upf (info) /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */ sprintf(filename, "/dev/pf/pfilt%d", b); @@ -181,10 +212,11 @@ diff -up dhcp-4.3.3b1/common/upf.c.cloexec dhcp-4.3.3b1/common/upf.c if (sock < 0) { if (errno == EBUSY) { continue; -diff -up dhcp-4.3.3b1/omapip/trace.c.cloexec dhcp-4.3.3b1/omapip/trace.c ---- dhcp-4.3.3b1/omapip/trace.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/omapip/trace.c 2015-08-10 10:46:20.276755503 +0200 -@@ -138,10 +138,10 @@ isc_result_t trace_begin (const char *fi +diff --git a/omapip/trace.c b/omapip/trace.c +index 45bd508..5ea7486 100644 +--- a/omapip/trace.c ++++ b/omapip/trace.c +@@ -136,10 +136,10 @@ isc_result_t trace_begin (const char *filename, return DHCP_R_INVALIDARG; } @@ -197,7 +229,7 @@ diff -up dhcp-4.3.3b1/omapip/trace.c.cloexec dhcp-4.3.3b1/omapip/trace.c 0600); } -@@ -429,7 +429,7 @@ void trace_file_replay (const char *file +@@ -427,7 +427,7 @@ void trace_file_replay (const char *filename) isc_result_t result; int len; @@ -206,10 +238,11 @@ diff -up dhcp-4.3.3b1/omapip/trace.c.cloexec dhcp-4.3.3b1/omapip/trace.c if (!traceinfile) { log_error("Can't open tracefile %s: %m", filename); return; -diff -up dhcp-4.3.3b1/relay/dhcrelay.c.cloexec dhcp-4.3.3b1/relay/dhcrelay.c ---- dhcp-4.3.3b1/relay/dhcrelay.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/relay/dhcrelay.c 2015-08-10 10:46:20.276755503 +0200 -@@ -187,11 +187,11 @@ main(int argc, char **argv) { +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index d8caaaf..ea1be18 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c +@@ -296,11 +296,11 @@ main(int argc, char **argv) { /* Make sure that file descriptors 0(stdin), 1,(stdout), and 2(stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ @@ -224,8 +257,8 @@ diff -up dhcp-4.3.3b1/relay/dhcrelay.c.cloexec dhcp-4.3.3b1/relay/dhcrelay.c if (fd == 2) log_perror = 0; /* No sense logging to /dev/null. */ else if (fd != -1) -@@ -558,13 +558,13 @@ main(int argc, char **argv) { - +@@ -776,13 +776,13 @@ main(int argc, char **argv) { + /* Create the pid file. */ if (no_pid_file == ISC_FALSE) { pfdesc = open(path_dhcrelay_pid, - O_CREAT | O_TRUNC | O_WRONLY, 0644); @@ -240,10 +273,11 @@ diff -up dhcp-4.3.3b1/relay/dhcrelay.c.cloexec dhcp-4.3.3b1/relay/dhcrelay.c if (!pf) log_error("Can't fdopen %s: %m", path_dhcrelay_pid); -diff -up dhcp-4.3.3b1/server/confpars.c.cloexec dhcp-4.3.3b1/server/confpars.c ---- dhcp-4.3.3b1/server/confpars.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/server/confpars.c 2015-08-10 10:46:20.277755500 +0200 -@@ -111,7 +111,7 @@ isc_result_t read_conf_file (const char +diff --git a/server/confpars.c b/server/confpars.c +index d2cedfe..2743979 100644 +--- a/server/confpars.c ++++ b/server/confpars.c +@@ -118,7 +118,7 @@ isc_result_t read_conf_file (const char *filename, struct group *group, } #endif @@ -252,19 +286,11 @@ diff -up dhcp-4.3.3b1/server/confpars.c.cloexec dhcp-4.3.3b1/server/confpars.c if (leasep) { log_error ("Can't open lease database %s: %m --", path_dhcpd_db); -diff -up dhcp-4.3.3b1/server/db.c.cloexec dhcp-4.3.3b1/server/db.c ---- dhcp-4.3.3b1/server/db.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/server/db.c 2015-08-10 10:47:32.644518358 +0200 -@@ -1072,7 +1072,7 @@ void db_startup (testp) - } - #endif - if (!testp) { -- db_file = fopen (path_dhcpd_db, "a"); -+ db_file = fopen (path_dhcpd_db, "ae"); - if (!db_file) - log_fatal ("Can't open %s for append.", path_dhcpd_db); - expire_all_pools (); -@@ -1120,7 +1120,7 @@ int new_lease_file () +diff --git a/server/db.c b/server/db.c +index 67e6cc1..6181528 100644 +--- a/server/db.c ++++ b/server/db.c +@@ -1154,7 +1154,7 @@ int new_lease_file (int test_mode) path_dhcpd_db, (int)t) >= sizeof newfname) log_fatal("new_lease_file: lease file path too long"); @@ -273,7 +299,7 @@ diff -up dhcp-4.3.3b1/server/db.c.cloexec dhcp-4.3.3b1/server/db.c if (db_fd < 0) { log_error ("Can't create new lease file: %m"); return 0; -@@ -1141,7 +1141,7 @@ int new_lease_file () +@@ -1175,7 +1175,7 @@ int new_lease_file (int test_mode) } #endif /* PARANOIA */ @@ -282,10 +308,11 @@ diff -up dhcp-4.3.3b1/server/db.c.cloexec dhcp-4.3.3b1/server/db.c log_error("Can't fdopen new lease file: %m"); close(db_fd); goto fdfail; -diff -up dhcp-4.3.3b1/server/dhcpd.c.cloexec dhcp-4.3.3b1/server/dhcpd.c ---- dhcp-4.3.3b1/server/dhcpd.c.cloexec 2015-07-30 15:17:16.000000000 +0200 -+++ dhcp-4.3.3b1/server/dhcpd.c 2015-08-10 10:46:20.278755497 +0200 -@@ -194,11 +194,11 @@ main(int argc, char **argv) { +diff --git a/server/dhcpd.c b/server/dhcpd.c +index 55ffae7..530a923 100644 +--- a/server/dhcpd.c ++++ b/server/dhcpd.c +@@ -300,11 +300,11 @@ main(int argc, char **argv) { /* Make sure that file descriptors 0 (stdin), 1, (stdout), and 2 (stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ @@ -300,7 +327,7 @@ diff -up dhcp-4.3.3b1/server/dhcpd.c.cloexec dhcp-4.3.3b1/server/dhcpd.c if (fd == 2) log_perror = 0; /* No sense logging to /dev/null. */ else if (fd != -1) -@@ -743,7 +743,7 @@ main(int argc, char **argv) { +@@ -975,7 +975,7 @@ main(int argc, char **argv) { * appropriate. */ if (no_pid_file == ISC_FALSE) { @@ -309,7 +336,7 @@ diff -up dhcp-4.3.3b1/server/dhcpd.c.cloexec dhcp-4.3.3b1/server/dhcpd.c if (i >= 0) { sprintf(pbuf, "%d\n", (int) getpid()); IGNORE_RET(write(i, pbuf, strlen(pbuf))); -@@ -787,9 +787,9 @@ main(int argc, char **argv) { +@@ -1028,9 +1028,9 @@ main(int argc, char **argv) { (void) close(2); /* Reopen them on /dev/null. */ @@ -322,10 +349,11 @@ diff -up dhcp-4.3.3b1/server/dhcpd.c.cloexec dhcp-4.3.3b1/server/dhcpd.c log_perror = 0; /* No sense logging to /dev/null. */ IGNORE_RET (chdir("/")); -diff -up dhcp-4.3.3b1/server/ldap.c.cloexec dhcp-4.3.3b1/server/ldap.c ---- dhcp-4.3.3b1/server/ldap.c.cloexec 2015-07-30 21:03:40.000000000 +0200 -+++ dhcp-4.3.3b1/server/ldap.c 2015-08-10 10:46:20.279755493 +0200 -@@ -1442,7 +1442,7 @@ ldap_start (void) +diff --git a/server/ldap.c b/server/ldap.c +index 5126d24..555545c 100644 +--- a/server/ldap.c ++++ b/server/ldap.c +@@ -1446,7 +1446,7 @@ ldap_start (void) if (ldap_debug_file != NULL && ldap_debug_fd == -1) { @@ -334,3 +362,6 @@ diff -up dhcp-4.3.3b1/server/ldap.c.cloexec dhcp-4.3.3b1/server/ldap.c S_IRUSR | S_IWUSR)) < 0) log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file, strerror (errno)); +-- +2.14.5 + diff --git a/dhcp/patches/0009-Fix-garbage-in-format-string-error.patch b/dhcp/patches/0009-Fix-garbage-in-format-string-error.patch new file mode 100644 index 000000000..82e224b7c --- /dev/null +++ b/dhcp/patches/0009-Fix-garbage-in-format-string-error.patch @@ -0,0 +1,27 @@ +From 9ffd73d22b1337aeedef751afd03822cc0a15014 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:28:13 +0100 +Subject: [PATCH 09/21] Fix 'garbage in format string' error +Cc: pzhukov(a)redhat.com + +RHBZ: 450042 +--- + common/tables.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/tables.c b/common/tables.c +index c1aa214..d2294c0 100644 +--- a/common/tables.c ++++ b/common/tables.c +@@ -215,7 +215,7 @@ static struct option dhcp_options[] = { + { "name-service-search", "Sa", &dhcp_universe, 117, 1 }, + #endif + { "subnet-selection", "I", &dhcp_universe, 118, 1 }, +- { "domain-search", "Dc", &dhcp_universe, 119, 1 }, ++ { "domain-search", "D", &dhcp_universe, 119, 1 }, + { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, + { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, + #if 0 +-- +2.14.5 + diff --git a/dhcp/patches/0010-Handle-null-timeout.patch b/dhcp/patches/0010-Handle-null-timeout.patch new file mode 100644 index 000000000..dae64407e --- /dev/null +++ b/dhcp/patches/0010-Handle-null-timeout.patch @@ -0,0 +1,32 @@ +From e269e137c3b7d25a2d089be508e6769731618d54 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:29:08 +0100 +Subject: [PATCH 10/21] Handle null timeout +Cc: pzhukov(a)redhat.com + +Handle cases in add_timeout() where the function is called with a NULL +value for the 'when' parameter + +ISC-Bugs: #19867 (rejected) +--- + common/dispatch.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/common/dispatch.c b/common/dispatch.c +index 0207ad3..d7fe200 100644 +--- a/common/dispatch.c ++++ b/common/dispatch.c +@@ -209,6 +209,10 @@ void add_timeout (when, where, what, ref, unref) + isc_interval_t interval; + isc_time_t expires; + ++ if (when == NULL) { ++ return; ++ } ++ + /* See if this timeout supersedes an existing timeout. */ + t = (struct timeout *)0; + for (q = timeouts; q; q = q->next) { +-- +2.14.5 + diff --git a/dhcp/patches/0010-dhcp-paths.patch b/dhcp/patches/0010-dhcp-paths.patch deleted file mode 100644 index 59a711dad..000000000 --- a/dhcp/patches/0010-dhcp-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf ---- dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths 2013-11-07 20:15:08.000000000 +0100 -+++ dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf 2013-12-19 15:34:16.262247711 +0100 -@@ -42,7 +42,7 @@ option dhcp6.domain-search "test.example - option dhcp6.info-refresh-time 21600; - - # The path of the lease file --dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases"; -+dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases"; - - # Static definition (must be global) - host myclient { -diff -up dhcp-4.3.0a1/includes/dhcpd.h.paths dhcp-4.3.0a1/includes/dhcpd.h ---- dhcp-4.3.0a1/includes/dhcpd.h.paths 2013-12-19 15:34:16.253247840 +0100 -+++ dhcp-4.3.0a1/includes/dhcpd.h 2013-12-19 15:34:16.263247697 +0100 -@@ -1429,7 +1429,7 @@ typedef unsigned char option_mask [16]; - #else /* !DEBUG */ - - #ifndef _PATH_DHCPD_CONF --#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" -+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" - #endif /* DEBUG */ - - #ifndef _PATH_DHCPD_DB -@@ -1451,11 +1451,11 @@ typedef unsigned char option_mask [16]; - #endif /* DEBUG */ - - #ifndef _PATH_DHCLIENT_CONF --#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" -+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" - #endif - - #ifndef _PATH_DHCLIENT_SCRIPT --#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" -+#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script" - #endif - - #ifndef _PATH_DHCLIENT_PID diff --git a/dhcp/patches/0015-dhcp-capability.patch b/dhcp/patches/0011-Drop-unnecessary-capabilities.patch similarity index 62% rename from dhcp/patches/0015-dhcp-capability.patch rename to dhcp/patches/0011-Drop-unnecessary-capabilities.patch index 4572c348c..1c83f70ff 100644 --- a/dhcp/patches/0015-dhcp-capability.patch +++ b/dhcp/patches/0011-Drop-unnecessary-capabilities.patch @@ -1,7 +1,59 @@ -diff -up dhcp-4.3.4/client/dhclient.8.capability dhcp-4.3.4/client/dhclient.8 ---- dhcp-4.3.4/client/dhclient.8.capability 2016-04-29 12:19:40.657129322 +0200 -+++ dhcp-4.3.4/client/dhclient.8 2016-04-29 12:19:40.715129297 +0200 -@@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Pr +From 291f738f341a78f8c7974a7603d1a2eaa01ebacc Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:30:28 +0100 +Subject: [PATCH 11/21] Drop unnecessary capabilities +Cc: pzhukov(a)redhat.com + +dhclient (#517649, #546765), dhcpd/dhcrelay (#699713) +--- + client/Makefile.am | 3 ++- + client/dhclient-script.8 | 10 ++++++++++ + client/dhclient.8 | 29 +++++++++++++++++++++++++++++ + client/dhclient.c | 24 ++++++++++++++++++++++++ + configure.ac | 35 +++++++++++++++++++++++++++++++++++ + relay/Makefile.am | 3 ++- + relay/dhcrelay.c | 29 +++++++++++++++++++++++++++++ + 7 files changed, 131 insertions(+), 2 deletions(-) + +diff --git a/client/Makefile.am b/client/Makefile.am +index d177159..0689185 100644 +--- a/client/Makefile.am ++++ b/client/Makefile.am +@@ -17,6 +17,7 @@ dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ + @BINDLIBIRSDIR@/libirs.@A@ \ + @BINDLIBDNSDIR@/libdns.@A@ \ + @BINDLIBISCCFGDIR@/libisccfg.@A@ \ +- @BINDLIBISCDIR@/libisc.@A@ ++ @BINDLIBISCDIR@/libisc.@A@ \ ++ $(CAPNG_LDADD) + man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 + EXTRA_DIST = $(man_MANS) +diff --git a/client/dhclient-script.8 b/client/dhclient-script.8 +index 0db5516..2eddb8f 100644 +--- a/client/dhclient-script.8 ++++ b/client/dhclient-script.8 +@@ -243,6 +243,16 @@ repeatedly initialized to the values provided by one server, and then + the other. Assuming the information provided by both servers is + valid, this shouldn't cause any real problems, but it could be + confusing. ++.PP ++Normally, if dhclient was compiled with libcap-ng support, ++dhclient drops most capabilities immediately upon startup. ++While more secure, this greatly restricts the additional actions that ++hooks in dhclient-script can take. For example, any daemons that ++dhclient-script starts or restarts will inherit the restricted ++capabilities as well, which may interfere with their correct operation. ++Thus, the ++.BI \-nc ++option can be used to prevent dhclient from dropping capabilities. + .SH SEE ALSO + dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and + dhclient.leases(5). +diff --git a/client/dhclient.8 b/client/dhclient.8 +index 6d7fbdb..0145b9f 100644 +--- a/client/dhclient.8 ++++ b/client/dhclient.8 +@@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Protocol Client .B -w ] [ @@ -11,10 +63,11 @@ diff -up dhcp-4.3.4/client/dhclient.8.capability dhcp-4.3.4/client/dhclient.8 .B -B ] [ -@@ -318,6 +321,32 @@ has been added or removed, so that the c +@@ -328,6 +331,32 @@ not to exit when it doesn't find any such interfaces. The + program can then be used to notify the client when a network interface + has been added or removed, so that the client can attempt to configure an IP address on that interface. - - .TP ++.TP +.BI \-nc +Do not drop capabilities. + @@ -40,16 +93,16 @@ diff -up dhcp-4.3.4/client/dhclient.8.capability dhcp-4.3.4/client/dhclient.8 +.B dhclient +was not compiled with libcap-ng support. + -+.TP - .BI \-B - Set the BOOTP broadcast flag in request packets so servers will always - broadcast replies. -diff -up dhcp-4.3.4/client/dhclient.c.capability dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.capability 2016-04-29 12:19:40.691129307 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:21:07.620091930 +0200 -@@ -40,6 +40,10 @@ - #include <isc/file.h> - #include <dns/result.h> + .TP + .BI \-n + Do not configure any interfaces. This is most likely to be useful in +diff --git a/client/dhclient.c b/client/dhclient.c +index a86ab9e..5d3f5bc 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -41,6 +41,10 @@ + #include <sys/wait.h> + #include <limits.h> +#ifdef HAVE_LIBCAP_NG +#include <cap-ng.h> @@ -58,7 +111,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.capability dhcp-4.3.4/client/dhclient.c /* * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define * that when building ISC code. -@@ -237,6 +241,9 @@ main(int argc, char **argv) { +@@ -266,6 +270,9 @@ main(int argc, char **argv) { int timeout_arg = 0; char *arg_conf = NULL; int arg_conf_len = 0; @@ -68,18 +121,18 @@ diff -up dhcp-4.3.4/client/dhclient.c.capability dhcp-4.3.4/client/dhclient.c /* Initialize client globals. */ memset(&default_duid, 0, sizeof(default_duid)); -@@ -537,6 +544,10 @@ main(int argc, char **argv) { - } +@@ -665,6 +672,10 @@ main(int argc, char **argv) { dhclient_request_options = argv[i]; + + } else if (!strcmp(argv[i], "-nc")) { +#ifdef HAVE_LIBCAP_NG -+ keep_capabilities = 1; ++ keep_capabilities = 1; +#endif } else if (argv[i][0] == '-') { usage("Unknown command: %s", argv[i]); } else if (interfaces_requested < 0) { -@@ -597,6 +608,19 @@ main(int argc, char **argv) { +@@ -725,6 +736,19 @@ main(int argc, char **argv) { path_dhclient_script = s; } @@ -99,42 +152,11 @@ diff -up dhcp-4.3.4/client/dhclient.c.capability dhcp-4.3.4/client/dhclient.c /* Set up the initial dhcp option universe. */ initialize_common_option_spaces(); -diff -up dhcp-4.3.4/client/dhclient-script.8.capability dhcp-4.3.4/client/dhclient-script.8 ---- dhcp-4.3.4/client/dhclient-script.8.capability 2016-04-29 12:19:40.668129317 +0200 -+++ dhcp-4.3.4/client/dhclient-script.8 2016-04-29 12:19:40.717129296 +0200 -@@ -243,6 +243,16 @@ repeatedly initialized to the values pro - the other. Assuming the information provided by both servers is - valid, this shouldn't cause any real problems, but it could be - confusing. -+.PP -+Normally, if dhclient was compiled with libcap-ng support, -+dhclient drops most capabilities immediately upon startup. -+While more secure, this greatly restricts the additional actions that -+hooks in dhclient-script can take. For example, any daemons that -+dhclient-script starts or restarts will inherit the restricted -+capabilities as well, which may interfere with their correct operation. -+Thus, the -+.BI \-nc -+option can be used to prevent dhclient from dropping capabilities. - .SH SEE ALSO - dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and - dhclient.leases(5). -diff -up dhcp-4.3.4/client/Makefile.am.capability dhcp-4.3.4/client/Makefile.am ---- dhcp-4.3.4/client/Makefile.am.capability 2016-04-29 12:19:40.652129324 +0200 -+++ dhcp-4.3.4/client/Makefile.am 2016-04-29 12:19:40.717129296 +0200 -@@ -13,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c - scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt --dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ -+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.4/configure.ac.capability dhcp-4.3.4/configure.ac ---- dhcp-4.3.4/configure.ac.capability 2016-04-29 12:19:40.652129324 +0200 -+++ dhcp-4.3.4/configure.ac 2016-04-29 12:19:40.717129296 +0200 -@@ -585,6 +585,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], +diff --git a/configure.ac b/configure.ac +index a797438..15fc0d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -612,6 +612,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn)); # Look for optional headers. AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) @@ -176,9 +198,24 @@ diff -up dhcp-4.3.4/configure.ac.capability dhcp-4.3.4/configure.ac # Solaris needs some libraries for functions AC_SEARCH_LIBS(socket, [socket]) AC_SEARCH_LIBS(inet_ntoa, [nsl]) -diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c ---- dhcp-4.3.4/relay/dhcrelay.c.capability 2016-04-29 12:19:40.694129306 +0200 -+++ dhcp-4.3.4/relay/dhcrelay.c 2016-04-29 12:22:30.278056386 +0200 +diff --git a/relay/Makefile.am b/relay/Makefile.am +index 2ba5979..8900e0b 100644 +--- a/relay/Makefile.am ++++ b/relay/Makefile.am +@@ -6,7 +6,8 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ + @BINDLIBIRSDIR@/libirs.@A@ \ + @BINDLIBDNSDIR@/libdns.@A@ \ + @BINDLIBISCCFGDIR@/libisccfg.@A@ \ +- @BINDLIBISCDIR@/libisc.@A@ ++ @BINDLIBISCDIR@/libisc.@A@ \ ++ $(CAPNG_LDADD) + man_MANS = dhcrelay.8 + EXTRA_DIST = $(man_MANS) + +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index ea1be18..7b4f4f1 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c @@ -32,6 +32,11 @@ #include <sys/time.h> #include <isc/file.h> @@ -191,18 +228,18 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ struct tree_cache *global_options[256]; -@@ -454,6 +459,10 @@ main(int argc, char **argv) { +@@ -590,6 +595,10 @@ main(int argc, char **argv) { + if (++i == argc) usage(use_noarg, argv[i-1]); dhcrelay_sub_id = argv[i]; - #endif ++#endif + } else if (!strcmp(argv[i], "-nc")) { +#ifdef HAVE_LIBCAP_NG + keep_capabilities = 1; -+#endif + #endif } else if (!strcmp(argv[i], "-pf")) { if (++i == argc) - usage(use_noarg, argv[i-1]); -@@ -528,6 +537,17 @@ main(int argc, char **argv) { +@@ -660,6 +669,17 @@ main(int argc, char **argv) { #endif } @@ -220,7 +257,7 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c if (!quiet) { log_info("%s %s", message, PACKAGE_VERSION); log_info(copyright); -@@ -680,6 +700,15 @@ main(int argc, char **argv) { +@@ -816,6 +836,15 @@ main(int argc, char **argv) { signal(SIGTERM, dhcp_signal_handler); /* kill */ #endif @@ -236,15 +273,6 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.capability dhcp-4.3.4/relay/dhcrelay.c /* Start dispatching packets and timeouts... */ dispatch(); -diff -up dhcp-4.3.4/relay/Makefile.am.capability dhcp-4.3.4/relay/Makefile.am ---- dhcp-4.3.4/relay/Makefile.am.capability 2016-04-29 12:19:40.653129323 +0200 -+++ dhcp-4.3.4/relay/Makefile.am 2016-04-29 12:19:40.718129295 +0200 -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst - - sbin_PROGRAMS = dhcrelay - dhcrelay_SOURCES = dhcrelay.c --dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ -+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export - man_MANS = dhcrelay.8 - EXTRA_DIST = $(man_MANS) +-- +2.14.5 + diff --git a/dhcp/patches/0017-dhcp-rfc3442-classless-static-routes.patch b/dhcp/patches/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch similarity index 76% rename from dhcp/patches/0017-dhcp-rfc3442-classless-static-routes.patch rename to dhcp/patches/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch index 6c3a2392b..a2804a46a 100644 --- a/dhcp/patches/0017-dhcp-rfc3442-classless-static-routes.patch +++ b/dhcp/patches/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch @@ -1,6 +1,27 @@ -diff -up dhcp-4.3.4/client/clparse.c.rfc3442 dhcp-4.3.4/client/clparse.c ---- dhcp-4.3.4/client/clparse.c.rfc3442 2016-04-29 12:23:34.192032714 +0200 -+++ dhcp-4.3.4/client/clparse.c 2016-04-29 12:24:37.531016317 +0200 +From 2756fcc3f88c27d0e12e72dbdd2906fbf45f2362 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:32:35 +0100 +Subject: [PATCH 12/21] RFC 3442 - Classless Static Route Option for DHCPv4 + (#516325) +Cc: pzhukov(a)redhat.com + +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #24572]) +--- + client/clparse.c | 13 ++++++++++-- + common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++++++++ + common/inet.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ + common/options.c | 49 +++++++++++++++++++++++++++++++++++++++++++- + common/parse.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++- + common/tables.c | 2 ++ + includes/dhcp.h | 1 + + includes/dhcpd.h | 2 ++ + includes/dhctoken.h | 5 +++-- + 9 files changed, 219 insertions(+), 6 deletions(-) + +diff --git a/client/clparse.c b/client/clparse.c +index 44387ed..862e4f9 100644 +--- a/client/clparse.c ++++ b/client/clparse.c @@ -31,7 +31,7 @@ struct client_config top_level_config; @@ -35,10 +56,11 @@ diff -up dhcp-4.3.4/client/clparse.c.rfc3442 dhcp-4.3.4/client/clparse.c for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) { if (default_requested_options[code] == NULL) log_fatal("Unable to find option definition for " -diff -up dhcp-4.3.4/common/dhcp-options.5.rfc3442 dhcp-4.3.4/common/dhcp-options.5 ---- dhcp-4.3.4/common/dhcp-options.5.rfc3442 2016-04-29 12:23:34.183032716 +0200 -+++ dhcp-4.3.4/common/dhcp-options.5 2016-04-29 12:23:34.237032703 +0200 -@@ -111,6 +111,26 @@ hexadecimal, separated by colons. For e +diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 +index d9e1197..2343b19 100644 +--- a/common/dhcp-options.5 ++++ b/common/dhcp-options.5 +@@ -110,6 +110,26 @@ hexadecimal, separated by colons. For example: or option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f; .fi @@ -65,7 +87,7 @@ diff -up dhcp-4.3.4/common/dhcp-options.5.rfc3442 dhcp-4.3.4/common/dhcp-options .SH SETTING OPTION VALUES USING EXPRESSIONS Sometimes it's helpful to be able to set the value of a DHCP option based on some value that the client has sent. To do this, you can -@@ -1031,6 +1051,29 @@ dhclient-script will create routes: +@@ -1086,6 +1106,29 @@ dhclient-script will create routes: .RE .PP .nf @@ -95,10 +117,11 @@ diff -up dhcp-4.3.4/common/dhcp-options.5.rfc3442 dhcp-4.3.4/common/dhcp-options .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...]\fB;\fR .fi -diff -up dhcp-4.3.4/common/inet.c.rfc3442 dhcp-4.3.4/common/inet.c ---- dhcp-4.3.4/common/inet.c.rfc3442 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/inet.c 2016-04-29 12:23:34.237032703 +0200 -@@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne +diff --git a/common/inet.c b/common/inet.c +index c4da73c..981fb92 100644 +--- a/common/inet.c ++++ b/common/inet.c +@@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrnetlist **result) { return ISC_R_SUCCESS; } @@ -159,10 +182,11 @@ diff -up dhcp-4.3.4/common/inet.c.rfc3442 dhcp-4.3.4/common/inet.c /* piaddr() turns an iaddr structure into a printable address. */ /* XXX: should use a const pointer rather than passing the structure */ const char * -diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c ---- dhcp-4.3.4/common/options.c.rfc3442 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/options.c 2016-04-29 12:23:34.237032703 +0200 -@@ -713,7 +713,11 @@ cons_options(struct packet *inpacket, st +diff --git a/common/options.c b/common/options.c +index fc0e088..3034cf0 100644 +--- a/common/options.c ++++ b/common/options.c +@@ -729,7 +729,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket, * packet. */ priority_list[priority_len++] = DHO_SUBNET_MASK; @@ -175,7 +199,7 @@ diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS; priority_list[priority_len++] = DHO_HOST_NAME; priority_list[priority_len++] = DHO_FQDN; -@@ -1694,6 +1698,7 @@ const char *pretty_print_option (option, +@@ -1804,6 +1808,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) unsigned long tval; isc_boolean_t a_array = ISC_FALSE; int len_used; @@ -183,7 +207,7 @@ diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c if (emit_commas) comma = ','; -@@ -1702,6 +1707,7 @@ const char *pretty_print_option (option, +@@ -1812,6 +1817,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) memset (enumbuf, 0, sizeof enumbuf); @@ -191,7 +215,7 @@ diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c /* Figure out the size of the data. */ for (l = i = 0; option -> format [i]; i++, l++) { if (l >= sizeof(fmtbuf) - 1) -@@ -1894,6 +1900,33 @@ const char *pretty_print_option (option, +@@ -2004,6 +2010,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) if (numhunk < 0) numhunk = 1; @@ -225,7 +249,7 @@ diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c /* Cycle through the array (or hunk) printing the data. */ for (i = 0; i < numhunk; i++) { if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) { -@@ -2049,6 +2082,20 @@ const char *pretty_print_option (option, +@@ -2159,6 +2192,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) strcpy(op, piaddr(iaddr)); dp += 4; break; @@ -246,13 +270,15 @@ diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c case '6': iaddr.len = 16; memcpy(iaddr.iabuf, dp, 16); -diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c ---- dhcp-4.3.4/common/parse.c.rfc3442 2016-04-29 12:23:34.220032707 +0200 -+++ dhcp-4.3.4/common/parse.c 2016-04-29 12:23:34.238032702 +0200 -@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr) +diff --git a/common/parse.c b/common/parse.c +index 3ac4ebf..f17bc0b 100644 +--- a/common/parse.c ++++ b/common/parse.c +@@ -344,6 +344,39 @@ int parse_ip_addr (cfile, addr) + return 0; } - /* ++/* + * destination-descriptor :== NUMBER DOT NUMBER | + * NUMBER DOT NUMBER DOT NUMBER | + * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER | @@ -285,11 +311,10 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c + return 0; +} + -+/* + /* * Return true if every character in the string is hexadecimal. */ - static int -@@ -720,8 +753,10 @@ unsigned char *parse_numeric_aggregate ( +@@ -724,8 +757,10 @@ unsigned char *parse_numeric_aggregate (cfile, buf, if (count) { token = peek_token (&val, (unsigned *)0, cfile); if (token != separator) { @@ -301,7 +326,7 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c if (token != RBRACE && token != LBRACE) token = next_token (&val, (unsigned *)0, -@@ -1668,6 +1703,9 @@ int parse_option_code_definition (cfile, +@@ -1672,6 +1707,9 @@ int parse_option_code_definition (cfile, option) case IP_ADDRESS: type = 'I'; break; @@ -311,7 +336,7 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c case IP6_ADDRESS: type = '6'; break; -@@ -5097,6 +5135,15 @@ int parse_option_token (rv, cfile, fmt, +@@ -5101,6 +5139,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups) } break; @@ -327,7 +352,7 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c case '6': /* IPv6 address. */ if (!parse_ip6_addr(cfile, &addr)) { return 0; -@@ -5374,6 +5421,13 @@ int parse_option_decl (oc, cfile) +@@ -5378,6 +5425,13 @@ int parse_option_decl (oc, cfile) goto exit; len = ip_addr.len; dp = ip_addr.iabuf; @@ -341,10 +366,11 @@ diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c alloc: if (hunkix + len > sizeof hunkbuf) { -diff -up dhcp-4.3.4/common/tables.c.rfc3442 dhcp-4.3.4/common/tables.c ---- dhcp-4.3.4/common/tables.c.rfc3442 2016-04-29 12:23:34.209032710 +0200 -+++ dhcp-4.3.4/common/tables.c 2016-04-29 12:23:34.238032702 +0200 -@@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsig +diff --git a/common/tables.c b/common/tables.c +index d2294c0..f1be07d 100644 +--- a/common/tables.c ++++ b/common/tables.c +@@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option, Format codes: I - IPv4 address @@ -360,10 +386,23 @@ diff -up dhcp-4.3.4/common/tables.c.rfc3442 dhcp-4.3.4/common/tables.c { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, #if 0 -diff -up dhcp-4.3.4/includes/dhcpd.h.rfc3442 dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.rfc3442 2016-04-29 12:23:34.186032716 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:23:34.239032702 +0200 -@@ -2894,6 +2894,7 @@ isc_result_t range2cidr(struct iaddrcidr +diff --git a/includes/dhcp.h b/includes/dhcp.h +index 0a74137..95bf539 100644 +--- a/includes/dhcp.h ++++ b/includes/dhcp.h +@@ -158,6 +158,7 @@ struct dhcp_packet { + #define DHO_ASSOCIATED_IP 92 + #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ + #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ ++#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ + #define DHO_VIVCO_SUBOPTIONS 124 + #define DHO_VIVSO_SUBOPTIONS 125 + +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 3632a6b..2ac39ae 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -2951,6 +2951,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result, const struct iaddr *lo, const struct iaddr *hi); isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result); const char *piaddr (struct iaddr); @@ -371,7 +410,7 @@ diff -up dhcp-4.3.4/includes/dhcpd.h.rfc3442 dhcp-4.3.4/includes/dhcpd.h char *piaddrmask(struct iaddr *, struct iaddr *); char *piaddrcidr(const struct iaddr *, unsigned int); u_int16_t validate_port(char *); -@@ -3108,6 +3109,7 @@ void parse_client_lease_declaration (str +@@ -3169,6 +3170,7 @@ void parse_client_lease_declaration (struct parse *, int parse_option_decl (struct option_cache **, struct parse *); void parse_string_list (struct parse *, struct string_list **, int); int parse_ip_addr (struct parse *, struct iaddr *); @@ -379,27 +418,22 @@ diff -up dhcp-4.3.4/includes/dhcpd.h.rfc3442 dhcp-4.3.4/includes/dhcpd.h int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *); void parse_reject_statement (struct parse *, struct client_config *); -diff -up dhcp-4.3.4/includes/dhcp.h.rfc3442 dhcp-4.3.4/includes/dhcp.h ---- dhcp-4.3.4/includes/dhcp.h.rfc3442 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/includes/dhcp.h 2016-04-29 12:23:34.239032702 +0200 -@@ -159,6 +159,7 @@ struct dhcp_packet { - #define DHO_ASSOCIATED_IP 92 - #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ - #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ -+#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ - #define DHO_VIVCO_SUBOPTIONS 124 - #define DHO_VIVSO_SUBOPTIONS 125 - -diff -up dhcp-4.3.4/includes/dhctoken.h.rfc3442 dhcp-4.3.4/includes/dhctoken.h ---- dhcp-4.3.4/includes/dhctoken.h.rfc3442 2016-04-29 12:23:34.239032702 +0200 -+++ dhcp-4.3.4/includes/dhctoken.h 2016-04-29 12:25:07.236008628 +0200 -@@ -374,7 +374,8 @@ enum dhcp_token { +diff --git a/includes/dhctoken.h b/includes/dhctoken.h +index 7e7215a..b4d93ba 100644 +--- a/includes/dhctoken.h ++++ b/includes/dhctoken.h +@@ -376,8 +376,9 @@ enum dhcp_token { LEASE_ID_FORMAT = 676, TOKEN_HEX = 677, TOKEN_OCTAL = 678, -- BOOTP_BROADCAST_ALWAYS = 679 -+ BOOTP_BROADCAST_ALWAYS = 679, -+ DESTINATION_DESCRIPTOR = 680 +- KEY_ALGORITHM = 679 +- BOOTP_BROADCAST_ALWAYS = 680 ++ KEY_ALGORITHM = 679, ++ BOOTP_BROADCAST_ALWAYS = 680, ++ DESTINATION_DESCRIPTOR = 681 }; #define is_identifier(x) ((x) >= FIRST_TOKEN && \ +-- +2.14.5 + diff --git a/dhcp/patches/0012-dhcp-garbage-chars.patch b/dhcp/patches/0012-dhcp-garbage-chars.patch deleted file mode 100644 index 131360be6..000000000 --- a/dhcp/patches/0012-dhcp-garbage-chars.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up dhcp-4.3.0rc1/common/tables.c.garbage dhcp-4.3.0rc1/common/tables.c ---- dhcp-4.3.0rc1/common/tables.c.garbage 2014-01-29 10:03:52.132624677 +0100 -+++ dhcp-4.3.0rc1/common/tables.c 2014-01-29 10:04:51.413875343 +0100 -@@ -213,7 +213,7 @@ static struct option dhcp_options[] = { - { "name-service-search", "Sa", &dhcp_universe, 117, 1 }, - #endif - { "subnet-selection", "I", &dhcp_universe, 118, 1 }, -- { "domain-search", "Dc", &dhcp_universe, 119, 1 }, -+ { "domain-search", "D", &dhcp_universe, 119, 1 }, - { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 }, - { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, - #if 0 diff --git a/dhcp/patches/0019-dhcp-PPP.patch b/dhcp/patches/0013-DHCPv6-over-PPP-support-626514.patch similarity index 64% rename from dhcp/patches/0019-dhcp-PPP.patch rename to dhcp/patches/0013-DHCPv6-over-PPP-support-626514.patch index b3d82ea4d..c9d381161 100644 --- a/dhcp/patches/0019-dhcp-PPP.patch +++ b/dhcp/patches/0013-DHCPv6-over-PPP-support-626514.patch @@ -1,7 +1,24 @@ -diff -up dhcp-4.3.4/client/dhc6.c.PPP dhcp-4.3.4/client/dhc6.c ---- dhcp-4.3.4/client/dhc6.c.PPP 2016-04-29 12:46:29.824988665 +0200 -+++ dhcp-4.3.4/client/dhc6.c 2016-04-29 12:46:29.828988666 +0200 -@@ -5641,7 +5641,8 @@ make_client6_options(struct client_state +From 43332b29f0c8fef3ddd225e31f5f2b4ff8273b36 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:33:06 +0100 +Subject: [PATCH 13/21] DHCPv6 over PPP support (#626514) +Cc: pzhukov(a)redhat.com + +--- + client/dhc6.c | 3 ++- + client/dhclient.c | 17 ++++++++++++++--- + common/bpf.c | 16 ++++++++++++++++ + common/lpf.c | 16 ++++++++++++++++ + includes/dhcp.h | 2 ++ + includes/dhcpd.h | 2 +- + server/dhcpv6.c | 3 +++ + 7 files changed, 54 insertions(+), 5 deletions(-) + +diff --git a/client/dhc6.c b/client/dhc6.c +index 16a0838..3171828 100644 +--- a/client/dhc6.c ++++ b/client/dhc6.c +@@ -5744,7 +5744,8 @@ make_client6_options(struct client_state *client, struct option_state **op, */ if ((oc = lookup_option(&dhcpv6_universe, *op, D6O_CLIENTID)) == NULL) { @@ -11,10 +28,11 @@ diff -up dhcp-4.3.4/client/dhc6.c.PPP dhcp-4.3.4/client/dhc6.c MDL)) log_fatal("Failure assembling a DUID."); -diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.PPP 2016-04-29 12:46:29.815988664 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:46:29.830988666 +0200 -@@ -1077,8 +1077,8 @@ main(int argc, char **argv) { +diff --git a/client/dhclient.c b/client/dhclient.c +index 5d3f5bc..301132c 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -1202,8 +1202,8 @@ main(int argc, char **argv) { if (default_duid.buffer != NULL) data_string_forget(&default_duid, MDL); @@ -25,7 +43,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c } } -@@ -3808,7 +3808,7 @@ write_options(struct client_state *clien +@@ -3956,7 +3956,7 @@ write_options(struct client_state *client, struct option_state *options, * is not how it is intended. Upcoming rearchitecting the client should * address this "one daemon model." */ @@ -34,7 +52,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c form_duid(struct data_string *duid, const char *file, int line) { struct interface_info *ip; -@@ -3821,6 +3821,15 @@ form_duid(struct data_string *duid, cons +@@ -3969,6 +3969,15 @@ form_duid(struct data_string *duid, const char *file, int line) if (ip == NULL) log_fatal("Impossible condition at %s:%d.", MDL); @@ -50,7 +68,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c if ((ip->hw_address.hlen == 0) || (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) log_fatal("Impossible hardware address length at %s:%d.", MDL); -@@ -3866,6 +3875,8 @@ form_duid(struct data_string *duid, cons +@@ -4014,6 +4023,8 @@ form_duid(struct data_string *duid, const char *file, int line) log_info("Created duid %s.", str); dfree(str, MDL); } @@ -59,10 +77,11 @@ diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c } /* Write the default DUID to the lease store. */ -diff -up dhcp-4.3.4/common/bpf.c.PPP dhcp-4.3.4/common/bpf.c ---- dhcp-4.3.4/common/bpf.c.PPP 2016-04-29 12:46:29.794988660 +0200 -+++ dhcp-4.3.4/common/bpf.c 2016-04-29 12:46:29.830988666 +0200 -@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har +diff --git a/common/bpf.c b/common/bpf.c +index 67b6d64..ffbd09a 100644 +--- a/common/bpf.c ++++ b/common/bpf.c +@@ -650,6 +650,22 @@ get_hw_addr(const char *name, struct hardware *hw) { memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen); break; #endif /* IFT_FDDI */ @@ -85,10 +104,11 @@ diff -up dhcp-4.3.4/common/bpf.c.PPP dhcp-4.3.4/common/bpf.c default: log_fatal("Unsupported device type %d for \"%s\"", sa->sdl_type, name); -diff -up dhcp-4.3.4/common/lpf.c.PPP dhcp-4.3.4/common/lpf.c ---- dhcp-4.3.4/common/lpf.c.PPP 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/lpf.c 2016-04-29 12:46:29.830988666 +0200 -@@ -548,6 +548,22 @@ get_hw_addr(const char *name, struct har +diff --git a/common/lpf.c b/common/lpf.c +index 82a279b..b0ed01c 100644 +--- a/common/lpf.c ++++ b/common/lpf.c +@@ -563,6 +563,22 @@ get_hw_addr(const char *name, struct hardware *hw) { hw->hbuf[0] = HTYPE_FDDI; memcpy(&hw->hbuf[1], sa->sa_data, 6); break; @@ -111,22 +131,11 @@ diff -up dhcp-4.3.4/common/lpf.c.PPP dhcp-4.3.4/common/lpf.c default: log_fatal("Unsupported device type %ld for \"%s\"", (long int)sa->sa_family, name); -diff -up dhcp-4.3.4/includes/dhcpd.h.PPP dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.PPP 2016-04-29 12:46:29.831988667 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:47:13.167995959 +0200 -@@ -2990,7 +2990,7 @@ void client_dns_remove(struct client_sta - - void dhcpv4_client_assignments(void); - void dhcpv6_client_assignments(void); --void form_duid(struct data_string *duid, const char *file, int line); -+isc_result_t form_duid(struct data_string *duid, const char *file, int line); - - void dhcp4o6_start(void); - -diff -up dhcp-4.3.4/includes/dhcp.h.PPP dhcp-4.3.4/includes/dhcp.h ---- dhcp-4.3.4/includes/dhcp.h.PPP 2016-04-29 12:46:29.822988665 +0200 -+++ dhcp-4.3.4/includes/dhcp.h 2016-04-29 12:46:29.832988667 +0200 -@@ -81,6 +81,8 @@ struct dhcp_packet { +diff --git a/includes/dhcp.h b/includes/dhcp.h +index 95bf539..4cc547a 100644 +--- a/includes/dhcp.h ++++ b/includes/dhcp.h +@@ -80,6 +80,8 @@ struct dhcp_packet { * is no standard for this so we * just steal a type */ @@ -135,10 +144,24 @@ diff -up dhcp-4.3.4/includes/dhcp.h.PPP dhcp-4.3.4/includes/dhcp.h /* Magic cookie validating dhcp options field (and bootp vendor extensions field). */ #define DHCP_OPTIONS_COOKIE "\143\202\123\143" -diff -up dhcp-4.3.4/server/dhcpv6.c.PPP dhcp-4.3.4/server/dhcpv6.c ---- dhcp-4.3.4/server/dhcpv6.c.PPP 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/server/dhcpv6.c 2016-04-29 12:46:29.833988667 +0200 -@@ -454,6 +454,9 @@ generate_new_server_duid(void) { +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 2ac39ae..faa9251 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -3051,7 +3051,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr); + + void dhcpv4_client_assignments(void); + void dhcpv6_client_assignments(void); +-void form_duid(struct data_string *duid, const char *file, int line); ++isc_result_t form_duid(struct data_string *duid, const char *file, int line); + + void dhcp4o6_start(void); + +diff --git a/server/dhcpv6.c b/server/dhcpv6.c +index a7110f9..c5ce7e8 100644 +--- a/server/dhcpv6.c ++++ b/server/dhcpv6.c +@@ -482,6 +482,9 @@ generate_new_server_duid(void) { if (p->hw_address.hlen > 0) { break; } @@ -148,3 +171,6 @@ diff -up dhcp-4.3.4/server/dhcpv6.c.PPP dhcp-4.3.4/server/dhcpv6.c } if (p == NULL) { return ISC_R_UNEXPECTED; +-- +2.14.5 + diff --git a/dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch b/dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch deleted file mode 100644 index 103824c38..000000000 --- a/dhcp/patches/0013-dhcp-add_timeout_when_NULL.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up dhcp-4.3.0a1/common/dispatch.c.dracut dhcp-4.3.0a1/common/dispatch.c ---- dhcp-4.3.0a1/common/dispatch.c.dracut 2013-12-11 01:25:12.000000000 +0100 -+++ dhcp-4.3.0a1/common/dispatch.c 2013-12-19 15:39:50.350505860 +0100 -@@ -210,6 +210,10 @@ void add_timeout (when, where, what, ref - isc_interval_t interval; - isc_time_t expires; - -+ if (when == NULL) { -+ return; -+ } -+ - /* See if this timeout supersedes an existing timeout. */ - t = (struct timeout *)0; - for (q = timeouts; q; q = q->next) { diff --git a/dhcp/patches/0020-dhcp-lpf-ib.patch b/dhcp/patches/0014-IPoIB-support-660681.patch similarity index 77% rename from dhcp/patches/0020-dhcp-lpf-ib.patch rename to dhcp/patches/0014-IPoIB-support-660681.patch index 766d518ad..3f5a27494 100644 --- a/dhcp/patches/0020-dhcp-lpf-ib.patch +++ b/dhcp/patches/0014-IPoIB-support-660681.patch @@ -1,16 +1,33 @@ -diff -up dhcp-4.3.4/client/dhclient.c.lpf-ib dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.lpf-ib 2016-05-02 14:37:36.945128001 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-05-02 14:37:36.952128005 +0200 -@@ -163,6 +163,8 @@ static const char use_noarg[] = "No argu - static const char use_v6command[] = "Command not used for DHCPv4: %s"; - #endif +From de8468cf16c0fa9d01412446fcf1d44ccd0fd411 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:34:21 +0100 +Subject: [PATCH 14/21] IPoIB support (#660681) +Cc: pzhukov(a)redhat.com + +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #24249]) +--- + client/dhclient.c | 32 +++++++ + common/bpf.c | 32 +++++++ + common/discover.c | 4 +- + common/lpf.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++----- + common/socket.c | 8 +- + includes/dhcpd.h | 6 +- + 6 files changed, 315 insertions(+), 29 deletions(-) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 301132c..dc9080e 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -205,6 +205,8 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; + + #define DHCLIENT_USAGEH "{--version|--help|-h}" +static void setup_ib_interface(struct interface_info *ip); + static void usage(const char *sfmt, const char *sarg) { -@@ -1066,6 +1068,13 @@ main(int argc, char **argv) { +@@ -1191,6 +1193,13 @@ main(int argc, char **argv) { } srandom(seed + cur_time + (unsigned)getpid()); @@ -24,7 +41,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.lpf-ib dhcp-4.3.4/client/dhclient.c /* * Establish a default DUID. We always do so for v6 and -@@ -1361,6 +1370,29 @@ int find_subnet (struct subnet **sp, +@@ -1486,6 +1495,29 @@ int find_subnet (struct subnet **sp, return 0; } @@ -54,12 +71,13 @@ diff -up dhcp-4.3.4/client/dhclient.c.lpf-ib dhcp-4.3.4/client/dhclient.c /* Individual States: * * Each routine is called from the dhclient_state_machine() in one of -diff -up dhcp-4.3.4/common/bpf.c.lpf-ib dhcp-4.3.4/common/bpf.c ---- dhcp-4.3.4/common/bpf.c.lpf-ib 2016-05-02 14:37:36.946128001 +0200 -+++ dhcp-4.3.4/common/bpf.c 2016-05-02 14:37:36.952128005 +0200 -@@ -198,11 +198,43 @@ struct bpf_insn dhcp_bpf_filter [] = { - BPF_STMT(BPF_RET+BPF_K, 0), - }; +diff --git a/common/bpf.c b/common/bpf.c +index ffbd09a..568e3d9 100644 +--- a/common/bpf.c ++++ b/common/bpf.c +@@ -237,11 +237,43 @@ int dhcp_bpf_relay_filter_len = + sizeof dhcp_bpf_relay_filter / sizeof (struct bpf_insn); + #endif +/* Packet filter program for DHCP over Infiniband. + * @@ -101,10 +119,11 @@ diff -up dhcp-4.3.4/common/bpf.c.lpf-ib dhcp-4.3.4/common/bpf.c #if defined (HAVE_TR_SUPPORT) struct bpf_insn dhcp_bpf_tr_filter [] = { /* accept all token ring packets due to variable length header */ -diff -up dhcp-4.3.4/common/discover.c.lpf-ib dhcp-4.3.4/common/discover.c ---- dhcp-4.3.4/common/discover.c.lpf-ib 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/discover.c 2016-05-02 14:38:08.257147982 +0200 -@@ -1235,7 +1235,7 @@ discover_interfaces(int state) { +diff --git a/common/discover.c b/common/discover.c +index 6ef8852..65881fc 100644 +--- a/common/discover.c ++++ b/common/discover.c +@@ -894,7 +894,7 @@ discover_interfaces(int state) { if_register_send(tmp); } else { /* get_hw_addr() was called by register. */ @@ -113,7 +132,7 @@ diff -up dhcp-4.3.4/common/discover.c.lpf-ib dhcp-4.3.4/common/discover.c } break; #ifdef DHCPv6 -@@ -1248,7 +1248,7 @@ discover_interfaces(int state) { +@@ -907,7 +907,7 @@ discover_interfaces(int state) { so now we have to call it explicitly to not leave the hardware address unknown (some code expects it cannot be. */ @@ -122,10 +141,11 @@ diff -up dhcp-4.3.4/common/discover.c.lpf-ib dhcp-4.3.4/common/discover.c } else { if_register_linklocal6(tmp); } -diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c ---- dhcp-4.3.4/common/lpf.c.lpf-ib 2016-05-02 14:37:36.947128002 +0200 -+++ dhcp-4.3.4/common/lpf.c 2016-05-02 14:37:36.953128006 +0200 -@@ -47,6 +47,17 @@ +diff --git a/common/lpf.c b/common/lpf.c +index b0ed01c..b732a86 100644 +--- a/common/lpf.c ++++ b/common/lpf.c +@@ -45,6 +45,17 @@ #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> @@ -143,7 +163,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c #endif #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE) -@@ -80,10 +91,20 @@ int if_register_lpf (info) +@@ -78,10 +89,20 @@ int if_register_lpf (info) struct sockaddr common; } sa; struct ifreq ifr; @@ -166,7 +186,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || errno == EAFNOSUPPORT || errno == EINVAL) { -@@ -106,6 +127,7 @@ int if_register_lpf (info) +@@ -104,6 +125,7 @@ int if_register_lpf (info) /* Bind to the interface name */ memset (&sa, 0, sizeof sa); sa.ll.sll_family = AF_PACKET; @@ -174,7 +194,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c sa.ll.sll_ifindex = ifr.ifr_ifindex; if (bind (sock, &sa.common, sizeof sa)) { if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || -@@ -122,8 +144,6 @@ int if_register_lpf (info) +@@ -120,8 +142,6 @@ int if_register_lpf (info) } @@ -183,16 +203,16 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c return sock; } #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */ -@@ -178,6 +198,8 @@ void if_deregister_send (info) +@@ -176,6 +196,8 @@ void if_deregister_send (info) in bpf includes... */ extern struct sock_filter dhcp_bpf_filter []; extern int dhcp_bpf_filter_len; +extern struct sock_filter dhcp_ib_bpf_filter []; +extern int dhcp_ib_bpf_filter_len; - #if defined (HAVE_TR_SUPPORT) - extern struct sock_filter dhcp_bpf_tr_filter []; -@@ -196,11 +218,12 @@ void if_register_receive (info) + #if defined(RELAY_PORT) + extern struct sock_filter dhcp_bpf_relay_filter []; +@@ -199,11 +221,12 @@ void if_register_receive (info) #ifdef PACKET_AUXDATA { int val = 1; @@ -210,45 +230,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c } } } -@@ -250,15 +273,28 @@ static void lpf_gen_filter_setup (info) - - memset(&p, 0, sizeof(p)); - -- /* Set up the bpf filter program structure. This is defined in -- bpf.c */ -- p.len = dhcp_bpf_filter_len; -- p.filter = dhcp_bpf_filter; -- -- /* Patch the server port into the LPF program... -- XXX changes to filter program may require changes -- to the insn number(s) used below! XXX */ -- dhcp_bpf_filter [8].k = ntohs ((short)local_port); -+ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) { -+ /* Set up the bpf filter program structure. */ -+ p.len = dhcp_ib_bpf_filter_len; -+ p.filter = dhcp_ib_bpf_filter; -+ -+ /* Patch the server port into the LPF program... -+ XXX -+ changes to filter program may require changes -+ to the insn number(s) used below! -+ XXX */ -+ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port); -+ } else { -+ /* Set up the bpf filter program structure. -+ This is defined in bpf.c */ -+ p.len = dhcp_bpf_filter_len; -+ p.filter = dhcp_bpf_filter; -+ -+ /* Patch the server port into the LPF program... -+ XXX changes to filter program may require changes -+ to the insn number(s) used below! XXX */ -+ dhcp_bpf_filter [8].k = ntohs ((short)local_port); -+ } - - if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p, - sizeof p) < 0) { -@@ -315,6 +351,54 @@ static void lpf_tr_filter_setup (info) +@@ -330,6 +353,54 @@ static void lpf_tr_filter_setup (info) #endif /* USE_LPF_RECEIVE */ #ifdef USE_LPF_SEND @@ -303,7 +285,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c ssize_t send_packet (interface, packet, raw, len, from, to, hto) struct interface_info *interface; struct packet *packet; -@@ -335,6 +419,11 @@ ssize_t send_packet (interface, packet, +@@ -350,6 +421,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) return send_fallback (interface, packet, raw, len, from, to, hto); @@ -315,7 +297,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c if (hto == NULL && interface->anycast_mac_addr.hlen) hto = &interface->anycast_mac_addr; -@@ -355,6 +444,42 @@ ssize_t send_packet (interface, packet, +@@ -370,6 +446,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) #endif /* USE_LPF_SEND */ #ifdef USE_LPF_RECEIVE @@ -358,7 +340,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c ssize_t receive_packet (interface, buf, len, from, hfrom) struct interface_info *interface; unsigned char *buf; -@@ -393,6 +518,10 @@ ssize_t receive_packet (interface, buf, +@@ -408,6 +520,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom) }; #endif /* PACKET_AUXDATA */ @@ -369,7 +351,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c length = recvmsg (interface->rfdesc, &msg, 0); if (length <= 0) return length; -@@ -506,11 +635,33 @@ void maybe_setup_fallback () +@@ -521,11 +637,33 @@ void maybe_setup_fallback () #endif #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR) @@ -406,7 +388,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c if (strlen(name) >= sizeof(tmp.ifr_name)) { log_fatal("Device name too long: \"%s\"", name); -@@ -524,16 +675,61 @@ get_hw_addr(const char *name, struct har +@@ -539,16 +677,61 @@ get_hw_addr(const char *name, struct hardware *hw) { memset(&tmp, 0, sizeof(tmp)); strcpy(tmp.ifr_name, name); if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) { @@ -471,7 +453,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c break; case ARPHRD_IEEE802: #ifdef ARPHRD_IEEE802_TR -@@ -541,18 +737,50 @@ get_hw_addr(const char *name, struct har +@@ -556,18 +739,50 @@ get_hw_addr(const char *name, struct hardware *hw) { #endif /* ARPHRD_IEEE802_TR */ hw->hlen = 7; hw->hbuf[0] = HTYPE_IEEE802; @@ -526,7 +508,7 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c hw->hlen = 0; hw->hbuf[0] = HTYPE_RESERVED; /* 0xdeadbeef should never occur on the wire, -@@ -565,10 +793,13 @@ get_hw_addr(const char *name, struct har +@@ -580,10 +795,13 @@ get_hw_addr(const char *name, struct hardware *hw) { break; #endif default: @@ -543,10 +525,11 @@ diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c + freeifaddrs(ifaddrs); } #endif -diff -up dhcp-4.3.4/common/socket.c.lpf-ib dhcp-4.3.4/common/socket.c ---- dhcp-4.3.4/common/socket.c.lpf-ib 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/common/socket.c 2016-05-02 14:37:36.953128006 +0200 -@@ -328,7 +328,7 @@ void if_register_send (info) +diff --git a/common/socket.c b/common/socket.c +index 483eb9c..6e1caac 100644 +--- a/common/socket.c ++++ b/common/socket.c +@@ -350,7 +350,7 @@ void if_register_send (info) info->wfdesc = if_register_socket(info, AF_INET, 0, NULL); /* If this is a normal IPv4 address, get the hardware address. */ if (strcmp(info->name, "fallback") != 0) @@ -555,7 +538,7 @@ diff -up dhcp-4.3.4/common/socket.c.lpf-ib dhcp-4.3.4/common/socket.c #if defined (USE_SOCKET_FALLBACK) /* Fallback only registers for send, but may need to receive as well. */ -@@ -391,7 +391,7 @@ void if_register_receive (info) +@@ -413,7 +413,7 @@ void if_register_receive (info) #endif /* IP_PKTINFO... */ /* If this is a normal IPv4 address, get the hardware address. */ if (strcmp(info->name, "fallback") != 0) @@ -564,7 +547,7 @@ diff -up dhcp-4.3.4/common/socket.c.lpf-ib dhcp-4.3.4/common/socket.c if (!quiet_interface_discovery) log_info ("Listening on Socket/%s%s%s", -@@ -505,7 +505,7 @@ if_register6(struct interface_info *info +@@ -567,7 +567,7 @@ if_register6(struct interface_info *info, int do_multicast) { if (req_multi) if_register_multicast(info); @@ -573,7 +556,7 @@ diff -up dhcp-4.3.4/common/socket.c.lpf-ib dhcp-4.3.4/common/socket.c if (!quiet_interface_discovery) { if (info->shared_network != NULL) { -@@ -561,7 +561,7 @@ if_register_linklocal6(struct interface_ +@@ -623,7 +623,7 @@ if_register_linklocal6(struct interface_info *info) { info->rfdesc = sock; info->wfdesc = sock; @@ -582,10 +565,11 @@ diff -up dhcp-4.3.4/common/socket.c.lpf-ib dhcp-4.3.4/common/socket.c if (!quiet_interface_discovery) { if (info->shared_network != NULL) { -diff -up dhcp-4.3.4/includes/dhcpd.h.lpf-ib dhcp-4.3.4/includes/dhcpd.h ---- dhcp-4.3.4/includes/dhcpd.h.lpf-ib 2016-05-02 14:37:36.948128002 +0200 -+++ dhcp-4.3.4/includes/dhcpd.h 2016-05-02 14:37:36.954128006 +0200 -@@ -482,6 +482,9 @@ struct packet { +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index faa9251..0c1a0aa 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -485,6 +485,9 @@ struct packet { #define HARDWARE_ADDR_LEN 20 @@ -595,7 +579,7 @@ diff -up dhcp-4.3.4/includes/dhcpd.h.lpf-ib dhcp-4.3.4/includes/dhcpd.h struct hardware { u_int8_t hlen; u_int8_t hbuf[HARDWARE_ADDR_LEN + 1]; -@@ -1343,6 +1346,7 @@ struct interface_info { +@@ -1365,6 +1368,7 @@ struct interface_info { struct shared_network *shared_network; /* Networks connected to this interface. */ struct hardware hw_address; /* Its physical address. */ @@ -603,7 +587,7 @@ diff -up dhcp-4.3.4/includes/dhcpd.h.lpf-ib dhcp-4.3.4/includes/dhcpd.h struct in_addr *addresses; /* Addresses associated with this * interface. */ -@@ -2580,7 +2584,7 @@ void print_dns_status (int, struct dhcp_ +@@ -2633,7 +2637,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); #endif const char *print_time(TIME); @@ -612,3 +596,6 @@ diff -up dhcp-4.3.4/includes/dhcpd.h.lpf-ib dhcp-4.3.4/includes/dhcpd.h char *buf_to_hex (const unsigned char *s, unsigned len, const char *file, int line); char *format_lease_id(const unsigned char *s, unsigned len, int format, +-- +2.14.5 + diff --git a/dhcp/patches/0014-dhcp-64_bit_lease_parse.patch b/dhcp/patches/0014-dhcp-64_bit_lease_parse.patch deleted file mode 100644 index a07b5b032..000000000 --- a/dhcp/patches/0014-dhcp-64_bit_lease_parse.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse dhcp-4.3.0a1/common/parse.c ---- dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse 2013-12-11 01:25:12.000000000 +0100 -+++ dhcp-4.3.0a1/common/parse.c 2013-12-19 15:45:25.990771814 +0100 -@@ -938,8 +938,8 @@ TIME - parse_date_core(cfile) - struct parse *cfile; - { -- int guess; -- int tzoff, year, mon, mday, hour, min, sec; -+ TIME guess; -+ long int tzoff, year, mon, mday, hour, min, sec; - const char *val; - enum dhcp_token token; - static int months[11] = { 31, 59, 90, 120, 151, 181, -@@ -965,7 +965,7 @@ parse_date_core(cfile) - } - - skip_token(&val, NULL, cfile); /* consume number */ -- guess = atoi(val); -+ guess = atol(val); - - return((TIME)guess); - } -@@ -993,7 +993,7 @@ parse_date_core(cfile) - somebody invents a time machine, I think we can safely disregard - it. This actually works around a stupid Y2K bug that was present - in a very early beta release of dhcpd. */ -- year = atoi(val); -+ year = atol(val); - if (year > 1900) - year -= 1900; - -@@ -1039,7 +1039,7 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume day of month */ -- mday = atoi(val); -+ mday = atol(val); - - /* Hour... */ - token = peek_token(&val, NULL, cfile); -@@ -1050,7 +1050,7 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume hour */ -- hour = atoi(val); -+ hour = atol(val); - - /* Colon separating hour from minute... */ - token = peek_token(&val, NULL, cfile); -@@ -1072,7 +1072,7 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume minute */ -- min = atoi(val); -+ min = atol(val); - - /* Colon separating minute from second... */ - token = peek_token(&val, NULL, cfile); -@@ -1094,13 +1094,13 @@ parse_date_core(cfile) - return((TIME)0); - } - skip_token(&val, NULL, cfile); /* consume second */ -- sec = atoi(val); -+ sec = atol(val); - - tzoff = 0; - token = peek_token(&val, NULL, cfile); - if (token == NUMBER) { - skip_token(&val, NULL, cfile); /* consume tzoff */ -- tzoff = atoi(val); -+ tzoff = atol(val); - } else if (token != SEMI) { - skip_token(&val, NULL, cfile); - parse_warn(cfile, diff --git a/dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch b/dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch new file mode 100644 index 000000000..a2f740e79 --- /dev/null +++ b/dhcp/patches/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch @@ -0,0 +1,332 @@ +From 7ac7d0b00874ee996c7ee75a595c029759368aad Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:35:47 +0100 +Subject: [PATCH 15/21] Add GUID/DUID to dhcpd logs (#1064416) +Cc: pzhukov(a)redhat.com + +--- + client/dhclient.c | 75 ++++++++++++++++++++++++++++++++++++++++++---------- + server/dhcp.c | 78 +++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 108 insertions(+), 45 deletions(-) + +diff --git a/client/dhclient.c b/client/dhclient.c +index dc9080e..8e57da9 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -1170,6 +1170,26 @@ main(int argc, char **argv) { + } + } + ++ /* We create a backup seed before rediscovering interfaces in order to ++ have a seed built using all of the available interfaces ++ It's interesting if required interfaces doesn't let us defined ++ a really unique seed due to a lack of valid HW addr later ++ (this is the case with DHCP over IB) ++ We only use the last device as using a sum could broke the ++ uniqueness of the seed among multiple nodes ++ */ ++ unsigned backup_seed = 0; ++ for (ip = interfaces; ip; ip = ip -> next) { ++ int junk; ++ if ( ip -> hw_address.hlen <= sizeof seed ) ++ continue; ++ memcpy (&junk, ++ &ip -> hw_address.hbuf [ip -> hw_address.hlen - ++ sizeof seed], sizeof seed); ++ backup_seed = junk; ++ } ++ ++ + /* At this point, all the interfaces that the script thinks + are relevant should be running, so now we once again call + discover_interfaces(), and this time ask it to actually set +@@ -1184,14 +1204,36 @@ main(int argc, char **argv) { + Not much entropy, but we're booting, so we're not likely to + find anything better. */ + seed = 0; ++ int seed_flag = 0; + for (ip = interfaces; ip; ip = ip->next) { + int junk; ++ if ( ip -> hw_address.hlen <= sizeof seed ) ++ continue; + memcpy(&junk, + &ip->hw_address.hbuf[ip->hw_address.hlen - + sizeof seed], sizeof seed); + seed += junk; ++ seed_flag = 1; + } +- srandom(seed + cur_time + (unsigned)getpid()); ++ if ( seed_flag == 0 ) { ++ if ( backup_seed != 0 ) { ++ seed = backup_seed; ++ log_info ("xid: rand init seed (0x%x) built using all" ++ " available interfaces",seed); ++ } ++ else { ++ seed = cur_time^((unsigned) gethostid()) ; ++ log_info ("xid: warning: no netdev with useable HWADDR found" ++ " for seed's uniqueness enforcement"); ++ log_info ("xid: rand init seed (0x%x) built using gethostid", ++ seed); ++ } ++ /* we only use seed and no current time as a broadcast reply */ ++ /* will certainly be used by the hwaddrless interface */ ++ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); ++ } ++ else ++ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); + + /* Setup specific Infiniband options */ + for (ip = interfaces; ip; ip = ip->next) { +@@ -1746,10 +1788,10 @@ void dhcpack (packet) + #endif + return; + } +- +- log_info ("DHCPACK of %s from %s", +- inet_ntoa(packet->raw->yiaddr), +- piaddr (packet->client_addr)); ++ log_info ("DHCPACK of %s from %s (xid=0x%x)", ++ inet_ntoa(packet->raw->yiaddr), ++ piaddr (packet -> client_addr), ++ ntohl(client -> xid)); + + lease = packet_to_lease (packet, client); + if (!lease) { +@@ -2669,7 +2711,7 @@ void dhcpnak (packet) + return; + } + +- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr)); ++ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid)); + + if (!client -> active) { + #if defined (DEBUG) +@@ -2802,10 +2844,10 @@ void send_discover (cpp) + (long)(client -> interval)); + } else + #endif +- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld", ++ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)", + client -> name ? client -> name : client -> interface -> name, + inet_ntoa (sockaddr_broadcast.sin_addr), +- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval)); ++ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), ntohl(client -> xid)); + + /* Send out a packet. */ + #if defined(DHCPv6) && defined(DHCP4o6) +@@ -3108,10 +3150,12 @@ void send_request (cpp) + } + + strncpy(rip_buf, rip_str, sizeof(rip_buf)-1); +- log_info ("DHCPREQUEST for %s on %s to %s port %d", rip_buf, ++ log_info ("DHCPREQUEST for %s on %s to %s port %d (xid=0x%x)", ++ rip_buf, + client->name ? client->name : client->interface->name, + inet_ntoa(destination.sin_addr), +- ntohs (destination.sin_port)); ++ ntohs (destination.sin_port), ++ ntohl(client -> xid)); + + #if defined(DHCPv6) && defined(DHCP4o6) + if (dhcpv4_over_dhcpv6) { +@@ -3168,11 +3212,13 @@ void send_decline (cpp) + log_info ("DHCPDECLINE"); + } else + #endif +- log_info ("DHCPDECLINE of %s on %s to %s port %d", ++ log_info ("DHCPDECLINE of %s on %s to %s port %d (xid=0x%x)", + piaddr(client->requested_address), + (client->name ? client->name : client->interface->name), + inet_ntoa(sockaddr_broadcast.sin_addr), +- ntohs(sockaddr_broadcast.sin_port)); ++ ntohs(sockaddr_broadcast.sin_port), ++ ntohl(client -> xid)); ++ + + /* Send out a packet. */ + #if defined(DHCPv6) && defined(DHCP4o6) +@@ -3231,11 +3277,12 @@ void send_release (cpp) + log_info ("DHCPRELEASE"); + } else + #endif +- log_info ("DHCPRELEASE of %s on %s to %s port %d", ++ log_info ("DHCPRELEASE of %s on %s to %s port %d (xid=0x%x)", + piaddr(client->active->address), + client->name ? client->name : client->interface->name, + inet_ntoa (destination.sin_addr), +- ntohs (destination.sin_port)); ++ ntohs (destination.sin_port), ++ ntohl(client -> xid)); + + #if defined(DHCPv6) && defined(DHCP4o6) + if (dhcpv4_over_dhcpv6) { +diff --git a/server/dhcp.c b/server/dhcp.c +index 20f2a62..0582c4c 100644 +--- a/server/dhcp.c ++++ b/server/dhcp.c +@@ -87,6 +87,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *)); + + static TIME leaseTimeCheck(TIME calculated, TIME alternate); + ++char *print_client_identifier_from_packet (packet) ++ struct packet *packet; ++{ ++ struct option_cache *oc; ++ struct data_string client_identifier; ++ char *ci; ++ ++ memset (&client_identifier, 0, sizeof client_identifier); ++ ++ oc = lookup_option (&dhcp_universe, packet -> options, ++ DHO_DHCP_CLIENT_IDENTIFIER); ++ if (oc && ++ evaluate_option_cache (&client_identifier, ++ packet, (struct lease *)0, ++ (struct client_state *)0, ++ packet -> options, ++ (struct option_state *)0, ++ &global_scope, oc, MDL)) { ++ ci = print_hw_addr (HTYPE_INFINIBAND, client_identifier.len, client_identifier.data); ++ data_string_forget (&client_identifier, MDL); ++ return ci; ++ } else ++ return "\"no client id\""; ++} ++ ++char *print_hw_addr_or_client_id (packet) ++ struct packet *packet; ++{ ++ if (packet -> raw -> htype == HTYPE_INFINIBAND) ++ return print_client_identifier_from_packet (packet); ++ else ++ return print_hw_addr (packet -> raw -> htype, ++ packet -> raw -> hlen, ++ packet -> raw -> chaddr); ++} ++ + void + dhcp (struct packet *packet) { + int ms_nulltp = 0; +@@ -129,9 +165,7 @@ dhcp (struct packet *packet) { + + log_info("%s from %s via %s: %s", s, + (packet->raw->htype +- ? print_hw_addr(packet->raw->htype, +- packet->raw->hlen, +- packet->raw->chaddr) ++ ? print_hw_addr_or_client_id(packet) + : "<no identifier>"), + packet->raw->giaddr.s_addr + ? inet_ntoa(packet->raw->giaddr) +@@ -328,9 +362,7 @@ void dhcpdiscover (packet, ms_nulltp) + #endif + snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s", + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id (packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -542,9 +574,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease) + "DHCPREQUEST for %s%s from %s %s%s%svia %s", + piaddr (cip), smbuf, + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id(packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -785,9 +815,7 @@ void dhcprelease (packet, ms_nulltp) + if ((oc = lookup_option (&dhcp_universe, packet -> options, + DHO_DHCP_REQUESTED_ADDRESS))) { + log_info ("DHCPRELEASE from %s specified requested-address.", +- print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr)); ++ print_hw_addr_or_client_id(packet)); + } + + oc = lookup_option (&dhcp_universe, packet -> options, +@@ -879,9 +907,7 @@ void dhcprelease (packet, ms_nulltp) + "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)", + cstr, + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id(packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -986,9 +1012,7 @@ void dhcpdecline (packet, ms_nulltp) + "DHCPDECLINE of %s from %s %s%s%svia %s", + piaddr (cip), + (packet -> raw -> htype +- ? print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr) ++ ? print_hw_addr_or_client_id(packet) + : (lease + ? print_hex_1(lease->uid_len, lease->uid, 60) + : "<no identifier>")), +@@ -1732,8 +1756,7 @@ void dhcpinform (packet, ms_nulltp) + /* Report what we're sending. */ + snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip), + (packet->raw->htype && packet->raw->hlen) ? +- print_hw_addr(packet->raw->htype, packet->raw->hlen, +- packet->raw->chaddr) : ++ print_hw_addr_or_client_id(packet) : + "<no client hardware address>"); + log_info("%s %s", msgbuf, gip.len ? piaddr(gip) : + packet->interface->name); +@@ -1918,9 +1941,7 @@ void nak_lease (packet, cip, network_group) + #endif + log_info ("DHCPNAK on %s to %s via %s", + piaddr (*cip), +- print_hw_addr (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr), ++ print_hw_addr_or_client_id(packet), + packet -> raw -> giaddr.s_addr + ? inet_ntoa (packet -> raw -> giaddr) + : packet -> interface -> name); +@@ -3936,7 +3957,7 @@ void dhcp_reply (lease) + ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER") + : "BOOTREPLY"), + piaddr (lease -> ip_addr), +- (lease -> hardware_addr.hlen ++ (lease -> hardware_addr.hlen > 1 + ? print_hw_addr (lease -> hardware_addr.hbuf [0], + lease -> hardware_addr.hlen - 1, + &lease -> hardware_addr.hbuf [1]) +@@ -4497,10 +4518,7 @@ int find_lease (struct lease **lp, + if (uid_lease) { + if (uid_lease->binding_state == FTS_ACTIVE) { + log_error ("client %s has duplicate%s on %s", +- (print_hw_addr +- (packet -> raw -> htype, +- packet -> raw -> hlen, +- packet -> raw -> chaddr)), ++ (print_hw_addr_or_client_id(packet)), + " leases", + (ip_lease -> subnet -> + shared_network -> name)); +@@ -4667,9 +4685,7 @@ int find_lease (struct lease **lp, + log_error("uid lease %s for client %s is duplicate " + "on %s", + piaddr(uid_lease->ip_addr), +- print_hw_addr(packet->raw->htype, +- packet->raw->hlen, +- packet->raw->chaddr), ++ print_hw_addr_or_client_id(packet), + uid_lease->subnet->shared_network->name); + + if (!packet -> raw -> ciaddr.s_addr && +-- +2.14.5 + diff --git a/dhcp/patches/0024-dhcp-duid_uuid.patch b/dhcp/patches/0016-Turn-on-creating-sending-of-DUID.patch similarity index 72% rename from dhcp/patches/0024-dhcp-duid_uuid.patch rename to dhcp/patches/0016-Turn-on-creating-sending-of-DUID.patch index f90bc4a7b..216cbabb3 100644 --- a/dhcp/patches/0024-dhcp-duid_uuid.patch +++ b/dhcp/patches/0016-Turn-on-creating-sending-of-DUID.patch @@ -1,7 +1,19 @@ -diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.duid_uuid 2016-04-29 12:58:14.846150838 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:58:14.851150839 +0200 -@@ -3868,6 +3868,59 @@ write_options(struct client_state *clien +From 1f0473939bcb17095bbef48cd9a81105a3de9846 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:36:30 +0100 +Subject: [PATCH 16/21] Turn on creating/sending of DUID +Cc: pzhukov(a)redhat.com + +as client identifier with DHCPv4 clients (#560361c#40, rfc4361) +--- + client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 70 insertions(+), 4 deletions(-) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 8e57da9..ccc98e4 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -4021,6 +4021,59 @@ write_options(struct client_state *client, struct option_state *options, } } @@ -36,8 +48,8 @@ diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c + log_debug("Not enough data in %s", id_fname); + return ISC_R_IOERROR; + } -+ -+ for (int j = 0; j < 16; j++) { ++ int j; ++ for (j = 0; j < 16; j++) { + int a, b; + + a = unhexchar(id[j*2]); @@ -61,7 +73,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c /* * The "best" default DUID, since we cannot predict any information * about the system (such as whether or not the hardware addresses are -@@ -3888,6 +3941,7 @@ form_duid(struct data_string *duid, cons +@@ -4041,6 +4094,7 @@ form_duid(struct data_string *duid, const char *file, int line) struct interface_info *ip; int len; char *str; @@ -69,7 +81,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c /* For now, just use the first interface on the list. */ ip = interfaces; -@@ -3908,9 +3962,16 @@ form_duid(struct data_string *duid, cons +@@ -4061,9 +4115,16 @@ form_duid(struct data_string *duid, const char *file, int line) (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) log_fatal("Impossible hardware address length at %s:%d.", MDL); @@ -89,7 +101,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c /* * 2 bytes for the 'duid type' field. * 2 bytes for the 'htype' field. -@@ -3921,13 +3982,18 @@ form_duid(struct data_string *duid, cons +@@ -4074,13 +4135,18 @@ form_duid(struct data_string *duid, const char *file, int line) len = 4 + (ip->hw_address.hlen - 1); if (duid_type == DUID_LLT) len += 4; @@ -109,3 +121,6 @@ diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c putUShort(duid->buffer->data, DUID_LLT); putUShort(duid->buffer->data + 2, ip->hw_address.hbuf[0]); putULong(duid->buffer->data + 4, cur_time - DUID_TIME_EPOCH); +-- +2.14.5 + diff --git a/dhcp/patches/0016-dhcp-sendDecline.patch b/dhcp/patches/0016-dhcp-sendDecline.patch deleted file mode 100644 index ede929885..000000000 --- a/dhcp/patches/0016-dhcp-sendDecline.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff -up dhcp-4.3.4/client/dhc6.c.sendDecline dhcp-4.3.4/client/dhc6.c ---- dhcp-4.3.4/client/dhc6.c.sendDecline 2016-03-22 14:16:51.000000000 +0100 -+++ dhcp-4.3.4/client/dhc6.c 2016-05-02 14:51:57.916578401 +0200 -@@ -115,6 +115,8 @@ void do_select6(void *input); - void do_refresh6(void *input); - static void do_release6(void *input); - static void start_bound(struct client_state *client); -+static void start_decline6(struct client_state *client); -+static void do_decline6(void *input); - static void start_informed(struct client_state *client); - void informed_handler(struct packet *packet, struct client_state *client); - void bound_handler(struct packet *packet, struct client_state *client); -@@ -2314,6 +2316,7 @@ start_release6(struct client_state *clie - cancel_timeout(do_select6, client); - cancel_timeout(do_refresh6, client); - cancel_timeout(do_release6, client); -+ cancel_timeout(do_decline6, client); - client->state = S_STOPPED; - - /* -@@ -2968,6 +2971,7 @@ dhc6_check_reply(struct client_state *cl - break; - - case S_STOPPED: -+ case S_DECLINED: - action = dhc6_stop_action; - break; - -@@ -3084,6 +3088,7 @@ dhc6_check_reply(struct client_state *cl - break; - - case S_STOPPED: -+ case S_DECLINED: - /* Nothing critical to do at this stage. */ - break; - -@@ -4214,17 +4219,23 @@ reply_handler(struct packet *packet, str - cancel_timeout(do_select6, client); - cancel_timeout(do_refresh6, client); - cancel_timeout(do_release6, client); -+ cancel_timeout(do_decline6, client); - - /* If this is in response to a Release/Decline, clean up and return. */ -- if (client->state == S_STOPPED) { -- if (client->active_lease == NULL) -- return; -+ if ((client->state == S_STOPPED) || -+ (client->state == S_DECLINED)) { -+ -+ if (client->active_lease != NULL) { -+ dhc6_lease_destroy(&client->active_lease, MDL); -+ client->active_lease = NULL; -+ /* We should never wait for nothing!? */ -+ if (stopping_finished()) -+ exit(0); -+ } -+ -+ if (client->state == S_DECLINED) -+ start_init6(client); - -- dhc6_lease_destroy(&client->active_lease, MDL); -- client->active_lease = NULL; -- /* We should never wait for nothing!? */ -- if (stopping_finished()) -- exit(0); - return; - } - -@@ -4798,7 +4809,11 @@ start_bound(struct client_state *client) - dhc6_marshall_values("new_", client, lease, ia, addr); - script_write_requested6(client); - -- script_go(client); -+ // when script returns 3, DAD failed -+ if (script_go(client) == 3) { -+ start_decline6(client); -+ return; -+ } - } - - /* XXX: maybe we should loop on the old values instead? */ -@@ -4851,6 +4866,149 @@ start_bound(struct client_state *client) - dhc6_check_times(client); - } - -+/* -+ * Decline addresses. -+ */ -+void -+start_decline6(struct client_state *client) -+{ -+ /* Cancel any pending transmissions */ -+ cancel_timeout(do_confirm6, client); -+ cancel_timeout(do_select6, client); -+ cancel_timeout(do_refresh6, client); -+ cancel_timeout(do_release6, client); -+ cancel_timeout(do_decline6, client); -+ client->state = S_DECLINED; -+ -+ if (client->active_lease == NULL) -+ return; -+ -+ /* Set timers per RFC3315 section 18.1.7. */ -+ client->IRT = DEC_TIMEOUT * 100; -+ client->MRT = 0; -+ client->MRC = DEC_MAX_RC; -+ client->MRD = 0; -+ -+ dhc6_retrans_init(client); -+ client->v6_handler = reply_handler; -+ -+ client->refresh_type = DHCPV6_DECLINE; -+ do_decline6(client); -+} -+ -+/* -+ * do_decline6() creates a Decline packet and transmits it. -+ */ -+static void -+do_decline6(void *input) -+{ -+ struct client_state *client; -+ struct data_string ds; -+ struct timeval elapsed, tv; -+ int send_ret, added; -+ -+ client = input; -+ -+ if ((client->active_lease == NULL) || !active_prefix(client)) -+ return; -+ -+ if ((client->MRC != 0) && (client->txcount > client->MRC)) { -+ log_info("Max retransmission count exceeded."); -+ goto decline_done; -+ } -+ -+ /* -+ * Start_time starts at the first transmission. -+ */ -+ if (client->txcount == 0) { -+ client->start_time.tv_sec = cur_tv.tv_sec; -+ client->start_time.tv_usec = cur_tv.tv_usec; -+ } -+ -+ /* elapsed = cur - start */ -+ elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec; -+ elapsed.tv_usec = cur_tv.tv_usec - client->start_time.tv_usec; -+ if (elapsed.tv_usec < 0) { -+ elapsed.tv_sec -= 1; -+ elapsed.tv_usec += 1000000; -+ } -+ -+ memset(&ds, 0, sizeof(ds)); -+ if (!buffer_allocate(&ds.buffer, 4, MDL)) { -+ log_error("Unable to allocate memory for Decline."); -+ goto decline_done; -+ } -+ -+ ds.data = ds.buffer->data; -+ ds.len = 4; -+ ds.buffer->data[0] = DHCPV6_DECLINE; -+ memcpy(ds.buffer->data + 1, client->dhcpv6_transaction_id, 3); -+ -+ /* Form an elapsed option. */ -+ /* Maximum value is 65535 1/100s coded as 0xffff. */ -+ if ((elapsed.tv_sec < 0) || (elapsed.tv_sec > 655) || -+ ((elapsed.tv_sec == 655) && (elapsed.tv_usec > 350000))) { -+ client->elapsed = 0xffff; -+ } else { -+ client->elapsed = elapsed.tv_sec * 100; -+ client->elapsed += elapsed.tv_usec / 10000; -+ } -+ -+ client->elapsed = htons(client->elapsed); -+ -+ log_debug("XMT: Forming Decline."); -+ make_client6_options(client, &client->sent_options, -+ client->active_lease, DHCPV6_DECLINE); -+ dhcpv6_universe.encapsulate(&ds, NULL, NULL, client, NULL, -+ client->sent_options, &global_scope, -+ &dhcpv6_universe); -+ -+ /* Append IA's (but don't release temporary addresses). */ -+ if (wanted_ia_na && -+ dhc6_add_ia_na(client, &ds, client->active_lease, -+ DHCPV6_DECLINE, 0, &added) != ISC_R_SUCCESS) { -+ data_string_forget(&ds, MDL); -+ goto decline_done; -+ } -+ if (wanted_ia_pd && -+ dhc6_add_ia_pd(client, &ds, client->active_lease, -+ DHCPV6_DECLINE, 0, &added) != ISC_R_SUCCESS) { -+ data_string_forget(&ds, MDL); -+ goto decline_done; -+ } -+ -+ /* Transmit and wait. */ -+ log_info("XMT: Decline on %s, interval %ld0ms.", -+ client->name ? client->name : client->interface->name, -+ (long int)client->RT); -+ -+ send_ret = send_packet6(client->interface, ds.data, ds.len, -+ &DHCPv6DestAddr); -+ if (send_ret != ds.len) { -+ log_error("dhc6: sendpacket6() sent %d of %d bytes", -+ send_ret, ds.len); -+ } -+ -+ data_string_forget(&ds, MDL); -+ -+ /* Wait RT */ -+ tv.tv_sec = cur_tv.tv_sec + client->RT / 100; -+ tv.tv_usec = cur_tv.tv_usec + (client->RT % 100) * 10000; -+ if (tv.tv_usec >= 1000000) { -+ tv.tv_sec += 1; -+ tv.tv_usec -= 1000000; -+ } -+ add_timeout(&tv, do_decline6, client, NULL, NULL); -+ dhc6_retrans_advance(client); -+ return; -+ -+decline_done: -+ dhc6_lease_destroy(&client->active_lease, MDL); -+ client->active_lease = NULL; -+ start_init6(client); -+ return; -+} -+ - /* While bound, ignore packets. In the future we'll want to answer - * Reconfigure-Request messages and the like. - */ diff --git a/dhcp/patches/0026-dhcp-client-request-release-bind-iface.patch b/dhcp/patches/0017-Send-unicast-request-release-via-correct-interface.patch similarity index 70% rename from dhcp/patches/0026-dhcp-client-request-release-bind-iface.patch rename to dhcp/patches/0017-Send-unicast-request-release-via-correct-interface.patch index 7b9f27113..309e14316 100644 --- a/dhcp/patches/0026-dhcp-client-request-release-bind-iface.patch +++ b/dhcp/patches/0017-Send-unicast-request-release-via-correct-interface.patch @@ -1,7 +1,20 @@ -diff -up dhcp-4.3.4/client/dhclient.c.bind-iface dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.bind-iface 2016-04-29 13:06:50.595257108 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 13:08:30.237281528 +0200 -@@ -3023,6 +3023,14 @@ void send_request (cpp) +From 8a2b491f79aab1f04feac89586dfab1e55b47adb Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:39:36 +0100 +Subject: [PATCH 17/21] Send unicast request/release via correct interface +Cc: pzhukov(a)redhat.com + +(#800561, #1177351) +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #30544]) +--- + client/dhclient.c | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index ccc98e4..27fde69 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -3171,6 +3171,14 @@ void send_request (cpp) #endif if (destination.sin_addr.s_addr != INADDR_BROADCAST && fallback_interface) { @@ -16,7 +29,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.bind-iface dhcp-4.3.4/client/dhclient.c result = send_packet(fallback_interface, NULL, &client->packet, client->packet_length, from, &destination, NULL); -@@ -3032,6 +3040,13 @@ void send_request (cpp) +@@ -3180,6 +3188,13 @@ void send_request (cpp) client->packet_length, fallback_interface->name); } @@ -30,7 +43,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.bind-iface dhcp-4.3.4/client/dhclient.c } else { /* Send out a packet. */ -@@ -3144,6 +3159,14 @@ void send_release (cpp) +@@ -3297,6 +3312,14 @@ void send_release (cpp) } else #endif if (fallback_interface) { @@ -45,7 +58,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.bind-iface dhcp-4.3.4/client/dhclient.c result = send_packet(fallback_interface, NULL, &client->packet, client->packet_length, from, &destination, NULL); -@@ -3153,6 +3176,13 @@ void send_release (cpp) +@@ -3306,6 +3329,13 @@ void send_release (cpp) client->packet_length, fallback_interface->name); } @@ -59,3 +72,6 @@ diff -up dhcp-4.3.4/client/dhclient.c.bind-iface dhcp-4.3.4/client/dhclient.c } else { /* Send out a packet. */ result = send_packet(client->interface, NULL, &client->packet, +-- +2.14.5 + diff --git a/dhcp/patches/0028-dhcp-no-subnet-error2info.patch b/dhcp/patches/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch similarity index 70% rename from dhcp/patches/0028-dhcp-no-subnet-error2info.patch rename to dhcp/patches/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch index 975a4d409..752ab770a 100644 --- a/dhcp/patches/0028-dhcp-no-subnet-error2info.patch +++ b/dhcp/patches/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch @@ -1,7 +1,19 @@ -diff -up dhcp-4.3.0a1/common/discover.c.error2info dhcp-4.3.0a1/common/discover.c ---- dhcp-4.3.0a1/common/discover.c.error2info 2013-12-20 13:59:15.148553898 +0100 -+++ dhcp-4.3.0a1/common/discover.c 2013-12-20 13:59:15.181553438 +0100 -@@ -779,9 +779,9 @@ discover_interfaces(int state) { +From 588ead2d9a9cfe70f14569a8e950c6c42f15c1e3 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:40:51 +0100 +Subject: [PATCH 18/21] No subnet declaration for <iface>' should be info, not + error. +Cc: pzhukov(a)redhat.com + +--- + common/discover.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/common/discover.c b/common/discover.c +index 65881fc..056342c 100644 +--- a/common/discover.c ++++ b/common/discover.c +@@ -801,9 +801,9 @@ discover_interfaces(int state) { /* We must have a subnet declaration for each interface. */ if (!tmp->shared_network && (state == DISCOVER_SERVER)) { @@ -13,7 +25,7 @@ diff -up dhcp-4.3.0a1/common/discover.c.error2info dhcp-4.3.0a1/common/discover. tmp->name, (tmp->addresses == NULL) ? "no IPv4 addresses" : -@@ -796,26 +796,26 @@ discover_interfaces(int state) { +@@ -818,26 +818,26 @@ discover_interfaces(int state) { } else { strcpy(abuf, "no IPv6 addresses"); } @@ -46,3 +58,6 @@ diff -up dhcp-4.3.0a1/common/discover.c.error2info dhcp-4.3.0a1/common/discover. goto next; } else { log_error ("You must write a %s", +-- +2.14.5 + diff --git a/dhcp/patches/0018-dhcp-honor-expired.patch b/dhcp/patches/0018-dhcp-honor-expired.patch deleted file mode 100644 index bd892975b..000000000 --- a/dhcp/patches/0018-dhcp-honor-expired.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up dhcp-4.3.0a1/client/dhc6.c.honor-expired dhcp-4.3.0a1/client/dhc6.c ---- dhcp-4.3.0a1/client/dhc6.c.honor-expired 2013-12-19 16:00:28.062183037 +0100 -+++ dhcp-4.3.0a1/client/dhc6.c 2013-12-19 16:00:28.076182842 +0100 -@@ -1351,6 +1351,32 @@ start_info_request6(struct client_state - go_daemon(); - } - -+/* Run through the addresses in lease and return true if there's any unexpired. -+ * Return false otherwise. -+ */ -+isc_boolean_t -+unexpired_address_in_lease(struct dhc6_lease *lease) -+{ -+ struct dhc6_ia *ia; -+ struct dhc6_addr *addr; -+ -+ for (ia = lease->bindings ; ia != NULL ; ia = ia->next) { -+ for (addr = ia->addrs ; addr != NULL ; addr = addr->next) { -+ if (addr->flags & DHC6_ADDR_EXPIRED) -+ continue; -+ -+ if (addr->starts + addr->max_life > cur_time) { -+ return ISC_TRUE; -+ } -+ } -+ } -+ -+ log_info("PRC: Previous lease is devoid of active addresses." -+ " Re-initializing."); -+ -+ return ISC_FALSE; -+} -+ - /* - * start_confirm6() kicks off an "init-reboot" version of the process, at - * startup to find out if old bindings are 'fair' and at runtime whenever -@@ -1363,8 +1389,10 @@ start_confirm6(struct client_state *clie - - /* If there is no active lease, there is nothing to check. */ - if ((client->active_lease == NULL) || -- !active_prefix(client) || -- client->active_lease->released) { -+ !active_prefix(client) || -+ client->active_lease->released || -+ !unexpired_address_in_lease(client->active_lease)) { -+ dhc6_lease_destroy(&client->active_lease, MDL); - start_init6(client); - return; - } diff --git a/dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch b/dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch new file mode 100644 index 000000000..4dbd9ffae --- /dev/null +++ b/dhcp/patches/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch @@ -0,0 +1,29 @@ +From 07b333c48a2fc99d7d502a0c88907b38f61c6230 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:41:14 +0100 +Subject: [PATCH 19/21] dhclient: write DUID_LLT even in stateless mode + (#1156356) +Cc: pzhukov(a)redhat.com + +(Submitted to dhcp-bugs(a)isc.org - [ISC-Bugs #38144]) +--- + client/dhclient.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 27fde69..4e5546a 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -1442,6 +1442,9 @@ void run_stateless(int exit_mode, u_int16_t port) + data_string_forget(&default_duid, MDL); + + form_duid(&default_duid, MDL); ++ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS && ++ duid_type == DUID_LLT) ++ write_duid(&default_duid); + } + + #ifdef DHCP4o6 +-- +2.14.5 + diff --git a/dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch b/dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch new file mode 100644 index 000000000..025a1ca58 --- /dev/null +++ b/dhcp/patches/0020-Discover-all-hwaddress-for-xid-uniqueness.patch @@ -0,0 +1,101 @@ +From f1467835402eee90a350a952f1a411f37475a9df Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:42:50 +0100 +Subject: [PATCH 20/21] Discover all hwaddress for xid uniqueness +Cc: pzhukov(a)redhat.com + +--- + common/discover.c | 2 ++ + common/lpf.c | 27 ++++++++++++++++++++++----- + includes/dhcpd.h | 3 +++ + 3 files changed, 27 insertions(+), 5 deletions(-) + +diff --git a/common/discover.c b/common/discover.c +index 056342c..e66e1c5 100644 +--- a/common/discover.c ++++ b/common/discover.c +@@ -648,6 +648,8 @@ discover_interfaces(int state) { + interface_dereference(&tmp, MDL); + tmp = interfaces; /* XXX */ + } ++ if (tmp != NULL) ++ try_hw_addr(tmp); + + if (dhcp_interface_discovery_hook) { + (*dhcp_interface_discovery_hook)(tmp); +diff --git a/common/lpf.c b/common/lpf.c +index b732a86..a708a5d 100644 +--- a/common/lpf.c ++++ b/common/lpf.c +@@ -699,8 +699,22 @@ ioctl_get_ll(char *name) + return sll; + } + ++// define ? ++void try_hw_addr(struct interface_info *info){ ++ get_hw_addr2(info); ++}; ++ + void + get_hw_addr(struct interface_info *info) ++{ ++ if (get_hw_addr2(info) == ISC_R_NOTFOUND){ ++ log_fatal("Unsupported device type for \"%s\"", ++ info->name); ++ } ++} ++ ++isc_result_t ++get_hw_addr2(struct interface_info *info) + { + struct hardware *hw = &info->hw_address; + char *name = info->name; +@@ -710,7 +724,8 @@ get_hw_addr(struct interface_info *info) + int sll_allocated = 0; + char *dup = NULL; + char *colon = NULL; +- ++ isc_result_t result = ISC_R_SUCCESS; ++ + if (getifaddrs(&ifaddrs) == -1) + log_fatal("Failed to get interfaces"); + +@@ -794,14 +809,16 @@ get_hw_addr(struct interface_info *info) + hw->hbuf[4] = 0xef; + break; + #endif +- default: +- freeifaddrs(ifaddrs); +- log_fatal("Unsupported device type %hu for \"%s\"", +- sll->sll_hatype, name); ++ default: ++ log_error("Unsupported device type %hu for \"%s\"", ++ sll->sll_hatype, name); ++ result = ISC_R_NOTFOUND; ++ + } + + if (sll_allocated) + dfree(sll, MDL); + freeifaddrs(ifaddrs); ++ return result; + } + #endif +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +index 0c1a0aa..635c510 100644 +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -2637,7 +2637,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); + #endif + const char *print_time(TIME); + ++ + void get_hw_addr(struct interface_info *info); ++void try_hw_addr(struct interface_info *info); ++isc_result_t get_hw_addr2(struct interface_info *info); + char *buf_to_hex (const unsigned char *s, unsigned len, + const char *file, int line); + char *format_lease_id(const unsigned char *s, unsigned len, int format, +-- +2.14.5 + diff --git a/dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch b/dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch new file mode 100644 index 000000000..ae72855b9 --- /dev/null +++ b/dhcp/patches/0021-Load-leases-DB-in-non-replay-mode-only.patch @@ -0,0 +1,51 @@ +From 1c7b876dc558774c40a2a28da53c19c65e123124 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Thu, 21 Feb 2019 10:44:06 +0100 +Subject: [PATCH 21/21] Load leases DB in non-replay mode only +Cc: pzhukov(a)redhat.com + +--- + server/confpars.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/server/confpars.c b/server/confpars.c +index 2743979..db21a0b 100644 +--- a/server/confpars.c ++++ b/server/confpars.c +@@ -134,6 +134,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group, + + cfile = (struct parse *)0; + #if defined (TRACING) ++ // No need to dmalloc huge memory region if we're not going to re-play ++ if (!trace_playback()){ ++ status = new_parse(&cfile, file, NULL, 0, filename, 0); ++ goto noreplay; ++ }; + flen = lseek (file, (off_t)0, SEEK_END); + if (flen < 0) { + boom: +@@ -171,9 +176,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group, + if (trace_record ()) + trace_write_packet (ttype, ulen + tflen + 1, dbuf, MDL); + status = new_parse(&cfile, -1, fbuf, ulen, filename, 0); /* XXX */ ++ dfree(dbuf, MDL); + #else + status = new_parse(&cfile, file, NULL, 0, filename, 0); + #endif ++ noreplay: + if (status != ISC_R_SUCCESS || cfile == NULL) + return status; + +@@ -182,9 +189,6 @@ isc_result_t read_conf_file (const char *filename, struct group *group, + else + status = conf_file_subparse (cfile, group, group_type); + end_parse (&cfile); +-#if defined (TRACING) +- dfree (dbuf, MDL); +-#endif + return status; + } + +-- +2.14.5 + diff --git a/dhcp/patches/0021-dhcp-IPoIB-log-id.patch b/dhcp/patches/0021-dhcp-IPoIB-log-id.patch deleted file mode 100644 index 97e9dd56c..000000000 --- a/dhcp/patches/0021-dhcp-IPoIB-log-id.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff -up dhcp-4.3.4/server/dhcp.c.IPoIB-log-id dhcp-4.3.4/server/dhcp.c ---- dhcp-4.3.4/server/dhcp.c.IPoIB-log-id 2016-04-29 12:52:14.285061620 +0200 -+++ dhcp-4.3.4/server/dhcp.c 2016-04-29 12:53:59.535088020 +0200 -@@ -85,6 +85,42 @@ const int dhcp_type_name_max = ((sizeof - # define send_packet trace_packet_send - #endif - -+char *print_client_identifier_from_packet (packet) -+ struct packet *packet; -+{ -+ struct option_cache *oc; -+ struct data_string client_identifier; -+ char *ci; -+ -+ memset (&client_identifier, 0, sizeof client_identifier); -+ -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_DHCP_CLIENT_IDENTIFIER); -+ if (oc && -+ evaluate_option_cache (&client_identifier, -+ packet, (struct lease *)0, -+ (struct client_state *)0, -+ packet -> options, -+ (struct option_state *)0, -+ &global_scope, oc, MDL)) { -+ ci = print_hw_addr (HTYPE_INFINIBAND, client_identifier.len, client_identifier.data); -+ data_string_forget (&client_identifier, MDL); -+ return ci; -+ } else -+ return "\"no client id\""; -+} -+ -+char *print_hw_addr_or_client_id (packet) -+ struct packet *packet; -+{ -+ if (packet -> raw -> htype == HTYPE_INFINIBAND) -+ return print_client_identifier_from_packet (packet); -+ else -+ return print_hw_addr (packet -> raw -> htype, -+ packet -> raw -> hlen, -+ packet -> raw -> chaddr); -+} -+ - void - dhcp (struct packet *packet) { - int ms_nulltp = 0; -@@ -127,9 +163,7 @@ dhcp (struct packet *packet) { - - log_info("%s from %s via %s: %s", s, - (packet->raw->htype -- ? print_hw_addr(packet->raw->htype, -- packet->raw->hlen, -- packet->raw->chaddr) -+ ? print_hw_addr_or_client_id(packet) - : "<no identifier>"), - packet->raw->giaddr.s_addr - ? inet_ntoa(packet->raw->giaddr) -@@ -326,9 +360,7 @@ void dhcpdiscover (packet, ms_nulltp) - #endif - snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s", - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id (packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -540,9 +572,7 @@ void dhcprequest (packet, ms_nulltp, ip_ - "DHCPREQUEST for %s%s from %s %s%s%svia %s", - piaddr (cip), smbuf, - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id(packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -783,9 +813,7 @@ void dhcprelease (packet, ms_nulltp) - if ((oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_REQUESTED_ADDRESS))) { - log_info ("DHCPRELEASE from %s specified requested-address.", -- print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr)); -+ print_hw_addr_or_client_id(packet)); - } - - oc = lookup_option (&dhcp_universe, packet -> options, -@@ -877,9 +905,7 @@ void dhcprelease (packet, ms_nulltp) - "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)", - cstr, - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id(packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -984,9 +1010,7 @@ void dhcpdecline (packet, ms_nulltp) - "DHCPDECLINE of %s from %s %s%s%svia %s", - piaddr (cip), - (packet -> raw -> htype -- ? print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr) -+ ? print_hw_addr_or_client_id(packet) - : (lease - ? print_hex_1(lease->uid_len, lease->uid, 60) - : "<no identifier>")), -@@ -1683,8 +1707,7 @@ void dhcpinform (packet, ms_nulltp) - /* Report what we're sending. */ - snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip), - (packet->raw->htype && packet->raw->hlen) ? -- print_hw_addr(packet->raw->htype, packet->raw->hlen, -- packet->raw->chaddr) : -+ print_hw_addr_or_client_id(packet) : - "<no client hardware address>"); - log_info("%s %s", msgbuf, gip.len ? piaddr(gip) : - packet->interface->name); -@@ -1862,9 +1885,7 @@ void nak_lease (packet, cip, network_gro - #endif - log_info ("DHCPNAK on %s to %s via %s", - piaddr (*cip), -- print_hw_addr (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr), -+ print_hw_addr_or_client_id(packet), - packet -> raw -> giaddr.s_addr - ? inet_ntoa (packet -> raw -> giaddr) - : packet -> interface -> name); -@@ -3859,7 +3880,7 @@ void dhcp_reply (lease) - ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER") - : "BOOTREPLY"), - piaddr (lease -> ip_addr), -- (lease -> hardware_addr.hlen -+ (lease -> hardware_addr.hlen > 1 - ? print_hw_addr (lease -> hardware_addr.hbuf [0], - lease -> hardware_addr.hlen - 1, - &lease -> hardware_addr.hbuf [1]) -@@ -4408,10 +4429,7 @@ int find_lease (struct lease **lp, - if (uid_lease) { - if (uid_lease->binding_state == FTS_ACTIVE) { - log_error ("client %s has duplicate%s on %s", -- (print_hw_addr -- (packet -> raw -> htype, -- packet -> raw -> hlen, -- packet -> raw -> chaddr)), -+ (print_hw_addr_or_client_id(packet)), - " leases", - (ip_lease -> subnet -> - shared_network -> name)); -@@ -4578,9 +4596,7 @@ int find_lease (struct lease **lp, - log_error("uid lease %s for client %s is duplicate " - "on %s", - piaddr(uid_lease->ip_addr), -- print_hw_addr(packet->raw->htype, -- packet->raw->hlen, -- packet->raw->chaddr), -+ print_hw_addr_or_client_id(packet), - uid_lease->subnet->shared_network->name); - - if (!packet -> raw -> ciaddr.s_addr && diff --git a/dhcp/patches/0029-dhcp-sd_notify.patch b/dhcp/patches/0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch similarity index 63% rename from dhcp/patches/0029-dhcp-sd_notify.patch rename to dhcp/patches/0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch index a12392360..2c9f46b94 100644 --- a/dhcp/patches/0029-dhcp-sd_notify.patch +++ b/dhcp/patches/0022-Backport-sd-notify-patch-for-systemd-support-1687040.patch @@ -1,7 +1,20 @@ -diff -up dhcp-4.3.4/configure.ac.sd_notify dhcp-4.3.4/configure.ac ---- dhcp-4.3.4/configure.ac.sd_notify 2016-04-29 13:08:52.813287060 +0200 -+++ dhcp-4.3.4/configure.ac 2016-04-29 13:08:52.872287075 +0200 -@@ -832,6 +832,17 @@ if test x$ldap = xyes || test x$ldapcryp +From 5c6204bab7279050b78b3d03d1211e9d13d3fd71 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov <pzhukov(a)redhat.com> +Date: Wed, 27 Mar 2019 09:59:20 +0100 +Subject: [PATCH] Backport sd-notify patch for systemd support (#1687040) +Cc: pzhukov(a)redhat.com + +--- + configure.ac | 11 +++++++++++ + relay/dhcrelay.c | 12 ++++++++++++ + server/dhcpd.c | 12 ++++++++++++ + 3 files changed, 35 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 15fc0d7..0c08000 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1014,6 +1014,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes; AC_SUBST(LDAP_CFLAGS, [$LDAP_CFLAGS]) fi @@ -19,9 +32,10 @@ diff -up dhcp-4.3.4/configure.ac.sd_notify dhcp-4.3.4/configure.ac # Append selected warning levels to CFLAGS before substitution (but after # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc). CFLAGS="$CFLAGS $STD_CWARNINGS" -diff -up dhcp-4.3.4/relay/dhcrelay.c.sd_notify dhcp-4.3.4/relay/dhcrelay.c ---- dhcp-4.3.4/relay/dhcrelay.c.sd_notify 2016-04-29 13:08:52.814287061 +0200 -+++ dhcp-4.3.4/relay/dhcrelay.c 2016-04-29 13:08:52.872287075 +0200 +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index 7b4f4f1..9eb5bfd 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c @@ -37,6 +37,10 @@ int keep_capabilities = 0; #endif @@ -33,7 +47,7 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.sd_notify dhcp-4.3.4/relay/dhcrelay.c TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ struct tree_cache *global_options[256]; -@@ -709,6 +713,14 @@ main(int argc, char **argv) { +@@ -845,6 +849,14 @@ main(int argc, char **argv) { } #endif @@ -48,12 +62,13 @@ diff -up dhcp-4.3.4/relay/dhcrelay.c.sd_notify dhcp-4.3.4/relay/dhcrelay.c /* Start dispatching packets and timeouts... */ dispatch(); -diff -up dhcp-4.3.4/server/dhcpd.c.sd_notify dhcp-4.3.4/server/dhcpd.c ---- dhcp-4.3.4/server/dhcpd.c.sd_notify 2016-04-29 13:08:52.873287075 +0200 -+++ dhcp-4.3.4/server/dhcpd.c 2016-04-29 13:12:00.655333096 +0200 -@@ -57,6 +57,10 @@ uid_t set_uid = 0; - gid_t set_gid = 0; - #endif /* PARANOIA */ +diff --git a/server/dhcpd.c b/server/dhcpd.c +index 530a923..e06f6b4 100644 +--- a/server/dhcpd.c ++++ b/server/dhcpd.c +@@ -60,6 +60,10 @@ gid_t set_gid = 0; + struct class unknown_class; + struct class known_class; +#ifdef HAVE_LIBSYSTEMD +#include <systemd/sd-daemon.h> @@ -62,7 +77,7 @@ diff -up dhcp-4.3.4/server/dhcpd.c.sd_notify dhcp-4.3.4/server/dhcpd.c struct iaddr server_identifier; int server_identifier_matched; -@@ -931,6 +935,14 @@ main(int argc, char **argv) { +@@ -1057,6 +1061,14 @@ main(int argc, char **argv) { /* Log that we are about to start working */ log_info("Server starting service."); @@ -77,3 +92,6 @@ diff -up dhcp-4.3.4/server/dhcpd.c.sd_notify dhcp-4.3.4/server/dhcpd.c /* * Receive packets and dispatch them... * dispatch() will never return. +-- +2.14.5 + diff --git a/dhcp/patches/0022-dhcp-improved-xid.patch b/dhcp/patches/0022-dhcp-improved-xid.patch deleted file mode 100644 index 69a6975dd..000000000 --- a/dhcp/patches/0022-dhcp-improved-xid.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.improved-xid dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.improved-xid 2016-04-29 12:54:55.997102182 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:57:25.123139587 +0200 -@@ -1045,6 +1045,26 @@ main(int argc, char **argv) { - } - } - -+ /* We create a backup seed before rediscovering interfaces in order to -+ have a seed built using all of the available interfaces -+ It's interesting if required interfaces doesn't let us defined -+ a really unique seed due to a lack of valid HW addr later -+ (this is the case with DHCP over IB) -+ We only use the last device as using a sum could broke the -+ uniqueness of the seed among multiple nodes -+ */ -+ unsigned backup_seed = 0; -+ for (ip = interfaces; ip; ip = ip -> next) { -+ int junk; -+ if ( ip -> hw_address.hlen <= sizeof seed ) -+ continue; -+ memcpy (&junk, -+ &ip -> hw_address.hbuf [ip -> hw_address.hlen - -+ sizeof seed], sizeof seed); -+ backup_seed = junk; -+ } -+ -+ - /* At this point, all the interfaces that the script thinks - are relevant should be running, so now we once again call - discover_interfaces(), and this time ask it to actually set -@@ -1059,14 +1079,36 @@ main(int argc, char **argv) { - Not much entropy, but we're booting, so we're not likely to - find anything better. */ - seed = 0; -+ int seed_flag = 0; - for (ip = interfaces; ip; ip = ip->next) { - int junk; -+ if ( ip -> hw_address.hlen <= sizeof seed ) -+ continue; - memcpy(&junk, - &ip->hw_address.hbuf[ip->hw_address.hlen - - sizeof seed], sizeof seed); - seed += junk; -+ seed_flag = 1; - } -- srandom(seed + cur_time + (unsigned)getpid()); -+ if ( seed_flag == 0 ) { -+ if ( backup_seed != 0 ) { -+ seed = backup_seed; -+ log_info ("xid: rand init seed (0x%x) built using all" -+ " available interfaces",seed); -+ } -+ else { -+ seed = cur_time^((unsigned) gethostid()) ; -+ log_info ("xid: warning: no netdev with useable HWADDR found" -+ " for seed's uniqueness enforcement"); -+ log_info ("xid: rand init seed (0x%x) built using gethostid", -+ seed); -+ } -+ /* we only use seed and no current time as a broadcast reply */ -+ /* will certainly be used by the hwaddrless interface */ -+ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); -+ } -+ else -+ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); - - /* Setup specific Infiniband options */ - for (ip = interfaces; ip; ip = ip->next) { -@@ -1633,7 +1675,7 @@ void dhcpack (packet) - return; - } - -- log_info ("DHCPACK from %s", piaddr (packet -> client_addr)); -+ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid)); - - lease = packet_to_lease (packet, client); - if (!lease) { -@@ -2541,7 +2583,7 @@ void dhcpnak (packet) - return; - } - -- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr)); -+ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid)); - - if (!client -> active) { - #if defined (DEBUG) -@@ -2674,10 +2716,10 @@ void send_discover (cpp) - (long)(client -> interval)); - } else - #endif -- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld", -+ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (sockaddr_broadcast.sin_addr), -- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval)); -+ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), ntohl(client -> xid)); - - /* Send out a packet. */ - #if defined(DHCPv6) && defined(DHCP4o6) -@@ -2962,10 +3004,10 @@ void send_request (cpp) - log_info ("DHCPREQUEST"); - } else - #endif -- log_info ("DHCPREQUEST on %s to %s port %d", -+ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (destination.sin_addr), -- ntohs (destination.sin_port)); -+ ntohs (destination.sin_port), ntohl(client -> xid)); - - #if defined(DHCPv6) && defined(DHCP4o6) - if (dhcpv4_over_dhcpv6) { -@@ -3022,10 +3064,10 @@ void send_decline (cpp) - log_info ("DHCPDECLINE"); - } else - #endif -- log_info ("DHCPDECLINE on %s to %s port %d", -+ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)", - client->name ? client->name : client->interface->name, - inet_ntoa(sockaddr_broadcast.sin_addr), -- ntohs(sockaddr_broadcast.sin_port)); -+ ntohs(sockaddr_broadcast.sin_port), ntohl(client -> xid)); - - /* Send out a packet. */ - #if defined(DHCPv6) && defined(DHCP4o6) -@@ -3084,10 +3126,10 @@ void send_release (cpp) - log_info ("DHCPRELEASE"); - } else - #endif -- log_info ("DHCPRELEASE on %s to %s port %d", -+ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (destination.sin_addr), -- ntohs (destination.sin_port)); -+ ntohs (destination.sin_port), ntohl(client -> xid)); - - #if defined(DHCPv6) && defined(DHCP4o6) - if (dhcpv4_over_dhcpv6) { diff --git a/dhcp/patches/0023-dhcp-duidv4.patch b/dhcp/patches/0023-dhcp-duidv4.patch deleted file mode 100644 index 52fde3b07..000000000 --- a/dhcp/patches/0023-dhcp-duidv4.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up dhcp-4.3.1b1/client/dhclient.8.KrJcIv dhcp-4.3.1b1/client/dhclient.8 ---- dhcp-4.3.1b1/client/dhclient.8.KrJcIv 2014-07-10 17:39:25.852763873 +0200 -+++ dhcp-4.3.1b1/client/dhclient.8 2014-07-10 17:54:26.841012988 +0200 -@@ -458,6 +458,9 @@ used to construct a RFC4361 style client - in the client's messages. This client id can be overridden by - setting a client id in the configuration file. Overridding the - client id in this fashion is discouraged. -+This option is turned on by default, if you want to redefine or turn off -+sending of client id, use send dhcp-client-identifier = "better identifier" -+or send dhcp-client-identifier = "" in /etc/dhcp/dhclient.conf. - .TP - .BI \-I - Use the standard DDNS scheme from RFCs 4701 & 4702. -diff -up dhcp-4.3.1b1/client/dhclient.c.KrJcIv dhcp-4.3.1b1/client/dhclient.c ---- dhcp-4.3.1b1/client/dhclient.c.KrJcIv 2014-07-10 17:54:26.829013157 +0200 -+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:55:50.155835918 +0200 -@@ -73,7 +73,7 @@ struct sockaddr_in sockaddr_broadcast; - struct in_addr giaddr; - struct data_string default_duid; - int duid_type = 0; --int duid_v4 = 0; -+int duid_v4 = 1; - int std_dhcid = 0; - - /* ASSERT_STATE() does nothing now; it used to be -@@ -1301,7 +1301,7 @@ static void setup_ib_interface(struct in - } - - /* No client ID specified */ -- log_fatal("dhcp-client-identifier must be specified for InfiniBand"); -+ //log_fatal("dhcp-client-identifier must be specified for InfiniBand"); - } - - /* Individual States: diff --git a/dhcp/patches/0025-dhcp-getifaddrs.patch b/dhcp/patches/0025-dhcp-getifaddrs.patch deleted file mode 100644 index 586c3b077..000000000 --- a/dhcp/patches/0025-dhcp-getifaddrs.patch +++ /dev/null @@ -1,429 +0,0 @@ -diff -up dhcp-4.3.5b1/common/discover.c.getifaddrs dhcp-4.3.5b1/common/discover.c ---- dhcp-4.3.5b1/common/discover.c.getifaddrs 2016-09-12 17:10:39.585374741 +0200 -+++ dhcp-4.3.5b1/common/discover.c 2016-09-12 17:15:56.160628636 +0200 -@@ -373,392 +373,13 @@ end_iface_scan(struct iface_conf_list *i - ifaces->sock = -1; - } - --#elif __linux /* !HAVE_SIOCGLIFCONF */ --/* -- * Linux support -- * ------------- -- * -- * In Linux, we use the /proc pseudo-filesystem to get information -- * about interfaces, along with selected ioctl() calls. -- * -- * Linux low level access is documented in the netdevice man page. -- */ -- --/* -- * Structure holding state about the scan. -- */ --struct iface_conf_list { -- int sock; /* file descriptor used to get information */ -- FILE *fp; /* input from /proc/net/dev */ --#ifdef DHCPv6 -- FILE *fp6; /* input from /proc/net/if_inet6 */ --#endif --}; -- --/* -- * Structure used to return information about a specific interface. -- */ --struct iface_info { -- char name[IFNAMSIZ]; /* name of the interface, e.g. "eth0" */ -- struct sockaddr_storage addr; /* address information */ -- isc_uint64_t flags; /* interface flags, e.g. IFF_LOOPBACK */ --}; -- --/* -- * Start a scan of interfaces. -- * -- * The iface_conf_list structure maintains state for this process. -- */ --int --begin_iface_scan(struct iface_conf_list *ifaces) { -- char buf[IF_LINE_LENGTH]; -- int len; -- int i; -- -- ifaces->fp = fopen("/proc/net/dev", "r"); -- if (ifaces->fp == NULL) { -- log_error("Error opening '/proc/net/dev' to list interfaces"); -- return 0; -- } -- -- /* -- * The first 2 lines are header information, so read and ignore them. -- */ -- for (i=0; i<2; i++) { -- if (fgets(buf, sizeof(buf), ifaces->fp) == NULL) { -- log_error("Error reading headers from '/proc/net/dev'"); -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- len = strlen(buf); -- if ((len <= 0) || (buf[len-1] != '\n')) { -- log_error("Bad header line in '/proc/net/dev'"); -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- } -- -- ifaces->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); -- if (ifaces->sock < 0) { -- log_error("Error creating socket to list interfaces; %m"); -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- --#ifdef DHCPv6 -- if (local_family == AF_INET6) { -- ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); -- if (ifaces->fp6 == NULL) { -- log_error("Error opening '/proc/net/if_inet6' to " -- "list IPv6 interfaces; %m"); -- close(ifaces->sock); -- ifaces->sock = -1; -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- return 0; -- } -- } --#endif -- -- return 1; --} -- --/* -- * Read our IPv4 interfaces from /proc/net/dev. -- * -- * The file looks something like this: -- * -- * Inter-| Receive ... -- * face |bytes packets errs drop fifo frame ... -- * lo: 1580562 4207 0 0 0 0 ... -- * eth0: 0 0 0 0 0 0 ... -- * eth1:1801552440 37895 0 14 0 ... -- * -- * We only care about the interface name, which is at the start of -- * each line. -- * -- * We use an ioctl() to get the address and flags for each interface. -- */ --static int --next_iface4(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -- char buf[IF_LINE_LENGTH]; -- int len; -- char *p; -- char *name; -- struct ifreq tmp; -- -- /* -- * Loop exits when we find an interface that has an address, or -- * when we run out of interfaces. -- */ -- for (;;) { -- do { -- /* -- * Read the next line in the file. -- */ -- if (fgets(buf, sizeof(buf), ifaces->fp) == NULL) { -- if (ferror(ifaces->fp)) { -- *err = 1; -- log_error("Error reading interface " -- "information"); -- } else { -- *err = 0; -- } -- return 0; -- } -- -- /* -- * Make sure the line is a nice, -- * newline-terminated line. -- */ -- len = strlen(buf); -- if ((len <= 0) || (buf[len-1] != '\n')) { -- log_error("Bad line reading interface " -- "information"); -- *err = 1; -- return 0; -- } -- -- /* -- * Figure out our name. -- */ -- p = strrchr(buf, ':'); -- if (p == NULL) { -- log_error("Bad line reading interface " -- "information (no colon)"); -- *err = 1; -- return 0; -- } -- *p = '\0'; -- name = buf; -- while (isspace(*name)) { -- name++; -- } -- -- /* -- * Copy our name into our interface structure. -- */ -- len = p - name; -- if (len >= sizeof(info->name)) { -- *err = 1; -- log_error("Interface name '%s' too long", name); -- return 0; -- } -- strncpy(info->name, name, sizeof(info->name) - 1); -- --#ifdef ALIAS_NAMED_PERMUTED -- /* interface aliases look like "eth0:1" or "wlan1:3" */ -- s = strchr(info->name, ':'); -- if (s != NULL) { -- *s = '\0'; -- } --#endif -- --#ifdef SKIP_DUMMY_INTERFACES -- } while (strncmp(info->name, "dummy", 5) == 0); --#else -- } while (0); --#endif -- -- memset(&tmp, 0, sizeof(tmp)); -- strncpy(tmp.ifr_name, name, sizeof(tmp.ifr_name) - 1); -- if (ioctl(ifaces->sock, SIOCGIFADDR, &tmp) < 0) { -- if (errno == EADDRNOTAVAIL) { -- continue; -- } -- log_error("Error getting interface address " -- "for '%s'; %m", name); -- *err = 1; -- return 0; -- } -- memcpy(&info->addr, &tmp.ifr_addr, sizeof(tmp.ifr_addr)); -- -- memset(&tmp, 0, sizeof(tmp)); -- strncpy(tmp.ifr_name, name, sizeof(tmp.ifr_name) - 1); -- if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) { -- log_error("Error getting interface flags for '%s'; %m", -- name); -- *err = 1; -- return 0; -- } -- info->flags = tmp.ifr_flags; -- -- *err = 0; -- return 1; -- } --} -- --#ifdef DHCPv6 --/* -- * Read our IPv6 interfaces from /proc/net/if_inet6. -- * -- * The file looks something like this: -- * -- * fe80000000000000025056fffec00008 05 40 20 80 vmnet8 -- * 00000000000000000000000000000001 01 80 10 80 lo -- * fe80000000000000025056fffec00001 06 40 20 80 vmnet1 -- * 200108881936000202166ffffe497d9b 03 40 00 00 eth1 -- * fe8000000000000002166ffffe497d9b 03 40 20 80 eth1 -- * -- * We get IPv6 address from the start, the interface name from the end, -- * and ioctl() to get flags. -- */ --static int --next_iface6(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -- char buf[IF_LINE_LENGTH]; -- int len; -- char *p; -- char *name; -- int i; -- struct sockaddr_in6 addr; -- struct ifreq tmp; -- -- do { -- /* -- * Read the next line in the file. -- */ -- if (fgets(buf, sizeof(buf), ifaces->fp6) == NULL) { -- if (ferror(ifaces->fp6)) { -- *err = 1; -- log_error("Error reading IPv6 " -- "interface information"); -- } else { -- *err = 0; -- } -- return 0; -- } -- -- /* -- * Make sure the line is a nice, newline-terminated line. -- */ -- len = strlen(buf); -- if ((len <= 0) || (buf[len-1] != '\n')) { -- log_error("Bad line reading IPv6 " -- "interface information"); -- *err = 1; -- return 0; -- } -- -- /* -- * Figure out our name. -- */ -- buf[--len] = '\0'; -- p = strrchr(buf, ' '); -- if (p == NULL) { -- log_error("Bad line reading IPv6 interface " -- "information (no space)"); -- *err = 1; -- return 0; -- } -- name = p+1; -- -- /* -- * Copy our name into our interface structure. -- */ -- len = strlen(name); -- if (len >= sizeof(info->name)) { -- *err = 1; -- log_error("IPv6 interface name '%s' too long", name); -- return 0; -- } -- strncpy(info->name, name, sizeof(info->name) - 1); -- --#ifdef SKIP_DUMMY_INTERFACES -- } while (strncmp(info->name, "dummy", 5) == 0); --#else -- } while (0); --#endif -- -- /* -- * Double-check we start with the IPv6 address. -- */ -- for (i=0; i<32; i++) { -- if (!isxdigit(buf[i]) || isupper(buf[i])) { -- *err = 1; -- log_error("Bad line reading IPv6 interface address " -- "for '%s'", name); -- return 0; -- } -- } -- -- /* -- * Load our socket structure. -- */ -- memset(&addr, 0, sizeof(addr)); -- addr.sin6_family = AF_INET6; -- for (i=0; i<16; i++) { -- unsigned char byte; -- static const char hex[] = "0123456789abcdef"; -- byte = ((index(hex, buf[i * 2]) - hex) << 4) | -- (index(hex, buf[i * 2 + 1]) - hex); -- addr.sin6_addr.s6_addr[i] = byte; -- } -- memcpy(&info->addr, &addr, sizeof(addr)); -- -- /* -- * Get our flags. -- */ -- memset(&tmp, 0, sizeof(tmp)); -- strncpy(tmp.ifr_name, name, sizeof(tmp.ifr_name) - 1); -- if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) { -- log_error("Error getting interface flags for '%s'; %m", name); -- *err = 1; -- return 0; -- } -- info->flags = tmp.ifr_flags; -- -- *err = 0; -- return 1; --} --#endif /* DHCPv6 */ -- --/* -- * Retrieve the next interface. -- * -- * Returns information in the info structure. -- * Sets err to 1 if there is an error, otherwise 0. -- */ --int --next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -- memset(info, 0, sizeof(struct iface_info)); -- if (next_iface4(info, err, ifaces)) { -- return 1; -- } --#ifdef DHCPv6 -- if (!(*err)) { -- if (local_family == AF_INET6) -- return next_iface6(info, err, ifaces); -- } --#endif -- return 0; --} -- --/* -- * End scan of interfaces. -- */ --void --end_iface_scan(struct iface_conf_list *ifaces) { -- fclose(ifaces->fp); -- ifaces->fp = NULL; -- close(ifaces->sock); -- ifaces->sock = -1; --#ifdef DHCPv6 -- if (local_family == AF_INET6) { -- fclose(ifaces->fp6); -- ifaces->fp6 = NULL; -- } --#endif --} - #else - - /* - * BSD support - * ----------- - * -- * FreeBSD, NetBSD, OpenBSD, and OS X all have the getifaddrs() -+ * FreeBSD, NetBSD, OpenBSD, OS X and Linux all have the getifaddrs() - * function. - * - * The getifaddrs() man page describes the use. -@@ -806,6 +427,8 @@ begin_iface_scan(struct iface_conf_list - */ - int - next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -+ size_t sa_len = 0; -+ - if (ifaces->next == NULL) { - *err = 0; - return 0; -@@ -818,8 +441,20 @@ next_iface(struct iface_info *info, int - } - memset(info, 0, sizeof(struct iface_info)); - strncpy(info->name, ifaces->next->ifa_name, sizeof(info->name) - 1); -- memcpy(&info->addr, ifaces->next->ifa_addr, -- ifaces->next->ifa_addr->sa_len); -+ -+ memset(&info->addr, 0 , sizeof(info->addr)); -+ -+ if (ifaces->next->ifa_addr != NULL) { -+#ifdef HAVE_SA_LEN -+ sa_len = ifaces->next->ifa_addr->sa_len; -+#else -+ if (ifaces->next->ifa_addr->sa_family == AF_INET) -+ sa_len = sizeof(struct sockaddr_in); -+ else if (ifaces->next->ifa_addr->sa_family == AF_INET6) -+ sa_len = sizeof(struct sockaddr_in6); -+#endif -+ memcpy(&info->addr, ifaces->next->ifa_addr, sa_len); -+ } - info->flags = ifaces->next->ifa_flags; - ifaces->next = ifaces->next->ifa_next; - *err = 0; diff --git a/dhcp/patches/0027-dhcp-interval.patch b/dhcp/patches/0027-dhcp-interval.patch deleted file mode 100644 index 8fff47c17..000000000 --- a/dhcp/patches/0027-dhcp-interval.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up dhcp-4.3.0a1/common/dispatch.c.interval dhcp-4.3.0a1/common/dispatch.c ---- dhcp-4.3.0a1/common/dispatch.c.interval 2013-12-20 13:51:14.385260622 +0100 -+++ dhcp-4.3.0a1/common/dispatch.c 2013-12-20 13:51:14.493259116 +0100 -@@ -343,7 +343,20 @@ void add_timeout (when, where, what, ref - q->next = timeouts; - timeouts = q; - -- isc_interval_set(&interval, sec & DHCP_SEC_MAX, usec * 1000); -+ /* isc_time_nowplusinterval() is not safe with 64-bit time_t and will -+ * return an error for sufficiently large intervals. We have to limit -+ * the interval to INT_MAX or less to ensure the interval doesn't -+ * overflow 32 bits, since the returned isc_time_t fields are -+ * 32-bit unsigned ints. -+ * -+ * HACK: The 9 is a magic number of seconds, since some time may have -+ * gone by since the last call to gettimeofday() and the one in -+ * isc_time_nowplusinterval(). -+ */ -+ if (sec > TIME_MAX) -+ sec = TIME_MAX - 9; -+ -+ isc_interval_set(&interval, sec, usec * 1000); - status = isc_time_nowplusinterval(&expires, &interval); - if (status != ISC_R_SUCCESS) { - /* diff --git a/dhcp/patches/0030-dhcp-option97-pxe-client-id.patch b/dhcp/patches/0030-dhcp-option97-pxe-client-id.patch deleted file mode 100644 index fac2ace5a..000000000 --- a/dhcp/patches/0030-dhcp-option97-pxe-client-id.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -up dhcp-4.3.5b1/common/options.c.option97 dhcp-4.3.5b1/common/options.c ---- dhcp-4.3.5b1/common/options.c.option97 2016-09-12 17:17:13.972691041 +0200 -+++ dhcp-4.3.5b1/common/options.c 2016-09-12 17:19:17.706790276 +0200 -@@ -4434,13 +4434,26 @@ int validate_packet(struct packet *packe - "a future version of ISC DHCP will reject this"); - } - } else { -- /* -- * If hlen is 0 we don't have any identifier, we warn the user -- * but continue processing the packet as we can. -- */ -- if (packet->raw->hlen == 0) { -- log_debug("Received DHCPv4 packet without client-id" -- " option and empty hlen field."); -+ oc = lookup_option (&dhcp_universe, packet->options, -+ DHO_PXE_CLIENT_ID); -+ if (oc) { -+ /* Let's check if pxe-client-id is sane */ -+ if ((oc->data.len < 2) || -+ (oc->data.data[0] == '\0' && -+ oc->data.len != 17)) { -+ log_debug("Dropped DHCPv4 packet with wrong " -+ "(len == %d) pxe-client-id", oc->data.len); -+ return (0); -+ } -+ } else { -+ /* -+ * If hlen is 0 we don't have any identifier, we warn the user -+ * but continue processing the packet as we can. -+ */ -+ if (packet->raw->hlen == 0) { -+ log_debug("Received DHCPv4 packet without client-id" -+ " option and empty hlen field."); -+ } - } - } - -diff -up dhcp-4.3.5b1/common/tables.c.option97 dhcp-4.3.5b1/common/tables.c ---- dhcp-4.3.5b1/common/tables.c.option97 2016-09-12 17:17:13.927691005 +0200 -+++ dhcp-4.3.5b1/common/tables.c 2016-09-12 17:17:13.972691041 +0200 -@@ -196,8 +196,9 @@ static struct option dhcp_options[] = { - /* Defined by RFC 4578 */ - { "pxe-system-type", "S", &dhcp_universe, 93, 1 }, - { "pxe-interface-id", "BBB", &dhcp_universe, 94, 1 }, -- { "pxe-client-id", "BX", &dhcp_universe, 97, 1 }, - #endif -+ { "pxe-client-id", "BX", &dhcp_universe, 97, 1 }, -+ - { "uap-servers", "t", &dhcp_universe, 98, 1 }, - #if defined(RFC4776_OPTIONS) - { "geoconf-civic", "X", &dhcp_universe, 99, 1 }, -diff -up dhcp-4.3.5b1/includes/dhcp.h.option97 dhcp-4.3.5b1/includes/dhcp.h ---- dhcp-4.3.5b1/includes/dhcp.h.option97 2016-09-12 17:17:13.936691013 +0200 -+++ dhcp-4.3.5b1/includes/dhcp.h 2016-09-12 17:17:13.972691041 +0200 -@@ -159,6 +159,7 @@ struct dhcp_packet { - #define DHO_AUTHENTICATE 90 /* RFC3118, was 210 */ - #define DHO_CLIENT_LAST_TRANSACTION_TIME 91 - #define DHO_ASSOCIATED_IP 92 -+#define DHO_PXE_CLIENT_ID 97 /* RFC4578 */ - #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ - #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ - #define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ -diff -up dhcp-4.3.5b1/server/dhcp.c.option97 dhcp-4.3.5b1/server/dhcp.c ---- dhcp-4.3.5b1/server/dhcp.c.option97 2016-09-12 17:17:13.947691021 +0200 -+++ dhcp-4.3.5b1/server/dhcp.c 2016-09-12 17:17:13.973691042 +0200 -@@ -221,6 +221,10 @@ dhcp (struct packet *packet) { - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); - if (!oc) -+ oc = lookup_option (&dhcp_universe, -+ packet -> options, -+ DHO_PXE_CLIENT_ID); -+ if (!oc) - goto nolease; - - memset (&data, 0, sizeof data); -@@ -818,6 +822,9 @@ void dhcprelease (packet, ms_nulltp) - - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset (&data, 0, sizeof data); - if (oc && - evaluate_option_cache (&data, packet, (struct lease *)0, -@@ -1286,6 +1293,9 @@ void dhcpinform (packet, ms_nulltp) - */ - oc = lookup_option(&dhcp_universe, packet->options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset(&d1, 0, sizeof(d1)); - if (oc && - evaluate_option_cache(&d1, packet, NULL, NULL, -@@ -2381,6 +2391,9 @@ void ack_lease (packet, lease, offer, wh - can be used. */ - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - if (oc && - evaluate_option_cache (&d1, packet, lease, - (struct client_state *)0, -@@ -2962,6 +2975,9 @@ void ack_lease (packet, lease, offer, wh - /* Record the uid, if given... */ - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - if (oc && - evaluate_option_cache(&d1, packet, lease, NULL, - packet->options, state->options, -@@ -4068,6 +4084,9 @@ int find_lease (struct lease **lp, - specified unique client identifier. */ - oc = lookup_option (&dhcp_universe, packet -> options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option (&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset (&client_identifier, 0, sizeof client_identifier); - if (oc && - evaluate_option_cache (&client_identifier, -diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.option97 dhcp-4.3.5b1/server/dhcpd.conf.5 ---- dhcp-4.3.5b1/server/dhcpd.conf.5.option97 2016-09-12 17:17:13.885690972 +0200 -+++ dhcp-4.3.5b1/server/dhcpd.conf.5 2016-09-12 17:17:13.974691043 +0200 -@@ -1587,10 +1587,12 @@ should be a name identifying the host. - not specified for the host, \fIhostname\fR is used. - .PP - \fIHost\fR declarations are matched to actual DHCP or BOOTP clients --by matching the \fRdhcp-client-identifier\fR option specified in the -+by matching the \fIdhcp-client-identifier\fR or \fIpxe-client-id\fR -+options specified in the - \fIhost\fR declaration to the one supplied by the client, or, if the - \fIhost\fR declaration or the client does not provide a --\fRdhcp-client-identifier\fR option, by matching the \fIhardware\fR -+\fIdhcp-client-identifier\fR or \fIpxe-client-id\fR options, -+by matching the \fIhardware\fR - parameter in the \fIhost\fR declaration to the network hardware - address supplied by the client. BOOTP clients do not normally - provide a \fIdhcp-client-identifier\fR, so the hardware address must -@@ -1602,7 +1604,8 @@ to identify hosts. - .PP - Please be aware that - .B only --the \fIdhcp-client-identifier\fR option and the hardware address can be -+the \fIdhcp-client-identifier\fR and \fIpxe-client-id\fR -+options and the hardware address can be - used to match a host declaration, or the \fIhost-identifier option\fR - parameter for DHCPv6 servers. For example, it is not possible to - match a host declaration to a \fIhost-name\fR option. This is -diff -up dhcp-4.3.5b1/server/dhcpleasequery.c.option97 dhcp-4.3.5b1/server/dhcpleasequery.c ---- dhcp-4.3.5b1/server/dhcpleasequery.c.option97 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/dhcpleasequery.c 2016-09-12 17:17:13.974691043 +0200 -@@ -273,7 +273,7 @@ dhcpleasequery(struct packet *packet, in - */ - - memset(&uid, 0, sizeof(uid)); -- if (get_option(&uid, -+ i = get_option(&uid, - &dhcp_universe, - packet, - NULL, -@@ -283,8 +283,20 @@ dhcpleasequery(struct packet *packet, in - packet->options, - &global_scope, - DHO_DHCP_CLIENT_IDENTIFIER, -- MDL)) { -- -+ MDL); -+ if (!i) -+ i = get_option(&uid, -+ &dhcp_universe, -+ packet, -+ NULL, -+ NULL, -+ packet->options, -+ NULL, -+ packet->options, -+ &global_scope, -+ DHO_PXE_CLIENT_ID, -+ MDL); -+ if (i) { - snprintf(dbg_info, - sizeof(dbg_info), - "client-id %s", -diff -up dhcp-4.3.5b1/server/failover.c.option97 dhcp-4.3.5b1/server/failover.c ---- dhcp-4.3.5b1/server/failover.c.option97 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/failover.c 2016-09-12 17:17:13.975691044 +0200 -@@ -5957,6 +5957,9 @@ int load_balance_mine (struct packet *pa - - oc = lookup_option(&dhcp_universe, packet->options, - DHO_DHCP_CLIENT_IDENTIFIER); -+ if (!oc) -+ oc = lookup_option(&dhcp_universe, packet -> options, -+ DHO_PXE_CLIENT_ID); - memset(&ds, 0, sizeof ds); - if (oc && - evaluate_option_cache(&ds, packet, NULL, NULL, -diff -up dhcp-4.3.5b1/server/mdb.c.option97 dhcp-4.3.5b1/server/mdb.c ---- dhcp-4.3.5b1/server/mdb.c.option97 2016-08-26 20:19:53.000000000 +0200 -+++ dhcp-4.3.5b1/server/mdb.c 2016-09-12 17:17:13.975691044 +0200 -@@ -129,8 +129,9 @@ static int find_uid_statement (struct ex - esp -> data.option && - (esp -> data.option -> option -> universe == - &dhcp_universe) && -- (esp -> data.option -> option -> code == -- DHO_DHCP_CLIENT_IDENTIFIER)) { -+ ((esp -> data.option -> option -> code == -+ DHO_DHCP_CLIENT_IDENTIFIER) || -+ (esp -> data.option -> option -> code == DHO_PXE_CLIENT_ID))) { - if (condp) { - log_error ("dhcp client identifier may not be %s", - "specified conditionally."); diff --git a/dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch b/dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch deleted file mode 100644 index 72b7b0f77..000000000 --- a/dhcp/patches/0031-dhcp-stateless-DUID-LLT.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.stateless-DUID-LLT dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.stateless-DUID-LLT 2016-04-29 13:13:50.467360008 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 13:14:53.389375428 +0200 -@@ -1317,6 +1317,9 @@ void run_stateless(int exit_mode, u_int1 - data_string_forget(&default_duid, MDL); - - form_duid(&default_duid, MDL); -+ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS && -+ duid_type == DUID_LLT) -+ write_duid(&default_duid); - } - - #ifdef DHCP4o6 diff --git a/dhcp/patches/0032-dhcp-dhclient-preinit6s.patch b/dhcp/patches/0032-dhcp-dhclient-preinit6s.patch deleted file mode 100644 index 0ce1cf827..000000000 --- a/dhcp/patches/0032-dhcp-dhclient-preinit6s.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up dhcp-4.3.4/client/dhclient.c.preinit6s dhcp-4.3.4/client/dhclient.c ---- dhcp-4.3.4/client/dhclient.c.preinit6s 2016-04-29 13:15:10.361379493 +0200 -+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 13:17:43.622415423 +0200 -@@ -812,6 +812,12 @@ main(int argc, char **argv) { - - inaddr_any.s_addr = INADDR_ANY; - -+ /* Discover all the network interfaces. */ -+ discover_interfaces(DISCOVER_UNCONFIGURED); -+ -+ /* Parse the dhclient.conf file. */ -+ read_client_conf(); -+ - /* Stateless special case. */ - if (stateless) { - if (release_mode || (wanted_ia_na > 0) || -@@ -828,12 +834,6 @@ main(int argc, char **argv) { - return 0; - } - -- /* Discover all the network interfaces. */ -- discover_interfaces(DISCOVER_UNCONFIGURED); -- -- /* Parse the dhclient.conf file. */ -- read_client_conf(); -- - /* Parse any extra command line configuration arguments: */ - if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) { - arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg); -@@ -1288,20 +1288,30 @@ void run_stateless(int exit_mode, u_int1 - IGNORE_UNUSED(port); - #endif - -- /* Discover the network interface. */ -- discover_interfaces(DISCOVER_REQUESTED); -+ struct interface_info *ip; - - if (!interfaces) - usage("No interfaces available for stateless command: %s", "-S"); - -- /* Parse the dhclient.conf file. */ - #ifdef DHCP4o6 - if (dhcpv4_over_dhcpv6) { - /* Mark we want to request IRT too! */ - dhcpv4_over_dhcpv6++; - } - #endif -- read_client_conf(); -+ -+ for (ip = interfaces; ip; ip = ip->next) { -+ if ((interfaces_requested > 0) && -+ ((ip->flags & (INTERFACE_REQUESTED | -+ INTERFACE_AUTOMATIC)) != -+ INTERFACE_REQUESTED)) -+ continue; -+ script_init(ip->client, "PREINIT6", NULL); -+ script_go(ip->client); -+ } -+ -+ /* Discover the network interface. */ -+ discover_interfaces(DISCOVER_REQUESTED); - - /* Parse the lease database. */ - read_client_leases(); -- 2.20.1

1 0

[PATCH] intel-microcode: add new package
by Arne Fitzenreiter 22 Jun '19

22 Jun '19

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- intel-microcode/intel-microcode.nm | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 intel-microcode/intel-microcode.nm diff --git a/intel-microcode/intel-microcode.nm b/intel-microcode/intel-microcode.nm new file mode 100644 index 0000000..1232a93 --- /dev/null +++ b/intel-microcode/intel-microcode.nm @@ -0,0 +1,40 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = intel-microcode +version = 20190618 +release = 1 +arch = noarch +thisapp = microcode-%{version} + +maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> +groups = System/Libraries +url = https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases +license = Non-GPL +summary = Microcode update for Intel CPU's. + +description + intel-microcode provides some binaries that + are loaded into the Intel CPU at startup. +end + +source_dl = https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/ + +build + build + : # Nothing to do. + end + + DIR_APP = %{DIR_SRC}/Intel-Linux-Processor-Microcode-Data-Files-%{thisapp} + + install + mkdir -pv %{BUILDROOT}%{prefix}/lib/firmware + cp -prv intel-ucode %{BUILDROOT}%{prefix}/lib/firmware + end +end + +packages + package %{name} +end -- 2.6.3

1 0

[PATCH 1/2] systemd: Drop systemd-units package.
by Stefan Schantl 21 Jun '19

21 Jun '19

* Rework build process to use meson and ninja macros. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- systemd/systemd.nm | 61 +++++++++------------------------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/systemd/systemd.nm b/systemd/systemd.nm index a1c3677d0..25bbd99cf 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 242 -release = 2 +release = 3 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -52,15 +52,16 @@ build libblkid-devel libcap-devel libgcrypt-devel - libmount-devel - libuuid-devel + libmount-devel >= 2.34-2 + libuuid-devel >= 2.34-2 m4 - meson - ninja >= 1.5 + meson >= 0.50.1 + ninja >= 1.9.0 pam-devel pciutils-devel python3-devel python3-lxml + setup >= 3.0-13 usbutils vala xz-devel @@ -95,10 +96,10 @@ build build # Call meson and pass configure options. - meson --buildtype=plain %{configure_options} . build + %{meson} %{configure_options} # Call ninja to start build - ninja -v %{PARALLELISMFLAGS} -C build + %{meson_build} end test @@ -113,11 +114,8 @@ build end install - # Export destdir. - export DESTDIR=%{BUILDROOT} - - # Call ninja to perform installation - ninja install -v %{PARALLELISMFLAGS} -C build + # Install systemd. + %{meson_install} # Create folder in log to store the journal. mkdir -pv %{BUILDROOT}/var/log/journal @@ -242,7 +240,6 @@ packages python-dbus python-gobject3 %{name}-libs=%{thisver} - %{name}-units=%{thisver} util-linux>=2.19 end @@ -269,6 +266,7 @@ packages obsoletes udev < 183 + systemd-units <= 242 end configfiles @@ -339,43 +337,6 @@ packages end end - # Package information for systemd-units - package %{name}-units - summary = Configuration files, directories and installation tool for systemd. - description - This package contains all needed configuration files, directories - and installation / configuration tool for systemd. - end - - prerequires - /bin/sh - coreutils - end - - provides - /bin/systemctl - end - - conflicts - filesystem < 002 - end - - files - %{sysconfdir}/etc/systemd/system - %{sysconfdir}/tmpfiles.d - %{sysconfdir}/bash_completion.d/systemctl-bash-completion.sh - %{unitdir} - %{bindir}/systemctl - %{bindir}/systemd-tmpfiles - %{mandir}/man1/systemctl.* - end - - script postup - # Reload service files - /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : - end - end - package %{name}-libs template LIBS -- 2.20.1

1 1

[PATCH] coreutils: Update to 8.31
by Stefan Schantl 21 Jun '19

21 Jun '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- coreutils/coreutils.nm | 8 +- .../patches/coreutils-i18n-cut-old.patch | 565 ++++++++++++ .../coreutils-i18n-expand-unexpand.patch | 848 ++++++++++++++++++ .../patches/coreutils-i18n-fix-unexpand.patch | 28 + .../coreutils-i18n-fix2-expand-unexpand.patch | 108 +++ .../patches/coreutils-i18n-fold-newline.patch | 80 ++ .../patches/coreutils-i18n-sort-human.patch | 35 + .../coreutils-i18n-un-expand-BOM.patch | 456 ++++++++++ coreutils/patches/coreutils-i18n.patch | 190 ++-- 9 files changed, 2208 insertions(+), 110 deletions(-) create mode 100644 coreutils/patches/coreutils-i18n-cut-old.patch create mode 100644 coreutils/patches/coreutils-i18n-expand-unexpand.patch create mode 100644 coreutils/patches/coreutils-i18n-fix-unexpand.patch create mode 100644 coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch create mode 100644 coreutils/patches/coreutils-i18n-fold-newline.patch create mode 100644 coreutils/patches/coreutils-i18n-sort-human.patch create mode 100644 coreutils/patches/coreutils-i18n-un-expand-BOM.patch diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index a85b6a872..026bc14da 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,7 +4,7 @@ ############################################################################### name = coreutils -version = 8.30 +version = 8.31 release = 1 groups = System/Base @@ -23,7 +23,7 @@ sources = %{thisapp}.tar.xz build requires autoconf - automake + automake >= 1.15 e2fsprogs-devel gettext-devel gmp-devel @@ -43,6 +43,10 @@ build --enable-no-install-program=hostname,kill,uptime \ --with-tty-group + prepare_cmds + autoreconf -vfi + end + test make check RUN_VERY_EXPENSIVE_TESTS=yes || true end diff --git a/coreutils/patches/coreutils-i18n-cut-old.patch b/coreutils/patches/coreutils-i18n-cut-old.patch new file mode 100644 index 000000000..757ee0fbb --- /dev/null +++ b/coreutils/patches/coreutils-i18n-cut-old.patch @@ -0,0 +1,565 @@ +diff --git a/src/cut.c b/src/cut.c +index 7ab6be4..022d0ad 100644 +--- a/src/cut.c ++++ b/src/cut.c +@@ -28,6 +28,11 @@ + #include <assert.h> + #include <getopt.h> + #include <sys/types.h> ++ ++/* Get mbstate_t, mbrtowc(). */ ++#if HAVE_WCHAR_H ++# include <wchar.h> ++#endif + #include "system.h" + + #include "error.h" +@@ -38,6 +43,18 @@ + + #include "set-fields.h" + ++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC ++ installation; work around this configuration error. */ ++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 ++# undef MB_LEN_MAX ++# define MB_LEN_MAX 16 ++#endif ++ ++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ ++#if HAVE_MBRTOWC && defined mbstate_t ++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) ++#endif ++ + /* The official name of this program (e.g., no 'g' prefix). */ + #define PROGRAM_NAME "cut" + +@@ -54,6 +71,52 @@ + } \ + while (0) + ++/* Refill the buffer BUF to get a multibyte character. */ ++#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM) \ ++ do \ ++ { \ ++ if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM)) \ ++ { \ ++ memmove (BUF, BUFPOS, BUFLEN); \ ++ BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \ ++ BUFPOS = BUF; \ ++ } \ ++ } \ ++ while (0) ++ ++/* Get wide character on BUFPOS. BUFPOS is not included after that. ++ If byte sequence is not valid as a character, CONVFAIL is true. Otherwise false. */ ++#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \ ++ do \ ++ { \ ++ mbstate_t state_bak; \ ++ \ ++ if (BUFLEN < 1) \ ++ { \ ++ WC = WEOF; \ ++ break; \ ++ } \ ++ \ ++ /* Get a wide character. */ \ ++ CONVFAIL = false; \ ++ state_bak = STATE; \ ++ MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE); \ ++ \ ++ switch (MBLENGTH) \ ++ { \ ++ case (size_t)-1: \ ++ case (size_t)-2: \ ++ CONVFAIL = true; \ ++ STATE = state_bak; \ ++ /* Fall througn. */ \ ++ \ ++ case 0: \ ++ MBLENGTH = 1; \ ++ break; \ ++ } \ ++ } \ ++ while (0) ++ + + /* Pointer inside RP. When checking if a byte or field is selected + by a finite range, we check if it is between CURRENT_RP.LO +@@ -61,6 +124,9 @@ + CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */ + static struct field_range_pair *current_rp; + ++/* Length of the delimiter given as argument to -d. */ ++size_t delimlen; ++ + /* This buffer is used to support the semantics of the -s option + (or lack of same) when the specified field list includes (does + not include) the first field. In both of those cases, the entire +@@ -77,15 +143,25 @@ enum operating_mode + { + undefined_mode, + +- /* Output characters that are in the given bytes. */ ++ /* Output bytes that are at the given positions. */ + byte_mode, + ++ /* Output characters that are at the given positions. */ ++ character_mode, ++ + /* Output the given delimiter-separated fields. */ + field_mode + }; + + static enum operating_mode operating_mode; + ++/* If nonzero, when in byte mode, don't split multibyte characters. */ ++static int byte_mode_character_aware; ++ ++/* If nonzero, the function for single byte locale is work ++ if this program runs on multibyte locale. */ ++static int force_singlebyte_mode; ++ + /* If true do not output lines containing no delimiter characters. + Otherwise, all such lines are printed. This option is valid only + with field mode. */ +@@ -97,6 +173,9 @@ static bool complement; + + /* The delimiter character for field mode. */ + static unsigned char delim; ++#if HAVE_WCHAR_H ++static wchar_t wcdelim; ++#endif + + /* The delimiter for each line/record. */ + static unsigned char line_delim = '\n'; +@@ -164,7 +243,7 @@ Print selected parts of lines from each FILE to standard output.\n\ + -f, --fields=LIST select only these fields; also print any line\n\ + that contains no delimiter character, unless\n\ + the -s option is specified\n\ +- -n (ignored)\n\ ++ -n with -b: don't split multibyte characters\n\ + "), stdout); + fputs (_("\ + --complement complement the set of selected bytes, characters\n\ +@@ -280,6 +359,82 @@ cut_bytes (FILE *stream) + } + } + ++#if HAVE_MBRTOWC ++/* This function is in use for the following case. ++ ++ 1. Read from the stream STREAM, printing to standard output any selected ++ characters. ++ ++ 2. Read from stream STREAM, printing to standard output any selected bytes, ++ without splitting multibyte characters. */ ++ ++static void ++cut_characters_or_cut_bytes_no_split (FILE *stream) ++{ ++ uintmax_t idx; /* number of bytes or characters in the line so far. */ ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen; /* The length of the byte sequence in buf. */ ++ wint_t wc; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character which shows ++ as same character as WC. */ ++ mbstate_t state; /* State of the stream. */ ++ bool convfail = false; /* true, when conversion failed. Otherwise false. */ ++ /* Whether to begin printing delimiters between ranges for the current line. ++ Set after we've begun printing data corresponding to the first range. */ ++ bool print_delimiter = false; ++ ++ idx = 0; ++ buflen = 0; ++ bufpos = buf; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ current_rp = frp; ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail); ++ (void) convfail; /* ignore unused */ ++ ++ if (wc == WEOF) ++ { ++ if (idx > 0) ++ putchar (line_delim); ++ break; ++ } ++ else if (wc == line_delim) ++ { ++ putchar (line_delim); ++ idx = 0; ++ print_delimiter = false; ++ current_rp = frp; ++ } ++ else ++ { ++ next_item (&idx); ++ if (print_kth (idx)) ++ { ++ if (output_delimiter_specified) ++ { ++ if (print_delimiter && is_range_start_index (idx)) ++ { ++ fwrite (output_delimiter_string, sizeof (char), ++ output_delimiter_length, stdout); ++ } ++ print_delimiter = true; ++ } ++ fwrite (bufpos, mblength, sizeof(char), stdout); ++ } ++ } ++ ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++} ++#endif ++ + /* Read from stream STREAM, printing to standard output any selected fields. */ + + static void +@@ -425,13 +580,211 @@ cut_fields (FILE *stream) + } + } + ++#if HAVE_MBRTOWC ++static void ++cut_fields_mb (FILE *stream) ++{ ++ int c; ++ uintmax_t field_idx; ++ int found_any_selected_field; ++ int buffer_first_field; ++ int empty_input; ++ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ ++ char *bufpos; /* Next read position of BUF. */ ++ size_t buflen; /* The length of the byte sequence in buf. */ ++ wint_t wc = 0; /* A gotten wide character. */ ++ size_t mblength; /* The byte size of a multibyte character which shows ++ as same character as WC. */ ++ mbstate_t state; /* State of the stream. */ ++ bool convfail = false; /* true, when conversion failed. Otherwise false. */ ++ ++ current_rp = frp; ++ ++ found_any_selected_field = 0; ++ field_idx = 1; ++ bufpos = buf; ++ buflen = 0; ++ memset (&state, '\0', sizeof(mbstate_t)); ++ ++ c = getc (stream); ++ empty_input = (c == EOF); ++ if (c != EOF) ++ { ++ ungetc (c, stream); ++ wc = 0; ++ } ++ else ++ wc = WEOF; ++ ++ /* To support the semantics of the -s flag, we may have to buffer ++ all of the first field to determine whether it is `delimited.' ++ But that is unnecessary if all non-delimited lines must be printed ++ and the first field has been selected, or if non-delimited lines ++ must be suppressed and the first field has *not* been selected. ++ That is because a non-delimited line has exactly one field. */ ++ buffer_first_field = (suppress_non_delimited ^ !print_kth (1)); ++ ++ while (1) ++ { ++ if (field_idx == 1 && buffer_first_field) ++ { ++ int len = 0; ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER ++ (wc, bufpos, buflen, mblength, state, convfail); ++ ++ if (wc == WEOF) ++ break; ++ ++ field_1_buffer = xrealloc (field_1_buffer, len + mblength); ++ memcpy (field_1_buffer + len, bufpos, mblength); ++ len += mblength; ++ buflen -= mblength; ++ bufpos += mblength; ++ ++ if (!convfail && (wc == line_delim || wc == wcdelim)) ++ break; ++ } ++ ++ if (len <= 0 && wc == WEOF) ++ break; ++ ++ /* If the first field extends to the end of line (it is not ++ delimited) and we are printing all non-delimited lines, ++ print this one. */ ++ if (convfail || (!convfail && wc != wcdelim)) ++ { ++ if (suppress_non_delimited) ++ { ++ /* Empty. */ ++ } ++ else ++ { ++ fwrite (field_1_buffer, sizeof (char), len, stdout); ++ /* Make sure the output line is newline terminated. */ ++ if (convfail || (!convfail && wc != line_delim)) ++ putchar (line_delim); ++ } ++ continue; ++ } ++ ++ if (print_kth (1)) ++ { ++ /* Print the field, but not the trailing delimiter. */ ++ fwrite (field_1_buffer, sizeof (char), len - 1, stdout); ++ found_any_selected_field = 1; ++ } ++ next_item (&field_idx); ++ } ++ ++ if (wc != WEOF) ++ { ++ if (print_kth (field_idx)) ++ { ++ if (found_any_selected_field) ++ { ++ fwrite (output_delimiter_string, sizeof (char), ++ output_delimiter_length, stdout); ++ } ++ found_any_selected_field = 1; ++ } ++ ++ while (1) ++ { ++ REFILL_BUFFER (buf, bufpos, buflen, stream); ++ ++ GET_NEXT_WC_FROM_BUFFER ++ (wc, bufpos, buflen, mblength, state, convfail); ++ ++ if (wc == WEOF) ++ break; ++ else if (!convfail && (wc == wcdelim || wc == line_delim)) ++ { ++ buflen -= mblength; ++ bufpos += mblength; ++ break; ++ } ++ ++ if (print_kth (field_idx)) ++ fwrite (bufpos, mblength, sizeof(char), stdout); ++ ++ buflen -= mblength; ++ bufpos += mblength; ++ } ++ } ++ ++ if ((!convfail || wc == line_delim) && buflen < 1) ++ wc = WEOF; ++ ++ if (!convfail && wc == wcdelim) ++ next_item (&field_idx); ++ else if (wc == WEOF || (!convfail && wc == line_delim)) ++ { ++ if (found_any_selected_field ++ || (!empty_input && !(suppress_non_delimited && field_idx == 1))) ++ putchar (line_delim); ++ if (wc == WEOF) ++ break; ++ field_idx = 1; ++ current_rp = frp; ++ found_any_selected_field = 0; ++ } ++ } ++} ++#endif ++ + static void + cut_stream (FILE *stream) + { +- if (operating_mode == byte_mode) +- cut_bytes (stream); ++#if HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) ++ { ++ switch (operating_mode) ++ { ++ case byte_mode: ++ if (byte_mode_character_aware) ++ cut_characters_or_cut_bytes_no_split (stream); ++ else ++ cut_bytes (stream); ++ break; ++ ++ case character_mode: ++ cut_characters_or_cut_bytes_no_split (stream); ++ break; ++ ++ case field_mode: ++ if (delimlen == 1) ++ { ++ /* Check if we have utf8 multibyte locale, so we can use this ++ optimization because of uniqueness of characters, which is ++ not true for e.g. SJIS */ ++ char * loc = setlocale(LC_CTYPE, NULL); ++ if (loc && (strstr (loc, "UTF-8") || strstr (loc, "utf-8") || ++ strstr (loc, "UTF8") || strstr (loc, "utf8"))) ++ { ++ cut_fields (stream); ++ break; ++ } ++ } ++ cut_fields_mb (stream); ++ break; ++ ++ default: ++ abort (); ++ } ++ } + else +- cut_fields (stream); ++#endif ++ { ++ if (operating_mode == field_mode) ++ cut_fields (stream); ++ else ++ cut_bytes (stream); ++ } + } + + /* Process file FILE to standard output. +@@ -483,6 +836,7 @@ main (int argc, char **argv) + bool ok; + bool delim_specified = false; + char *spec_list_string IF_LINT ( = NULL); ++ char mbdelim[MB_LEN_MAX + 1]; + + initialize_main (&argc, &argv); + set_program_name (argv[0]); +@@ -505,7 +859,6 @@ main (int argc, char **argv) + switch (optc) + { + case 'b': +- case 'c': + /* Build the byte list. */ + if (operating_mode != undefined_mode) + FATAL_ERROR (_("only one type of list may be specified")); +@@ -513,6 +866,14 @@ main (int argc, char **argv) + spec_list_string = optarg; + break; + ++ case 'c': ++ /* Build the character list. */ ++ if (operating_mode != undefined_mode) ++ FATAL_ERROR (_("only one type of list may be specified")); ++ operating_mode = character_mode; ++ spec_list_string = optarg; ++ break; ++ + case 'f': + /* Build the field list. */ + if (operating_mode != undefined_mode) +@@ -524,10 +885,38 @@ main (int argc, char **argv) + case 'd': + /* New delimiter. */ + /* Interpret -d '' to mean 'use the NUL byte as the delimiter.' */ +- if (optarg[0] != '\0' && optarg[1] != '\0') +- FATAL_ERROR (_("the delimiter must be a single character")); +- delim = optarg[0]; +- delim_specified = true; ++ { ++#if HAVE_MBRTOWC ++ if(MB_CUR_MAX > 1) ++ { ++ mbstate_t state; ++ ++ memset (&state, '\0', sizeof(mbstate_t)); ++ delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state); ++ ++ if (delimlen == (size_t)-1 || delimlen == (size_t)-2) ++ ++force_singlebyte_mode; ++ else ++ { ++ delimlen = (delimlen < 1) ? 1 : delimlen; ++ if (wcdelim != L'\0' && *(optarg + delimlen) != '\0') ++ FATAL_ERROR (_("the delimiter must be a single character")); ++ memcpy (mbdelim, optarg, delimlen); ++ mbdelim[delimlen] = '\0'; ++ if (delimlen == 1) ++ delim = *optarg; ++ } ++ } ++ ++ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) ++#endif ++ { ++ if (optarg[0] != '\0' && optarg[1] != '\0') ++ FATAL_ERROR (_("the delimiter must be a single character")); ++ delim = (unsigned char) optarg[0]; ++ } ++ delim_specified = true; ++ } + break; + + case OUTPUT_DELIMITER_OPTION: +@@ -540,6 +929,7 @@ main (int argc, char **argv) + break; + + case 'n': ++ byte_mode_character_aware = 1; + break; + + case 's': +@@ -579,15 +969,34 @@ main (int argc, char **argv) + | (complement ? SETFLD_COMPLEMENT : 0) ); + + if (!delim_specified) +- delim = '\t'; ++ { ++ delim = '\t'; ++#ifdef HAVE_MBRTOWC ++ wcdelim = L'\t'; ++ mbdelim[0] = '\t'; ++ mbdelim[1] = '\0'; ++ delimlen = 1; ++#endif ++ } + + if (output_delimiter_string == NULL) + { +- static char dummy[2]; +- dummy[0] = delim; +- dummy[1] = '\0'; +- output_delimiter_string = dummy; +- output_delimiter_length = 1; ++#ifdef HAVE_MBRTOWC ++ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) ++ { ++ output_delimiter_string = xstrdup(mbdelim); ++ output_delimiter_length = delimlen; ++ } ++ ++ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) ++#endif ++ { ++ static char dummy[2]; ++ dummy[0] = delim; ++ dummy[1] = '\0'; ++ output_delimiter_string = dummy; ++ output_delimiter_length = 1; ++ } + } + + if (optind == argc) diff --git a/coreutils/patches/coreutils-i18n-expand-unexpand.patch b/coreutils/patches/coreutils-i18n-expand-unexpand.patch new file mode 100644 index 000000000..b5f571f5f --- /dev/null +++ b/coreutils/patches/coreutils-i18n-expand-unexpand.patch @@ -0,0 +1,848 @@ +From e87ab5b991b08092a7e07af82b3ec822a8604151 Mon Sep 17 00:00:00 2001 +From: Ondrej Oprala <ooprala(a)redhat.com> +Date: Wed, 5 Aug 2015 09:15:09 +0200 +Subject: [PATCH] expand,unexpand: add multibyte support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* NEWS: Mention the changes. +* bootstrap.conf: Add mbfile to the list of modules. +* configure.ac: Properly initialize mbfile. +* src/expand.c (expand): Iterate over multibyte characters properly. +* src/unexpand.c (unexpand): Iterate over multibyte characters +properly. +* tests/local.mk: Add new tests. +* tests/{expand,unexpand}/mb.sh: New tests. + +Co-authored-by: Pádraig Brady <pbrady(a)redhat.com> +--- + bootstrap.conf | 1 + + configure.ac | 2 + + lib/mbfile.c | 3 + + lib/mbfile.h | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++ + m4/mbfile.m4 | 14 +++ + src/expand.c | 43 +++++---- + src/unexpand.c | 54 +++++++---- + tests/expand/mb.sh | 98 ++++++++++++++++++++ + tests/local.mk | 2 + + tests/unexpand/mb.sh | 97 ++++++++++++++++++++ + 10 files changed, 535 insertions(+), 34 deletions(-) + create mode 100644 lib/mbfile.c + create mode 100644 lib/mbfile.h + create mode 100644 m4/mbfile.m4 + create mode 100755 tests/expand/mb.sh + create mode 100755 tests/unexpand/mb.sh + +diff --git a/bootstrap.conf b/bootstrap.conf +index 8a0ff31..a1c78b2 100644 +--- a/bootstrap.conf ++++ b/bootstrap.conf +@@ -152,6 +152,7 @@ gnulib_modules=" + maintainer-makefile + malloc-gnu + manywarnings ++ mbfile + mbrlen + mbrtowc + mbsalign +diff --git a/configure.ac b/configure.ac +index 1e74b36..24c9725 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -427,6 +427,8 @@ fi + # I'm leaving it here for now. This whole thing needs to be modernized... + gl_WINSIZE_IN_PTEM + ++gl_MBFILE ++ + gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H + + if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \ +diff --git a/lib/mbfile.c b/lib/mbfile.c +new file mode 100644 +index 0000000..b0a468e +--- /dev/null ++++ b/lib/mbfile.c +@@ -0,0 +1,3 @@ ++#include <config.h> ++#define MBFILE_INLINE _GL_EXTERN_INLINE ++#include "mbfile.h" +diff --git a/lib/mbfile.h b/lib/mbfile.h +new file mode 100644 +index 0000000..11f1b12 +--- /dev/null ++++ b/lib/mbfile.h +@@ -0,0 +1,255 @@ ++/* Multibyte character I/O: macros for multi-byte encodings. ++ Copyright (C) 2001, 2005, 2009-2015 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see <http://www.gnu.org/licenses/>. */ ++ ++/* Written by Mitsuru Chinen <mchinen(a)yamato.ibm.com> ++ and Bruno Haible <bruno(a)clisp.org>. */ ++ ++/* The macros in this file implement multi-byte character input from a ++ stream. ++ ++ mb_file_t ++ is the type for multibyte character input stream, usable for variable ++ declarations. ++ ++ mbf_char_t ++ is the type for multibyte character or EOF, usable for variable ++ declarations. ++ ++ mbf_init (mbf, stream) ++ initializes the MB_FILE for reading from stream. ++ ++ mbf_getc (mbc, mbf) ++ reads the next multibyte character from mbf and stores it in mbc. ++ ++ mb_iseof (mbc) ++ returns true if mbc represents the EOF value. ++ ++ Here are the function prototypes of the macros. ++ ++ extern void mbf_init (mb_file_t mbf, FILE *stream); ++ extern void mbf_getc (mbf_char_t mbc, mb_file_t mbf); ++ extern bool mb_iseof (const mbf_char_t mbc); ++ */ ++ ++#ifndef _MBFILE_H ++#define _MBFILE_H 1 ++ ++#include <assert.h> ++#include <stdbool.h> ++#include <stdio.h> ++#include <string.h> ++ ++/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before ++ <wchar.h>. ++ BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before ++ <wchar.h>. */ ++#include <stdio.h> ++#include <time.h> ++#include <wchar.h> ++ ++#include "mbchar.h" ++ ++#ifndef _GL_INLINE_HEADER_BEGIN ++ #error "Please include config.h first." ++#endif ++_GL_INLINE_HEADER_BEGIN ++#ifndef MBFILE_INLINE ++# define MBFILE_INLINE _GL_INLINE ++#endif ++ ++struct mbfile_multi { ++ FILE *fp; ++ bool eof_seen; ++ bool have_pushback; ++ mbstate_t state; ++ unsigned int bufcount; ++ char buf[MBCHAR_BUF_SIZE]; ++ struct mbchar pushback; ++}; ++ ++MBFILE_INLINE void ++mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf) ++{ ++ size_t bytes; ++ ++ /* If EOF has already been seen, don't use getc. This matters if ++ mbf->fp is connected to an interactive tty. */ ++ if (mbf->eof_seen) ++ goto eof; ++ ++ /* Return character pushed back, if there is one. */ ++ if (mbf->have_pushback) ++ { ++ mb_copy (mbc, &mbf->pushback); ++ mbf->have_pushback = false; ++ return; ++ } ++ ++ /* Before using mbrtowc, we need at least one byte. */ ++ if (mbf->bufcount == 0) ++ { ++ int c = getc (mbf->fp); ++ if (c == EOF) ++ { ++ mbf->eof_seen = true; ++ goto eof; ++ } ++ mbf->buf[0] = (unsigned char) c; ++ mbf->bufcount++; ++ } ++ ++ /* Handle most ASCII characters quickly, without calling mbrtowc(). */ ++ if (mbf->bufcount == 1 && mbsinit (&mbf->state) && is_basic (mbf->buf[0])) ++ { ++ /* These characters are part of the basic character set. ISO C 99 ++ guarantees that their wide character code is identical to their ++ char code. */ ++ mbc->wc = mbc->buf[0] = mbf->buf[0]; ++ mbc->wc_valid = true; ++ mbc->ptr = &mbc->buf[0]; ++ mbc->bytes = 1; ++ mbf->bufcount = 0; ++ return; ++ } ++ ++ /* Use mbrtowc on an increasing number of bytes. Read only as many bytes ++ from mbf->fp as needed. This is needed to give reasonable interactive ++ behaviour when mbf->fp is connected to an interactive tty. */ ++ for (;;) ++ { ++ /* We don't know whether the 'mbrtowc' function updates the state when ++ it returns -2, - this is the ISO C 99 and glibc-2.2 behaviour - or ++ not - amended ANSI C, glibc-2.1 and Solaris 2.7 behaviour. We ++ don't have an autoconf test for this, yet. ++ The new behaviour would allow us to feed the bytes one by one into ++ mbrtowc. But the old behaviour forces us to feed all bytes since ++ the end of the last character into mbrtowc. Since we want to retry ++ with more bytes when mbrtowc returns -2, we must backup the state ++ before calling mbrtowc, because implementations with the new ++ behaviour will clobber it. */ ++ mbstate_t backup_state = mbf->state; ++ ++ bytes = mbrtowc (&mbc->wc, &mbf->buf[0], mbf->bufcount, &mbf->state); ++ ++ if (bytes == (size_t) -1) ++ { ++ /* An invalid multibyte sequence was encountered. */ ++ /* Return a single byte. */ ++ bytes = 1; ++ mbc->wc_valid = false; ++ break; ++ } ++ else if (bytes == (size_t) -2) ++ { ++ /* An incomplete multibyte character. */ ++ mbf->state = backup_state; ++ if (mbf->bufcount == MBCHAR_BUF_SIZE) ++ { ++ /* An overlong incomplete multibyte sequence was encountered. */ ++ /* Return a single byte. */ ++ bytes = 1; ++ mbc->wc_valid = false; ++ break; ++ } ++ else ++ { ++ /* Read one more byte and retry mbrtowc. */ ++ int c = getc (mbf->fp); ++ if (c == EOF) ++ { ++ /* An incomplete multibyte character at the end. */ ++ mbf->eof_seen = true; ++ bytes = mbf->bufcount; ++ mbc->wc_valid = false; ++ break; ++ } ++ mbf->buf[mbf->bufcount] = (unsigned char) c; ++ mbf->bufcount++; ++ } ++ } ++ else ++ { ++ if (bytes == 0) ++ { ++ /* A null wide character was encountered. */ ++ bytes = 1; ++ assert (mbf->buf[0] == '\0'); ++ assert (mbc->wc == 0); ++ } ++ mbc->wc_valid = true; ++ break; ++ } ++ } ++ ++ /* Return the multibyte sequence mbf->buf[0..bytes-1]. */ ++ mbc->ptr = &mbc->buf[0]; ++ memcpy (&mbc->buf[0], &mbf->buf[0], bytes); ++ mbc->bytes = bytes; ++ ++ mbf->bufcount -= bytes; ++ if (mbf->bufcount > 0) ++ { ++ /* It's not worth calling memmove() for so few bytes. */ ++ unsigned int count = mbf->bufcount; ++ char *p = &mbf->buf[0]; ++ ++ do ++ { ++ *p = *(p + bytes); ++ p++; ++ } ++ while (--count > 0); ++ } ++ return; ++ ++eof: ++ /* An mbchar_t with bytes == 0 is used to indicate EOF. */ ++ mbc->ptr = NULL; ++ mbc->bytes = 0; ++ mbc->wc_valid = false; ++ return; ++} ++ ++MBFILE_INLINE void ++mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf) ++{ ++ mb_copy (&mbf->pushback, mbc); ++ mbf->have_pushback = true; ++} ++ ++typedef struct mbfile_multi mb_file_t; ++ ++typedef mbchar_t mbf_char_t; ++ ++#define mbf_init(mbf, stream) \ ++ ((mbf).fp = (stream), \ ++ (mbf).eof_seen = false, \ ++ (mbf).have_pushback = false, \ ++ memset (&(mbf).state, '\0', sizeof (mbstate_t)), \ ++ (mbf).bufcount = 0) ++ ++#define mbf_getc(mbc, mbf) mbfile_multi_getc (&(mbc), &(mbf)) ++ ++#define mbf_ungetc(mbc, mbf) mbfile_multi_ungetc (&(mbc), &(mbf)) ++ ++#define mb_iseof(mbc) ((mbc).bytes == 0) ++ ++#ifndef _GL_INLINE_HEADER_BEGIN ++ #error "Please include config.h first." ++#endif ++_GL_INLINE_HEADER_BEGIN ++ ++#endif /* _MBFILE_H */ +diff --git a/m4/mbfile.m4 b/m4/mbfile.m4 +new file mode 100644 +index 0000000..8589902 +--- /dev/null ++++ b/m4/mbfile.m4 +@@ -0,0 +1,14 @@ ++# mbfile.m4 serial 7 ++dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl autoconf tests required for use of mbfile.h ++dnl From Bruno Haible. ++ ++AC_DEFUN([gl_MBFILE], ++[ ++ AC_REQUIRE([AC_TYPE_MBSTATE_T]) ++ : ++]) +diff --git a/src/expand.c b/src/expand.c +index 9fa2e10..380e020 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -37,6 +37,9 @@ + #include <stdio.h> + #include <getopt.h> + #include <sys/types.h> ++ ++#include <mbfile.h> ++ + #include "system.h" + #include "die.h" + #include "xstrndup.h" +@@ -100,19 +103,19 @@ expand (void) + { + /* Input stream. */ + FILE *fp = next_file (NULL); ++ mb_file_t mbf; ++ mbf_char_t c; + + if (!fp) + return; + ++ mbf_init (mbf, fp); ++ + while (true) + { +- /* Input character, or EOF. */ +- int c; +- + /* If true, perform translations. */ + bool convert = true; + +- + /* The following variables have valid values only when CONVERT + is true: */ + +@@ -122,17 +125,23 @@ expand (void) + /* Index in TAB_LIST of next tab stop to examine. */ + size_t tab_index = 0; + +- + /* Convert a line of text. */ + + do + { +- while ((c = getc (fp)) < 0 && (fp = next_file (fp))) +- continue; ++ do { ++ mbf_getc (c, mbf); ++ if (mb_iseof (c)) ++ { ++ mbf_init (mbf, fp = next_file (fp)); ++ continue; ++ } ++ } ++ while (false); + + if (convert) + { +- if (c == '\t') ++ if (mb_iseq (c, '\t')) + { + /* Column the next input tab stop is on. */ + uintmax_t next_tab_column; +@@ -151,32 +160,34 @@ expand (void) + if (putchar (' ') < 0) + die (EXIT_FAILURE, errno, _("write error")); + +- c = ' '; ++ mb_setascii (&c, ' '); + } +- else if (c == '\b') ++ else if (mb_iseq (c, '\b')) + { + /* Go back one column, and force recalculation of the + next tab stop. */ + column -= !!column; + tab_index -= !!tab_index; + } +- else ++ /* A leading control character could make us trip over. */ ++ else if (!mb_iscntrl (c)) + { +- column++; ++ column += mb_width (c); + if (!column) + die (EXIT_FAILURE, 0, _("input line is too long")); + } + +- convert &= convert_entire_line || !! isblank (c); ++ convert &= convert_entire_line || mb_isblank (c); + } + +- if (c < 0) ++ if (mb_iseof (c)) + return; + +- if (putchar (c) < 0) ++ mb_putc (c, stdout); ++ if (ferror (stdout)) + die (EXIT_FAILURE, errno, _("write error")); + } +- while (c != '\n'); ++ while (!mb_iseq (c, '\n')); + } + } + +diff --git a/src/unexpand.c b/src/unexpand.c +index 7801274..569a7ee 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -38,6 +38,9 @@ + #include <stdio.h> + #include <getopt.h> + #include <sys/types.h> ++ ++#include <mbfile.h> ++ + #include "system.h" + #include "die.h" + #include "xstrndup.h" +@@ -107,11 +110,12 @@ unexpand (void) + { + /* Input stream. */ + FILE *fp = next_file (NULL); ++ mb_file_t mbf; + + /* The array of pending blanks. In non-POSIX locales, blanks can + include characters other than spaces, so the blanks must be + stored, not merely counted. */ +- char *pending_blank; ++ mbf_char_t *pending_blank; + + if (!fp) + return; +@@ -119,12 +123,14 @@ unexpand (void) + /* The worst case is a non-blank character, then one blank, then a + tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so + allocate MAX_COLUMN_WIDTH bytes to store the blanks. */ +- pending_blank = xmalloc (max_column_width); ++ pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t)); ++ ++ mbf_init (mbf, fp); + + while (true) + { + /* Input character, or EOF. */ +- int c; ++ mbf_char_t c; + + /* If true, perform translations. */ + bool convert = true; +@@ -158,12 +164,19 @@ unexpand (void) + + do + { +- while ((c = getc (fp)) < 0 && (fp = next_file (fp))) +- continue; ++ do { ++ mbf_getc (c, mbf); ++ if (mb_iseof (c)) ++ { ++ mbf_init (mbf, fp = next_file (fp)); ++ continue; ++ } ++ } ++ while (false); + + if (convert) + { +- bool blank = !! isblank (c); ++ bool blank = mb_isblank (c); + + if (blank) + { +@@ -180,16 +193,16 @@ unexpand (void) + if (next_tab_column < column) + die (EXIT_FAILURE, 0, _("input line is too long")); + +- if (c == '\t') ++ if (mb_iseq (c, '\t')) + { + column = next_tab_column; + + if (pending) +- pending_blank[0] = '\t'; ++ mb_setascii (&pending_blank[0], '\t'); + } + else + { +- column++; ++ column += mb_width (c); + + if (! (prev_blank && column == next_tab_column)) + { +@@ -197,13 +210,14 @@ unexpand (void) + will be replaced by tabs. */ + if (column == next_tab_column) + one_blank_before_tab_stop = true; +- pending_blank[pending++] = c; ++ mb_copy (&pending_blank[pending++], &c); + prev_blank = true; + continue; + } + + /* Replace the pending blanks by a tab or two. */ +- pending_blank[0] = c = '\t'; ++ mb_setascii (&c, '\t'); ++ mb_setascii (&pending_blank[0], '\t'); + } + + /* Discard pending blanks, unless it was a single +@@ -211,7 +225,7 @@ unexpand (void) + pending = one_blank_before_tab_stop; + } + } +- else if (c == '\b') ++ else if (mb_iseq (c, '\b')) + { + /* Go back one column, and force recalculation of the + next tab stop. */ +@@ -221,7 +235,7 @@ unexpand (void) + } + else + { +- column++; ++ column += mb_width (c); + if (!column) + die (EXIT_FAILURE, 0, _("input line is too long")); + } +@@ -229,8 +243,11 @@ unexpand (void) + if (pending) + { + if (pending > 1 && one_blank_before_tab_stop) +- pending_blank[0] = '\t'; +- if (fwrite (pending_blank, 1, pending, stdout) != pending) ++ mb_setascii (&pending_blank[0], '\t'); ++ ++ for (int n = 0; n < pending; ++n) ++ mb_putc (pending_blank[n], stdout); ++ if (ferror (stdout)) + die (EXIT_FAILURE, errno, _("write error")); + pending = 0; + one_blank_before_tab_stop = false; +@@ -240,16 +257,17 @@ unexpand (void) + convert &= convert_entire_line || blank; + } + +- if (c < 0) ++ if (mb_iseof (c)) + { + free (pending_blank); + return; + } + +- if (putchar (c) < 0) ++ mb_putc (c, stdout); ++ if (ferror (stdout)) + die (EXIT_FAILURE, errno, _("write error")); + } +- while (c != '\n'); ++ while (!mb_iseq (c, '\n')); + } + } + +diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh +new file mode 100755 +index 0000000..7971e18 +--- /dev/null ++++ b/tests/expand/mb.sh +@@ -0,0 +1,98 @@ ++#!/bin/sh ++ ++# Copyright (C) 2012-2015 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src ++print_ver_ expand ++ ++export LC_ALL=en_US.UTF-8 ++ ++#input containing multibyte characters ++cat <<\EOF > in || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ ++ ++cat <<\EOF > exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#test characters with display widths != 1 ++env printf '12345678 ++e\t|ascii(1) ++\u00E9\t|composed(1) ++e\u0301\t|decomposed(1) ++\u3000\t|ideo-space(2) ++\uFF0D\t|full-hypen(2) ++' > in || framework_failure_ ++ ++env printf '12345678 ++e |ascii(1) ++\u00E9 |composed(1) ++e\u0301 |decomposed(1) ++\u3000 |ideo-space(2) ++\uFF0D |full-hypen(2) ++' > exp || framework_failure_ ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#shouldn't fail with "input line too long" ++#when a line starts with a control character ++env printf '\n' > in || framework_failure_ ++ ++expand < in > out || fail=1 ++compare in out > /dev/null 2>&1 || fail=1 ++ ++#non-Unicode characters interspersed between Unicode ones ++env printf '12345678 ++\t\xFF| ++\xFF\t| ++\t\xFFä| ++ä\xFF\t| ++\tä\xFF| ++\xFF\tä| ++äbcdef\xFF\t| ++' > in || framework_failure_ ++ ++env printf '12345678 ++ \xFF| ++\xFF | ++ \xFFä| ++ä\xFF | ++ ä\xFF| ++\xFF ä| ++äbcdef\xFF | ++' > exp || framework_failure_ ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++exit $fail +diff --git a/tests/local.mk b/tests/local.mk +index 192f776..8053397 100644 +--- a/tests/local.mk ++++ b/tests/local.mk +@@ -544,6 +544,7 @@ all_tests = \ + tests/du/threshold.sh \ + tests/du/trailing-slash.sh \ + tests/du/two-args.sh \ ++ tests/expand/mb.sh \ + tests/id/gnu-zero-uids.sh \ + tests/id/no-context.sh \ + tests/id/context.sh \ +@@ -684,6 +685,7 @@ all_tests = \ + tests/touch/read-only.sh \ + tests/touch/relative.sh \ + tests/touch/trailing-slash.sh \ ++ tests/unexpand/mb.sh \ + $(all_root_tests) + + # See tests/factor/create-test.sh. +diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh +new file mode 100755 +index 0000000..60d4c1a +--- /dev/null ++++ b/tests/unexpand/mb.sh +@@ -0,0 +1,97 @@ ++#!/bin/sh ++ ++# Copyright (C) 2012-2015 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src ++print_ver_ unexpand ++ ++export LC_ALL=en_US.UTF-8 ++ ++#input containing multibyte characters ++cat > in <<\EOF ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++cat > exp <<\EOF ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#test characters with a display width larger than 1 ++ ++env printf '12345678 ++e |ascii(1) ++\u00E9 |composed(1) ++e\u0301 |decomposed(1) ++\u3000 |ideo-space(2) ++\uFF0D |full-hypen(2) ++' > in || framework_failure_ ++ ++env printf '12345678 ++e\t|ascii(1) ++\u00E9\t|composed(1) ++e\u0301\t|decomposed(1) ++\u3000\t|ideo-space(2) ++\uFF0D\t|full-hypen(2) ++' > exp || framework_failure_ ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#test input where a blank of width > 1 is not being substituted ++in="$(LC_ALL=en_US.UTF-8 printf ' \u3000 ö ü ß')" ++exp=' 　 ö ü ß' ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++#non-Unicode characters interspersed between Unicode ones ++env printf '12345678 ++ \xFF| ++\xFF | ++ \xFFä| ++ä\xFF | ++ ä\xFF| ++\xFF ä| ++äbcdef\xFF | ++' > in || framework_failure_ ++ ++env printf '12345678 ++\t\xFF| ++\xFF\t| ++\t\xFFä| ++ä\xFF\t| ++\tä\xFF| ++\xFF\tä| ++äbcdef\xFF\t| ++' > exp || framework_failure_ ++ ++unexpand -a < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 +-- +2.7.4 + diff --git a/coreutils/patches/coreutils-i18n-fix-unexpand.patch b/coreutils/patches/coreutils-i18n-fix-unexpand.patch new file mode 100644 index 000000000..f0c347cd2 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-fix-unexpand.patch @@ -0,0 +1,28 @@ +From 02424bfcd719bbaa695f4e1c3ef17ad91b0d23c0 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel <lkundrak(a)v3.sk> +Date: Thu, 28 Jan 2016 20:57:22 +0100 +Subject: [PATCH] unexpand: fix blank line handling + + echo '' |./src/unexpand -a + +Really? +--- + src/unexpand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unexpand.c b/src/unexpand.c +index 569a7ee..3bbbd66 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -233,7 +233,7 @@ unexpand (void) + next_tab_column = column; + tab_index -= !!tab_index; + } +- else ++ else if (!mb_iseq (c, '\n')) + { + column += mb_width (c); + if (!column) +-- +2.7.4 + diff --git a/coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch b/coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch new file mode 100644 index 000000000..b34d7b74f --- /dev/null +++ b/coreutils/patches/coreutils-i18n-fix2-expand-unexpand.patch @@ -0,0 +1,108 @@ +diff --git a/src/expand.c b/src/expand.c +index 380e020..310b349 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -129,15 +129,19 @@ expand (void) + + do + { +- do { ++ while (true) { + mbf_getc (c, mbf); +- if (mb_iseof (c)) ++ if ((mb_iseof (c)) && (fp = next_file (fp))) + { +- mbf_init (mbf, fp = next_file (fp)); ++ mbf_init (mbf, fp); + continue; + } ++ else ++ { ++ break; ++ } + } +- while (false); ++ + + if (convert) + { +diff --git a/src/unexpand.c b/src/unexpand.c +index 3bbbd66..863a90a 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -164,15 +164,19 @@ unexpand (void) + + do + { +- do { ++ while (true) { + mbf_getc (c, mbf); +- if (mb_iseof (c)) ++ if ((mb_iseof (c)) && (fp = next_file (fp))) + { +- mbf_init (mbf, fp = next_file (fp)); ++ mbf_init (mbf, fp); + continue; + } ++ else ++ { ++ break; ++ } + } +- while (false); ++ + + if (convert) + { +diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh +index 7971e18..031be7a 100755 +--- a/tests/expand/mb.sh ++++ b/tests/expand/mb.sh +@@ -44,6 +44,20 @@ EOF + expand < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 + ++#multiple files as an input ++cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++expand ./in ./in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ + #test characters with display widths != 1 + env printf '12345678 + e\t|ascii(1) +diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh +index 60d4c1a..8d75652 100755 +--- a/tests/unexpand/mb.sh ++++ b/tests/unexpand/mb.sh +@@ -44,6 +44,22 @@ EOF + unexpand -a < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 + ++ ++#multiple files as an input ++cat >> exp <<\EOF ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++ ++unexpand -a ./in ./in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ + #test characters with a display width larger than 1 + + env printf '12345678 diff --git a/coreutils/patches/coreutils-i18n-fold-newline.patch b/coreutils/patches/coreutils-i18n-fold-newline.patch new file mode 100644 index 000000000..f7286efe0 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-fold-newline.patch @@ -0,0 +1,80 @@ +From ff424639fe863cbd6963add1a79b97290c1606c6 Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Fri, 3 Feb 2017 12:26:53 +0100 +Subject: [PATCH] fold.c: preserve new-lines in mutlibyte text + +--- + src/fold.c | 49 ++++++++++++++++++++++++------------------------- + 1 file changed, 24 insertions(+), 25 deletions(-) + +diff --git a/src/fold.c b/src/fold.c +index d23edd5..8c232a7 100644 +--- a/src/fold.c ++++ b/src/fold.c +@@ -342,39 +342,38 @@ fold_multibyte_text (FILE *istream, size_t width, int *saved_errno) + } + + rescan: +- if (operating_mode == byte_mode) /* byte mode */ ++ if (convfail) ++ increment = 1; ++ else if (wc == L'\n') ++ { ++ /* preserve newline */ ++ fwrite (line_out, sizeof(char), offset_out, stdout); ++ START_NEW_LINE; ++ continue; ++ } ++ else if (operating_mode == byte_mode) /* byte mode */ + increment = mblength; + else if (operating_mode == character_mode) /* character mode */ + increment = 1; +- else /* column mode */ ++ else /* column mode */ + { +- if (convfail) +- increment = 1; +- else ++ switch (wc) + { +- switch (wc) +- { +- case L'\n': +- fwrite (line_out, sizeof(char), offset_out, stdout); +- START_NEW_LINE; +- continue; ++ case L'\b': ++ increment = (column > 0) ? -1 : 0; ++ break; + +- case L'\b': +- increment = (column > 0) ? -1 : 0; +- break; ++ case L'\r': ++ increment = -1 * column; ++ break; + +- case L'\r': +- increment = -1 * column; +- break; ++ case L'\t': ++ increment = 8 - column % 8; ++ break; + +- case L'\t': +- increment = 8 - column % 8; +- break; +- +- default: +- increment = wcwidth (wc); +- increment = (increment < 0) ? 0 : increment; +- } ++ default: ++ increment = wcwidth (wc); ++ increment = (increment < 0) ? 0 : increment; + } + } + +-- +2.7.4 + diff --git a/coreutils/patches/coreutils-i18n-sort-human.patch b/coreutils/patches/coreutils-i18n-sort-human.patch new file mode 100644 index 000000000..675249315 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-sort-human.patch @@ -0,0 +1,35 @@ +From 3976ef5a20369d8b490907ab2cba2d617305a5e0 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka(a)redhat.com> +Date: Mon, 30 May 2016 16:19:20 +0200 +Subject: [PATCH] sort: do not use static array 'blanks' in human_numcompare() + +... because the array is not initialized with MB locales. Note this is +rather a conservative fix. I plan to do more cleanup of the i18n patch +in Fedora to prevent mistakes like this in future updates of coreutils. +--- + src/sort.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/sort.c b/src/sort.c +index 9e07ad8..e47b039 100644 +--- a/src/sort.c ++++ b/src/sort.c +@@ -2304,12 +2304,10 @@ find_unit_order (char const *number) + <none/unknown> < K/k < M < G < T < P < E < Z < Y */ + + static int +-human_numcompare (char const *a, char const *b) ++human_numcompare (char *a, char *b) + { +- while (blanks[to_uchar (*a)]) +- a++; +- while (blanks[to_uchar (*b)]) +- b++; ++ skipblanks(&a, a + strlen(a)); ++ skipblanks(&b, b + strlen(b)); + + int diff = find_unit_order (a) - find_unit_order (b); + return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep)); +-- +2.5.5 + diff --git a/coreutils/patches/coreutils-i18n-un-expand-BOM.patch b/coreutils/patches/coreutils-i18n-un-expand-BOM.patch new file mode 100644 index 000000000..6210ce7e8 --- /dev/null +++ b/coreutils/patches/coreutils-i18n-un-expand-BOM.patch @@ -0,0 +1,456 @@ +From 7a7c776a4e228d180e74614fd8c8afcad5d4bdf7 Mon Sep 17 00:00:00 2001 +From: Jakub Martisko <jamartis(a)redhat.com> +Date: Thu, 7 Jul 2016 12:53:26 +0200 +Subject: [PATCH] coreutils-i18n-un-expand-BOM.patch + +--- + src/expand-common.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/expand-common.h | 12 ++++++ + src/expand.c | 45 +++++++++++++++++++- + src/unexpand.c | 43 ++++++++++++++++++- + tests/expand/mb.sh | 71 ++++++++++++++++++++++++++++++++ + tests/unexpand/mb.sh | 59 ++++++++++++++++++++++++++ + 6 files changed, 342 insertions(+), 2 deletions(-) + +diff --git a/src/expand-common.c b/src/expand-common.c +index 4657e46..97cbb09 100644 +--- a/src/expand-common.c ++++ b/src/expand-common.c +@@ -19,6 +19,7 @@ + #include <assert.h> + #include <stdio.h> + #include <sys/types.h> ++#include <mbfile.h> + #include "system.h" + #include "die.h" + #include "error.h" +@@ -126,6 +127,119 @@ set_increment_size (uintmax_t tabval) + return ok; + } + ++extern int ++set_utf_locale (void) ++{ ++ /*try using some predefined locale */ ++ const char* predef_locales[] = {"C.UTF8","en_US.UTF8","en_GB.UTF8"}; ++ ++ const int predef_locales_count=3; ++ for (int i=0;i<predef_locales_count;i++) ++ { ++ if (setlocale(LC_ALL,predef_locales[i])!=NULL) ++ { ++ break; ++ } ++ else if (i==predef_locales_count-1) ++ { ++ return 1; ++ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); ++ } ++ } ++ return 0; ++} ++ ++extern bool ++check_utf_locale(void) ++{ ++ char* locale = setlocale (LC_CTYPE , NULL); ++ if (locale == NULL) ++ { ++ return false; ++ } ++ else if (strcasestr(locale, "utf8") == NULL && strcasestr(locale, "utf-8") == NULL) ++ { ++ return false; ++ } ++ return true; ++} ++ ++extern bool ++check_bom(FILE* fp, mb_file_t *mbf) ++{ ++ int c; ++ ++ ++ c=fgetc(fp); ++ ++ /*test BOM header of the first file */ ++ mbf->bufcount=0; ++ if (c == 0xEF) ++ { ++ c=fgetc(fp); ++ } ++ else ++ { ++ if (c != EOF) ++ { ++ ungetc(c,fp); ++ } ++ return false; ++ } ++ ++ if (c == 0xBB) ++ { ++ c=fgetc(fp); ++ } ++ else ++ { ++ if ( c!= EOF ) ++ { ++ mbf->buf[0]=(unsigned char) 0xEF; ++ mbf->bufcount=1; ++ ungetc(c,fp); ++ return false; ++ } ++ else ++ { ++ ungetc(0xEF,fp); ++ return false; ++ } ++ } ++ if (c == 0xBF) ++ { ++ mbf->bufcount=0; ++ return true; ++ } ++ else ++ { ++ if (c != EOF) ++ { ++ mbf->buf[0]=(unsigned char) 0xEF; ++ mbf->buf[1]=(unsigned char) 0xBB; ++ mbf->bufcount=2; ++ ungetc(c,fp); ++ return false; ++ } ++ else ++ { ++ mbf->buf[0]=(unsigned char) 0xEF; ++ mbf->bufcount=1; ++ ungetc(0xBB,fp); ++ return false; ++ } ++ } ++ return false; ++} ++ ++extern void ++print_bom(void) ++{ ++ putc (0xEF, stdout); ++ putc (0xBB, stdout); ++ putc (0xBF, stdout); ++} ++ + /* Add the comma or blank separated list of tab stops STOPS + to the list of tab stops. */ + extern void +diff --git a/src/expand-common.h b/src/expand-common.h +index 8cb2079..763bfda 100644 +--- a/src/expand-common.h ++++ b/src/expand-common.h +@@ -34,6 +34,18 @@ extern size_t max_column_width; + /* The desired exit status. */ + extern int exit_status; + ++extern int ++set_utf_locale (void); ++ ++extern bool ++check_utf_locale(void); ++ ++extern bool ++check_bom(FILE* fp, mb_file_t *mbf); ++ ++extern void ++print_bom(void); ++ + /* Add tab stop TABVAL to the end of 'tab_list'. */ + extern void + add_tab_stop (uintmax_t tabval); +diff --git a/src/expand.c b/src/expand.c +index 310b349..4136824 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -103,11 +103,33 @@ expand (void) + FILE *fp = next_file (NULL); + mb_file_t mbf; + mbf_char_t c; ++ /* True if the starting locale is utf8. */ ++ bool using_utf_locale; ++ ++ /* True if the first file contains BOM header. */ ++ bool found_bom; ++ using_utf_locale=check_utf_locale(); + + if (!fp) + return; +- + mbf_init (mbf, fp); ++ found_bom=check_bom(fp,&mbf); ++ ++ if (using_utf_locale == false && found_bom == true) ++ { ++ /*try using some predefined locale */ ++ ++ if (set_utf_locale () != 0) ++ { ++ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); ++ } ++ } ++ ++ ++ if (found_bom == true) ++ { ++ print_bom(); ++ } + + while (true) + { +@@ -132,6 +154,27 @@ expand (void) + if ((mb_iseof (c)) && (fp = next_file (fp))) + { + mbf_init (mbf, fp); ++ if (fp!=NULL) ++ { ++ if (check_bom(fp,&mbf)==true) ++ { ++ /*Not the first file - check BOM header*/ ++ if (using_utf_locale==false && found_bom==false) ++ { ++ /*BOM header in subsequent file but not in the first one. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ else ++ { ++ if(using_utf_locale==false && found_bom==true) ++ { ++ /*First file conatined BOM header - locale was switched to UTF ++ *all subsequent files should contain BOM. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ } + continue; + } + else +diff --git a/src/unexpand.c b/src/unexpand.c +index 863a90a..5681b58 100644 +--- a/src/unexpand.c ++++ b/src/unexpand.c +@@ -116,16 +116,36 @@ unexpand (void) + include characters other than spaces, so the blanks must be + stored, not merely counted. */ + mbf_char_t *pending_blank; ++ /* True if the starting locale is utf8. */ ++ bool using_utf_locale; ++ ++ /* True if the first file contains BOM header. */ ++ bool found_bom; ++ using_utf_locale=check_utf_locale(); + + if (!fp) + return; ++ mbf_init (mbf, fp); ++ found_bom=check_bom(fp,&mbf); ++ ++ if (using_utf_locale == false && found_bom == true) ++ { ++ /*try using some predefined locale */ + ++ if (set_utf_locale () != 0) ++ { ++ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); ++ } ++ } + /* The worst case is a non-blank character, then one blank, then a + tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so + allocate MAX_COLUMN_WIDTH bytes to store the blanks. */ + pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t)); + +- mbf_init (mbf, fp); ++ if (found_bom == true) ++ { ++ print_bom(); ++ } + + while (true) + { +@@ -169,6 +189,27 @@ unexpand (void) + if ((mb_iseof (c)) && (fp = next_file (fp))) + { + mbf_init (mbf, fp); ++ if (fp!=NULL) ++ { ++ if (check_bom(fp,&mbf)==true) ++ { ++ /*Not the first file - check BOM header*/ ++ if (using_utf_locale==false && found_bom==false) ++ { ++ /*BOM header in subsequent file but not in the first one. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ else ++ { ++ if(using_utf_locale==false && found_bom==true) ++ { ++ /*First file conatined BOM header - locale was switched to UTF ++ *all subsequent files should contain BOM. */ ++ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); ++ } ++ } ++ } + continue; + } + else +diff --git a/tests/expand/mb.sh b/tests/expand/mb.sh +index 031be7a..1621c84 100755 +--- a/tests/expand/mb.sh ++++ b/tests/expand/mb.sh +@@ -109,4 +109,75 @@ env printf '12345678 + expand < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 + ++ ++ ++#BOM header test 1 ++printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ ++ ++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++ ++expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C expand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++ ++printf '\xEF\xBB\xBF' > in1; cat <<\EOF >> in1 || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in1 || framework_failure_ ++ ++ ++printf '\xEF\xBB\xBF' > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++expand in1 in1 > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C expand in1 in1 > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C expand in1 in1 > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ + exit $fail +diff --git a/tests/unexpand/mb.sh b/tests/unexpand/mb.sh +index 8d75652..9d4ee3e 100755 +--- a/tests/unexpand/mb.sh ++++ b/tests/unexpand/mb.sh +@@ -111,3 +111,62 @@ env printf '12345678 + + unexpand -a < in > out || fail=1 + compare exp out > /dev/null 2>&1 || fail=1 ++ ++#BOM header test 1 ++printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ ++ ++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++unexpand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C unexpand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C unexpand < in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++ ++printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++1234567812345678123456781 ++. . . . ++a b c d ++. . . . ++ä ö ü ß ++. . . . ++ äöü . öüä. ä xx ++EOF ++ ++ ++unexpand in in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LANG=C unexpand in in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 ++ ++LC_ALL=C unexpand in in > out || fail=1 ++compare exp out > /dev/null 2>&1 || fail=1 +-- +2.9.3 + diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch index d7cf59ce1..e3428d933 100644 --- a/coreutils/patches/coreutils-i18n.patch +++ b/coreutils/patches/coreutils-i18n.patch @@ -13,7 +13,6 @@ TODO: merge upstream src/uniq.c | 265 ++++++++++++++- tests/i18n/sort.sh | 29 ++ tests/local.mk | 2 + - tests/misc/cut.pl | 7 +- tests/misc/expand.pl | 42 +++ tests/misc/fold.pl | 50 ++- tests/misc/join.pl | 50 +++ @@ -23,9 +22,9 @@ TODO: merge upstream tests/misc/unexpand.pl | 39 +++ tests/misc/uniq.pl | 55 ++++ tests/pr/pr-tests.pl | 49 +++ - 18 files changed, 2435 insertions(+), 162 deletions(-) - create mode 100644 tests/i18n/sort.sh - create mode 100644 tests/misc/sort-mb-tests.sh + 17 files changed, 2430 insertions(+), 160 deletions(-) + create mode 100755 tests/i18n/sort.sh + create mode 100755 tests/misc/sort-mb-tests.sh diff --git a/lib/linebuffer.h b/lib/linebuffer.h index 64181af..9b8fe5a 100644 @@ -315,7 +314,7 @@ index 8cd0d6b..d23edd5 100644 + fwrite (line_out, sizeof(char), offset_out, stdout); + START_NEW_LINE; + continue; -+ ++ + case L'\b': + increment = (column > 0) ? -1 : 0; + break; @@ -672,7 +671,7 @@ index 98b461c..9990f38 100644 + extract_field (line, ptr, lim - ptr); +} +#endif -+ ++ static void freeline (struct line *line) { @@ -845,7 +844,7 @@ index 98b461c..9990f38 100644 xfields (line); if (prevline[which - 1]) -@@ -567,21 +807,28 @@ prfield (size_t n, struct line const *line) +@@ -563,21 +803,28 @@ prfield (size_t n, struct line const *line) /* Output all the fields in line, other than the join field. */ @@ -877,7 +876,7 @@ index 98b461c..9990f38 100644 prfield (i, line); } } -@@ -592,7 +839,6 @@ static void +@@ -588,7 +835,6 @@ static void prjoin (struct line const *line1, struct line const *line2) { const struct outlist *outlist; @@ -885,7 +884,7 @@ index 98b461c..9990f38 100644 size_t field; struct line const *line; -@@ -626,7 +872,7 @@ prjoin (struct line const *line1, struct line const *line2) +@@ -622,7 +868,7 @@ prjoin (struct line const *line1, struct line const *line2) o = o->next; if (o == NULL) break; @@ -894,7 +893,7 @@ index 98b461c..9990f38 100644 } putchar (eolchar); } -@@ -1104,20 +1350,43 @@ main (int argc, char **argv) +@@ -1099,20 +1345,43 @@ main (int argc, char **argv) case 't': { @@ -1171,7 +1170,7 @@ index 26f221f..633f50e 100644 use_col_separator = true; if (optarg) separator_string (optarg); -@@ -1166,10 +1250,45 @@ getoptnum (const char *n_str, int min, int *num, const char *err) +@@ -1165,10 +1249,45 @@ getoptnum (const char *n_str, int min, int *num, const char *err) a number. */ static void @@ -1219,7 +1218,7 @@ index 26f221f..633f50e 100644 if (*arg) { long int tmp_long; -@@ -1191,6 +1310,11 @@ static void +@@ -1190,6 +1309,11 @@ static void init_parameters (int number_of_files) { int chars_used_by_number = 0; @@ -1231,7 +1230,7 @@ index 26f221f..633f50e 100644 lines_per_body = lines_per_page - lines_per_header - lines_per_footer; if (lines_per_body <= 0) -@@ -1228,7 +1352,7 @@ init_parameters (int number_of_files) +@@ -1227,7 +1351,7 @@ init_parameters (int number_of_files) else col_sep_string = column_separator; @@ -1240,7 +1239,7 @@ index 26f221f..633f50e 100644 use_col_separator = true; } /* It's rather pointless to define a TAB separator with column -@@ -1258,11 +1382,11 @@ init_parameters (int number_of_files) +@@ -1257,11 +1381,11 @@ init_parameters (int number_of_files) + TAB_WIDTH (chars_per_input_tab, chars_per_number); */ /* Estimate chars_per_text without any margin and keep it constant. */ @@ -1254,7 +1253,7 @@ index 26f221f..633f50e 100644 /* The number is part of the column width unless we are printing files in parallel. */ -@@ -1271,7 +1395,7 @@ init_parameters (int number_of_files) +@@ -1270,7 +1394,7 @@ init_parameters (int number_of_files) } int sep_chars, useful_chars; @@ -1263,7 +1262,7 @@ index 26f221f..633f50e 100644 sep_chars = INT_MAX; if (INT_SUBTRACT_WRAPV (chars_per_line - chars_used_by_number, sep_chars, &useful_chars)) -@@ -1294,7 +1418,7 @@ init_parameters (int number_of_files) +@@ -1293,7 +1417,7 @@ init_parameters (int number_of_files) We've to use 8 as the lower limit, if we use chars_per_default_tab = 8 to expand a tab which is not an input_tab-char. */ free (clump_buff); @@ -1272,7 +1271,7 @@ index 26f221f..633f50e 100644 } /* Open the necessary files, -@@ -1402,7 +1526,7 @@ init_funcs (void) +@@ -1399,7 +1523,7 @@ init_funcs (void) /* Enlarge p->start_position of first column to use the same form of padding_not_printed with all columns. */ @@ -1281,7 +1280,7 @@ index 26f221f..633f50e 100644 /* This loop takes care of all but the rightmost column. */ -@@ -1436,7 +1560,7 @@ init_funcs (void) +@@ -1433,7 +1557,7 @@ init_funcs (void) } else { @@ -1290,7 +1289,7 @@ index 26f221f..633f50e 100644 h_next = h + chars_per_column; } } -@@ -1727,9 +1851,9 @@ static void +@@ -1724,9 +1848,9 @@ static void align_column (COLUMN *p) { padding_not_printed = p->start_position; @@ -1302,7 +1301,7 @@ index 26f221f..633f50e 100644 padding_not_printed = ANYWHERE; } -@@ -2004,13 +2128,13 @@ store_char (char c) +@@ -2001,13 +2125,13 @@ store_char (char c) /* May be too generous. */ buff = X2REALLOC (buff, &buff_allocated); } @@ -1318,7 +1317,7 @@ index 26f221f..633f50e 100644 char *s; int num_width; -@@ -2027,22 +2151,24 @@ add_line_number (COLUMN *p) +@@ -2024,22 +2148,24 @@ add_line_number (COLUMN *p) /* Tabification is assumed for multiple columns, also for n-separators, but 'default n-separator = TAB' hasn't been given priority over equal column_width also specified by POSIX. */ @@ -1347,7 +1346,7 @@ index 26f221f..633f50e 100644 output_position = POS_AFTER_TAB (chars_per_output_tab, output_position); } -@@ -2203,7 +2329,7 @@ print_white_space (void) +@@ -2198,7 +2324,7 @@ print_white_space (void) while (goal - h_old > 1 && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal) { @@ -1356,7 +1355,7 @@ index 26f221f..633f50e 100644 h_old = h_new; } while (++h_old <= goal) -@@ -2223,6 +2349,7 @@ print_sep_string (void) +@@ -2218,6 +2344,7 @@ print_sep_string (void) { char const *s = col_sep_string; int l = col_sep_length; @@ -1364,7 +1363,7 @@ index 26f221f..633f50e 100644 if (separators_not_printed <= 0) { -@@ -2234,6 +2361,7 @@ print_sep_string (void) +@@ -2229,6 +2356,7 @@ print_sep_string (void) { for (; separators_not_printed > 0; --separators_not_printed) { @@ -1372,7 +1371,7 @@ index 26f221f..633f50e 100644 while (l-- > 0) { /* 3 types of sep_strings: spaces only, spaces and chars, -@@ -2247,12 +2375,15 @@ print_sep_string (void) +@@ -2242,12 +2370,15 @@ print_sep_string (void) } else { @@ -1389,7 +1388,7 @@ index 26f221f..633f50e 100644 /* sep_string ends with some spaces */ if (spaces_not_printed > 0) print_white_space (); -@@ -2280,7 +2411,7 @@ print_clump (COLUMN *p, int n, char *clump) +@@ -2275,7 +2406,7 @@ print_clump (COLUMN *p, int n, char *clump) required number of tabs and spaces. */ static void @@ -1398,7 +1397,7 @@ index 26f221f..633f50e 100644 { if (tabify_output) { -@@ -2304,6 +2435,74 @@ print_char (char c) +@@ -2299,6 +2430,74 @@ print_char (char c) putchar (c); } @@ -1473,7 +1472,7 @@ index 26f221f..633f50e 100644 /* Skip to page PAGE before printing. PAGE may be larger than total number of pages. */ -@@ -2483,9 +2682,9 @@ read_line (COLUMN *p) +@@ -2476,9 +2675,9 @@ read_line (COLUMN *p) align_empty_cols = false; } @@ -1485,8 +1484,8 @@ index 26f221f..633f50e 100644 padding_not_printed = ANYWHERE; } -@@ -2555,7 +2754,7 @@ print_stored (COLUMN *p) - int i; +@@ -2547,7 +2746,7 @@ print_stored (COLUMN *p) + COLUMN *q; int line = p->current_line++; - char *first = &buff[line_vector[line]]; @@ -1494,7 +1493,7 @@ index 26f221f..633f50e 100644 /* FIXME UMR: Uninitialized memory read: * This is occurring while in: -@@ -2567,7 +2766,7 @@ print_stored (COLUMN *p) +@@ -2559,7 +2758,7 @@ print_stored (COLUMN *p) xmalloc [xmalloc.c:94] init_store_cols [pr.c:1648] */ @@ -1503,7 +1502,7 @@ index 26f221f..633f50e 100644 pad_vertically = true; -@@ -2586,9 +2785,9 @@ print_stored (COLUMN *p) +@@ -2579,9 +2778,9 @@ print_stored (COLUMN *p) } } @@ -1515,7 +1514,7 @@ index 26f221f..633f50e 100644 padding_not_printed = ANYWHERE; } -@@ -2601,8 +2800,8 @@ print_stored (COLUMN *p) +@@ -2594,8 +2793,8 @@ print_stored (COLUMN *p) if (spaces_not_printed == 0) { output_position = p->start_position + end_vector[line]; @@ -1526,7 +1525,7 @@ index 26f221f..633f50e 100644 } return true; -@@ -2621,7 +2820,7 @@ print_stored (COLUMN *p) +@@ -2614,7 +2813,7 @@ print_stored (COLUMN *p) number of characters is 1.) */ static int @@ -1535,7 +1534,7 @@ index 26f221f..633f50e 100644 { unsigned char uc = c; char *s = clump_buff; -@@ -2631,10 +2830,10 @@ char_to_clump (char c) +@@ -2624,10 +2823,10 @@ char_to_clump (char c) int chars; int chars_per_c = 8; @@ -1548,7 +1547,7 @@ index 26f221f..633f50e 100644 { width = TAB_WIDTH (chars_per_c, input_position); -@@ -2715,6 +2914,164 @@ char_to_clump (char c) +@@ -2708,6 +2907,164 @@ char_to_clump (char c) return chars; } @@ -1732,7 +1731,7 @@ index 6d2eec5..f189a0d 100644 #include "system.h" #include "argmatch.h" #include "die.h" -@@ -165,14 +173,39 @@ static int decimal_point; +@@ -161,14 +169,39 @@ static int decimal_point; /* Thousands separator; if -1, then there isn't one. */ static int thousands_sep; @@ -1773,7 +1772,7 @@ index 6d2eec5..f189a0d 100644 /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -346,13 +379,11 @@ static bool reverse; +@@ -342,13 +375,11 @@ static bool reverse; they were read if all keys compare equal. */ static bool stable; @@ -1790,7 +1789,7 @@ index 6d2eec5..f189a0d 100644 /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -811,6 +842,46 @@ reap_all (void) +@@ -806,6 +837,46 @@ reap_all (void) reap (-1); } @@ -1837,7 +1836,7 @@ index 6d2eec5..f189a0d 100644 /* Clean up any remaining temporary files. */ static void -@@ -1255,7 +1326,7 @@ zaptemp (char const *name) +@@ -1274,7 +1345,7 @@ zaptemp (char const *name) free (node); } @@ -1846,7 +1845,7 @@ index 6d2eec5..f189a0d 100644 static int struct_month_cmp (void const *m1, void const *m2) -@@ -1270,7 +1341,7 @@ struct_month_cmp (void const *m1, void const *m2) +@@ -1289,7 +1360,7 @@ struct_month_cmp (void const *m1, void const *m2) /* Initialize the character class tables. */ static void @@ -1855,7 +1854,7 @@ index 6d2eec5..f189a0d 100644 { size_t i; -@@ -1282,7 +1353,7 @@ inittables (void) +@@ -1301,7 +1372,7 @@ inittables (void) fold_toupper[i] = toupper (i); } @@ -1864,7 +1863,7 @@ index 6d2eec5..f189a0d 100644 /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -1364,6 +1435,84 @@ specify_nmerge (int oi, char c, char const *s) +@@ -1383,6 +1454,84 @@ specify_nmerge (int oi, char c, char const *s) xstrtol_fatal (e, oi, c, long_options, s); } @@ -1949,7 +1948,7 @@ index 6d2eec5..f189a0d 100644 /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (int oi, char c, char const *s) -@@ -1597,7 +1746,7 @@ buffer_linelim (struct buffer const *buf) +@@ -1614,7 +1763,7 @@ buffer_linelim (struct buffer const *buf) by KEY in LINE. */ static char * @@ -1958,7 +1957,7 @@ index 6d2eec5..f189a0d 100644 { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -1606,10 +1755,10 @@ begfield (struct line const *line, struct keyfield const *key) +@@ -1623,10 +1772,10 @@ begfield (struct line const *line, struct keyfield const *key) /* The leading field separator itself is included in a field when -t is absent. */ @@ -1971,7 +1970,7 @@ index 6d2eec5..f189a0d 100644 ++ptr; if (ptr < lim) ++ptr; -@@ -1635,11 +1784,70 @@ begfield (struct line const *line, struct keyfield const *key) +@@ -1652,11 +1801,70 @@ begfield (struct line const *line, struct keyfield const *key) return ptr; } @@ -2043,7 +2042,7 @@ index 6d2eec5..f189a0d 100644 { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -1654,10 +1862,10 @@ limfield (struct line const *line, struct keyfield const *key) +@@ -1671,10 +1879,10 @@ limfield (struct line const *line, struct keyfield const *key) 'beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first 'blank' character after the preceding field. */ @@ -2056,7 +2055,7 @@ index 6d2eec5..f189a0d 100644 ++ptr; if (ptr < lim && (eword || echar)) ++ptr; -@@ -1703,10 +1911,10 @@ limfield (struct line const *line, struct keyfield const *key) +@@ -1720,10 +1928,10 @@ limfield (struct line const *line, struct keyfield const *key) */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -2069,7 +2068,7 @@ index 6d2eec5..f189a0d 100644 if (newlim) lim = newlim; } -@@ -1737,6 +1945,130 @@ limfield (struct line const *line, struct keyfield const *key) +@@ -1754,6 +1962,130 @@ limfield (struct line const *line, struct keyfield const *key) return ptr; } @@ -2200,7 +2199,7 @@ index 6d2eec5..f189a0d 100644 /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1823,8 +2155,22 @@ fillbuf (struct buffer *buf, FILE *fp, char const *file) +@@ -1840,8 +2172,22 @@ fillbuf (struct buffer *buf, FILE *fp, char const *file) else { if (key->skipsblanks) @@ -2225,7 +2224,7 @@ index 6d2eec5..f189a0d 100644 line->keybeg = line_start; } } -@@ -1974,7 +2320,7 @@ human_numcompare (char const *a, char const *b) +@@ -1991,7 +2337,7 @@ human_numcompare (char const *a, char const *b) hideously fast. */ static int @@ -2234,7 +2233,7 @@ index 6d2eec5..f189a0d 100644 { while (blanks[to_uchar (*a)]) a++; -@@ -1984,6 +2330,25 @@ numcompare (char const *a, char const *b) +@@ -2001,6 +2347,25 @@ numcompare (char const *a, char const *b) return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -2259,8 +2258,8 @@ index 6d2eec5..f189a0d 100644 + /* Work around a problem whereby the long double value returned by glibc's strtold ("NaN", ...) contains uninitialized bits: clear all bytes of - A and B before calling strtold. FIXME: remove this function once -@@ -2034,7 +2399,7 @@ general_numcompare (char const *sa, char const *sb) + A and B before calling strtold. FIXME: remove this function if +@@ -2051,7 +2416,7 @@ general_numcompare (char const *sa, char const *sb) Return 0 if the name in S is not recognized. */ static int @@ -2269,7 +2268,7 @@ index 6d2eec5..f189a0d 100644 { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -2310,15 +2675,14 @@ debug_key (struct line const *line, struct keyfield const *key) +@@ -2327,15 +2692,14 @@ debug_key (struct line const *line, struct keyfield const *key) char saved = *lim; *lim = '\0'; @@ -2287,7 +2286,7 @@ index 6d2eec5..f189a0d 100644 else if (key->general_numeric) ignore_value (strtold (beg, &tighter_lim)); else if (key->numeric || key->human_numeric) -@@ -2452,7 +2816,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) +@@ -2469,7 +2833,7 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) /* Warn about significant leading blanks. */ bool implicit_skip = key_numeric (key) || key->month; bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ @@ -2296,7 +2295,7 @@ index 6d2eec5..f189a0d 100644 && ((!key->skipsblanks && !implicit_skip) || (!key->skipsblanks && key->schar) || (!key->skipeblanks && key->echar))) -@@ -2510,11 +2874,87 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) +@@ -2527,11 +2891,87 @@ key_warnings (struct keyfield const *gkey, bool gkey_only) error (0, 0, _("option '-r' only applies to last-resort comparison")); } @@ -2385,7 +2384,7 @@ index 6d2eec5..f189a0d 100644 { struct keyfield *key = keylist; -@@ -2599,7 +3039,7 @@ keycompare (struct line const *a, struct line const *b) +@@ -2616,7 +3056,7 @@ keycompare (struct line const *a, struct line const *b) else if (key->human_numeric) diff = human_numcompare (ta, tb); else if (key->month) @@ -2394,7 +2393,7 @@ index 6d2eec5..f189a0d 100644 else if (key->random) diff = compare_random (ta, tlena, tb, tlenb); else if (key->version) -@@ -2715,6 +3155,211 @@ keycompare (struct line const *a, struct line const *b) +@@ -2732,6 +3172,211 @@ keycompare (struct line const *a, struct line const *b) return key->reverse ? -diff : diff; } @@ -2606,16 +2605,16 @@ index 6d2eec5..f189a0d 100644 /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -2742,7 +3387,7 @@ compare (struct line const *a, struct line const *b) +@@ -2759,7 +3404,7 @@ compare (struct line const *a, struct line const *b) diff = - NONZERO (blen); else if (blen == 0) diff = 1; - else if (hard_LC_COLLATE) + else if (hard_LC_COLLATE && !folding) { - /* Note xmemcoll0 is a performance enhancement as + /* xmemcoll0 is a performance enhancement as it will not unconditionally write '\0' after the -@@ -4139,6 +4784,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype) +@@ -4149,6 +4794,7 @@ set_ordering (char const *s, struct keyfield *key, enum blanktype blanktype) break; case 'f': key->translate = fold_toupper; @@ -2623,7 +2622,7 @@ index 6d2eec5..f189a0d 100644 break; case 'g': key->general_numeric = true; -@@ -4218,7 +4864,7 @@ main (int argc, char **argv) +@@ -4228,7 +4874,7 @@ main (int argc, char **argv) initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -2632,7 +2631,7 @@ index 6d2eec5..f189a0d 100644 hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -4239,6 +4885,29 @@ main (int argc, char **argv) +@@ -4249,6 +4895,29 @@ main (int argc, char **argv) thousands_sep = -1; } @@ -2662,7 +2661,7 @@ index 6d2eec5..f189a0d 100644 have_read_stdin = false; inittables (); -@@ -4513,13 +5182,34 @@ main (int argc, char **argv) +@@ -4523,13 +5192,34 @@ main (int argc, char **argv) case 't': { @@ -2701,7 +2700,7 @@ index 6d2eec5..f189a0d 100644 else { /* Provoke with 'sort -txx'. Complain about -@@ -4530,9 +5220,11 @@ main (int argc, char **argv) +@@ -4540,9 +5230,11 @@ main (int argc, char **argv) quote (optarg)); } } @@ -2715,7 +2714,7 @@ index 6d2eec5..f189a0d 100644 } break; -@@ -4770,12 +5462,10 @@ main (int argc, char **argv) +@@ -4771,12 +5463,10 @@ main (int argc, char **argv) sort (files, nfiles, outfile, nthreads); } @@ -2843,7 +2842,7 @@ index 87a0c93..9f755d9 100644 + while (pos < size) + { + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); -+ ++ + if (convfail || !(iswblank (wc) || wc == '\n')) + { + pos += mblength; @@ -2886,7 +2885,7 @@ index 87a0c93..9f755d9 100644 if (check_chars < oldlen) oldlen = check_chars; if (check_chars < newlen) -@@ -295,14 +401,103 @@ different (char *old, char *new, size_t oldlen, size_t newlen) +@@ -295,15 +401,104 @@ different (char *old, char *new, size_t oldlen, size_t newlen) if (ignore_case) { @@ -2918,8 +2917,8 @@ index 87a0c93..9f755d9 100644 + + return xmemcoll (copy_old, oldlen, copy_new, newlen); + -+} -+ + } + +#if HAVE_MBRTOWC +static int +different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate) @@ -2990,11 +2989,12 @@ index 87a0c93..9f755d9 100644 + free (copy[1]); + return rc; + - } ++} +#endif - ++ /* Output the line in linebuffer LINE to standard output provided that the switches say it should be output. + MATCH is true if the line matches the previous line. @@ -367,19 +562,38 @@ check_file (const char *infile, const char *outfile, char delimiter) char *prevfield IF_LINT ( = NULL); size_t prevlen IF_LINT ( = 0); @@ -3118,7 +3118,7 @@ index 87a0c93..9f755d9 100644 skip_fields = 0; check_chars = SIZE_MAX; diff --git a/tests/i18n/sort.sh b/tests/i18n/sort.sh -new file mode 100644 +new file mode 100755 index 0000000..26c95de --- /dev/null +++ b/tests/i18n/sort.sh @@ -3156,7 +3156,7 @@ diff --git a/tests/local.mk b/tests/local.mk index 568944e..192f776 100644 --- a/tests/local.mk +++ b/tests/local.mk -@@ -350,6 +350,8 @@ all_tests = \ +@@ -368,6 +368,8 @@ all_tests = \ tests/misc/sort-discrim.sh \ tests/misc/sort-files0-from.pl \ tests/misc/sort-float.sh \ @@ -3165,32 +3165,6 @@ index 568944e..192f776 100644 tests/misc/sort-h-thousands-sep.sh \ tests/misc/sort-merge.pl \ tests/misc/sort-merge-fdlimit.sh \ -diff --git a/tests/misc/cut.pl b/tests/misc/cut.pl -index f6f8a56..b426a80 100755 ---- a/tests/misc/cut.pl -+++ b/tests/misc/cut.pl -@@ -23,9 +23,11 @@ use strict; - # Turn off localization of executable's output. - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - --my $mb_locale = $ENV{LOCALE_FR_UTF8}; -+my $mb_locale; -+# uncommented enable multibyte paths -+$mb_locale = $ENV{LOCALE_FR_UTF8}; - ! defined $mb_locale || $mb_locale eq 'none' -- and $mb_locale = 'C'; -+ and $mb_locale = 'C'; - - my $prog = 'cut'; - my $try = "Try '$prog --help' for more information.\n"; -@@ -240,6 +242,7 @@ if ($mb_locale ne 'C') - my @new_t = @$t; - my $test_name = shift @new_t; - -+ next if ($test_name =~ "newline-[12][0-9]"); - push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; - } - push @Tests, @new; diff --git a/tests/misc/expand.pl b/tests/misc/expand.pl index 8a9cad1..9293e39 100755 --- a/tests/misc/expand.pl @@ -3211,7 +3185,7 @@ index 8a9cad1..9293e39 100755 my @Tests = ( ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], -@@ -140,6 +149,8 @@ my @Tests = +@@ -168,6 +177,8 @@ my @Tests = # Test errors @@ -3220,8 +3194,8 @@ index 8a9cad1..9293e39 100755 ['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR => "$prog: tab size contains invalid character(s): 'a'\n"}], ['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1}, -@@ -150,6 +161,37 @@ my @Tests = - {ERR => "$prog: tab sizes must be ascending\n"}], +@@ -184,6 +195,37 @@ my @Tests = + {ERR => "$prog: '/' specifier not at start of number: '/'\n"}], ); +if ($mb_locale ne 'C') @@ -3351,7 +3325,7 @@ index 4d399d8..07f2823 100755 my $delim = chr 0247; sub t_subst ($) { -@@ -329,8 +338,49 @@ foreach my $t (@tv) +@@ -333,8 +342,49 @@ foreach my $t (@tv) push @Tests, $new_ent; } @@ -3402,7 +3376,7 @@ index 4d399d8..07f2823 100755 my $verbose = $ENV{VERBOSE}; diff --git a/tests/misc/sort-mb-tests.sh b/tests/misc/sort-mb-tests.sh -new file mode 100644 +new file mode 100755 index 0000000..11836ba --- /dev/null +++ b/tests/misc/sort-mb-tests.sh @@ -3533,7 +3507,7 @@ index c3e7f8e..6ecd3ff 100755 # Since each test is run with a file name and with redirected stdin, # the name in the diagnostic is either the file name or "-". # Normalize each diagnostic to use '-'. -@@ -424,6 +429,38 @@ foreach my $t (@Tests) +@@ -423,6 +428,38 @@ foreach my $t (@Tests) } } @@ -3572,7 +3546,7 @@ index c3e7f8e..6ecd3ff 100755 @Tests = triple_test \@Tests; # Remember that triple_test creates from each test with exactly one "IN" -@@ -433,6 +470,7 @@ foreach my $t (@Tests) +@@ -432,6 +469,7 @@ foreach my $t (@Tests) # Remove the IN_PIPE version of the "output-is-input" test above. # The others aren't susceptible because they have three inputs each. @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; -- 2.20.1

1 0

[PATCH] bash: Update to 5.0
by Stefan Schantl 21 Jun '19

21 Jun '19

This is a major update to the latest version of bash. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- bash/bash.nm | 2 +- bash/patches/bash-2.05b-xcc.patch | 19 --- bash/patches/bash-4.3-noecho.patch | 31 +++-- bash/patches/bash-5.0-patch-1.patch | 150 +++++++++++++++++++++ bash/patches/bash-5.0-patch-2.patch | 96 +++++++++++++ bash/patches/bash-5.0-patch-3.patch | 202 ++++++++++++++++++++++++++++ bash/patches/bash-5.0-patch-4.patch | 42 ++++++ bash/patches/bash-5.0-patch-5.patch | 102 ++++++++++++++ bash/patches/bash-5.0-patch-6.patch | 39 ++++++ bash/patches/bash-5.0-patch-7.patch | 51 +++++++ bash/patches/bash-requires.patch | 155 ++++++++++----------- bash/patches/bash-tty-tests.patch | 41 +++--- 12 files changed, 798 insertions(+), 132 deletions(-) delete mode 100644 bash/patches/bash-2.05b-xcc.patch create mode 100644 bash/patches/bash-5.0-patch-1.patch create mode 100644 bash/patches/bash-5.0-patch-2.patch create mode 100644 bash/patches/bash-5.0-patch-3.patch create mode 100644 bash/patches/bash-5.0-patch-4.patch create mode 100644 bash/patches/bash-5.0-patch-5.patch create mode 100644 bash/patches/bash-5.0-patch-6.patch create mode 100644 bash/patches/bash-5.0-patch-7.patch diff --git a/bash/bash.nm b/bash/bash.nm index 0ca9d1560..4179d3add 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -4,7 +4,7 @@ ############################################################################### name = bash -version = 4.4 +version = 5.0 release = 1 groups = System/Tools diff --git a/bash/patches/bash-2.05b-xcc.patch b/bash/patches/bash-2.05b-xcc.patch deleted file mode 100644 index ad4283260..000000000 --- a/bash/patches/bash-2.05b-xcc.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- bash-3.1/Makefile.in.xcc 2005-10-25 19:37:52.000000000 +0100 -+++ bash-3.1/Makefile.in 2005-12-23 16:11:09.000000000 +0000 -@@ -68,6 +68,7 @@ - ARFLAGS = @ARFLAGS@ - RANLIB = @RANLIB@ - SIZE = @SIZE@ -+STRIP = strip - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -535,7 +536,7 @@ - @chmod a+rx bashbug - - strip: $(Program) .made -- strip $(Program) -+ $(STRIP) $(Program) - ls -l $(Program) - -$(SIZE) $(Program) - diff --git a/bash/patches/bash-4.3-noecho.patch b/bash/patches/bash-4.3-noecho.patch index 8a2842ac5..8adf36d93 100644 --- a/bash/patches/bash-4.3-noecho.patch +++ b/bash/patches/bash-4.3-noecho.patch @@ -1,25 +1,29 @@ ---- bash-4.3/parse.y 2014-05-29 14:46:09.545543384 +0200 -+++ bash-4.3/parse.y 2014-05-29 14:48:40.758626213 +0200 -@@ -3858,6 +3858,8 @@ xparse_dolparen (base, string, indp, fla +diff --git a/parse.y b/parse.y +index 07e6e3e..4cd373f 100644 +--- a/parse.y ++++ b/parse.y +@@ -4410,6 +4410,8 @@ xparse_dolparen (base, string, indp, flags) save_parser_state (&ps); save_input_line_state (&ls); orig_eof_token = shell_eof_token; + /* avoid echoing every substitution again */ + echo_input_at_read = 0; - - /*(*/ - parser_state |= PST_CMDSUBST|PST_EOFTOKEN; /* allow instant ')' */ /*(*/ ---- bash-4.3/subst.c 2014-05-29 16:04:35.802784549 +0200 -+++ bash-4.3/subst.c 2014-05-29 16:08:25.021942676 +0200 -@@ -7103,6 +7103,7 @@ param_expand (string, sindex, quoted, ex + #if defined (ALIAS) || defined (DPAREN_ARITHMETIC) + saved_pushed_strings = pushed_string_list; /* separate parsing context */ + pushed_string_list = (STRING_SAVER *)NULL; +diff --git a/subst.c b/subst.c +index 9559187..0c2caa6 100644 +--- a/subst.c ++++ b/subst.c +@@ -9145,6 +9145,7 @@ param_expand (string, sindex, quoted, expanded_something, WORD_LIST *list; WORD_DESC *tdesc, *ret; int tflag; + int old_echo_input; + /*itrace("param_expand: `%s' pflags = %d", string+*sindex, pflags);*/ zindex = *sindex; - c = string[++zindex]; -@@ -7401,6 +7402,9 @@ arithsub: +@@ -9514,6 +9515,9 @@ arithsub: } comsub: @@ -29,7 +33,7 @@ if (pflags & PF_NOCOMSUB) /* we need zindex+1 because string[zindex] == RPAREN */ temp1 = substring (string, *sindex, zindex+1); -@@ -7413,6 +7417,7 @@ comsub: +@@ -9526,6 +9530,7 @@ comsub: } FREE (temp); temp = temp1; @@ -37,3 +41,6 @@ break; /* Do POSIX.2d9-style arithmetic substitution. This will probably go +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-1.patch b/bash/patches/bash-5.0-patch-1.patch new file mode 100644 index 000000000..254fd9ee0 --- /dev/null +++ b/bash/patches/bash-5.0-patch-1.patch @@ -0,0 +1,150 @@ +From 4d2e315490b778707b3a3afdfc514d5083a97a11 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Fri, 18 Jan 2019 15:12:37 -0500 +Subject: [PATCH] Bash-5.0 patch 1: fix pathname expansion of directory names + containing backslashes + +--- + bashline.c | 62 +++++++++++++++++++++++++++++++++++++++++--- + lib/glob/glob_loop.c | 6 ----- + patchlevel.h | 2 +- + 3 files changed, 60 insertions(+), 10 deletions(-) + +diff --git a/bashline.c b/bashline.c +index 2846aabf..75e79f1a 100644 +--- a/bashline.c ++++ b/bashline.c +@@ -231,6 +231,7 @@ static int bash_possible_variable_completions __P((int, int)); + static int bash_complete_command __P((int, int)); + static int bash_possible_command_completions __P((int, int)); + ++static int completion_glob_pattern __P((char *)); + static char *glob_complete_word __P((const char *, int)); + static int bash_glob_completion_internal __P((int)); + static int bash_glob_complete_word __P((int, int)); +@@ -1741,7 +1742,7 @@ bash_default_completion (text, start, end, qc, compflags) + + /* This could be a globbing pattern, so try to expand it using pathname + expansion. */ +- if (!matches && glob_pattern_p (text)) ++ if (!matches && completion_glob_pattern ((char *)text)) + { + matches = rl_completion_matches (text, glob_complete_word); + /* A glob expression that matches more than one filename is problematic. +@@ -1850,7 +1851,7 @@ command_word_completion_function (hint_text, state) + glob_matches = (char **)NULL; + } + +- globpat = glob_pattern_p (hint_text); ++ globpat = completion_glob_pattern ((char *)hint_text); + + /* If this is an absolute program name, do not check it against + aliases, reserved words, functions or builtins. We must check +@@ -3713,6 +3714,61 @@ bash_complete_command_internal (what_to_do) + return bash_specific_completion (what_to_do, command_word_completion_function); + } + ++static int ++completion_glob_pattern (string) ++ char *string; ++{ ++ register int c; ++ char *send; ++ int open; ++ ++ DECLARE_MBSTATE; ++ ++ open = 0; ++ send = string + strlen (string); ++ ++ while (c = *string++) ++ { ++ switch (c) ++ { ++ case '?': ++ case '*': ++ return (1); ++ ++ case '[': ++ open++; ++ continue; ++ ++ case ']': ++ if (open) ++ return (1); ++ continue; ++ ++ case '+': ++ case '@': ++ case '!': ++ if (*string == '(') /*)*/ ++ return (1); ++ continue; ++ ++ case '\\': ++ if (*string == 0) ++ return (0); ++ } ++ ++ /* Advance one fewer byte than an entire multibyte character to ++ account for the auto-increment in the loop above. */ ++#ifdef HANDLE_MULTIBYTE ++ string--; ++ ADVANCE_CHAR_P (string, send - string); ++ string++; ++#else ++ ADVANCE_CHAR_P (string, send - string); ++#endif ++ } ++ return (0); ++} ++ + static char *globtext; + static char *globorig; + +@@ -3877,7 +3933,7 @@ bash_vi_complete (count, key) + t = substring (rl_line_buffer, p, rl_point); + } + +- if (t && glob_pattern_p (t) == 0) ++ if (t && completion_glob_pattern (t) == 0) + rl_explicit_arg = 1; /* XXX - force glob_complete_word to append `*' */ + FREE (t); + +diff --git a/lib/glob/glob_loop.c b/lib/glob/glob_loop.c +index 5f319cc2..7d6ae211 100644 +--- a/lib/glob/glob_loop.c ++++ b/lib/glob/glob_loop.c +@@ -54,17 +54,11 @@ INTERNAL_GLOB_PATTERN_P (pattern) + continue; + + case L('\\'): +-#if 0 + /* Don't let the pattern end in a backslash (GMATCH returns no match + if the pattern ends in a backslash anyway), but otherwise return 1, + since the matching engine uses backslash as an escape character + and it can be removed. */ + return (*p != L('\0')); +-#else +- /* The pattern may not end with a backslash. */ +- if (*p++ == L('\0')) +- return 0; +-#endif + } + + return 0; +diff --git a/patchlevel.h b/patchlevel.h +index 1cd7c96c..40db1a32 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 0 ++#define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-2.patch b/bash/patches/bash-5.0-patch-2.patch new file mode 100644 index 000000000..b9858ae18 --- /dev/null +++ b/bash/patches/bash-5.0-patch-2.patch @@ -0,0 +1,96 @@ +From ddf3f643cb9b9a2ca8e6d996c605e4332204874c Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Fri, 18 Jan 2019 15:13:57 -0500 +Subject: [PATCH] Bash-5.0 patch 2: fix expansion of aliases whose value ends + with an unquoted tab + +--- + parse.y | 5 ++++- + parser.h | 1 + + patchlevel.h | 2 +- + y.tab.c | 5 ++++- + 4 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/parse.y b/parse.y +index 3ff87bcc..07e6e3e4 100644 +--- a/parse.y ++++ b/parse.y +@@ -2557,12 +2557,14 @@ next_alias_char: + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE && + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && ++ (parser_state & PST_ENDALIAS) == 0 && /* only once */ + shell_input_line_index > 0 && +- shell_input_line[shell_input_line_index-1] != ' ' && ++ shellblank (shell_input_line[shell_input_line_index-1]) == 0 && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { ++ parser_state |= PST_ENDALIAS; + return ' '; /* END_ALIAS */ + } + #endif +@@ -2571,6 +2573,7 @@ pop_alias: + /* This case works for PSH_DPAREN as well */ + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) + { ++ parser_state &= ~PST_ENDALIAS; + pop_string (); + uc = shell_input_line[shell_input_line_index]; + if (uc) +diff --git a/parser.h b/parser.h +index 54dd2c88..6d08915d 100644 +--- a/parser.h ++++ b/parser.h +@@ -47,6 +47,7 @@ + #define PST_REPARSE 0x040000 /* re-parsing in parse_string_to_word_list */ + #define PST_REDIRLIST 0x080000 /* parsing a list of redirections preceding a simple command name */ + #define PST_COMMENT 0x100000 /* parsing a shell comment; used by aliases */ ++#define PST_ENDALIAS 0x200000 /* just finished expanding and consuming an alias */ + + /* Definition of the delimiter stack. Needed by parse.y and bashhist.c. */ + struct dstack { +diff --git a/patchlevel.h b/patchlevel.h +index 40db1a32..a988d852 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 1 ++#define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +diff --git a/y.tab.c b/y.tab.c +index 1abe2c50..7efce3c8 100644 +--- a/y.tab.c ++++ b/y.tab.c +@@ -4873,12 +4873,14 @@ next_alias_char: + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE && + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && ++ (parser_state & PST_ENDALIAS) == 0 && /* only once */ + shell_input_line_index > 0 && +- shell_input_line[shell_input_line_index-1] != ' ' && ++ shellblank (shell_input_line[shell_input_line_index-1]) == 0 && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { ++ parser_state |= PST_ENDALIAS; + return ' '; /* END_ALIAS */ + } + #endif +@@ -4887,6 +4889,7 @@ pop_alias: + /* This case works for PSH_DPAREN as well */ + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) + { ++ parser_state &= ~PST_ENDALIAS; + pop_string (); + uc = shell_input_line[shell_input_line_index]; + if (uc) +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-3.patch b/bash/patches/bash-5.0-patch-3.patch new file mode 100644 index 000000000..509f52efb --- /dev/null +++ b/bash/patches/bash-5.0-patch-3.patch @@ -0,0 +1,202 @@ +From fcf6ae7d069a64741e9484cf219d7fe95de9e796 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Tue, 19 Mar 2019 10:05:39 -0400 +Subject: [PATCH] Bash-5.0 patch 3: improvements when globbing directory names + containing backslashes + +--- + bashline.c | 2 +- + lib/glob/glob.c | 25 +++++++++++++++++++++---- + lib/glob/glob.h | 1 + + lib/glob/glob_loop.c | 23 ++++++++++++++++------- + patchlevel.h | 2 +- + pathexp.c | 16 ++++++++++++---- + 6 files changed, 52 insertions(+), 17 deletions(-) + +diff --git a/bashline.c b/bashline.c +index 75e79f1a..824ea9d9 100644 +--- a/bashline.c ++++ b/bashline.c +@@ -3752,7 +3752,7 @@ completion_glob_pattern (string) + continue; + + case '\\': +- if (*string == 0) ++ if (*string++ == 0) + return (0); + } + +diff --git a/lib/glob/glob.c b/lib/glob/glob.c +index 22d90a5c..398253b5 100644 +--- a/lib/glob/glob.c ++++ b/lib/glob/glob.c +@@ -1061,7 +1061,7 @@ glob_filename (pathname, flags) + char *directory_name, *filename, *dname, *fn; + unsigned int directory_len; + int free_dirname; /* flag */ +- int dflags; ++ int dflags, hasglob; + + result = (char **) malloc (sizeof (char *)); + result_size = 1; +@@ -1110,9 +1110,12 @@ glob_filename (pathname, flags) + free_dirname = 1; + } + ++ hasglob = 0; + /* If directory_name contains globbing characters, then we +- have to expand the previous levels. Just recurse. */ +- if (directory_len > 0 && glob_pattern_p (directory_name)) ++ have to expand the previous levels. Just recurse. ++ If glob_pattern_p returns != [0,1] we have a pattern that has backslash ++ quotes but no unquoted glob pattern characters. We dequote it below. */ ++ if (directory_len > 0 && (hasglob = glob_pattern_p (directory_name)) == 1) + { + char **directories, *d, *p; + register unsigned int i; +@@ -1175,7 +1178,7 @@ glob_filename (pathname, flags) + if (d[directory_len - 1] == '/') + d[directory_len - 1] = '\0'; + +- directories = glob_filename (d, dflags); ++ directories = glob_filename (d, dflags|GX_RECURSE); + + if (free_dirname) + { +@@ -1332,6 +1335,20 @@ only_filename: + free (directory_name); + return (NULL); + } ++ /* If we have a directory name with quoted characters, and we are ++ being called recursively to glob the directory portion of a pathname, ++ we need to dequote the directory name before returning it so the ++ caller can read the directory */ ++ if (directory_len > 0 && hasglob == 2 && (flags & GX_RECURSE) != 0) ++ { ++ dequote_pathname (directory_name); ++ directory_len = strlen (directory_name); ++ } ++ ++ /* We could check whether or not the dequoted directory_name is a ++ directory and return it here, returning the original directory_name ++ if not, but we don't do that yet. I'm not sure it matters. */ ++ + /* Handle GX_MARKDIRS here. */ + result[0] = (char *) malloc (directory_len + 1); + if (result[0] == NULL) +diff --git a/lib/glob/glob.h b/lib/glob/glob.h +index b9462333..56ac08ba 100644 +--- a/lib/glob/glob.h ++++ b/lib/glob/glob.h +@@ -30,6 +30,7 @@ + #define GX_NULLDIR 0x100 /* internal -- no directory preceding pattern */ + #define GX_ADDCURDIR 0x200 /* internal -- add passed directory name */ + #define GX_GLOBSTAR 0x400 /* turn on special handling of ** */ ++#define GX_RECURSE 0x800 /* internal -- glob_filename called recursively */ + + extern int glob_pattern_p __P((const char *)); + extern char **glob_vector __P((char *, char *, int)); +diff --git a/lib/glob/glob_loop.c b/lib/glob/glob_loop.c +index 7d6ae211..3a4f4f1e 100644 +--- a/lib/glob/glob_loop.c ++++ b/lib/glob/glob_loop.c +@@ -26,10 +26,10 @@ INTERNAL_GLOB_PATTERN_P (pattern) + { + register const GCHAR *p; + register GCHAR c; +- int bopen; ++ int bopen, bsquote; + + p = pattern; +- bopen = 0; ++ bopen = bsquote = 0; + + while ((c = *p++) != L('\0')) + switch (c) +@@ -55,13 +55,22 @@ INTERNAL_GLOB_PATTERN_P (pattern) + + case L('\\'): + /* Don't let the pattern end in a backslash (GMATCH returns no match +- if the pattern ends in a backslash anyway), but otherwise return 1, +- since the matching engine uses backslash as an escape character +- and it can be removed. */ +- return (*p != L('\0')); ++ if the pattern ends in a backslash anyway), but otherwise note that ++ we have seen this, since the matching engine uses backslash as an ++ escape character and it can be removed. We return 2 later if we ++ have seen only backslash-escaped characters, so interested callers ++ know they can shortcut and just dequote the pathname. */ ++ if (*p != L('\0')) ++ { ++ p++; ++ bsquote = 1; ++ continue; ++ } ++ else /* (*p == L('\0')) */ ++ return 0; + } + +- return 0; ++ return bsquote ? 2 : 0; + } + + #undef INTERNAL_GLOB_PATTERN_P +diff --git a/patchlevel.h b/patchlevel.h +index a988d852..e7e960c1 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 2 ++#define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ +diff --git a/pathexp.c b/pathexp.c +index b51729a7..c1bf2d89 100644 +--- a/pathexp.c ++++ b/pathexp.c +@@ -65,11 +65,11 @@ unquoted_glob_pattern_p (string) + { + register int c; + char *send; +- int open; ++ int open, bsquote; + + DECLARE_MBSTATE; + +- open = 0; ++ open = bsquote = 0; + send = string + strlen (string); + + while (c = *string++) +@@ -100,7 +100,14 @@ unquoted_glob_pattern_p (string) + can be removed by the matching engine, so we have to run it through + globbing. */ + case '\\': +- return (*string != 0); ++ if (*string != '\0' && *string != '/') ++ { ++ bsquote = 1; ++ string++; ++ continue; ++ } ++ else if (*string == 0) ++ return (0); + + case CTLESC: + if (*string++ == '\0') +@@ -117,7 +124,8 @@ unquoted_glob_pattern_p (string) + ADVANCE_CHAR_P (string, send - string); + #endif + } +- return (0); ++ ++ return (bsquote ? 2 : 0); + } + + /* Return 1 if C is a character that is `special' in a POSIX ERE and needs to +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-4.patch b/bash/patches/bash-5.0-patch-4.patch new file mode 100644 index 000000000..899383312 --- /dev/null +++ b/bash/patches/bash-5.0-patch-4.patch @@ -0,0 +1,42 @@ +From 16c907aa3bb427618733e5a6f2f4e2fc5a3488d3 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:24:28 -0400 +Subject: [PATCH] Bash-5.0 patch 4: the wait builtin without arguments only + waits for known children the shell started + +--- + jobs.c | 4 +--- + patchlevel.h | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/jobs.c b/jobs.c +index ce2bdf24..ae3c54c6 100644 +--- a/jobs.c ++++ b/jobs.c +@@ -2488,10 +2488,8 @@ wait_for_background_pids () + r = wait_for (last_procsub_child->pid); + wait_procsubs (); + reap_procsubs (); +-#if 1 ++#if 0 + /* We don't want to wait indefinitely if we have stopped children. */ +- /* XXX - should add a loop that goes through the list of process +- substitutions and waits for each proc in turn before this code. */ + if (any_stopped == 0) + { + /* Check whether or not we have any unreaped children. */ +diff --git a/patchlevel.h b/patchlevel.h +index e7e960c1..c059f0bd 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 3 ++#define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-5.patch b/bash/patches/bash-5.0-patch-5.patch new file mode 100644 index 000000000..1fb4fafaf --- /dev/null +++ b/bash/patches/bash-5.0-patch-5.patch @@ -0,0 +1,102 @@ +From 41f5420db7a911fb0833be693205f4db41f05434 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:25:52 -0400 +Subject: [PATCH] Bash-5.0 patch 5: prevent optimizing forks away too + aggressively + +--- + builtins/evalstring.c | 26 +++++++++++++++++++++++--- + command.h | 1 + + execute_cmd.c | 2 ++ + patchlevel.h | 2 +- + 4 files changed, 27 insertions(+), 4 deletions(-) + +diff --git a/builtins/evalstring.c b/builtins/evalstring.c +index 1496eeec..cadc9bc0 100644 +--- a/builtins/evalstring.c ++++ b/builtins/evalstring.c +@@ -100,12 +100,22 @@ should_suppress_fork (command) + ((command->flags & CMD_INVERT_RETURN) == 0)); + } + ++int ++can_optimize_connection (command) ++ COMMAND *command; ++{ ++ return (*bash_input.location.string == '\0' && ++ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && ++ command->value.Connection->second->type == cm_simple); ++} ++ + void + optimize_fork (command) + COMMAND *command; + { + if (command->type == cm_connection && +- (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR) && ++ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && ++ (command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) && + should_suppress_fork (command->value.Connection->second)) + { + command->value.Connection->second->flags |= CMD_NO_FORK; +@@ -412,8 +422,18 @@ parse_and_execute (string, from_file, flags) + command->flags |= CMD_NO_FORK; + command->value.Simple->flags |= CMD_NO_FORK; + } +- else if (command->type == cm_connection) +- optimize_fork (command); ++ ++ /* Can't optimize forks out here execept for simple commands. ++ This knows that the parser sets up commands as left-side heavy ++ (&& and || are left-associative) and after the single parse, ++ if we are at the end of the command string, the last in a ++ series of connection commands is ++ command->value.Connection->second. */ ++ else if (command->type == cm_connection && can_optimize_connection (command)) ++ { ++ command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING; ++ command->value.Connection->second->value.Simple->flags |= CMD_TRY_OPTIMIZING; ++ } + #endif /* ONESHOT */ + + /* See if this is a candidate for $( <file ). */ +diff --git a/command.h b/command.h +index 32495162..b9e9b669 100644 +--- a/command.h ++++ b/command.h +@@ -186,6 +186,7 @@ typedef struct element { + #define CMD_COPROC_SUBSHELL 0x1000 + #define CMD_LASTPIPE 0x2000 + #define CMD_STDPATH 0x4000 /* use standard path for command lookup */ ++#define CMD_TRY_OPTIMIZING 0x8000 /* try to optimize this simple command */ + + /* What a command looks like. */ + typedef struct command { +diff --git a/execute_cmd.c b/execute_cmd.c +index 8b3c83aa..f1d74bfe 100644 +--- a/execute_cmd.c ++++ b/execute_cmd.c +@@ -2767,6 +2767,8 @@ execute_connection (command, asynchronous, pipe_in, pipe_out, fds_to_close) + ((command->value.Connection->connector == OR_OR) && + (exec_result != EXECUTION_SUCCESS))) + { ++ optimize_fork (command); ++ + second = command->value.Connection->second; + if (ignore_return && second) + second->flags |= CMD_IGNORE_RETURN; +diff --git a/patchlevel.h b/patchlevel.h +index c059f0bd..1bc098b8 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 4 ++#define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-6.patch b/bash/patches/bash-5.0-patch-6.patch new file mode 100644 index 000000000..bfd84603b --- /dev/null +++ b/bash/patches/bash-5.0-patch-6.patch @@ -0,0 +1,39 @@ +From dfd2cc6ac5558e252af0a7cb829a9629bf782e17 Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:27:00 -0400 +Subject: [PATCH] Bash-5.0 patch 6: allow building with SYSLOG_HISTORY defined + without defining SYSLOG_SHOPT + +--- + builtins/shopt.def | 2 +- + patchlevel.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/builtins/shopt.def b/builtins/shopt.def +index f6dc6f97..1c485361 100644 +--- a/builtins/shopt.def ++++ b/builtins/shopt.def +@@ -122,7 +122,7 @@ extern int assoc_expand_once; + extern int array_expand_once; + #endif + +-#if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT) ++#if defined (SYSLOG_HISTORY) + extern int syslog_history; + #endif + +diff --git a/patchlevel.h b/patchlevel.h +index 1bc098b8..14bff9fc 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 5 ++#define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-5.0-patch-7.patch b/bash/patches/bash-5.0-patch-7.patch new file mode 100644 index 000000000..2a4315e71 --- /dev/null +++ b/bash/patches/bash-5.0-patch-7.patch @@ -0,0 +1,51 @@ +From 3ba697465bc74fab513a26dea700cc82e9f4724e Mon Sep 17 00:00:00 2001 +From: Chet Ramey <chet.ramey(a)case.edu> +Date: Sat, 20 Apr 2019 14:27:56 -0400 +Subject: [PATCH] Bash-5.0 patch 7: fix exec builtin leaving the terminal in + the wrong process group + +--- + jobs.c | 12 +++++------- + patchlevel.h | 2 +- + 2 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/jobs.c b/jobs.c +index ae3c54c6..6bc31dca 100644 +--- a/jobs.c ++++ b/jobs.c +@@ -4837,15 +4837,13 @@ void + end_job_control () + { + if (job_control) +- { +- terminate_stopped_jobs (); ++ terminate_stopped_jobs (); + +- if (original_pgrp >= 0) +- give_terminal_to (original_pgrp, 1); +- } ++ if (original_pgrp >= 0 && terminal_pgrp != original_pgrp) ++ give_terminal_to (original_pgrp, 1); + +- if (original_pgrp >= 0) +- setpgid (0, original_pgrp); ++ if (original_pgrp >= 0 && setpgid (0, original_pgrp) == 0) ++ shell_pgrp = original_pgrp; + } + + /* Restart job control by closing shell tty and reinitializing. This is +diff --git a/patchlevel.h b/patchlevel.h +index 14bff9fc..deb9c5b7 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 6 ++#define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +-- +2.17.2 + diff --git a/bash/patches/bash-requires.patch b/bash/patches/bash-requires.patch index 888de173c..35670bd55 100644 --- a/bash/patches/bash-requires.patch +++ b/bash/patches/bash-requires.patch @@ -1,40 +1,32 @@ -commit efb0da0c0fee3e3ca21b21cd72f63cdfd7766d45 -Author: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sun Sep 18 14:12:44 2016 +0100 - - Implement --rpm-requires - - Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> - diff --git a/builtins.h b/builtins.h -index 0cfea18..c0c6acc 100644 +index dac95fd..5b7e811 100644 --- a/builtins.h +++ b/builtins.h -@@ -42,6 +42,7 @@ +@@ -45,6 +45,7 @@ #define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */ #define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */ #define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */ -+#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */ ++#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */ #define BASE_INDENT 4 diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c -index 4f51201..69707ec 100644 +index 4f51201..91c25db 100644 --- a/builtins/mkbuiltins.c +++ b/builtins/mkbuiltins.c @@ -69,10 +69,15 @@ extern char *strcpy (); #define whitespace(c) (((c) == ' ') || ((c) == '\t')) /* Flag values that builtins can have. */ -+/* These flags are for the C code generator, ++/* These flags are for the C code generator, + the C which is produced (./builtin.c) -+ includes the flags definitions found ++ includes the flags definitions found + in ../builtins.h */ #define BUILTIN_FLAG_SPECIAL 0x01 #define BUILTIN_FLAG_ASSIGNMENT 0x02 #define BUILTIN_FLAG_LOCALVAR 0x04 #define BUILTIN_FLAG_POSIX_BUILTIN 0x08 -+#define BUILTIN_FLAG_REQUIRES 0x16 ++#define BUILTIN_FLAG_REQUIRES 0x10 #define BASE_INDENT 4 @@ -58,17 +50,16 @@ index 4f51201..69707ec 100644 #if !defined (HAVE_RENAME) static int rename (); -@@ -831,6 +844,9 @@ builtin_handler (self, defs, arg) +@@ -831,6 +844,8 @@ builtin_handler (self, defs, arg) new->flags |= BUILTIN_FLAG_LOCALVAR; if (is_posix_builtin (name)) new->flags |= BUILTIN_FLAG_POSIX_BUILTIN; + if (is_requires_builtin (name)) + new->flags |= BUILTIN_FLAG_REQUIRES; -+ array_add ((char *)new, defs->builtins); building_builtin = 1; -@@ -1250,12 +1266,13 @@ write_builtins (defs, structfile, externfile) +@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, externfile) else fprintf (structfile, "(sh_builtin_func_t *)0x0, "); @@ -83,7 +74,7 @@ index 4f51201..69707ec 100644 document_name (builtin)); /* Don't translate short document summaries that are identical -@@ -1645,6 +1662,13 @@ is_posix_builtin (name) +@@ -1645,6 +1661,13 @@ is_posix_builtin (name) return (_find_in_table (name, posix_builtins)); } @@ -98,15 +89,15 @@ index 4f51201..69707ec 100644 static int rename (from, to) diff --git a/doc/bash.1 b/doc/bash.1 -index 9a7a384..1c738bb 100644 +index d91f1fd..111a66d 100644 --- a/doc/bash.1 +++ b/doc/bash.1 -@@ -238,6 +238,14 @@ The shell becomes restricted (see +@@ -239,6 +239,14 @@ The shell becomes restricted (see .B "RESTRICTED SHELL" below). .TP +.B \-\-rpm-requires -+Produce the list of files that are required for the ++Produce the list of files that are required for the +shell script to run. This implies '-n' and is subject +to the same limitations as compile time error checking checking; +Command substitutions, Conditional expressions and @@ -117,15 +108,15 @@ index 9a7a384..1c738bb 100644 Equivalent to \fB\-v\fP. .TP diff --git a/doc/bashref.texi b/doc/bashref.texi -index c0f4a2f..8e30d4f 100644 +index d33cd57..6fc4d18 100644 --- a/doc/bashref.texi +++ b/doc/bashref.texi -@@ -6243,6 +6243,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash +@@ -6453,6 +6453,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash @item --restricted Make the shell a restricted shell (@pxref{The Restricted Shell}). +@item --rpm-requires -+Produce the list of files that are required for the ++Produce the list of files that are required for the +shell script to run. This implies '-n' and is subject +to the same limitations as compile time error checking checking; +Command substitutions, Conditional expressions and @command{eval} @@ -135,31 +126,24 @@ index c0f4a2f..8e30d4f 100644 Equivalent to @option{-v}. Print shell input lines as they're read. diff --git a/eval.c b/eval.c -index db863e7..5a5af32 100644 +index f02d6e4..76c1e8d 100644 --- a/eval.c +++ b/eval.c -@@ -56,6 +56,7 @@ extern int need_here_doc; - extern int current_command_number, current_command_line_count, line_number; - extern int expand_aliases; - extern char *ps0_prompt; -+extern int rpm_requires; - - #if defined (HAVE_POSIX_SIGNALS) - extern sigset_t top_level_mask; -@@ -148,7 +149,7 @@ reader_loop () +@@ -142,7 +142,8 @@ reader_loop () if (read_command () == 0) { - if (interactive_shell == 0 && read_but_dont_execute) ++ + if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires)) { last_command_exit_value = EXECUTION_SUCCESS; dispose_command (global_command); diff --git a/execute_cmd.c b/execute_cmd.c -index 2a3df6d..2e3fb0c 100644 +index 8b3c83a..4eae19c 100644 --- a/execute_cmd.c +++ b/execute_cmd.c -@@ -529,6 +529,8 @@ async_redirect_stdin () +@@ -538,6 +538,8 @@ async_redirect_stdin () #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0) @@ -168,7 +152,7 @@ index 2a3df6d..2e3fb0c 100644 /* Execute the command passed in COMMAND, perhaps doing it asynchronously. COMMAND is exactly what read_command () places into GLOBAL_COMMAND. ASYNCHROUNOUS, if non-zero, says to do this command in the background. -@@ -561,7 +563,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out, +@@ -569,7 +571,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out, if (breaking || continuing) return (last_command_exit_value); @@ -178,14 +162,14 @@ index 2a3df6d..2e3fb0c 100644 + if (rpm_requires && command->type == cm_function_def) + return last_command_exit_value = + execute_intern_function (command->value.Function_def->name, -+ command->value.Function_def->command); ++ command->value.Function_def); + if (read_but_dont_execute) return (EXECUTION_SUCCESS); QUIT; -@@ -5609,7 +5617,7 @@ execute_intern_function (name, funcdef) - - if (check_identifier (name, posixly_correct) == 0) +@@ -2813,7 +2821,7 @@ execute_for_command (for_command) + save_line_number = line_number; + if (check_identifier (for_command->name, 1) == 0) { - if (posixly_correct && interactive_shell == 0) + if (posixly_correct && interactive_shell == 0 && rpm_requires == 0) @@ -193,53 +177,24 @@ index 2a3df6d..2e3fb0c 100644 last_command_exit_value = EX_BADUSAGE; jump_to_top_level (ERREXIT); diff --git a/execute_cmd.h b/execute_cmd.h -index 62bec82..d42dc85 100644 +index dc2f15e..506fff4 100644 --- a/execute_cmd.h +++ b/execute_cmd.h -@@ -22,6 +22,8 @@ +@@ -22,6 +22,9 @@ #define _EXECUTE_CMD_H_ #include "stdc.h" +#include "variables.h" +#include "command.h" ++ #if defined (ARRAY_VARS) struct func_array_state diff --git a/make_cmd.c b/make_cmd.c -index b42e9ff..95ec723 100644 +index ecbbfd6..3d8bfa4 100644 --- a/make_cmd.c +++ b/make_cmd.c -@@ -42,11 +42,15 @@ - #include "flags.h" - #include "make_cmd.h" - #include "dispose_cmd.h" -+#include "execute_cmd.h" - #include "variables.h" - #include "subst.h" - #include "input.h" - #include "ocache.h" - #include "externs.h" -+#include "builtins.h" -+ -+#include "builtins/common.h" - - #if defined (JOB_CONTROL) - #include "jobs.h" -@@ -57,9 +61,13 @@ - extern int line_number, current_command_line_count, parser_state; - extern int last_command_exit_value; - extern int shell_initialized; -+extern int rpm_requires; - - int here_doc_first_line = 0; - -+static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz" -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -+ - /* Object caching */ - sh_obj_cache_t wdcache = {0, 0, 0}; - sh_obj_cache_t wlcache = {0, 0, 0}; -@@ -839,6 +847,27 @@ make_coproc_command (name, command) +@@ -828,6 +828,27 @@ make_coproc_command (name, command) return (make_command (cm_coproc, (SIMPLE_COM *)temp)); } @@ -251,9 +206,9 @@ index b42e9ff..95ec723 100644 + if (strchr(filename, '$') || (filename[0] != '/' && strchr(filename, '/'))) + return; + -+ /* ++ /* + if the executable is called via variable substitution we can -+ not dermine what it is at compile time. ++ not dermine what it is at compile time. + + if the executable consists only of characters not in the + alphabet we do not consider it a dependency just an artifact @@ -267,7 +222,7 @@ index b42e9ff..95ec723 100644 /* Reverse the word list and redirection list in the simple command has just been parsed. It seems simpler to do this here the one time then by any other method that I can think of. */ -@@ -856,6 +885,27 @@ clean_simple_command (command) +@@ -845,6 +866,28 @@ clean_simple_command (command) REVERSE_LIST (command->value.Simple->redirects, REDIRECT *); } @@ -291,15 +246,16 @@ index b42e9ff..95ec723 100644 + output_requirement (find_function(cmd0) ? "function" : "executable", cmd0); + } + } /*rpm_requires*/ ++ + parser_state &= ~PST_REDIRLIST; return (command); } diff --git a/shell.c b/shell.c -index 45b77f9..b43de50 100644 +index a2b2a55..c5d99b3 100644 --- a/shell.c +++ b/shell.c -@@ -201,6 +201,9 @@ int have_devfd = 0; +@@ -193,6 +193,9 @@ int have_devfd = 0; /* The name of the .(shell)rc file. */ static char *bashrc_file = DEFAULT_BASHRC; @@ -309,7 +265,7 @@ index 45b77f9..b43de50 100644 /* Non-zero means to act more like the Bourne shell on startup. */ static int act_like_sh; -@@ -264,6 +267,7 @@ static const struct { +@@ -259,6 +262,7 @@ static const struct { { "protected", Int, &protected_mode, (char **)0x0 }, #endif { "rcfile", Charp, (int *)0x0, &bashrc_file }, @@ -317,7 +273,7 @@ index 45b77f9..b43de50 100644 #if defined (RESTRICTED_SHELL) { "restricted", Int, &restricted, (char **)0x0 }, #endif -@@ -500,6 +504,12 @@ main (argc, argv, env) +@@ -496,6 +500,12 @@ main (argc, argv, env) if (dump_translatable_strings) read_but_dont_execute = 1; @@ -330,3 +286,36 @@ index 45b77f9..b43de50 100644 if (running_setuid && privileged_mode == 0) disable_priv_mode (); +diff --git a/shell.h b/shell.h +index 8072605..6c4149d 100644 +--- a/shell.h ++++ b/shell.h +@@ -34,12 +34,15 @@ + #include "maxpath.h" + #include "unwind_prot.h" + #include "dispose_cmd.h" ++#include "execute_cmd.h" + #include "make_cmd.h" + #include "ocache.h" + #include "subst.h" + #include "sig.h" + #include "pathnames.h" + #include "externs.h" ++#include "builtins.h" ++#include "builtins/common.h" + + extern int EOF_Reached; + +@@ -99,6 +102,9 @@ extern int interactive, interactive_shell; + extern int startup_state; + extern int reading_shell_script; + extern int shell_initialized; ++extern int rpm_requires; ++static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz" ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + extern int bash_argv_initialized; + extern int subshell_environment; + extern int current_command_number; +-- +2.17.2 + diff --git a/bash/patches/bash-tty-tests.patch b/bash/patches/bash-tty-tests.patch index 984f1b40d..f9b653245 100644 --- a/bash/patches/bash-tty-tests.patch +++ b/bash/patches/bash-tty-tests.patch @@ -1,7 +1,8 @@ -diff -up bash-4.2-rc2/tests/exec.right.tty_tests bash-4.2-rc2/tests/exec.right ---- bash-4.2-rc2/tests/exec.right.tty_tests 2011-02-09 10:42:48.000000000 +0100 -+++ bash-4.2-rc2/tests/exec.right 2011-02-09 10:42:59.000000000 +0100 -@@ -50,7 +50,6 @@ this is ohio-state +diff --git a/tests/exec.right b/tests/exec.right +index 6075cc8..0b3f02c 100644 +--- a/tests/exec.right ++++ b/tests/exec.right +@@ -51,7 +51,6 @@ this is ohio-state 0 1 testb @@ -9,21 +10,23 @@ diff -up bash-4.2-rc2/tests/exec.right.tty_tests bash-4.2-rc2/tests/exec.right 1 1 1 -diff -up bash-4.2-rc2/tests/execscript.tty_tests bash-4.2-rc2/tests/execscript ---- bash-4.2-rc2/tests/execscript.tty_tests 2010-12-27 22:01:02.000000000 +0100 -+++ bash-4.2-rc2/tests/execscript 2011-02-09 10:42:34.000000000 +0100 -@@ -107,8 +107,6 @@ ${THIS_SH} ./exec6.sub +diff --git a/tests/execscript b/tests/execscript +index c1819de..9227a4a 100644 +--- a/tests/execscript ++++ b/tests/execscript +@@ -108,8 +108,6 @@ ${THIS_SH} ./exec6.sub # checks for properly deciding what constitutes an executable file ${THIS_SH} ./exec7.sub --${THIS_SH} -i ./exec8.sub +-${THIS_SH} -i ${PWD}/exec8.sub - ${THIS_SH} ./exec9.sub - true | `echo true` & -diff -up bash-4.2-rc2/tests/read.right.tty_tests bash-4.2-rc2/tests/read.right ---- bash-4.2-rc2/tests/read.right.tty_tests 2010-12-21 16:49:00.000000000 +0100 -+++ bash-4.2-rc2/tests/read.right 2011-02-09 10:42:34.000000000 +0100 + ${THIS_SH} ./exec10.sub +diff --git a/tests/read.right b/tests/read.right +index 73cb704..a92fe7f 100644 +--- a/tests/read.right ++++ b/tests/read.right @@ -33,14 +33,6 @@ a = abcdefg a = xyz a = -xyz 123- @@ -39,10 +42,11 @@ diff -up bash-4.2-rc2/tests/read.right.tty_tests bash-4.2-rc2/tests/read.right ./read3.sub: line 4: read: -1: invalid number abc ab -diff -up bash-4.2-rc2/tests/read.tests.tty_tests bash-4.2-rc2/tests/read.tests ---- bash-4.2-rc2/tests/read.tests.tty_tests 2008-09-06 19:09:11.000000000 +0200 -+++ bash-4.2-rc2/tests/read.tests 2011-02-09 10:42:34.000000000 +0100 -@@ -82,9 +82,6 @@ echo " foo" | { IFS=$':' ; read line; re +diff --git a/tests/read.tests b/tests/read.tests +index f67cd00..083f4a4 100644 +--- a/tests/read.tests ++++ b/tests/read.tests +@@ -82,9 +82,6 @@ echo " foo" | { IFS=$':' ; read line; recho "$line"; } # test read -d delim behavior ${THIS_SH} ./read1.sub @@ -52,3 +56,6 @@ diff -up bash-4.2-rc2/tests/read.tests.tty_tests bash-4.2-rc2/tests/read.tests # test read -n nchars behavior ${THIS_SH} ./read3.sub +-- +2.17.2 + -- 2.20.1

1 0

[PATCH] bash-completion: Remove file for rfkill.
by Stefan Schantl 21 Jun '19

21 Jun '19

This is now shipped by util-linux. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- bash-completion/bash-completion.nm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bash-completion/bash-completion.nm b/bash-completion/bash-completion.nm index 867cbe669..f0c3f51f8 100644 --- a/bash-completion/bash-completion.nm +++ b/bash-completion/bash-completion.nm @@ -5,7 +5,7 @@ name = bash-completion version = 2.4 -release = 2 +release = 3 arch = noarch groups = Development/Languages @@ -25,8 +25,8 @@ build install_cmds rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{cawsay,cowthink} - # Drop files which are provided by util-linux >= 2.28 - rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{mount,umount} + # Drop files which are provided by util-linux >= 2.28 and 2.34 + rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{mount,umount,rfkill} install -Dpm 644 %{DIR_SOURCE}/bash-completion-1.99-redefine_filedir.bash \ %{BUILDROOT}%{sysconfdir}/bash_completion.d/redefine_filedir -- 2.20.1

1 0

[PATCH] pcengines-apu-firmware: update to 4.9.0.6
by Arne Fitzenreiter 21 Jun '19

21 Jun '19

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- pcengines-apu-firmware/pcengines-apu-firmware.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcengines-apu-firmware/pcengines-apu-firmware.nm b/pcengines-apu-firmware/pcengines-apu-firmware.nm index 81308fe..72543d9 100644 --- a/pcengines-apu-firmware/pcengines-apu-firmware.nm +++ b/pcengines-apu-firmware/pcengines-apu-firmware.nm @@ -4,7 +4,7 @@ ############################################################################### name = pcengines-apu-firmware -version = 4.9.0.3 +version = 4.9.0.6 release = 1 arch = noarch -- 2.6.3

1 0

[PATCH] grubby: drop package
by Arne Fitzenreiter 21 Jun '19

21 Jun '19

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- grubby/grubby.nm | 69 -------------------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 grubby/grubby.nm diff --git a/grubby/grubby.nm b/grubby/grubby.nm deleted file mode 100644 index 576d77a..0000000 --- a/grubby/grubby.nm +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = grubby -version = 8.11 -release = 5 - -groups = System/Base -url = http://git.fedorahosted.org/git/grubby.git -license = GPLv2+ -summary = Command line tool for updating bootloader configs. - -description - grubby is a command line tool for updating and displaying information about - the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) - and zipl (s390) boot loaders. It is primarily designed to be used from scripts - which install new kernels and need to find information about the current boot - environment. -end - -# Source tarballs must be generated from git. -sources = %{thisapp}.tar.bz2 - -build - requires - glib2-devel - libblkid-devel - popt-devel - util-linux - end - - make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" - - test - make test - end - - make_install_targets += mandir=%{mandir} - - install_cmds - mkdir -pv %{BUILDROOT}%{prefix} - mv -v %{BUILDROOT}{,%{prefix}}/sbin - end -end - -packages - package %{name} - # Pull in u-boot-tools on ARM platforms. - if "%{DISTRO_ARCH}" == "armv7hl" - requires += u-boot-tools - end - - if "%{DISTRO_ARCH}" == "armv5tel" - requires += u-boot-tools - end - - provides - /sbin/grubby - /sbin/installkernel - /sbin/new-kernel-pkg - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end -- 2.6.3

1 0

[PATCH] kernel: remove grubby from dependencies
by Arne Fitzenreiter 21 Jun '19

21 Jun '19

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- kernel/kernel.nm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 193cf57..033ef0e 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 5.0 -release = 1 +release = 2 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -309,7 +309,7 @@ packages requires dracut - grubby + kernel-updater linux-firmware end @@ -322,8 +322,7 @@ packages end _posttrans - /sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release} - /sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release} + kernel-updater install %{kernel_release} end script posttransin @@ -334,16 +333,8 @@ packages %{_posttrans} end - script postin - /sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release} - end - - script postup - /sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release} - end - - script preun - /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{kernel_release} + script postun + kernel-updater uninstall %{kernel_release} end end -- 2.6.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2019