Hello community,
here is the log from the commit of package dhcp for openSUSE:12.1:Update:Test
checked in at 2012-01-11 18:26:45
Comparing /work/SRC/openSUSE:12.1:Update:Test/dhcp (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.dhcp.new (New)
Package is dhcp, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/dhcp/dhcp.changes 2011-12-09
16:44:58.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.dhcp.new/dhcp.changes 2012-01-11
18:26:47.0 +0100
@@ -1,0 +2,10 @@
+Fri Jan 6 12:15:47 UTC 2012 - m...@suse.com
+
+- Fixed close-on-exec patch to not set it on stderr (bnc#732910)
+- Fixed incorrect a array type option parsing causing to discard
+ e.g. classless static routes from lease file [reported as ISC-Bug
+ 27289] and zero-length option parsing such as dhcp6.rapid-commit
+ in dhclient6 [reported as ISC-Bug 27314] (bnc#739696).
+- Fixed dhclient to include its pid number in syslog messages.
+
+---
New:
dhcp-4.2.2-dhclient-log-pid.diff
dhcp-4.2.2-dhclient-option_param-a.diff
dhcp-4.2.2-dhclient-zero-length-options.patch
Other differences:
--
++ dhcp.spec ++
--- /var/tmp/diff_new_pack.1oMSFm/_old 2012-01-11 18:26:47.0 +0100
+++ /var/tmp/diff_new_pack.1oMSFm/_new 2012-01-11 18:26:47.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dhcp
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -89,6 +89,9 @@
Patch46:dhcp-4.2.2-close-on-exec.diff
Patch47:dhcp-4.2.2-quiet-dhclient.bnc711420.diff
Patch48:dhcp-4.2.2-CVE-2011-4539-regex-DoS.bnc735610.diff
+Patch49:dhcp-4.2.2-dhclient-option_param-a.diff
+Patch50:dhcp-4.2.2-dhclient-log-pid.diff
+Patch51:dhcp-4.2.2-dhclient-zero-length-options.patch
##
PreReq: /bin/touch /sbin/chkconfig sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -218,6 +221,9 @@
%patch46 -p1
%patch47 -p1
%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
##
find . -type f -name \*.cat\* -exec rm -f {} \;
dos2unix contrib/ms2isc/*
++ dhcp-4.2.2-close-on-exec.diff ++
--- /var/tmp/diff_new_pack.1oMSFm/_old 2012-01-11 18:26:47.0 +0100
+++ /var/tmp/diff_new_pack.1oMSFm/_new 2012-01-11 18:26:47.0 +0100
@@ -24,21 +24,6 @@
index 82c26bb..a1cab01 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
-@@ -131,11 +131,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. */
-- fd = open(/dev/null, O_RDWR);
-+ fd = open(/dev/null, O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open(/dev/null, O_RDWR);
-+ fd = open(/dev/null, O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open(/dev/null, O_RDWR);
-+ fd = open(/dev/null, O_RDWR | O_CLOEXEC);
- if (fd == 2)
- log_perror = 0; /* No sense logging to /dev/null. */
- else if (fd != -1)
@@ -423,7 +423,7 @@ main(int argc, char **argv) {
int e;
@@ -84,19 +69,6 @@
if (leaseFile == NULL) {
log_error (can't create %s: %m, path_dhclient_db);
return 0;
-@@ -3472,9 +3472,9 @@ void go_daemon ()
- close(2);
-
- /* Reopen them on /dev/null. */
-- open(/dev/null, O_RDWR);
-- open(/dev/null, O_RDWR);
-- open(/dev/null, O_RDWR);
-+ open(/dev/null, O_RDWR | O_CLOEXEC);
-+ open(/dev/null, O_RDWR | O_CLOEXEC);
-+ open(/dev/null, O_RDWR | O_CLOEXEC);
-
- write_client_pid_file ();
-
diff --git a/common/bpf.c b/common/bpf.c
index 8bd5727..7b8f1d4 100644
--- a/common/bpf.c
@@ -276,21 +248,6 @@
index f21f16f..d2aa90e 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
-@@ -183,11 +183,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. */
-- fd = open(/dev/null, O_RDWR);
-+ fd = open(/dev/null, O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open(/dev/null, O_RDWR);
-+ fd = open(/dev/null, O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open(/dev/null, O_RDWR);
-+
