OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 19-Feb-2003 14:47:16
Branch: OPENPKG_1_1_SOLID HEAD Handle: 2003021913471302
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_1_SOLID)
openpkg-src/dhcpd dhcpd.patch dhcpd.spec
Log:
MFS: SA-2003.012-dhcpd; CAN-2003-0039
Summary:
Revision Changes Path
1.1.2.2 +53 -0 openpkg-src/dhcpd/dhcpd.patch
1.25.2.3 +6 -6 openpkg-src/dhcpd/dhcpd.spec
1.3362 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.patch
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 dhcpd.patch
--- openpkg-src/dhcpd/dhcpd.patch 16 Jan 2003 13:17:21 -0000 1.1.2.1
+++ openpkg-src/dhcpd/dhcpd.patch 19 Feb 2003 13:47:15 -0000 1.1.2.2
@@ -73,3 +73,56 @@
}
dname++;
}
+--- relay/dhcrelay.c-orig Sat Apr 27 05:34:20 2002
++++ relay/dhcrelay.c Wed Feb 19 12:44:19 2003
+@@ -88,6 +88,7 @@
+ did not match any known circuit ID. */
+ int missing_circuit_id = 0; /* Circuit ID option in matching RAI option
+ was missing. */
++int max_hop_count = 4; /* Maximum hop count */
+
+ /* Maximum size of a packet with agent options added. */
+ int dhcp_max_agent_option_packet_length = 576;
+@@ -182,6 +183,15 @@
+ quiet_interface_discovery = 1;
+ } else if (!strcmp (argv [i], "-a")) {
+ add_agent_options = 1;
++ } else if (!strcmp (argv [i], "-c")) {
++ int hcount;
++ if (++i == argc)
++ usage ();
++ hcount = atoi(argv[i]);
++ if (hcount <= 16)
++ max_hop_count = hcount;
++ else
++ usage ();
+ } else if (!strcmp (argv [i], "-A")) {
+ if (++i == argc)
+ usage ();
+@@ -425,6 +435,17 @@
+ packet -> giaddr = ip -> primary_address;
+ if (packet -> hops != 255)
+ packet -> hops = packet -> hops + 1;
++
++ /* ftp://ftp.rfc-editor.org/in-notes/rfc1542.txt
++ * 4.1.1 BOOTREQUEST Messages
++ * The relay agent MUST silently discard BOOTREQUEST messages whose
++ * 'hops' field exceeds the value 16. A configuration option SHOULD be
++ * provided to set this threshold to a smaller value if desired by the
++ * network manager. The default setting for a configurable threshold
++ * SHOULD be 4.
++ */
++ if (packet -> hops >= max_hop_count)
++ return;
+
+ /* Otherwise, it's a BOOTREQUEST, so forward it to all the
+ servers. */
+@@ -470,7 +470,7 @@
+ static void usage ()
+ {
+ log_fatal ("Usage: dhcrelay [-p <port>] [-d] [-D] [-i %s%s%s",
+- "interface]\n ",
++ "interface] [-c max_hop_count]\n ",
+ "[-q] [-a] [-A length] [-m append|replace|forward|discard]\n",
+ " [server1 [... serverN]]");
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.25.2.2 -r1.25.2.3 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 16 Jan 2003 13:17:21 -0000 1.25.2.2
+++ openpkg-src/dhcpd/dhcpd.spec 19 Feb 2003 13:47:15 -0000 1.25.2.3
@@ -1,8 +1,8 @@
##
## dhcpd.spec -- OpenPKG RPM Specification
-## Copyright (c) 2000-2002 Cable & Wireless Deutschland GmbH
-## Copyright (c) 2000-2002 The OpenPKG Project <http://www.openpkg.org/>
-## Copyright (c) 2000-2002 Ralf S. Engelschall <[EMAIL PROTECTED]>
+## Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
+## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
+## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -26,14 +26,14 @@
# package information
Name: dhcpd
Summary: DHCP Daemon
-URL: http://www.isc.org/products/ISC/
+URL: http://www.isc.org/products/DHCP/
Vendor: Internet Software Consortium
Packager: The OpenPKG Project
Distribution: OpenPKG [BASE]
Group: DNS
License: ISC/BSD
Version: 3.0.1rc9
-Release: 1.1.1
+Release: 1.1.2
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -54,7 +54,7 @@
%prep
%setup -q -n dhcp-%{version}
- %patch -p0
+ %patch
%build
( echo 'CC = %{l_cc}'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3361 -r1.3362 news.txt
--- openpkg-web/news.txt 19 Feb 2003 13:37:44 -0000 1.3361
+++ openpkg-web/news.txt 19 Feb 2003 13:47:13 -0000 1.3362
@@ -1,3 +1,4 @@
+19-Feb-2003: Upgraded package: P<dhcpd-3.0.1rc9-1.1.2>
19-Feb-2003: Upgraded package: P<dhcpd-3.0.1rc11-1.2.1>
19-Feb-2003: Upgraded package: P<qt-3.1.1-20030218>
19-Feb-2003: Upgraded package: P<cvstrac-1.1.2-20030219>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
