Author: arekm Date: Tue Apr 27 10:40:47 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.0.2
---- Files affected:
packages/dhcp:
dhcp-dhclient-anycast.patch (1.1 -> 1.2) , dhcp-memory.patch (1.1 -> 1.2) ,
dhcp-options.patch (1.4 -> 1.5) , dhcp.spec (1.175 -> 1.176) ,
dhcp-arg-concat.patch (1.1 -> NONE) (REMOVED), dhcp-no-ipv6.patch (1.1 ->
NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/dhcp/dhcp-dhclient-anycast.patch
diff -u packages/dhcp/dhcp-dhclient-anycast.patch:1.1
packages/dhcp/dhcp-dhclient-anycast.patch:1.2
--- packages/dhcp/dhcp-dhclient-anycast.patch:1.1 Sun Apr 27 17:14:36 2008
+++ packages/dhcp/dhcp-dhclient-anycast.patch Tue Apr 27 12:40:42 2010
@@ -38,9 +38,9 @@
--- dhcp-4.0.0/includes/dhctoken.h.anycast 2007-12-29 06:44:46.000000000
-1000
+++ dhcp-4.0.0/includes/dhctoken.h 2007-12-29 10:44:00.000000000 -1000
@@ -346,7 +346,8 @@ enum dhcp_token {
- WHITESPACE = 649,
TOKEN_ALSO = 650,
AFTER = 651,
+ CONFLICT_DONE = 660,
- BOOTP_BROADCAST_ALWAYS = 652
+ BOOTP_BROADCAST_ALWAYS = 652,
+ ANYCAST_MAC = 653
================================================================
Index: packages/dhcp/dhcp-memory.patch
diff -u packages/dhcp/dhcp-memory.patch:1.1 packages/dhcp/dhcp-memory.patch:1.2
--- packages/dhcp/dhcp-memory.patch:1.1 Sun Apr 27 17:14:37 2008
+++ packages/dhcp/dhcp-memory.patch Tue Apr 27 12:40:42 2010
@@ -1,18 +1,3 @@
-diff -up dhcp-3.0.6/minires/ns_name.c.memory dhcp-3.0.6/minires/ns_name.c
---- dhcp-3.0.6/minires/ns_name.c.memory 2004-06-10 13:59:40.000000000
-0400
-+++ dhcp-3.0.6/minires/ns_name.c 2007-07-10 11:43:29.000000000 -0400
-@@ -71,6 +71,11 @@ ns_name_ntop(const u_char *src, char *ds
- dn = dst;
- eom = dst + dstsiz;
-
-+ if (dn >= eom) {
-+ errno = EMSGSIZE;
-+ return (-1);
-+ }
-+
- while ((n = *cp++) != 0) {
- if ((n & NS_CMPRSFLGS) != 0) {
- /* Some kind of compression pointer. */
diff -up dhcp-3.0.6/common/packet.c.memory dhcp-3.0.6/common/packet.c
--- dhcp-3.0.6/common/packet.c.memory 2007-05-01 16:42:55.000000000 -0400
+++ dhcp-3.0.6/common/packet.c 2007-07-10 11:43:29.000000000 -0400
================================================================
Index: packages/dhcp/dhcp-options.patch
diff -u packages/dhcp/dhcp-options.patch:1.4
packages/dhcp/dhcp-options.patch:1.5
--- packages/dhcp/dhcp-options.patch:1.4 Sun Apr 27 15:33:49 2008
+++ packages/dhcp/dhcp-options.patch Tue Apr 27 12:40:42 2010
@@ -27,11 +27,11 @@
--- dhcp-4.0.0/includes/dhctoken.h.options 2007-10-31 09:13:33.000000000
-1000
+++ dhcp-4.0.0/includes/dhctoken.h 2007-12-29 11:13:51.000000000 -1000
@@ -345,7 +345,8 @@ enum dhcp_token {
- RANGE6 = 648,
WHITESPACE = 649,
TOKEN_ALSO = 650,
-- AFTER = 651
-+ AFTER = 651,
+ AFTER = 651,
+- CONFLICT_DONE = 660
++ CONFLICT_DONE = 660,
+ BOOTP_BROADCAST_ALWAYS = 652
};
================================================================
Index: packages/dhcp/dhcp.spec
diff -u packages/dhcp/dhcp.spec:1.175 packages/dhcp/dhcp.spec:1.176
--- packages/dhcp/dhcp.spec:1.175 Sun Apr 11 08:26:53 2010
+++ packages/dhcp/dhcp.spec Tue Apr 27 12:40:42 2010
@@ -13,13 +13,13 @@
Summary(pt_BR.UTF-8): Servidor DHCP (Protocolo de configuração dinâmica de
hosts)
Name: dhcp
# 4.1.0a1 is on DEVEL
-Version: 4.0.1p1
-Release: 3
+Version: 4.0.2
+Release: 1
Epoch: 4
License: MIT
Group: Networking/Daemons
Source0: ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5: 42bac85e1513e177c6bb2bf64d448dbe
+# Source0-md5: f8d35ade3727429b1ab74c26058bd6b1
Source1: %{name}.init
Source2: %{name}6.init
Source3: %{name}-relay.init
@@ -39,7 +39,6 @@
Patch1: %{name}-ldap.patch
Patch2: %{name}-3.0.3-x-option.patch
Patch3: %{name}-paths.patch
-Patch4: %{name}-arg-concat.patch
Patch5: %{name}-timeouts.patch
Patch6: %{name}-options.patch
Patch7: %{name}-libdhcp4client.patch
@@ -56,7 +55,6 @@
Patch18: %{name}-dhclient-anycast.patch
Patch19: %{name}-manpages.patch
Patch20: %{name}-NetworkManager-crash.patch
-Patch21: %{name}-no-ipv6.patch
URL: http://www.isc.org/sw/dhcp/
BuildRequires: autoconf
BuildRequires: automake
@@ -227,7 +225,6 @@
# however, fedora doesn't have this patch anymore, so can drop?
#%%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@@ -244,7 +241,6 @@
%patch18 -p1
%patch19 -p1
%patch20 -p1
-%patch21 -p1
# Copy in documentation and example scripts for LDAP patch to dhcpd
cp -a %{SOURCE11} README.ldap
@@ -492,6 +488,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.176 2010/04/27 10:40:42 arekm
+- up to 4.0.2
+
Revision 1.175 2010/04/11 06:26:53 arekm
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp-dhclient-anycast.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp-memory.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp-options.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp.spec?r1=1.175&r2=1.176&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
