From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 31 May 2012 13:34:56 +0000 (+0200)
Subject: Merge branch 'trac1503'
X-Git-Tag: trac2351_base~226^2~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92cdf7773ea4631eda41a15b5b5b21a4926ff391;p=thirdparty%2Fkea.git

Merge branch 'trac1503'

Conflicts:
	ChangeLog
	src/bin/dhcp6/tests/dhcp6_test.py
---

92cdf7773ea4631eda41a15b5b5b21a4926ff391
diff --cc ChangeLog
index 5b9c9d183e,3e3bcc54a1..c849b55d0e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,13 @@@
 -4XX.	[func]		tomek
++442.	[func]		tomek
+ 	b10-dhcp4, b10-dhcp6: Both DHCP servers now accept -p parameter
+ 	that can be used to specify listening port number. This capability
+ 	is useful only for testing purposes.
 -	(Trac #1503, git TBD)
++	(Trac #1503, git e60af9fa16a6094d2204f27c40a648fae313bdae)
++
 +441.	[func]		tomek
 +	libdhcp++: Stub interface detection (support for interfaces.txt
 +	file) was removed.
 +	(Trac #1281, git 900fc8b420789a8c636bcf20fdaffc60bc1041e0)
  
  bind10-devel-20120517 released on May 17. 2012
  
diff --cc src/bin/dhcp4/tests/Makefile.am
index b956aee802,c46b9abde6..a327e478c7
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -1,7 -1,10 +1,11 @@@
  PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
  
- # If necessary (rare cases), explicitly specify paths to dynamic libraries
- # required by loadable python modules.
+ PYTESTS = dhcp4_test.py
+ EXTRA_DIST = $(PYTESTS)
+ 
 -# If necessary (rare cases), explicitly specify paths to dynamic libraries
 -# required by loadable python modules.
++# Explicitly specify paths to dynamic libraries required by loadable python
++# modules. That is required on Mac OS systems. Otherwise we will get exception
++# about python not being able to load liblog library.
  LIBRARY_PATH_PLACEHOLDER =
  if SET_ENV_LIBRARY_PATH
  LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/util/io/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)
diff --cc src/bin/dhcp6/tests/Makefile.am
index d216f534e0,6a0844fd09..a1a11a075e
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@@ -2,8 -2,10 +2,9 @@@ PYCOVERAGE_RUN = @PYCOVERAGE_RUN
  PYTESTS = dhcp6_test.py
  EXTRA_DIST = $(PYTESTS)
  
--# If necessary (rare cases), explicitly specify paths to dynamic libraries
--# required by loadable python modules.
++# Explicitly specify paths to dynamic libraries required by loadable python
++# modules. That is required on Mac OS systems. Otherwise we will get exception
++# about python not being able to load liblog library.
  LIBRARY_PATH_PLACEHOLDER =
  if SET_ENV_LIBRARY_PATH
  LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/util/io/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)