This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
0341434b10
commit
7a1ce40e10
15
dhcp-3.0.6-dhclient-config-no-script.patch
Normal file
15
dhcp-3.0.6-dhclient-config-no-script.patch
Normal file
@ -0,0 +1,15 @@
|
||||
--- dhcp-3.0.6/client/dhclient.conf
|
||||
+++ dhcp-3.0.6/client/dhclient.conf 2007/11/19 08:14:01
|
||||
@@ -32,7 +32,11 @@
|
||||
reboot 10;
|
||||
select-timeout 5;
|
||||
initial-interval 2;
|
||||
-script "/sbin/dhclient-script";
|
||||
+
|
||||
+# Default location of the dhclient-script. Note: Setting
|
||||
+# it in the config, disables the -sf command line option!
|
||||
+#script "/sbin/dhclient-script";
|
||||
|
||||
#media "-link0 -link1 -link2", "link0 link1";
|
||||
#reject 192.33.137.209;
|
||||
+
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 19 09:43:56 CET 2007 - mt@suse.de
|
||||
|
||||
- Disabled script setting in the /etc/dhclient.conf,
|
||||
because it overrides the -sf command line option.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 24 10:25:29 CEST 2007 - mt@suse.de
|
||||
|
||||
|
||||
24
dhcp.spec
24
dhcp.spec
@ -21,11 +21,11 @@ BuildRequires: CASA-devel
|
||||
BuildRequires: openldap2-devel
|
||||
License: BSD 3-Clause
|
||||
Group: Productivity/Networking/Boot/Servers
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
Version: 3.0.6
|
||||
Release: 14
|
||||
Release: 37
|
||||
Summary: Common Files Used by ISC DHCP Software
|
||||
URL: http://www.isc.org/isc/dhcp.html
|
||||
Url: http://www.isc.org/isc/dhcp.html
|
||||
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
|
||||
@ -83,6 +83,7 @@ Patch81: dhcp-3.0.3-dhclient-script-dhcdbd.patch
|
||||
Patch83: dhcp-3.0.6-dhclient-requests-conf.patch
|
||||
Patch84: dhcp-3.0.6-dhclient-script-ntp-runtime.patch
|
||||
Patch85: dhcp-send-hostname-rml.patch
|
||||
Patch86: dhcp-3.0.6-dhclient-config-no-script.patch
|
||||
Obsoletes: dhcp-base
|
||||
Provides: dhcp-base:/usr/bin/omshell
|
||||
PreReq: /bin/touch /sbin/chkconfig
|
||||
@ -94,7 +95,7 @@ Group: Productivity/Networking/Boot/Servers
|
||||
Requires: net-tools dhcp
|
||||
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
|
||||
Provides: dhcp_server dhcp:/usr/sbin/dhcpd
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
|
||||
%package client
|
||||
Summary: ISC DHCP Client
|
||||
@ -103,7 +104,7 @@ Requires: net-tools dhcp /usr/bin/host
|
||||
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
|
||||
Provides: dhcp_client dhclient
|
||||
Obsoletes: dhclient
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
|
||||
%package relay
|
||||
Summary: DHCP Relay Agent
|
||||
@ -112,13 +113,12 @@ Requires: net-tools dhcp
|
||||
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
|
||||
Provides: dhcp_relay dhcrelay
|
||||
Obsoletes: dhcrelay
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
|
||||
%package devel
|
||||
Summary: Header Files and Libraries for dhcpctl API
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: dhcp = %{version}
|
||||
|
||||
%if %ul_version >= 1
|
||||
%define VENDOR UnitedLinux
|
||||
%else
|
||||
@ -135,7 +135,6 @@ Authors:
|
||||
--------
|
||||
Ted Lemon <mellon@fugue.com>
|
||||
|
||||
|
||||
%description server
|
||||
This package contains the ISC DHCP server.
|
||||
|
||||
@ -151,7 +150,6 @@ Authors:
|
||||
This package also contains software written by Kevin C. Miller <kevinm@andrew.cmu.edu>
|
||||
and Jeff Wilson <wilsonj@cs.ecs.baylor.edu>.
|
||||
|
||||
|
||||
%description client
|
||||
This is an alternative DHCP client, the ISC DHCP client for Linux. Like
|
||||
"dhcpcd" (the client that is installed by default), it can be used to
|
||||
@ -169,7 +167,6 @@ Authors:
|
||||
--------
|
||||
Ted Lemon <mellon@fugue.com>
|
||||
|
||||
|
||||
%description relay
|
||||
This is the ISC DHCP relay agent. It can be used as a 'gateway' for
|
||||
DHCP messages across physical network segments. This is necessary
|
||||
@ -178,7 +175,6 @@ routed.
|
||||
|
||||
|
||||
|
||||
|
||||
%description devel
|
||||
This package contains all of the libraries and headers for developing
|
||||
with the Internet Software Consortium (ISC) dhcpctl API.
|
||||
@ -215,6 +211,7 @@ Authors:
|
||||
%patch83 -p1
|
||||
%patch84 -p1
|
||||
%patch85 -p1
|
||||
%patch86 -p1
|
||||
find . -type f -name \*.cat\* -exec rm -f {} \;
|
||||
cp -p %{S:2} %{S:3} %{S:11} %{S:12} %{S:14} %{S:32} %{S:33} .
|
||||
for i in README LIESMICH; do
|
||||
@ -261,7 +258,6 @@ echo "ddns-update-style interim;" > testconf
|
||||
work.linux-2.2/server/dhcpd -t -cf testconf || exit 1
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} make install
|
||||
install -m 744 work.linux-2.2/omapip/svtest $RPM_BUILD_ROOT/usr/sbin/svtest
|
||||
install -m 644 work.linux-2.2/dst/libdst.a $RPM_BUILD_ROOT/%{_libdir}
|
||||
@ -378,7 +374,6 @@ if [ ${FIRST_ARG:-0} -gt 1 ]; then
|
||||
/etc/init.d/dhcpd start
|
||||
fi
|
||||
fi
|
||||
|
||||
# see comment above
|
||||
if [ -f var/adm/dhcpd_needs_insserv ]; then
|
||||
sbin/insserv dhcpd
|
||||
@ -486,6 +481,9 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
||||
%doc %{_mandir}/man3/dhcpctl.3.gz
|
||||
|
||||
%changelog
|
||||
* Mon Nov 19 2007 - mt@suse.de
|
||||
- Disabled script setting in the /etc/dhclient.conf,
|
||||
because it overrides the -sf command line option.
|
||||
* Fri Aug 24 2007 - mt@suse.de
|
||||
- Removed getcfg interface config to interface name conversions
|
||||
* Mon Jul 30 2007 - thoenig@suse.de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user