rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2007-07-21 15:29:24 +00:00 committed by Git OBS Bridge
parent 74d6caa6a2
commit 41c2e5cef2
11 changed files with 124 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dhcp-3.0.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
size 876591

11
dhcp-3.0.5.tar.gz.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (FreeBSD)
iQEVAwUARUkswyM0Ek4byR5sAQLf0gf+PEw+bNTHnSbzNIYZtMu20rw7JU0zGklx
INRhplkpO8VY+yeQv8gqpLJmlvtwz87/dSu3A3utXOmjD5bDgl54crSR9iULbGZZ
fnmv1GE6wWpXNpfuxu/snnF/UFPMUI9HSg7axREiCSo54G9XyH2l2pj+AnkRvOs1
+eOs50i5y3Lsw+4NnEKw9LgwBF8/BpGuovj819TC5JWsX4+Z52nBejZVQTvU8PXG
Hmp/w6Y5Sn6VvKZDWkBtpSQNwJRllC2W4ZYVphUH7AO5AdOtE7EbV2jgTz1t6g3h
dZPehdpSQ0bLYwCudYjNKCVFv1faYL7nQz7KLgGOoR3tTwIHauR/yA==
=abWh
-----END PGP SIGNATURE-----

13
dhcp-3.0rc10.filedes.dif → dhcp-3.0.6-dhclient-exec-filedes.dif
View File

@ -1,13 +1,12 @@
--- client/dhclient.c.orig Wed Jun 20 05:03:59 2001
+++ client/dhclient.c Mon Jul 16 14:30:00 2001
@@ -2558,6 +2558,13 @@
wstatus = 0;
}
} else {
--- client/dhclient.c
+++ client/dhclient.c 2007/07/19 12:35:45
@@ -2629,6 +2629,12 @@
*/
if (leaseFile != NULL)
fclose(leaseFile);
+ if ((i = open("/dev/null", O_RDWR)) != -1) {
+ dup2(i, STDIN_FILENO);
+ dup2(i, STDOUT_FILENO);
+ dup2(i, STDERR_FILENO);
+ if (i > STDERR_FILENO)
+ close(i);
+ }

12
dhcp-3.0.5-dhclient-nis-ntp.patch → dhcp-3.0.6-dhclient-requests-conf.patch
View File

@ -1,17 +1,17 @@
Author: Timo Hoenig <thoenig at suse dot de>, Lars Mueller <lmuelle at suse dot de>
Subject: Request NIS and NTP settings by default
Author: Timo Hoenig <thoenig at suse dot de>, Lars Mueller <lmuelle at suse dot de>, Marius Tomaschewski <mt at suse dot de>
Subject: Request NIS, NTP and netbios-ns settings by default
Index: dhcp-3.0.5/client/dhclient.conf
Index: dhcp-3.0.6/client/dhclient.conf
===================================================================
--- dhcp-3.0.5.orig/client/dhclient.conf
+++ dhcp-3.0.5/client/dhclient.conf
--- dhcp-3.0.6.orig/client/dhclient.conf
+++ dhcp-3.0.6/client/dhclient.conf
@@ -24,7 +24,8 @@
send dhcp-lease-time 3600;
request subnet-mask, broadcast-address, time-offset, routers,
- domain-name, domain-name-servers, host-name;
+ domain-name, domain-name-servers, host-name, nis-domain,
+ nis-servers, ntp-servers;
+ nis-servers, ntp-servers, netbios-name-servers;
require subnet-mask, domain-name-servers;
timeout 60;
retry 60;

49
dhcp-3.0.6-dhclient-script-ntp-runtime.patch Normal file
View File

@ -0,0 +1,49 @@
Index: dhcp-3.0.6/client/scripts/linux
===================================================================
--- dhcp-3.0.6.orig/client/scripts/linux
+++ dhcp-3.0.6/client/scripts/linux
@@ -103,6 +103,28 @@ make_resolv_conf() {
done
}
+make_ntp_runtime_conf() {
+ if [ "x$new_ntp_servers" != "x" ]; then
+
+ cat > /var/run/ntp/servers << EOF
+### BEGIN INFO
+#
+# Modified_by: dhclient-script
+# Process: /sbin/dhclient
+# Process_id: $(pidof dhclient)
+# Script: /sbin/dhclient-script
+#
+# Info: This is a temporary autogenerated config by the NTP init script.
+# In the case of a restart these infomrmations are used to
+# configure ntpd during runtime.
+### END INFO
+
+RUNTIME_SERVERS="$new_ntp_servers"
+
+EOF
+ fi
+}
+
function write_informational_resolv_conf_header() {
cat > /etc/resolv.conf << EOF
### BEGIN INFO
@@ -250,6 +272,7 @@ if [ x$reason = xBOUND ] || [ x$reason =
fi
if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then
make_resolv_conf
+ make_ntp_runtime_conf
eval `grep --no-filename "^DHCLIENT_SET_HOSTNAME=" /etc/sysconfig/network/dhcp`
if [ "$DHCLIENT_SET_HOSTNAME" = yes ] ; then
@@ -311,6 +334,7 @@ if [ x$reason = xTIMEOUT ]; then
route add default gw $router
done
make_resolv_conf
+ make_ntp_runtime_conf
exit_with_hooks 0
fi
ifconfig $interface inet 0 down

3
dhcp-3.0.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f77b0ebf975d71578e2d305a2e07b900a9462b7efaac41826facfb4d4f00f4d
size 891513

11
dhcp-3.0.6.tar.gz.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iQEVAwUARoq/7yM0Ek4byR5sAQIfegf9GFrj5mfEsZEHeHeJ/rsHktCn3v+wEzz+
eqVU7UwYCMIbMw0Pvejj/bwMJz7hoxyDtjZ7GF7+SWLUDqXObazxhFEYg5tmeu4l
OZnbfiaaw5u7m62JfBm9LXT6Nr9CcyOM0/AySR6N86sBefsRY70Q1AoTnIpygYha
KPZfgadjkZ6p824CflRBj0eg0dKfEchTH7g6QpOKaa17J+fKxRYrZjh3Rh2R7lDe
yEPSEzHpNlFc40JCFYSShKP7J0lxQHFTVQAUm4+9Svfw/At2t+g43utn/Jwqhq5i
ox6lGoSf0ZcpTfJU2vO2Fc8OecvCItVTFps0r++gz3kni+ZyQt995w==
=mLMd
-----END PGP SIGNATURE-----

19
dhcp.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Jul 19 16:14:33 CEST 2007 - mt@suse.de
- Updated to 3.0.6, a maintenance release containing fixes
for bugs discovered since DHCP 3.0.5, but no new features.
See the RELNOTES file for full list of changes.
- Adopted dhcp-3.0rc10.filedes.dif patch
new patch file name: dhcp-3.0.6-dhclient-exec-filedes.dif
- Bug #289933: Let dhclient request netbios-name-servers as well;
old patch file name: dhcp-3.0.5-dhclient-nis-ntp.patch
new patch file name: dhcp-3.0.6-dhclient-requests-conf.patch
- Removed $local_fs from init-scripts, included in $remote_fs.
-------------------------------------------------------------------
Wed Jun 27 17:41:11 CEST 2007 - anschneider@suse.de
- Added support for ntpd runtime configuration
new patch file: dhcp-3.0.6-dhclient-script-ntp-runtime.patch
-------------------------------------------------------------------
Wed Jun 27 12:27:47 CEST 2007 - lmuelle@suse.de

66
dhcp.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package dhcp (Version 3.0.5)
# spec file for package dhcp (Version 3.0.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -19,11 +19,11 @@ Name: dhcp
BuildRequires: CASA-devel
%endif
BuildRequires: openldap2-devel
License: BSD License and BSD-like
License: BSD 3-Clause
Group: Productivity/Networking/Boot/Servers
Autoreqprov: on
Version: 3.0.5
Release: 47
Version: 3.0.6
Release: 1
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
@ -59,7 +59,7 @@ Patch2: test.c.dif
Patch31: dhcp-3.0b2pl24.resolv.conf.dif
Patch32: dhclient.c.dif
## duplicate stdin, stdout and stderr for dhclient childs
Patch40: dhcp-3.0rc10.filedes.dif
Patch40: dhcp-3.0.6-dhclient-exec-filedes.dif
## other stuff
Patch41: makefile.diff
Patch51: dhcp-3.0.5-tmpfile.dif
@ -80,8 +80,9 @@ Patch70: dhcp-3.0.3b1-pie.dif
# Add support for dhcdbd
Patch80: dhcp-3.0.2-extended_option_environment.patch
Patch81: dhcp-3.0.3-dhclient-script-dhcdbd.patch
Patch83: dhcp-3.0.5-dhclient-nis-ntp.patch
Patch84: dhcp-send-hostname-rml.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
Obsoletes: dhcp-base
Provides: dhcp-base:/usr/bin/omshell
PreReq: /bin/touch /sbin/chkconfig
@ -91,9 +92,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: ISC DHCP Server
Group: Productivity/Networking/Boot/Servers
Requires: net-tools dhcp
%if %suse_version > 800
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
%endif
Provides: dhcp_server dhcp:/usr/sbin/dhcpd
Autoreqprov: on
@ -101,9 +100,7 @@ Autoreqprov: on
Summary: ISC DHCP Client
Group: Productivity/Networking/Boot/Clients
Requires: net-tools dhcp /usr/bin/host
%if %suse_version > 800
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
%endif
Provides: dhcp_client dhclient
Obsoletes: dhclient
Autoreqprov: on
@ -112,9 +109,7 @@ Autoreqprov: on
Summary: DHCP Relay Agent
Group: Productivity/Networking/Boot/Servers
Requires: net-tools dhcp
%if %suse_version > 800
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
%endif
Provides: dhcp_relay dhcrelay
Obsoletes: dhcrelay
Autoreqprov: on
@ -219,6 +214,7 @@ Authors:
%patch81 -p1
%patch83 -p1
%patch84 -p1
%patch85 -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
@ -312,7 +308,7 @@ sed '/^max-lease-time/ a \
# read /usr/share/doc/packages/dhcp-server/DDNS-howto.txt\
ddns-update-style none; ddns-updates off;\
' server/dhcpd.conf > dhcpd.conf
mv contrib/3.0b1-lease-convert .
install -m644 contrib/3.0b1-lease-convert 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}/
install -m 644 $RPM_SOURCE_DIR/SuSEfirewall2.dhcp-server \
@ -357,29 +353,8 @@ if [ ! -x usr/sbin/dhcpd.lpf -a \
fi
%post server
%if %suse_version < 800
echo "Updating /etc/rc.config and etc/rc.config.d/dhcpd.rc.config..."
bin/cat > var/adm/fillup-templates/rc.config.dhcpd <<-EOF
START_DHCPD="yes"
EOF
bin/fillup -q etc/rc.config var/adm/fillup-templates/rc.config.dhcpd
bin/rm var/adm/fillup-templates/rc.config.dhcpd
bin/cat > var/adm/fillup-templates/rc.config.d.dhcpd <<-EOF
DHCPD_INTERFACE=""
DHCPD_RUN_CHROOTED="yes"
DHCPD_CONF_INCLUDE_FILES=""
DHCPD_RUN_AS="dhcpd"
DHCPD_OTHER_ARGS=""
EOF
bin/fillup -q etc/rc.config.d/dhcpd.rc.config var/adm/fillup-templates/rc.config.d.dhcpd
bin/fillup -q etc/rc.config.d/dhcpd.rc.config var/adm/fillup-templates/sysconfig.dhcpd
bin/rm var/adm/fillup-templates/rc.config.d.dhcpd
#
sbin/insserv etc/init.d/dhcpd
%else
%{fillup_and_insserv -n dhcpd dhcpd}
%{fillup_only -ans syslog dhcpd}
%endif
if grep -q '^DHCPD_RUN_AS="nobody"' etc/sysconfig/dhcpd; then
tmpfile=$(mktemp -q etc/sysconfig/dhcpd.XXXXXX)
sed 's|^DHCPD_RUN_AS="nobody"|DHCPD_RUN_AS="dhcpd"|' etc/sysconfig/dhcpd \
@ -415,29 +390,21 @@ test -s etc/dhcpd.conf || { cp -p usr/share/doc/packages/dhcp-server/dhcpd.conf
exit 0
%postun server
%if %suse_version > 810
%restart_on_update dhcpd
%endif
%insserv_cleanup
%if %suse_version > 810
%preun server
%stop_on_removal dhcpd
%endif
%post relay
%{fillup_and_insserv -n dhcrelay dhcrelay}
%postun relay
%if %suse_version > 810
%restart_on_update dhcrelay
%endif
%insserv_cleanup
%if %suse_version > 810
%preun relay
%stop_on_removal dhcrelay
%endif
%clean
if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
@ -519,6 +486,19 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%doc %{_mandir}/man3/dhcpctl.3.gz
%changelog
* Thu Jul 19 2007 - mt@suse.de
- Updated to 3.0.6, a maintenance release containing fixes
for bugs discovered since DHCP 3.0.5, but no new features.
See the RELNOTES file for full list of changes.
- Adopted dhcp-3.0rc10.filedes.dif patch
new patch file name: dhcp-3.0.6-dhclient-exec-filedes.dif
- Bug #289933: Let dhclient request netbios-name-servers as well;
old patch file name: dhcp-3.0.5-dhclient-nis-ntp.patch
new patch file name: dhcp-3.0.6-dhclient-requests-conf.patch
- Removed $local_fs from init-scripts, included in $remote_fs.
* Wed Jun 27 2007 - anschneider@suse.de
- Added support for ntpd runtime configuration
new patch file: dhcp-3.0.6-dhclient-script-ntp-runtime.patch
* Wed Jun 27 2007 - lmuelle@suse.de
- Let dhclient request ntp-servers by default.
* Tue May 22 2007 - mt@suse.de

4
rc.dhcpd
View File

@ -12,9 +12,9 @@
#
### BEGIN INIT INFO
# Provides: dhcpd
# Required-Start: $local_fs $remote_fs $network
# Required-Start: $remote_fs $network
# Should-Start: $named $syslog $time ldap ndsd
# Required-Stop: $local_fs $remote_fs $network
# Required-Stop: $remote_fs $network
# Should-Stop: $named $syslog ldap ndsd
# Default-Start: 3 5
# Default-Stop: 0 1 2 6

6
rc.dhcrelay
View File

@ -11,10 +11,10 @@
#
### BEGIN INIT INFO
# Provides: dhcrelay
# Required-Start: $local_fs $remote_fs $network
# Required-Start: $remote_fs $network
# Should-Start: $named $syslog
# Required-Stop:
# Should-Stop:
# Required-Stop: $remote_fs $network
# Should-Stop: $named $syslog
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: DHCP Relay