OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Jan-2003 14:16:42
Branch: OPENPKG_1_0_SOLID Handle: 2003011613164100
Added files: (Branch: OPENPKG_1_0_SOLID)
openpkg-src/dhcpd dhcpd.patch
Modified files: (Branch: OPENPKG_1_0_SOLID)
openpkg-src/dhcpd dhcpd.spec
Log:
apply security bugfix
Summary:
Revision Changes Path
1.2.2.1 +64 -0 openpkg-src/dhcpd/dhcpd.patch
1.15.2.3 +3 -1 openpkg-src/dhcpd/dhcpd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.1 dhcpd.patch
--- /dev/null 2003-01-16 14:16:42.000000000 +0100
+++ dhcpd.patch 2003-01-16 14:16:42.000000000 +0100
@@ -0,0 +1,64 @@
+--- minires/ns_name.c Wed Feb 2 08:28:14 2000
++++ minires/ns_name.c Wed Jan 15 00:15:06 2003
+@@ -255,6 +255,10 @@
+ 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. */
+--- minires/ns_samedomain.c Tue Jan 16 23:33:09 2001
++++ minires/ns_samedomain.c Wed Jan 15 00:15:06 2003
+@@ -168,7 +168,7 @@
+ size_t n = strlen(src);
+
+ if (n + sizeof "." > dstsize) {
+- ISC_R_NOSPACE;
++ return ISC_R_NOSPACE;
+ }
+ strcpy(dst, src);
+ while (n > 0 && dst[n - 1] == '.') /* Ends in "." */
+--- minires/ns_sign.c Thu May 17 22:47:33 2001
++++ minires/ns_sign.c Wed Jan 15 00:15:06 2003
+@@ -87,7 +87,7 @@
+
+ dst_init();
+ if (msg == NULL || msglen == NULL || sig == NULL || siglen == NULL)
+- ISC_R_INVALIDARG;
++ return ISC_R_INVALIDARG;
+
+ /* Name. */
+ if (key != NULL && error != ns_r_badsig && error != ns_r_badkey)
+@@ -118,7 +118,7 @@
+ else
+ n = dn_comp("", cp, (unsigned)(eob - cp), NULL, NULL);
+ if (n < 0)
+- ISC_R_NOSPACE;
++ return ISC_R_NOSPACE;
+ alg = cp;
+ cp += n;
+
+@@ -190,7 +190,7 @@
+ n = dst_sign_data(SIG_MODE_FINAL, key, &ctx, NULL, 0,
+ sig, *siglen);
+ if (n < 0)
+- ISC_R_BADKEY;
++ return ISC_R_BADKEY;
+ *siglen = n;
+ } else
+ *siglen = 0;
+--- minires/res_findzonecut.c Thu May 17 22:47:35 2001
++++ minires/res_findzonecut.c Wed Jan 15 00:15:06 2003
+@@ -355,7 +355,7 @@
+ while (*dname != '.') {
+ if (*dname == '\\')
+ if (*++dname == '\0') {
+- ISC_R_NOSPACE;
++ return ISC_R_NOSPACE;
+ }
+ dname++;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.15.2.2 -r1.15.2.3 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 5 Dec 2001 09:38:47 -0000 1.15.2.2
+++ openpkg-src/dhcpd/dhcpd.spec 16 Jan 2003 13:16:41 -0000 1.15.2.3
@@ -33,12 +33,13 @@
Group: DNS
License: ISC/BSD
Version: 3.0.1rc4
-Release: 1.0.0
+Release: 1.0.1
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
Source1: dhcpd.conf
Source2: rc.dhcpd
+Patch0: dhcpd.patch
# build information
Prefix: %{l_prefix}
@@ -53,6 +54,7 @@
%prep
%setup -q -n dhcp-%{version}
+ %patch -p0
%build
PATH="%{l_prefix}/bin:$PATH"; export PATH
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
