Date: Tue, 25 Apr 2006 15:30:38 GMT From: =?ISO-8859-1?Q?K=F6vesd=E1n_G=E1bor?= <gabor.kovesdan@t-hosting.hu> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/96130: [maintainer update] dns/dualserver Message-ID: <200604251530.k3PFUcm0060019@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/96130; it has been noted by GNATS.
From: =?ISO-8859-1?Q?K=F6vesd=E1n_G=E1bor?= <gabor.kovesdan@t-hosting.hu>
To: bug-followup@FreeBSD.org, gabor.kovesdan@t-hosting.hu
Cc:
Subject: Re: ports/96130: [maintainer update] dns/dualserver
Date: Tue, 25 Apr 2006 17:28:41 +0200
This is a multi-part message in MIME format.
--------------010006050507020508030706
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sorry, I forgot to regenerate those extra patches. Here's the new diff
with the regenerated patches, but I can't guarantee that will work on
4.11, because I don't have a 4.X machine to test.
Regards,
Gabor Kovesdan
--------------010006050507020508030706
Content-Type: text/plain;
name="dualserver.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="dualserver.diff"
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/dns/dualserver/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 12 Dec 2005 09:57:23 -0000 1.1
+++ Makefile 21 Apr 2006 10:19:08 -0000
@@ -4,7 +4,7 @@
# $FreeBSD: ports/dns/dualserver/Makefile,v 1.1 2005/12/12 09:57:23 barner Exp $
PORTNAME= dualserver
-PORTVERSION= 1.0
+PORTVERSION= 2.0
CATEGORIES= dns net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= dhcp-dns-server
@@ -13,7 +13,6 @@
MAINTAINER= gkovesdan@t-hosting.hu
COMMENT= Combined DHCP/DNS server for small LANs
-USE_REINPLACE= YES
USE_RC_SUBR= dualserver.sh
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= sbin/dualserver etc/dualserver.conf.sample
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/dns/dualserver/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 12 Dec 2005 09:57:23 -0000 1.1
+++ distinfo 21 Apr 2006 10:19:15 -0000
@@ -1,3 +1,3 @@
-MD5 (dualserverV1.0.tar.gz) = 279703af257c78a0f123cec194d8bdb8
-SHA256 (dualserverV1.0.tar.gz) = 37d0c6f8fd802bc94badae6b6043e3754ab5fa6781a271e8503457ca7d0faf8a
-SIZE (dualserverV1.0.tar.gz) = 39140
+MD5 (dualserverV2.0.tar.gz) = de37780d54f0b462e7bfc84503049605
+SHA256 (dualserverV2.0.tar.gz) = c6f96cbc1782cbd0813e1af10ebeba5949232369187a981d1a7a939dcd01154d
+SIZE (dualserverV2.0.tar.gz) = 49200
Index: files/extra-patch-dualserver.cpp
===================================================================
RCS file: /usr/cvs/ports/dns/dualserver/files/extra-patch-dualserver.cpp,v
retrieving revision 1.1
diff -u -r1.1 extra-patch-dualserver.cpp
--- files/extra-patch-dualserver.cpp 12 Dec 2005 09:57:23 -0000 1.1
+++ files/extra-patch-dualserver.cpp 25 Apr 2006 15:24:57 -0000
@@ -1,66 +1,69 @@
---- dualserver.cpp.orig Mon Dec 12 10:41:03 2005
-+++ dualserver.cpp Mon Dec 12 10:43:53 2005
-@@ -349,8 +349,8 @@
- else
+--- dualserver.cpp.orig Tue Apr 25 17:18:11 2006
++++ dualserver.cpp Tue Apr 25 17:22:47 2006
+@@ -463,8 +463,9 @@
+ if (!req->rtype)
{
req->dnsp.header.ancount = 0;
- req->dnsp.header.rcode = 3;
- req->dnsp.header.ra = 0;
-+ req->dnsp.header.flags.rcode = 3;
-+ req->dnsp.header.flags.ra = 0;
++ req->dnsp.header.flags.rcode = 3;
++ req->dnsp.header.flags.ra = 0;
++
}
if (cfig->servers[0])
-@@ -364,8 +364,8 @@
+@@ -478,8 +479,8 @@
req->dnsp.header.adcount = 0;
}
- req->dnsp.header.qr = 1;
- req->dnsp.header.aa = 1;
-+ req->dnsp.header.flags.qr = 1;
-+ req->dnsp.header.flags.aa = 1;
++ req->dnsp.header.flags.qr = 1;
++ req->dnsp.header.flags.aa = 1;
char *raw = req->dnsp.data;
-@@ -495,7 +495,7 @@
- if (!cfig->servers[0])
- glocal(cfig);
+@@ -649,7 +650,7 @@
+ if (!cfig->dns[0])
+ getdnserv(cfig);
- if (ntohs(req->dnsp.header.qdcount) == 1 && ntohs(req->dnsp.header.opcode) == 0)
-+ if (ntohs(req->dnsp.header.qdcount) == 1 && ntohs(req->dnsp.header.flags.opcode) == 0)
++ if (ntohs(req->dnsp.header.qdcount) == 1 && ntohs(req->dnsp.header.flags.opcode) == 0)
{
char *raw = req->dnsp.data;
- strcpy(req->raw_query, raw);
-@@ -619,7 +619,7 @@
+ fQu(req->query, &req->dnsp, raw);
+@@ -853,7 +854,7 @@
WORD fdnmess(data5 *req, data2 *cfig)
{
- if (!req->dnsp.header.rd)
-+ if (!req->dnsp.header.flags.rd)
++ if (!req->dnsp.header.flags.rd)
return 0;
if (!cfig->dns[0])
-@@ -679,10 +679,10 @@
+@@ -922,11 +923,11 @@
+ }
else
{
- req->dnsp.header.ancount = 0;
+- req->dnsp.header.ancount = 0;
- req->dnsp.header.rcode = 3;
- req->dnsp.header.ra = 0;
- req->dnsp.header.qr = 1;
- req->dnsp.header.aa = 0;
-+ req->dnsp.header.flags.rcode = 3;
-+ req->dnsp.header.flags.ra = 0;
-+ req->dnsp.header.flags.qr = 1;
-+ req->dnsp.header.flags.aa = 0;
- req->BytesReady = req->BytesRecd;
- return 0;
- }
-@@ -754,7 +754,7 @@
++ req->dnsp.header.ancount = 0;
++ req->dnsp.header.flags.rcode = 3;
++ req->dnsp.header.flags.ra = 0;
++ req->dnsp.header.flags.qr = 1;
++ req->dnsp.header.flags.aa = 0;
+ char *dp = req->dnsp.data;
+ dp += pQu(dp, req->query);
+ dp += pShort(dp, DNS_TYPE_A);
+@@ -1106,7 +1107,7 @@
if (!found)
- req->BytesReady = 0;
+ req->bytes = 0;
- req->dnsp.header.aa = 0;
-+ req->dnsp.header.flags.aa = 0;
- return req->BytesReady;
++ req->dnsp.header.flags.aa = 0;
+ return req->bytes;
}
Index: files/extra-patch-dualserver.h
===================================================================
RCS file: /usr/cvs/ports/dns/dualserver/files/extra-patch-dualserver.h,v
retrieving revision 1.1
diff -u -r1.1 extra-patch-dualserver.h
--- files/extra-patch-dualserver.h 12 Dec 2005 09:57:23 -0000 1.1
+++ files/extra-patch-dualserver.h 25 Apr 2006 15:17:09 -0000
@@ -1,9 +1,9 @@
---- dualserver.h.orig Mon Dec 12 10:40:55 2005
-+++ dualserver.h Mon Dec 12 10:41:23 2005
-@@ -94,7 +94,7 @@
- BYTE rcode:4;
- BYTE z:3;
- BYTE ra:1;
+--- dualserver.h.orig Tue Apr 25 17:15:20 2006
++++ dualserver.h Tue Apr 25 17:16:08 2006
+@@ -98,7 +98,7 @@
+ BYTE rcode: 4;
+ BYTE z: 3;
+ BYTE ra: 1;
- };
+ } flags;
};
--------------010006050507020508030706--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604251530.k3PFUcm0060019>