Accepting request 39104 from network:dhcp
checked in (request 39104) OBS-URL: https://build.opensuse.org/request/show/39104 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=14
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
4eeca9a16e
commit
fd86efa200
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:75faa831bcd8594c621ab48aacf0ae55f676facf205d7e0059f2a0216ac0030a
|
||||
size 626100
|
||||
3
dhcp-3.1.3.tar.bz2
Normal file
3
dhcp-3.1.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0010cbf3c63f33226ba7070ec108101d2760b2b2cf1313b41a10b45542256b8e
|
||||
size 633520
|
||||
21
dhcp.changes
21
dhcp.changes
@ -1,24 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 29 11:18:20 UTC 2010 - mt@suse.de
|
||||
|
||||
- Updated to ISC DHCP 3.1-ESV, an extended support version release
|
||||
which includes a small number of bug fixes (bnc#592178) over the
|
||||
3.1.3 version:
|
||||
* Modified the handling of a connection to avoid releasing the
|
||||
omapi io object for the connection while it is still in use.
|
||||
One symptom from this error was a segfault when a failover
|
||||
secondary attempted to connect to the failover primary if
|
||||
their clocks were not synchronized.
|
||||
* Fix test in dhcp_interface_signal_handler to check that the
|
||||
inner handler has a signal_handler before calling it.
|
||||
* When using 'ignore client-updates;', the FQDN returned to the
|
||||
client is no longer truncated to one octet.
|
||||
* Clean up some compiler warnings - ticket 19054.
|
||||
- Fixed vlan interface check in dhcpd-restart-hook if-up.d script
|
||||
(bnc#599702)
|
||||
- Touch dhclient.leases in post-install script instead to provide
|
||||
an empty file, versioned provides/obsoletes (rpmlint warnings).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 12 15:53:09 UTC 2010 - mt@suse.de
|
||||
|
||||
|
||||
30
dhcp.spec
30
dhcp.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package dhcp (Version 3.1.3.ESV)
|
||||
# spec file for package dhcp (Version 3.1.3)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,7 +19,6 @@
|
||||
|
||||
|
||||
Name: dhcp
|
||||
%define isc_version 3.1-ESV
|
||||
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
%define omc_prefix /usr/share/omc
|
||||
%define omc_svcdir %{omc_prefix}/svcinfo.d
|
||||
@ -31,13 +30,13 @@ BuildRequires: dos2unix openldap2-devel
|
||||
License: BSD3c(or similar)
|
||||
Group: Productivity/Networking/Boot/Servers
|
||||
AutoReqProv: on
|
||||
Version: 3.1.3.ESV
|
||||
Release: 0
|
||||
Version: 3.1.3
|
||||
Release: 3
|
||||
Summary: Common Files Used by ISC DHCP Software
|
||||
Url: http://www.isc.org/isc/dhcp.html
|
||||
Source0: dhcp-%{isc_version}.tar.bz2
|
||||
#Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{isc_version}.tar.gz
|
||||
#Source1: http://ftp.isc.org/isc/dhcp/dhcp-%{isc_version}.tar.gz.asc
|
||||
Source0: dhcp-%{version}.tar.bz2
|
||||
#Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
|
||||
#Source1: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz.asc
|
||||
Source2: rc.dhcpd
|
||||
Source3: rc.dhcrelay
|
||||
Source11: sysconfig.dhcpd
|
||||
@ -104,9 +103,8 @@ Summary: ISC DHCP Client
|
||||
Group: Productivity/Networking/Boot/Clients
|
||||
Requires: net-tools dhcp /usr/bin/host
|
||||
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
|
||||
Provides: dhcp_client
|
||||
Provides: dhclient = %{version}
|
||||
Obsoletes: dhclient < %{version}
|
||||
Provides: dhcp_client dhclient
|
||||
Obsoletes: dhclient
|
||||
AutoReqProv: on
|
||||
|
||||
%package relay
|
||||
@ -115,9 +113,8 @@ Summary: DHCP Relay Agent
|
||||
Group: Productivity/Networking/Boot/Servers
|
||||
Requires: net-tools dhcp
|
||||
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
|
||||
Provides: dhcp_relay
|
||||
Provides: dhcrelay = %{version}
|
||||
Obsoletes: dhcrelay < %{version}
|
||||
Provides: dhcp_relay dhcrelay
|
||||
Obsoletes: dhcrelay
|
||||
AutoReqProv: on
|
||||
|
||||
%package devel
|
||||
@ -192,7 +189,7 @@ Authors:
|
||||
Ted Lemon <mellon@fugue.com>
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{isc_version}
|
||||
%setup -q -n %{name}-%{version}
|
||||
##
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
@ -296,6 +293,7 @@ install -m 644 sysconfig.dhcpd $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
install -m 644 sysconfig.syslog-dhcpd $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
install -m 644 sysconfig.dhcrelay $RPM_BUILD_ROOT/var/adm/fillup-templates/
|
||||
rm -f $RPM_BUILD_ROOT/var/lib/dhcp/dhcpd.leases
|
||||
touch $RPM_BUILD_ROOT/var/lib/dhcp/dhclient.leases
|
||||
install -m 644 client/dhclient.conf $RPM_BUILD_ROOT/etc/dhclient.conf
|
||||
sed '/^max-lease-time/ a \
|
||||
\
|
||||
@ -411,9 +409,6 @@ exit 0
|
||||
%preun relay
|
||||
%stop_on_removal dhcrelay
|
||||
|
||||
%post client
|
||||
touch var/lib/dhcp/dhclient.leases
|
||||
|
||||
%clean
|
||||
if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
||||
|
||||
@ -472,6 +467,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
||||
/sbin/dhclient
|
||||
/sbin/dhclient-script
|
||||
%config(noreplace) /etc/dhclient.conf
|
||||
%config(noreplace) /var/lib/dhcp/dhclient.leases
|
||||
%doc %{_mandir}/man5/dhclient.conf.5.gz
|
||||
%doc %{_mandir}/man5/dhclient.leases.5.gz
|
||||
%doc %{_mandir}/man8/dhclient.8.gz
|
||||
|
||||
@ -62,7 +62,7 @@ iface_needs_restart()
|
||||
{
|
||||
test -d /sys/class/net/$1/bridge -o \
|
||||
-d /sys/class/net/$1/bonding -o \
|
||||
-f /proc/net/vlan/$1
|
||||
-d /proc/net/vlan/$1
|
||||
}
|
||||
|
||||
case "$0" in
|
||||
|
||||
Loading…
Reference in New Issue
Block a user