diff --git a/dhcp-4.1.1-P1-optional-value-infinite-loop.diff b/dhcp-4.1.1-P1-optional-value-infinite-loop.diff deleted file mode 100644 index cfe480d..0000000 --- a/dhcp-4.1.1-P1-optional-value-infinite-loop.diff +++ /dev/null @@ -1,46 +0,0 @@ -From 912eb17103f764ef4486b30a4801af64321a23ed Mon Sep 17 00:00:00 2001 -From: Marius Tomaschewski -Date: Fri, 29 Oct 2010 18:51:02 +0200 -Subject: [PATCH] dhcp-4.1.1-P1-optional-value-infinite-loop - -Fixed dhcp server infinite loop while parsing options with optional -parts in the value such as in slp-service-scope option (bnc#643845, -[ISC-Bugs #22410]). - -Signed-off-by: Marius Tomaschewski ---- - common/parse.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -diff --git a/common/parse.c b/common/parse.c -index 34b909a..081dcc9 100644 ---- a/common/parse.c -+++ b/common/parse.c -@@ -4931,8 +4931,23 @@ struct option *option; - do { - if ((*fmt == 'A') || (*fmt == 'a')) - break; -- if (*fmt == 'o') -+ if (*fmt == 'o') { -+ /* previous value were optional */ -+ fmt++; - continue; -+ } -+ if (fmt[1] == 'o') { -+ /* -+ * value for current format code is optional -+ * check if the next token is a semicolon; -+ * it is expected to be read by our caller. -+ */ -+ token = peek_token (&val, (unsigned *)0, cfile); -+ if (token == SEMI) { -+ fmt++; -+ continue; -+ } -+ } - - tmp = *expr; - *expr = NULL; --- -1.7.1 - diff --git a/dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 b/dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 deleted file mode 100644 index d5d9410..0000000 --- a/dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e58b92113ba2502a7f3957065dac709d8d7e8fe3e23bc3e2543cec0a2c11450 -size 9915 diff --git a/dhcp-4.2.0-P1-no-libcrypto.diff b/dhcp-4.2.0-P1-no-libcrypto.diff deleted file mode 100644 index 2ee2481..0000000 --- a/dhcp-4.2.0-P1-no-libcrypto.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index b880616..3e0d11b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -420,8 +420,12 @@ AC_TRY_LINK( - AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) - - # find an MD5 library -+saved_LIBS="$LIBS" -+LIBS="" - AC_SEARCH_LIBS(MD5_Init, [crypto]) - AC_SEARCH_LIBS(MD5Init, [crypto]) -+CRYPTO_LIBS="$LIBS" -+LIBS="$saved_LIBS" - - # Solaris needs some libraries for functions - AC_SEARCH_LIBS(socket, [socket]) diff --git a/dhcp-4.2.0-P2-CVE-2011-0413.bnc667655.diff b/dhcp-4.2.0-P2-CVE-2011-0413.bnc667655.diff deleted file mode 100644 index 5941b03..0000000 --- a/dhcp-4.2.0-P2-CVE-2011-0413.bnc667655.diff +++ /dev/null @@ -1,78 +0,0 @@ -From ef8d97cd543d87135b3aae2d778a6f91cb800498 Mon Sep 17 00:00:00 2001 -From: Marius Tomaschewski -Date: Wed, 2 Feb 2011 09:18:39 +0100 -Subject: [PATCH] Unexpected abort caused by a DHCPv6 decline - -Security fix (CVE-2011-0413, VU#686084, bnc#667655) extracted from -dhcp-4.2.1b1 sources; description from dhcp-4.2.1b1/RELNOTES: -! When processing a request in the DHCPv6 server code that specifies - an address that is tagged as abandoned (meaning we received a - decline request for it previously) don't attempt to move it from - the inactive to active pool as doing so can result in the server - crshing on an assert failure. Also retag the lease as active - and reset it's timeout value. - [ISC-Bugs #21921] - -Signed-off-by: Marius Tomaschewski ---- - server/mdb6.c | 19 ++++++++++++++++--- - 1 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/server/mdb6.c b/server/mdb6.c -index 87bd152..9d410f5 100644 ---- a/server/mdb6.c -+++ b/server/mdb6.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2007-2010 by Internet Systems Consortium, Inc. ("ISC") -+ * Copyright (C) 2007-2011 by Internet Systems Consortium, Inc. ("ISC") - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above -@@ -1010,7 +1010,7 @@ move_lease_to_active(struct ipv6_pool *pool, struct iasubopt *lease) { - * Renew an lease in the pool. - * - * To do this, first set the new hard_lifetime_end_time for the resource, -- * and then invoke renew_lease() on it. -+ * and then invoke renew_lease6() on it. - * - * WARNING: lease times must only be extended, never reduced!!! - */ -@@ -1020,12 +1020,24 @@ renew_lease6(struct ipv6_pool *pool, struct iasubopt *lease) { - * If we're already active, then we can just move our expiration - * time down the heap. - * -+ * If we're abandoned then we are already on the active list -+ * but we need to retag the lease and move our expiration -+ * from infinite to the current value -+ * - * Otherwise, we have to move from the inactive heap to the - * active heap. - */ - if (lease->state == FTS_ACTIVE) { - isc_heap_decreased(pool->active_timeouts, lease->heap_index); - return ISC_R_SUCCESS; -+ } else if (lease->state == FTS_ABANDONED) { -+ char tmp_addr[INET6_ADDRSTRLEN]; -+ lease->state = FTS_ACTIVE; -+ isc_heap_increased(pool->active_timeouts, lease->heap_index); -+ log_info("Reclaiming previously abandoned address %s", -+ inet_ntop(AF_INET6, &(lease->addr), tmp_addr, -+ sizeof(tmp_addr))); -+ return ISC_R_SUCCESS; - } else { - return move_lease_to_active(pool, lease); - } -@@ -1115,7 +1127,8 @@ isc_result_t - decline_lease6(struct ipv6_pool *pool, struct iasubopt *lease) { - isc_result_t result; - -- if (lease->state != FTS_ACTIVE) { -+ if ((lease->state != FTS_ACTIVE) && -+ (lease->state != FTS_ABANDONED)) { - result = move_lease_to_active(pool, lease); - if (result != ISC_R_SUCCESS) { - return result; --- -1.7.1 - diff --git a/dhcp-4.2.0-P2.tar.bz2 b/dhcp-4.2.0-P2.tar.bz2 deleted file mode 100644 index 3815edd..0000000 --- a/dhcp-4.2.0-P2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fb1e8f4f4bef848bc7c5cbac510c2d4091cf4a10ca831ab892512f48274983e -size 8432072 diff --git a/dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff b/dhcp-4.2.1-dhclient-send-hostname-rml.diff similarity index 75% rename from dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff rename to dhcp-4.2.1-dhclient-send-hostname-rml.diff index 6aca931..89be585 100644 --- a/dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff +++ b/dhcp-4.2.1-dhclient-send-hostname-rml.diff @@ -1,34 +1,34 @@ diff --git a/client/dhclient.8 b/client/dhclient.8 -index b805528..d31fa8d 100644 +index 7a3c154..e284210 100644 --- a/client/dhclient.8 +++ b/client/dhclient.8 -@@ -60,6 +60,9 @@ dhclient - Dynamic Host Configuration Protocol Client +@@ -64,6 +64,10 @@ dhclient - Dynamic Host Configuration Protocol Client .I port ] [ -+.B -H hostname ++.B -H ++.I hostname +] +[ .B -d ] [ -@@ -227,6 +230,11 @@ If a different port is specified for the client to listen on and - transmit on, the client will also use a different destination port - +@@ -305,6 +309,10 @@ If a different port is specified on which the client should listen and + transmit, the client will also use a different destination port - one less than the specified port. - .PP -+The -+.B -H -+flag may be used to specify a client hostname that should be sent to + .TP ++.BI \-H \ hostname ++This flag may be used to specify a client hostname that should be sent to +the DHCP server. Note, that this option is a SUSE/Novell extension. -+.PP - The DHCP client normally transmits any protocol messages it sends - before acquiring an IP address to, 255.255.255.255, the IP limited - broadcast address. For debugging purposes, it may be useful to have ++.TP + .BI \-s \ server + Specify the server IP address or fully qualified domain name to use as + a destination for DHCP protocol messages before diff --git a/client/dhclient.c b/client/dhclient.c -index 15c31a5..65e9c23 100644 +index dc19e8b..bd02cc9 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -108,6 +108,7 @@ main(int argc, char **argv) { +@@ -110,6 +110,7 @@ main(int argc, char **argv) { int no_dhclient_db = 0; int no_dhclient_pid = 0; int no_dhclient_script = 0; @@ -36,7 +36,7 @@ index 15c31a5..65e9c23 100644 #ifdef DHCPv6 int local_family_set = 0; #endif /* DHCPv6 */ -@@ -212,6 +213,16 @@ main(int argc, char **argv) { +@@ -220,6 +221,16 @@ main(int argc, char **argv) { if (++i == argc) usage(); mockup_relay = argv[i]; @@ -53,7 +53,7 @@ index 15c31a5..65e9c23 100644 } else if (!strcmp(argv[i], "-nw")) { nowait = 1; } else if (!strcmp(argv[i], "-n")) { -@@ -445,6 +456,32 @@ main(int argc, char **argv) { +@@ -468,6 +479,32 @@ main(int argc, char **argv) { /* Parse the dhclient.conf file. */ read_client_conf(); @@ -86,7 +86,7 @@ index 15c31a5..65e9c23 100644 /* Parse the lease database. */ read_client_leases(); -@@ -674,12 +711,12 @@ static void usage() +@@ -676,12 +713,12 @@ static void usage() log_error("Usage: dhclient %s %s", #ifdef DHCPv6 diff --git a/dhcp-4.2.1-ldap-patch-mt01.diff.bz2 b/dhcp-4.2.1-ldap-patch-mt01.diff.bz2 new file mode 100644 index 0000000..87aa665 --- /dev/null +++ b/dhcp-4.2.1-ldap-patch-mt01.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c2229228431fa1b71761a76a45952fb8ec6e7a7cc7e84d7f49f953f96c303ad +size 10004 diff --git a/dhcp-4.2.1.tar.bz2 b/dhcp-4.2.1.tar.bz2 new file mode 100644 index 0000000..09becf6 --- /dev/null +++ b/dhcp-4.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:172851e0eedbbb009142b143a5f1ed9d6d370d909475a356ac9a753c15c354e9 +size 8656089 diff --git a/dhcp.changes b/dhcp.changes index 97542ec..3267ba4 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 30 15:56:14 UTC 2011 - mt@suse.de + +- first test to update to 4.2.1 + ------------------------------------------------------------------- Mon Feb 21 14:51:43 UTC 2011 - mt@suse.de diff --git a/dhcp.spec b/dhcp.spec index 04a8282..82230d1 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -17,7 +17,7 @@ # norootforbuild -%define isc_version 4.2.0-P2 +%define isc_version 4.2.1 %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define omc_prefix /usr/share/omc %define omc_svcdir %{omc_prefix}/svcinfo.d @@ -35,8 +35,8 @@ BuildRequires: dos2unix License: BSD3c(or similar) Group: Productivity/Networking/Boot/Servers AutoReqProv: on -Version: 4.2.0.P2 -Release: 8 +Version: 4.2.1 +Release: 0 Summary: Common Files Used by ISC DHCP Software Url: http://www.isc.org/software/dhcp Source0: dhcp-%{isc_version}.tar.bz2 @@ -76,14 +76,11 @@ Patch13: dhcp-4.1.1-tmpfile.diff Patch14: dhcp-4.1.1-in6_pktinfo-prototype.diff Patch15: contrib-lease-path.diff Patch20: dhcp-4.1.1-dhclient-exec-filedes.diff -Patch21: dhcp-4.2.0-P1-dhclient-send-hostname-rml.diff +Patch21: dhcp-4.2.1-dhclient-send-hostname-rml.diff ## patch lives here: http://www.suse.de/~mt/git/dhcp-ldap.git/ -Patch30: dhcp-4.2.0-P1-ldap-patch-mt01.diff.bz2 -Patch39: dhcp-4.2.0-P1-no-libcrypto.diff +Patch30: dhcp-4.2.1-ldap-patch-mt01.diff.bz2 Patch40: dhcp-4.1.1-P1-lpf-bind-msg-fix.diff Patch41: dhcp-4.1.1-P1-relay-no-ip-on-interface.diff -Patch42: dhcp-4.1.1-P1-optional-value-infinite-loop.diff -Patch43: dhcp-4.2.0-P2-CVE-2011-0413.bnc667655.diff Patch44: dhcp-4.2.0-xen-checksum.patch ## PreReq: /bin/touch /sbin/chkconfig sysconfig @@ -206,11 +203,8 @@ Authors: %if 0%{?with_ldap} %patch30 -p1 %endif -%patch39 -p1 %patch40 -p1 %patch41 -p1 -%patch42 -p1 -%patch43 -p1 %patch44 -p1 ## find . -type f -name \*.cat\* -exec rm -f {} \;