Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at Tue Sep 6 17:14:31 CEST 2011.
-------- --- dhcp/dhcp.changes 2011-08-29 17:37:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2011-09-06 16:43:09.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Sep 6 14:27:51 UTC 2011 - [email protected] + +- Commented out all configuration examples in /etc/dhcpd.conf and + dhcp6.conf (bnc#715473). +- Enabled dhcp6.rapid-commit in /etc/dhclient6.conf config file. +- Removed useless provides/obsoletes from spec file. + +------------------------------------------------------------------- +Wed Aug 31 08:42:12 UTC 2011 - [email protected] + +- Set the DHCPD_CONF_INCLUDE_FILES and the DHCPD6_CONF_INCLUDE_FILES + variables to /etc/dhcpd.d and /etc/dhcpd6.d by default, so there + are well-defined directories expected to contain additional config + files (bnc#690585). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.UNX3Ba/_old 2011-09-06 17:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UNX3Ba/_new 2011-09-06 17:12:10.000000000 +0200 @@ -40,7 +40,7 @@ Group: Productivity/Networking/Boot/Servers AutoReqProv: on Version: 4.2.2 -Release: 1 +Release: 3 Summary: Common Files Used by ISC DHCP Software Url: http://www.isc.org/software/dhcp Source0: dhcp-%{isc_version}.tar.bz2 @@ -90,8 +90,6 @@ ## PreReq: /bin/touch /sbin/chkconfig sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: dhcp = %{version} -Obsoletes: dhcp < %{version} %package server License: BSD3c(or similar) @@ -99,8 +97,6 @@ Group: Productivity/Networking/Boot/Servers Requires: net-tools dhcp = %{version} PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd -Provides: dhcp-server = %{version}, dhcp_server, dhcp_server6 -Obsoletes: dhcp-server < %{version} AutoReqProv: on %package client @@ -109,8 +105,6 @@ Group: Productivity/Networking/Boot/Clients Requires: net-tools dhcp = %{version} /sbin/arping /usr/bin/host PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/grep -Provides: dhcp-client = %{version}, dhclient = %{version}, dhcp_client, dhcp_client6 -Obsoletes: dhcp-client < %{version}, dhclient < %{version} AutoReqProv: on %package relay @@ -119,8 +113,6 @@ Group: Productivity/Networking/Boot/Servers Requires: net-tools dhcp = %{version} PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp -Provides: dhcp-relay = %{version}, dhcrelay = %{version}, dhcp_relay, dhcp_relay6 -Obsoletes: dhcp-relay < %{version}, dhcrelay < %{version} AutoReqProv: on %package devel @@ -128,8 +120,6 @@ Summary: Header Files and Libraries for dhcpctl API Group: Development/Libraries/C and C++ Requires: dhcp = %{version} -Provides: dhcp-devel = %{version} -Obsoletes: dhcp-devel < %{version} %if %{with_doc_package} @@ -137,8 +127,6 @@ License: BSD3c(or similar) Summary: Documentation Group: Productivity/Networking/Boot/Servers -Provides: dhcp-doc = %{version} -Obsoletes: dhcp-doc < %{version} %endif %description @@ -308,6 +296,7 @@ # directories install -d -m0755 $RPM_BUILD_ROOT/sbin install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d +install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/dhcpd{,6}.d install -d -m0755 $RPM_BUILD_ROOT/%{susefw2dir} install -d -m0755 $RPM_BUILD_ROOT/%{omc_svcdir} %if %{with_ldap} @@ -458,6 +447,8 @@ %config %{_sysconfdir}/init.d/dhcpd6 %config(noreplace) %{_sysconfdir}/dhcpd.conf %config(noreplace) %{_sysconfdir}/dhcpd6.conf +%attr(755,root,root) %dir %config(noreplace) %ghost %{_sysconfdir}/dhcpd.d/ +%attr(755,root,root) %dir %config(noreplace) %ghost %{_sysconfdir}/dhcpd6.d/ %dir %{_localstatedir}/lib/dhcp %dir %{_localstatedir}/lib/dhcp/etc %dir %{_localstatedir}/lib/dhcp/dev ++++++ dhclient6.conf ++++++ --- /var/tmp/diff_new_pack.UNX3Ba/_old 2011-09-06 17:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UNX3Ba/_new 2011-09-06 17:12:10.000000000 +0200 @@ -1,7 +1,7 @@ # Client configuration file example for DHCPv6 # The client side command to enable rapid-commit (2 packet exchange) -##send dhcp6.rapid-commit; +send dhcp6.rapid-commit; # name-servers and domain-search are requested by default. # here is the way to request sip-servers-addresses too ++++++ dhcpd.conf ++++++ --- /var/tmp/diff_new_pack.UNX3Ba/_old 2011-09-06 17:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UNX3Ba/_new 2011-09-06 17:12:10.000000000 +0200 @@ -1,24 +1,29 @@ -# dhcpd.conf +# /etc/dhcpd.conf # # Sample configuration file for ISC dhcpd # +# *** PLEASE CONFIGURE IT FIRST *** +# +# Don't forget to set the DHCPD_INTERFACE in the +# /etc/sysconfig/dhcpd file. +# # option definitions common to all supported networks... -option domain-name "example.org"; -option domain-name-servers ns1.example.org, ns2.example.org; +#option domain-name "example.org"; +#option domain-name-servers ns1.example.org, ns2.example.org; -default-lease-time 600; -max-lease-time 7200; +#default-lease-time 600; +#max-lease-time 7200; # if you do not use dynamical DNS updates: # # if you want to use dynamical DNS updates, you should first read -# the manuals and DDNS-howto.txt provided in the dhcp-doc package. +# read /usr/share/doc/packages/dhcp-server/DDNS-howto.txt # -ddns-updates off; +#ddns-updates off; # Use this to enble / disable dynamic dns updates globally. -ddns-update-style none; +#ddns-update-style none; # If this DHCP server is the official DHCP server for the local # network, the authoritative directive should be uncommented. @@ -26,7 +31,7 @@ # Use this to send dhcp log messages to a different log file (you also # have to hack syslog.conf to complete the redirection). -log-facility local7; +#log-facility local7; # # Define RFC 3442 classless static route option (121); @@ -52,52 +57,52 @@ # as well, because when classless routes are in use, # the 'routers' option is ignored by the dhcp client. # -option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; +#option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; # No service will be given on this subnet, but declaring it helps the # DHCP server to understand the network topology. -subnet 10.152.187.0 netmask 255.255.255.0 { -} +#subnet 10.152.187.0 netmask 255.255.255.0 { +#} # This is a very basic subnet declaration. -subnet 10.254.239.0 netmask 255.255.255.224 { - range 10.254.239.10 10.254.239.20; - option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org; -} +#subnet 10.254.239.0 netmask 255.255.255.224 { +# range 10.254.239.10 10.254.239.20; +# option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org; +#} # This declaration allows BOOTP clients to get dynamic addresses, # which we don't really recommend. -subnet 10.254.239.32 netmask 255.255.255.224 { - range dynamic-bootp 10.254.239.40 10.254.239.60; - option broadcast-address 10.254.239.31; - option routers rtr-239-32-1.example.org; -} +#subnet 10.254.239.32 netmask 255.255.255.224 { +# range dynamic-bootp 10.254.239.40 10.254.239.60; +# option broadcast-address 10.254.239.31; +# option routers rtr-239-32-1.example.org; +#} # A slightly different configuration for an internal subnet. -subnet 10.5.5.0 netmask 255.255.255.224 { - range 10.5.5.26 10.5.5.30; - option domain-name-servers ns1.internal.example.org; - option domain-name "internal.example.org"; - option routers 10.5.5.1; - option broadcast-address 10.5.5.31; - default-lease-time 600; - max-lease-time 7200; -} +#subnet 10.5.5.0 netmask 255.255.255.224 { +# range 10.5.5.26 10.5.5.30; +# option domain-name-servers ns1.internal.example.org; +# option domain-name "internal.example.org"; +# option routers 10.5.5.1; +# option broadcast-address 10.5.5.31; +# default-lease-time 600; +# max-lease-time 7200; +#} # Hosts which require special configuration options can be listed in # host statements. If no address is specified, the address will be # allocated dynamically (if possible), but the host-specific information # will still come from the host declaration. -host passacaglia { - hardware ethernet 0:0:c0:5d:bd:95; - filename "vmunix.passacaglia"; - server-name "toccata.fugue.com"; -} +#host passacaglia { +# hardware ethernet 0:0:c0:5d:bd:95; +# filename "vmunix.passacaglia"; +# server-name "toccata.fugue.com"; +#} # Fixed IP addresses can also be specified for hosts. These addresses # should not also be listed as being available for dynamic assignment. @@ -106,33 +111,34 @@ # be booted with DHCP, unless there is an address range on the subnet # to which a BOOTP client is connected which has the dynamic-bootp flag # set. -host fantasia { - hardware ethernet 08:00:07:26:c0:a5; - fixed-address fantasia.fugue.com; -} +#host fantasia { +# hardware ethernet 08:00:07:26:c0:a5; +# fixed-address fantasia.fugue.com; +#} # You can declare a class of clients and then do address allocation # based on that. The example below shows a case where all clients # in a certain class get addresses on the 10.17.224/24 subnet, and all # other clients get addresses on the 10.0.29/24 subnet. -class "foo" { - match if substring (option vendor-class-identifier, 0, 4) = "SUNW"; -} - -shared-network 224-29 { - subnet 10.17.224.0 netmask 255.255.255.0 { - option routers rtr-224.example.org; - } - subnet 10.0.29.0 netmask 255.255.255.0 { - option routers rtr-29.example.org; - } - pool { - allow members of "foo"; - range 10.17.224.10 10.17.224.250; - } - pool { - deny members of "foo"; - range 10.0.29.10 10.0.29.230; - } -} +#class "foo" { +# match if substring (option vendor-class-identifier, 0, 4) = "SUNW"; +#} +# +#shared-network 224-29 { +# subnet 10.17.224.0 netmask 255.255.255.0 { +# option routers rtr-224.example.org; +# } +# subnet 10.0.29.0 netmask 255.255.255.0 { +# option routers rtr-29.example.org; +# } +# pool { +# allow members of "foo"; +# range 10.17.224.10 10.17.224.250; +# } +# pool { +# deny members of "foo"; +# range 10.0.29.10 10.0.29.230; +# } +#} + ++++++ dhcpd6.conf ++++++ --- /var/tmp/diff_new_pack.UNX3Ba/_old 2011-09-06 17:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UNX3Ba/_new 2011-09-06 17:12:10.000000000 +0200 @@ -1,4 +1,13 @@ -# Server configuration file example for DHCPv6 +# /etc/dhcpd6.conf +# +# Sample DHCPv6 configuration file for ISC dhcpd +# +# *** PLEASE CONFIGURE IT FIRST *** +# +# Don't forget to set the DHCPD6_INTERFACE in the +# /etc/sysconfig/dhcpd file. +# + # From the file used for TAHI tests. # @@ -17,30 +26,30 @@ # IPv6 address valid lifetime # (at the end the address is no longer usable by the client) # (set to 30 days, the usual IPv6 default) -default-lease-time 2592000; +#default-lease-time 2592000; # IPv6 address preferred lifetime # (at the end the address is deprecated, i.e., the client should use # other addresses for new connections) # (set to 7 days, the usual IPv6 default) -preferred-lifetime 604800; +#preferred-lifetime 604800; # T1, the delay before Renew # (default is 1/2 preferred lifetime) # (set to 1 hour) -option dhcp-renewal-time 3600; +#option dhcp-renewal-time 3600; # T2, the delay before Rebind (if Renews failed) # (default is 3/4 preferred lifetime) # (set to 2 hours) -option dhcp-rebinding-time 7200; +#option dhcp-rebinding-time 7200; # Enable RFC 5007 support (same than for DHCPv4) -allow leasequery; +#allow leasequery; # Global definitions for name server address(es) and domain search list -option dhcp6.name-servers fc00:501:ffff:100:200:ff:fe00:3f3e; -option dhcp6.domain-search "test.example.com","example.com"; +#option dhcp6.name-servers fc00:501:ffff:100:200:ff:fe00:3f3e; +#option dhcp6.domain-search "test.example.com","example.com"; # Set preference to 255 (maximum) in order to avoid waiting for # additional servers when there is only one @@ -52,56 +61,56 @@ # The delay before information-request refresh # (minimum is 10 minutes, maximum one day, default is to not refresh) # (set to 6 hours) -option dhcp6.info-refresh-time 21600; +#option dhcp6.info-refresh-time 21600; # Static definition (must be global) -host myclient { - # The entry is looked up by this - host-identifier option - dhcp6.client-id 00:01:00:01:00:04:93:e0:00:00:00:00:a2:a2; - - # A fixed address - fixed-address6 fc00:501:ffff:100::1234; - - # A fixed prefix - fixed-prefix6 fc00:501:ffff:101::/64; - - # Override of the global definitions, - # works only when a resource (address or prefix) is assigned - option dhcp6.name-servers fc00:501:ffff:100:200:ff:fe00:4f4e; - - # For debug (to see when the entry statements are executed) - # (log "sol" when a matching Solicitation is received) - ##if packet(0,1) = 1 { log(debug,"sol"); } -} +#host myclient { +# # The entry is looked up by this +# host-identifier option +# dhcp6.client-id 00:01:00:01:00:04:93:e0:00:00:00:00:a2:a2; +# +# # A fixed address +# fixed-address6 fc00:501:ffff:100::1234; +# +# # A fixed prefix +# fixed-prefix6 fc00:501:ffff:101::/64; +# +# # Override of the global definitions, +# # works only when a resource (address or prefix) is assigned +# option dhcp6.name-servers fc00:501:ffff:100:200:ff:fe00:4f4e; +# +# # For debug (to see when the entry statements are executed) +# # (log "sol" when a matching Solicitation is received) +# ##if packet(0,1) = 1 { log(debug,"sol"); } +#} # The subnet where the server is attached # (i.e., the server has an address in this subnet) -subnet6 fc00:501:ffff:100::/64 { - # Two addresses available to clients - # (the third client should get NoAddrsAvail) - range6 fc00:501:ffff:100::10 fc00:501:ffff:100::11; - - # Use the whole /64 prefix for temporary addresses - # (i.e., direct application of RFC 4941) - range6 fc00:501:ffff:100:: temporary; - - # Some /64 prefixes available for Prefix Delegation (RFC 3633) - prefix6 fc00:501:ffff:100:: fc00:501:ffff:111:: /64; -} +#subnet6 fc00:501:ffff:100::/64 { +# # Two addresses available to clients +# # (the third client should get NoAddrsAvail) +# range6 fc00:501:ffff:100::10 fc00:501:ffff:100::11; +# +# # Use the whole /64 prefix for temporary addresses +# # (i.e., direct application of RFC 4941) +# range6 fc00:501:ffff:100:: temporary; +# +# # Some /64 prefixes available for Prefix Delegation (RFC 3633) +# prefix6 fc00:501:ffff:100:: fc00:501:ffff:111:: /64; +#} # A second subnet behind a relay agent -subnet6 fc00:501:ffff:101::/64 { - range6 fc00:501:ffff:101::10 fc00:501:ffff:101::11; - - # Override of the global definitions, - # works only when a resource (address or prefix) is assigned - option dhcp6.name-servers fc00:501:ffff:101:200:ff:fe00:3f3e; - -} +#subnet6 fc00:501:ffff:101::/64 { +# range6 fc00:501:ffff:101::10 fc00:501:ffff:101::11; +# +# # Override of the global definitions, +# # works only when a resource (address or prefix) is assigned +# option dhcp6.name-servers fc00:501:ffff:101:200:ff:fe00:3f3e; +# +#} # A third subnet behind a relay agent chain -subnet6 fc00:501:ffff:102::/64 { - range6 fc00:501:ffff:102::10 fc00:501:ffff:102::11; -} +#subnet6 fc00:501:ffff:102::/64 { +# range6 fc00:501:ffff:102::10 fc00:501:ffff:102::11; +#} ++++++ rc.dhcpd ++++++ --- /var/tmp/diff_new_pack.UNX3Ba/_old 2011-09-06 17:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UNX3Ba/_new 2011-09-06 17:12:10.000000000 +0200 @@ -53,6 +53,7 @@ test "$DHCPD_BINARY" = "/usr/sbin/dhcpd.lpf" -o \ "$DHCPD_BINARY" = "/usr/sbin/dhcpd.bsd" && \ DHCPD_BINARY=/usr/sbin/dhcpd +DHCPD_CONF_INCLUDE_FILES=${DHCPD_CONF_INCLUDE_FILES:-/etc/dhcpd.d} DAEMON='ISC DHCPv4 4.x Server' DAEMON_BIN=${DHCPD_BINARY:=/usr/sbin/dhcpd} ++++++ rc.dhcpd6 ++++++ --- /var/tmp/diff_new_pack.UNX3Ba/_old 2011-09-06 17:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UNX3Ba/_new 2011-09-06 17:12:10.000000000 +0200 @@ -52,7 +52,7 @@ DHCPD_RUN_AS=$DHCPD6_RUN_AS DHCPD_BINARY=$DHCPD6_BINARY DHCPD_INTERFACE=$DHCPD6_INTERFACE -DHCPD_CONF_INCLUDE_FILES=$DHCPD6_CONF_INCLUDE_FILES +DHCPD_CONF_INCLUDE_FILES=${DHCPD6_CONF_INCLUDE_FILES:-/etc/dhcpd6.d} DHCPD_OTHER_ARGS=$DHCPD6_OTHER_ARGS test "$SUPPORTS_CHROOT" = no && DHCPD_RUN_CHROOTED=no ++++++ sysconfig.dhcpd ++++++ --- /var/tmp/diff_new_pack.UNX3Ba/_old 2011-09-06 17:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UNX3Ba/_new 2011-09-06 17:12:10.000000000 +0200 @@ -80,8 +80,8 @@ # # Shall the DHCP server dhcpd run in a chroot jail (/var/lib/dhcp)? # -# Each time you start dhcpd with the init script, /etc/dhcpd.conf will -# be copied to /var/lib/dhcp/etc/. +# Each time you start dhcpd with the init script, /etc/dhcpd.conf +# will be copied to /var/lib/dhcp/etc/. # # Some files that are important for hostname to IP address resolution # (/etc/{gai.conf,nsswitch.conf,resolv.conf,host.conf,hosts,localtime}, @@ -97,10 +97,10 @@ ## Default: yes ## ServiceRestart: dhcpd6 # -# Shall the DHCP server dhcpd run in a chroot jail (/var/lib/dhcp)? +# Shall the DHCP server dhcpd run in a chroot jail (/var/lib/dhcp6)? # -# Each time you start dhcpd with the init script, /etc/dhcpd.conf will -# be copied to /var/lib/dhcp/etc/. +# Each time you start dhcpd with the init script, /etc/dhcpd6.conf +# will be copied to /var/lib/dhcp6/etc/. # # Some files that are important for hostname to IP address resolution # (/etc/{gai.conf,nsswitch.conf,resolv.conf,host.conf,hosts,localtime}, @@ -108,12 +108,12 @@ # also be copied to the chroot jail by the init script when you start # it (less than 1MB altogether). # -# The pid file will be in /var/lib/dhcp/var/run/dhcpd.pid. +# The pid file will be in /var/lib/dhcp6/var/run/dhcpd.pid. # DHCPD6_RUN_CHROOTED="yes" ## Type: string -## Default: "" +## Default: "/etc/dhcpd.d" ## ServiceRestart: dhcpd # # Since version 3, dhcpd.conf can contain include statements. @@ -121,28 +121,30 @@ # files will be copied to $chroot/etc/, when dhcpd is started in the # chroot jail. (/etc/dhcpd.conf is always copied.) # -# For your convenience, you can also specify entire directories, like -# "/etc/dhcpd.conf.d". +# For your convenience, you can also specify entire directories, +# that will be copied inclusive subdirectories. The /etc/dhcpd.d +# directory will be copied by default when it exists. # -# Example: "/etc/dhcpd.conf.shared /etc/dhcpd.conf.bootp-clients" +# Example: "/etc/foo.bar.conf /etc/dhcpd.bootp-clients.conf" # -DHCPD_CONF_INCLUDE_FILES="" +DHCPD_CONF_INCLUDE_FILES="/etc/dhcpd.d" ## Type: string -## Default: "" +## Default: "/etc/dhcpd.d" ## ServiceRestart: dhcpd6 # # Since version 3, dhcpd.conf can contain include statements. # If you enter the names of any include files here, _all_ conf -# files will be copied to $chroot/etc/, when dhcpd is started in the -# chroot jail. (/etc/dhcpd.conf is always copied.) +# files will be copied to $chroot/etc/, when dhcpd is started in +# the chroot jail. (/etc/dhcpd6.conf is always copied.) # -# For your convenience, you can also specify entire directories, like -# "/etc/dhcpd.conf.d". +# For your convenience, you can also specify entire directories, +# that will be copied inclusive subdirectories. The /etc/dhcpd6.d +# directory will be copied by default when it exists. # -# Example: "/etc/dhcpd.conf.shared /etc/dhcpd.conf.bootp-clients" +# Example: "/etc/foo.bar.conf /etc/dhcpd6.bootp-clients.conf" # -DHCPD6_CONF_INCLUDE_FILES="" +DHCPD6_CONF_INCLUDE_FILES="/etc/dhcpd6.d" ## Type: string ## Default: "dhcpd" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
