Hello community, here is the log from the commit of package dhcp checked in at Wed Jan 10 17:39:56 CET 2007. -------- --- dhcp/dhcp.changes 2006-11-08 11:51:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2007-01-09 13:48:19.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 9 13:48:07 CET 2007 - mt@suse.de + +- Added installation of dhcpd.xml, dhcpd service description + for omc xml-service-provider, fate #301710. +- fix of the ldap-patch strncat fix, bug #202648 + +------------------------------------------------------------------- New: ---- dhcpd.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.q26743/_old 2007-01-10 17:39:13.000000000 +0100 +++ /var/tmp/diff_new_pack.q26743/_new 2007-01-10 17:39:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dhcp (Version 3.0.5) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,12 +11,14 @@ # norootforbuild Name: dhcp +%define omc_prefix /usr/share/omc +%define omc_svcdir %{omc_prefix}/svcinfo.d BuildRequires: openldap2-devel -License: BSD License and BSD-like, Other License(s), see package +License: BSD License and BSD-like Group: Productivity/Networking/Boot/Servers Autoreqprov: on Version: 3.0.5 -Release: 2 +Release: 12 Summary: Common Files Used by ISC DHCP Software URL: http://www.isc.org/isc/dhcp.html Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz @@ -39,6 +41,7 @@ Source33: http://www.andrew.cmu.edu/~kevinm/dhcp/reset-ip Source40: http://www3.baylor.edu/~Jeff_Wilson/GiveAway/leases.awk Source41: http://www.suse.de/~poeml/dnscompr.py +Source42: dhcpd.xml ## adjust some paths Patch: dhcp-3.0rc10.dif ## chroot patch by Ari Edelkind (see readme) @@ -256,6 +259,7 @@ # install the saved bsd flavor binary install -m 755 work.linux-2.2/server/dhcpd.bsd $RPM_BUILD_ROOT/usr/sbin/dhcpd.bsd mkdir -p $RPM_BUILD_ROOT/etc/init.d +mkdir -p $RPM_BUILD_ROOT/%{omc_svcdir} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/var/run # set up chroot jail @@ -296,6 +300,7 @@ ' server/dhcpd.conf > dhcpd.conf mv contrib/3.0b1-lease-convert . find $RPM_BUILD_ROOT/%{_mandir} -type f | xargs chmod 644 +install -m 644 $RPM_SOURCE_DIR/dhcpd.xml $RPM_BUILD_ROOT/%{omc_svcdir}/ %pre # In the past, the name of the source package was "dhcp" but the subpackage @@ -465,6 +470,9 @@ /var/adm/fillup-templates/sysconfig.dhcpd /var/adm/fillup-templates/sysconfig.syslog-dhcpd %dir /var/lib/dhcp/%_lib +%dir %{omc_prefix}/ +%dir %{omc_svcdir}/ +%{omc_svcdir}/dhcpd.xml %files client %defattr(-,root,root) @@ -494,6 +502,10 @@ %doc %{_mandir}/man3/dhcpctl.3.gz %changelog -n dhcp +* Tue Jan 09 2007 - mt@suse.de +- Added installation of dhcpd.xml, dhcpd service description + for omc xml-service-provider, fate #301710. +- fix of the ldap-patch strncat fix, bug #202648 * Wed Nov 08 2006 - mt@suse.de - fix for strncat usage in ldap-patch, bug #202648 * Tue Nov 07 2006 - mt@suse.de ++++++ dhcp-3.0.4-ldap-patch-strncat.diff ++++++ --- /var/tmp/diff_new_pack.q26743/_old 2007-01-10 17:39:14.000000000 +0100 +++ /var/tmp/diff_new_pack.q26743/_new 2007-01-10 17:39:14.000000000 +0100 @@ -9,7 +9,7 @@ +x_strncat(char *dst, const char *src, size_t dst_size) +{ + size_t len = strlen(dst); -+ return strncat(dst, src, dst_size > len ? dst_size - len + 1: 0); ++ return strncat(dst, src, dst_size > len ? dst_size - len - 1: 0); +} static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org