Hello community, here is the log from the commit of package dhcp checked in at Tue May 22 15:06:42 CEST 2007. -------- --- dhcp/dhcp.changes 2007-05-14 15:38:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2007-05-22 10:17:31.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 22 09:37:59 CEST 2007 - mt@suse.de + +- Bug 275592: Added ldap and ndsd to the Should-Start/Stop LSB + init info tags of the dhcp-server init script. +- Bug #241113: Added copying of /etc/openldap/ldap.conf and + more base libraries into the chroot jail. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.Yl9484/_old 2007-05-22 15:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Yl9484/_new 2007-05-22 15:05:16.000000000 +0200 @@ -23,7 +23,7 @@ Group: Productivity/Networking/Boot/Servers Autoreqprov: on Version: 3.0.5 -Release: 34 +Release: 37 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 @@ -519,6 +519,11 @@ %doc %{_mandir}/man3/dhcpctl.3.gz %changelog +* Tue May 22 2007 - mt@suse.de +- Bug 275592: Added ldap and ndsd to the Should-Start/Stop LSB + init info tags of the dhcp-server init script. +- Bug #241113: Added copying of /etc/openldap/ldap.conf and + more base libraries into the chroot jail. * Mon May 14 2007 - mt@suse.de - Bug #265337: Fix to generate proper "host ... {" block begin brace even if no harware address is specified for the host. ++++++ rc.dhcpd ++++++ --- dhcp/rc.dhcpd 2007-05-14 15:27:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcp/rc.dhcpd 2007-05-22 10:15:11.000000000 +0200 @@ -13,9 +13,9 @@ ### BEGIN INIT INFO # Provides: dhcpd # Required-Start: $local_fs $remote_fs $network -# Should-Start: $named $syslog $time +# Should-Start: $named $syslog $time ldap ndsd # Required-Stop: $local_fs $remote_fs $network -# Should-Stop: $named $syslog +# Should-Stop: $named $syslog ldap ndsd # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: DHCP Server @@ -57,6 +57,7 @@ DAEMON_PIDFILE=/var/run/dhcpd.pid STARTPROC_LOGFILE=/var/log/rc.dhcpd.log SUPPORTS_HUP="no" +LDAP_CONF=/etc/openldap/ldap.conf # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status @@ -159,7 +160,7 @@ if test "$DHCPD_RUN_CHROOTED" = "yes" ; then ## copy the conf file to the chroot jail (dhcpd has to be restarted anyway, ## when it has changed) and change path to leases file - for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES; do + for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF; do if test -d "${i}" ; then test -d "$CHROOT_PREFIX/${i}" || \ mkdir -p "$CHROOT_PREFIX/${i}" @@ -169,13 +170,14 @@ fi done rm -f $CHROOT_PREFIX/dev/urandom - for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES /etc/{resolv.conf,host.conf,hosts,localtime} /dev/urandom; do + for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF /etc/{resolv.conf,host.conf,hosts,localtime} /dev/urandom; do if ! test -e "$i"; then continue; fi # neither of them is absolutely necessary - cp -aL "$i" "$CHROOT_PREFIX/${i%/*}/" &>/dev/null \ + cp -aL "$i" "${CHROOT_PREFIX}/${i%/*}/" &>/dev/null \ || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } done libdir=/$(basename $(echo /var/lib/dhcp/lib*)) - for i in /$libdir/{libresolv.so.2,libnss_dns{,6}.so.2}; do + for i in /$libdir/{libresolv.so.2,libnss_dns{,6}.so.2} \ + /$libdir/{libpthread.so.0,libdl.so.2} ; do if [ -s "$i" ]; then cp -pL "$i" "/var/lib/dhcp/$libdir/" \ || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org