rpms/dhcp/devel .cvsignore, 1.24, 1.25 dhclient-script, 1.8, 1.9 dhcp.spec, 1.249, 1.250 sources, 1.25, 1.26
David Cantrell
dcantrel at fedoraproject.org
Mon Apr 13 21:56:31 UTC 2009
- Previous message (by thread): rpms/lxmusic/F-10 lxmusic.spec,1.1,1.2
- Next message (by thread): rpms/pam_mount/devel 0001-use-extra_opts-in-etc-mtab-unless-empty.patch, NONE, 1.1 pam_mount-1.22-uninitialized-variable.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 pam_mount.spec, 1.54, 1.55 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcantrel
Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18044
Modified Files:
.cvsignore dhclient-script dhcp.spec sources
Log Message:
* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-16
- Correct %post problems in dhclient package (#495361)
- Read hooks scripts from /etc/dhcp (#495361)
- Update to latest ldap-for-dhcp
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 9 Mar 2009 23:01:06 -0000 1.24
+++ .cvsignore 13 Apr 2009 21:56:00 -0000 1.25
@@ -1,2 +1,2 @@
dhcp-4.1.0.tar.gz
-ldap-for-dhcp-4.1.0.tar.gz
+ldap-for-dhcp-4.1.0-2.tar.gz
Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dhclient-script 11 Mar 2009 19:12:56 -0000 1.8
+++ dhclient-script 13 Apr 2009 21:56:00 -0000 1.9
@@ -3,7 +3,7 @@
# dhclient-script: Network interface configuration script run by
# dhclient based on DHCP client communication
#
-# Copyright (C) 2008 Red Hat, Inc.
+# Copyright (C) 2008, 2009 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -35,6 +35,8 @@
LOGFACILITY="local7"
LOGLEVEL="notice"
+ETCDIR="/etc/dhcp"
+
logmessage() {
msg="${1}"
logger -p ${LOGFACILITY}.${LOGLEVEL} -t "NET" "dhclient: ${msg}"
@@ -107,8 +109,8 @@
exit_with_hooks() {
exit_status="${1}"
- if [ -x /etc/dhclient-exit-hooks ]; then
- . /etc/dhclient-exit-hooks
+ if [ -x ${ETCDIR}/dhclient-exit-hooks ]; then
+ . ${ETCDIR}/dhclient-exit-hooks
fi
exit ${exit_status}
@@ -236,10 +238,10 @@
ip link set ${interface} mtu ${new_interface_mtu}
fi
- if [ -x /etc/dhclient-${interface}-up-hooks ]; then
- . /etc/dhclient-${interface}-up-hooks
- elif [ -x /etc/dhclient-up-hooks ]; then
- . /etc/dhclient-up-hooks
+ if [ -x ${ETCDIR}/dhclient-${interface}-up-hooks ]; then
+ . ${ETCDIR}/dhclient-${interface}-up-hooks
+ elif [ -x ${ETCDIR}/dhclient-up-hooks ]; then
+ . ${ETCDIR}/dhclient-up-hooks
fi
if [[ (( -z "${GATEWAYDEV}" ) ||
@@ -360,8 +362,8 @@
fi
# execute any additional client side configuration scripts we have
- if [ -d /etc/dhcp/dhclient.d ]; then
- for f in /etc/dhcp/dhclient.d/*.sh ; do
+ if [ -d ${ETCDIR}/dhclient.d ]; then
+ for f in ${ETCDIR}/dhclient.d/*.sh ; do
if [ -x ${f} ]; then
subsystem="${f%.sh}"
subsystem="${subsystem##*/}"
@@ -386,12 +388,12 @@
# ### MAIN
#
-if [ -x /etc/dhclient-enter-hooks ]; then
+if [ -x ${ETCDIR}/dhclient-enter-hooks ]; then
exit_status=0
# dhclient-enter-hooks can abort dhclient-script by setting
# the exit_status variable to a non-zero value
- . /etc/dhclient-enter-hooks
+ . ${ETCDIR}/dhclient-enter-hooks
if [ ${exit_status} -ne 0 ]; then
exit ${exit_status}
fi
@@ -488,8 +490,8 @@
fi
# execute any additional client side configuration scripts we have
- if [ -d /etc/dhcp/dhclient.d ]; then
- for f in /etc/dhcp/dhclient.d/*.sh ; do
+ if [ -d ${ETCDIR}/dhclient.d ]; then
+ for f in ${ETCDIR}/dhclient.d/*.sh ; do
if [ -x ${f} ]; then
subsystem="${f%.sh}"
subsystem="${subsystem##*/}"
@@ -499,10 +501,10 @@
done
fi
- if [ -x /etc/dhclient-${interface}-down-hooks ]; then
- . /etc/dhclient-${interface}-down-hooks
- elif [ -x /etc/dhclient-down-hooks ]; then
- . /etc/dhclient-down-hooks
+ if [ -x ${ETCDIR}/dhclient-${interface}-down-hooks ]; then
+ . ${ETCDIR}/dhclient-${interface}-down-hooks
+ elif [ -x ${ETCDIR}/dhclient-down-hooks ]; then
+ . ${ETCDIR}/dhclient-down-hooks
fi
if [ -n "${alias_ip_address}" ]; then
Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- dhcp.spec 4 Apr 2009 01:50:27 -0000 1.249
+++ dhcp.spec 13 Apr 2009 21:56:00 -0000 1.250
@@ -1,10 +1,13 @@
# vendor string (e.g., Fedora, EL)
%define vvendor Fedora
+# Where dhcp configuration files are stored
+%define dhcpconfdir %{_sysconfdir}/dhcp
+
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: 4.1.0
-Release: 15%{?dist}
+Release: 16%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was.
@@ -14,7 +17,7 @@
Group: System Environment/Daemons
URL: http://isc.org/products/DHCP/
Source0: ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz
-Source1: http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{version}.tar.gz
+Source1: http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-%{version}-2.tar.gz
Source2: dhcpd.init
Source3: dhcrelay.init
Source4: dhclient-script
@@ -70,6 +73,7 @@
Group: System Environment/Base
Requires: initscripts >= 6.75
Requires(post): coreutils
+Requires(post): grep
Obsoletes: dhcpcd <= 1.3.22pl1-7
Obsoletes: libdhcp4client <= 12:4.0.0-31.fc10
Obsoletes: libdhcp <= 1.99.8-1.fc10
@@ -102,7 +106,7 @@
%setup -T -D -a 1
# Add in LDAP support
-%{__patch} -p1 < ldap-for-dhcp-%{version}/%{name}-%{version}-ldap.patch
+%{__patch} -p1 < ldap-for-dhcp-%{version}-2/%{name}-%{version}-ldap.patch
# Replace the standard ISC warning message about requesting help with an
# explanation that this is a patched build of ISC DHCP and bugs should be
@@ -222,14 +226,14 @@
%{__sed} -i -e 's|CLIENTBINDIR|/sbin|g' \
-e 's|RUNDIR|%{_localstatedir}/run|g' \
-e 's|DBDIR|%{_localstatedir}/db/dhclient|g' \
- -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
+ -e 's|ETCDIR|%{dhcpconfdir}|g' $page
done
for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8 ; do
%{__sed} -i -e 's|CLIENTBINDIR|/sbin|g' \
-e 's|RUNDIR|%{_localstatedir}/run|g' \
-e 's|DBDIR|%{_localstatedir}/db/dhcpd|g' \
- -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
+ -e 's|ETCDIR|%{dhcpconfdir}|g' $page
done
aclocal
@@ -296,8 +300,8 @@
%{__cp} -p server/dhcpd.conf dhcpd.conf.sample
# Install default (empty) dhcpd.conf:
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcp/dhcpd.conf
+%{__mkdir} -p %{buildroot}%{dhcpconfdir}
+%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd.conf
#
# DHCP Server Configuration file.
# see /usr/share/doc/dhcp*/dhcpd.conf.sample
@@ -311,33 +315,28 @@
%{buildroot}%{_sysconfdir}/openldap/schema
# Install empty directory for dhclient.d scripts
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d
+%{__mkdir} -p %{buildroot}%{dhcpconfdir}/dhclient.d
%clean
%{__rm} -rf %{buildroot}
%post
-if [ -f /etc/dhcpd.conf ]; then
- /bin/cp -a /etc/dhcpd.conf /etc/dhcp/dhcpd.conf >/dev/null 2>&1
+if [ -f %{_sysconfdir}/dhcpd.conf ] && [ ! -r %{dhcpconfdir}/dhcpd.conf ]; then
+ /bin/ln -s %{_sysconfdir}/dhcpd.conf %{dhcpconfdir}/dhcpd.conf >/dev/null 2>&1
fi
/sbin/chkconfig --add dhcpd
/sbin/chkconfig --add dhcrelay || :
%post -n dhclient
-/bin/ls -1 /etc/dhclient* >/dev/null 2>&1
+/bin/ls -1 %{_sysconfdir}/dhclient* >/dev/null 2>&1
if [ $? = 0 ]; then
- /bin/ls -1 /etc/dhclient* 2>/dev/null | while read etcfile ; do
+ /bin/ls -1 %{_sysconfdir}/dhclient* | \
+ /bin/grep -v "\.rpmsave$" 2>/dev/null | \
+ while read etcfile ; do
cf="$(/bin/basename ${etcfile})"
- if [ ! -f /etc/dhcp/${cf} ]; then
- /bin/cp -a "${etcfile}" /etc/dhcp
- if [ ! -f "${etcfile}.rpmsave" ]; then
- /bin/mv -f "${etcfile}" "${etcfile}.rpmsave"
- elif [ ! -f "${etcfile}.rpmsave.$$" ]; then
- /bin/mv -f "${etcfile}" "${etcfile}.rpmsave.$$"
- else
- /bin/mv -f "${etcfile}" "${etcfile}.rpmsave.$(date +%s)"
- fi
+ if [ -f ${etcfile} ] && [ ! -r %{dhcpconfdir}/${cf} ]; then
+ /bin/ln -s ${etcfile} %{dhcpconfdir}/${cf} >/dev/null 2>&1
fi
done || :
fi || :
@@ -370,12 +369,12 @@
%doc RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters doc/api+protocol
%doc doc/*.txt __fedora_contrib/* ldap-for-dhcp-%{version}/*.txt
%dir %{_localstatedir}/lib/dhcpd
-%dir %{_sysconfdir}/dhcp
+%dir %{dhcpconfdir}
%verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases
%verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd6.leases
%config(noreplace) %{_sysconfdir}/sysconfig/dhcpd
%config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay
-%config(noreplace) %{_sysconfdir}/dhcp/dhcpd.conf
+%config(noreplace) %{dhcpconfdir}/dhcpd.conf
%config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
%{_initrddir}/dhcpd
%{_initrddir}/dhcrelay
@@ -393,8 +392,8 @@
%files -n dhclient
%defattr(-,root,root,-)
%doc dhclient.conf.sample README.dhclient.d
-%dir %{_sysconfdir}/dhcp
-%dir %{_sysconfdir}/dhcp/dhclient.d
+%dir %{dhcpconfdir}
+%dir %{dhcpconfdir}/dhclient.d
%dir %{_localstatedir}/lib/dhclient
/sbin/dhclient
/sbin/dhclient-script
@@ -417,6 +416,11 @@
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog
+* Mon Apr 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-16
+- Correct %%post problems in dhclient package (#495361)
+- Read hooks scripts from /etc/dhcp (#495361)
+- Update to latest ldap-for-dhcp
+
* Fri Apr 03 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-15
- Obsolete libdhcp and libdhcp-devel (#493547)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 9 Mar 2009 23:01:07 -0000 1.25
+++ sources 13 Apr 2009 21:56:00 -0000 1.26
@@ -1,2 +1,2 @@
1fffed2e8c3d67b111316d6a9b33db7a dhcp-4.1.0.tar.gz
-782cf7358bab53fd564895a253f93fff ldap-for-dhcp-4.1.0.tar.gz
+04d735015e104e3e6377e7fb80fd4fce ldap-for-dhcp-4.1.0-2.tar.gz
- Previous message (by thread): rpms/lxmusic/F-10 lxmusic.spec,1.1,1.2
- Next message (by thread): rpms/pam_mount/devel 0001-use-extra_opts-in-etc-mtab-unless-empty.patch, NONE, 1.1 pam_mount-1.22-uninitialized-variable.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 pam_mount.spec, 1.54, 1.55 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list