Attachment #104370 for bug #144535

View | Details | Raw Unified | Return to bug 144535
Collapse All | Expand All

Lines 6-12 Link Here

(-)powerdns-recursor/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= powerdns-recursor	8	PORTNAME= powerdns-recursor
9	PORTVERSION= 3.1.7.2	9	PORTVERSION= 3.2
10	CATEGORIES= dns ipv6	10	CATEGORIES= dns ipv6
11	MASTER_SITES= http://downloads.powerdns.com/releases/ \	11	MASTER_SITES= http://downloads.powerdns.com/releases/ \
12	http://mirrors.evolva.ro/powerdns.com/releases/	12	http://mirrors.evolva.ro/powerdns.com/releases/

Lines 1-3 Link Here

(-)powerdns-recursor/distinfo (-3 / +3 lines)
1	MD5 (pdns-recursor-3.1.7.2.tar.bz2) = 5fdba3612e281bf65c6c9f665673dc4e	1	MD5 (pdns-recursor-3.2.tar.bz2) = 7e14d9487664d58c27448ae26e824215
2	SHA256 (pdns-recursor-3.1.7.2.tar.bz2) = 0f2fd93eec8d7c68578fbf1f680f6d1ab44c3249f0a08257a4e6531e48a9d2ea	2	SHA256 (pdns-recursor-3.2.tar.bz2) = 1994140bf0816ef16fe5c8fe9956737a8f7445041adc3d8bc4d0795b2c50c0de
3	SIZE (pdns-recursor-3.1.7.2.tar.bz2) = 174082	3	SIZE (pdns-recursor-3.2.tar.bz2) = 139569

Lines 1-6 Link Here

(-)powerdns-recursor/files/extrapatch-setuid (-5 / +5 lines)
1	--- pdns_recursor.cc.orig Wed Jan 17 23:45:51 2007	1	--- pdns_recursor.cc.orig 2010-03-06 13:10:44.000000000 +0100
2	+++ pdns_recursor.cc Thu Jan 18 00:01:47 2007	2	+++ pdns_recursor.cc 2010-03-07 21:13:07.000000000 +0100
3	@@ -1669,8 +1669,8 @@	3	@@ -1890,8 +1890,8 @@
4	::arg().set("daemon","Operate as a daemon")="yes";	4	::arg().set("daemon","Operate as a daemon")="yes";
5	::arg().set("log-common-errors","If we should log rather common errors")="yes";	5	::arg().set("log-common-errors","If we should log rather common errors")="yes";
6	::arg().set("chroot","switch to chroot jail")="";	6	::arg().set("chroot","switch to chroot jail")="";
Lines 8-13 Link Here
8	- ::arg().set("setuid","If set, change user id to this uid for more security")="";	8	- ::arg().set("setuid","If set, change user id to this uid for more security")="";
9	+ ::arg().set("setgid","If set, change group id to this gid for more security")="pdns";	9	+ ::arg().set("setgid","If set, change group id to this gid for more security")="pdns";
10	+ ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor";	10	+ ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor";
		11	::arg().set("network-timeout", "Wait this nummer of milliseconds for network i/o")="1500";
		12	::arg().set("threads", "Launch this number of threads")="2";
11	#ifdef WIN32	13	#ifdef WIN32
12	::arg().set("quiet","Suppress logging of questions and answers")="off";
13	::arg().setSwitch( "register-service", "Register the service" )= "no";




--- Makefile.orig	2010-02-10 20:46:15.000000000 +0100
+++ Makefile	2010-02-11 13:22:25.000000000 +0100
@@ -38,10 +38,10 @@
 SBINDIR=/usr/sbin/
 BINDIR=/usr/bin/
 CONFIGDIR="/etc/powerdns/"
-OPTFLAGS?=-O3
 CXXFLAGS:= $(CXXFLAGS) -Wall -DBOOST_SP_DISABLE_THREADS $(OPTFLAGS) $(PROFILEFLAGS)
 CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS)
 LINKCC=$(CXX)
@@ -41,10 +40,10 @@
 ifeq ($(STATIC),semi)
 	STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc
 	LINKCC=$(CC)
-	LDFLAGS += -ldl -lm
+	LDFLAGS += -lm
 else 
    ifeq ($(STATIC),full)
-	STATICFLAGS=-lstdc++ $(LUALIBS) -ldl -lm -static 
+	STATICFLAGS=-lstdc++ $(LUALIBS) -lm -static 
 	LINKCC=$(CC)
    else
 	LDFLAGS +=  $(LUALIBS)
@@ -69,16 +69,14 @@
 	 fi
 
 install: all

+	mv rec_control.1 rec_control.8
 	$(OS_SPECIFIC_INSTALL)	
 
 clean: binclean




--- pdns_recursor.1.orig	2010-02-11 11:28:22.000000000 +0100
+++ pdns_recursor.1	2010-02-11 11:27:38.000000000 +0100
@@ -5,7 +5,7 @@
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "PDNS_RECURSOR" "1" "03/22/2008" "" ""
+.TH "PDNS_RECURSOR" "8" "03/22/2008" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)

 \fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]
 .sp
 .SH "DESCRIPTION"
-pdns_recursor(1) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.
+pdns_recursor(8) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.
 .sp
 The recursor is configured via a configuration file, but each item in that file can be overridden on the command line.
 .sp
@@ -243,7 +243,7 @@
 Website: http://wiki.powerdns.com, http://www.powerdns.com
 .sp
 .SH "SEE ALSO"
-rec_control(1)
+rec_control(8)
 .sp
 .SH "COPYING"
 Copyright \(co 2006 PowerDNS.COM BV. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2.
--- rec_control.1.orig	2010-02-11 11:28:12.000000000 +0100
+++ rec_control.1	2010-02-11 11:27:38.000000000 +0100
@@ -5,7 +5,7 @@
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "REC_CONTROL" "1" "09/22/2009" "" ""
+.TH "REC_CONTROL" "8" "09/22/2009" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)

 .sp
 The commands that can be passed to the recursor are described on http://doc\&.powerdns\&.com/rec\-control\&.html
 .sp
@@ -110,7 +110,7 @@
 Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com
 .sp
 .SH "SEE ALSO"
-pdns_recursor(1)
+pdns_recursor(8)
 .sp
 .SH "COPYING"
 Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.

Return to bug 144535

Lines 1-27 Link Here

(-)powerdns-recursor/files/patch-makefile (-19 / +11 lines)
1	--- Makefile.orig 2010-01-03 15:26:42.000000000 +0100	1	--- Makefile.orig 2010-02-10 20:46:15.000000000 +0100
2	+++ Makefile 2010-01-05 10:32:00.000000000 +0100	2	+++ Makefile 2010-02-11 13:22:25.000000000 +0100
3	@@ -2,7 +2,6 @@	3	@@ -38,10 +38,10 @@
4	SBINDIR=/usr/sbin/
5	BINDIR=/usr/bin/
6	CONFIGDIR="/etc/powerdns/"
7	-OPTFLAGS?=-O3
8	CXXFLAGS:= $(CXXFLAGS) -Wall -DBOOST_SP_DISABLE_THREADS $(OPTFLAGS) $(PROFILEFLAGS)
9	CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS)
10	LINKCC=$(CXX)
11	@@ -41,10 +40,10 @@
12	ifeq ($(STATIC),semi)	4	ifeq ($(STATIC),semi)
13	STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc	5	STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc
14	LINKCC=$(CC)	6	LINKCC=$(CC)
15	- LDFLAGS += malloc.o -ldl -lm	7	- LDFLAGS += -ldl -lm
16	+ LDFLAGS += malloc.o -lm	8	+ LDFLAGS += -lm
17	else	9	else
18	ifeq ($(STATIC),full)	10	ifeq ($(STATIC),full)
19	- STATICFLAGS=-lstdc++ $(LUALIBS) -ldl -lm -static	11	- STATICFLAGS=-lstdc++ $(LUALIBS) -ldl -lm -static
20	+ STATICFLAGS=-lstdc++ $(LUALIBS) -lm -static	12	+ STATICFLAGS=-lstdc++ $(LUALIBS) -lm -static
21	LINKCC=$(CC)	13	LINKCC=$(CC)
22	else	14	else
23	LDFLAGS += malloc.o $(LUALIBS)	15	LDFLAGS += $(LUALIBS)
24	@@ -72,16 +71,14 @@	16	@@ -69,16 +69,14 @@
25	fi	17	fi
26		18
27	install: all	19	install: all
Lines 39-42 Link Here
39	+ mv rec_control.1 rec_control.8	31	+ mv rec_control.1 rec_control.8
40	$(OS_SPECIFIC_INSTALL)	32	$(OS_SPECIFIC_INSTALL)
41		33
42	clean:	34	clean: binclean

Lines 1-11 Link Here

(-)powerdns-recursor/files/patch-manpages (-17 / +17 lines)
1	--- pdns_recursor.1.orig 2010-01-03 15:26:42.000000000 +0100	1	--- pdns_recursor.1.orig 2010-02-11 11:28:22.000000000 +0100
2	+++ pdns_recursor.1 2010-01-05 10:36:30.000000000 +0100	2	+++ pdns_recursor.1 2010-02-11 11:27:38.000000000 +0100
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4	.\" Manual:	4	.\" Manual:
5	.\" Source:	5	.\" Source:
6	.\"	6	.\"
7	-.TH "PDNS_RECURSOR" "1" "12/29/2009" "" ""	7	-.TH "PDNS_RECURSOR" "1" "03/22/2008" "" ""
8	+.TH "PDNS_RECURSOR" "8" "12/29/2009" "" ""	8	+.TH "PDNS_RECURSOR" "8" "03/22/2008" "" ""
9	.\" disable hyphenation	9	.\" disable hyphenation
10	.nh	10	.nh
11	.\" disable justification (adjust text to left margin only)	11	.\" disable justification (adjust text to left margin only)
Lines 13-40 Link Here
13	\fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]	13	\fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]
14	.sp	14	.sp
15	.SH "DESCRIPTION"	15	.SH "DESCRIPTION"
16	-pdns_recursor(1) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.	16	-pdns_recursor(1) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.
17	+pdns_recursor(8) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.	17	+pdns_recursor(8) is a high performance, simple and secure recursing nameserver. It currently powers over two million internet connections.
18	.sp	18	.sp
19	The recursor is configured via a configuration file, but each item in that file can be overridden on the command line\&.	19	The recursor is configured via a configuration file, but each item in that file can be overridden on the command line.
20	.sp	20	.sp
21	@@ -242,7 +242,7 @@	21	@@ -243,7 +243,7 @@
22	Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com	22	Website: http://wiki.powerdns.com, http://www.powerdns.com
23	.sp	23	.sp
24	.SH "SEE ALSO"	24	.SH "SEE ALSO"
25	-rec_control(1)	25	-rec_control(1)
26	+rec_control(8)	26	+rec_control(8)
27	.sp	27	.sp
28	.SH "COPYING"	28	.SH "COPYING"
29	Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.	29	Copyright \(co 2006 PowerDNS.COM BV. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2.
30	--- rec_control.1.orig 2010-01-03 15:26:42.000000000 +0100	30	--- rec_control.1.orig 2010-02-11 11:28:12.000000000 +0100
31	+++ rec_control.1 2010-01-05 10:35:14.000000000 +0100	31	+++ rec_control.1 2010-02-11 11:27:38.000000000 +0100
32	@@ -5,7 +5,7 @@	32	@@ -5,7 +5,7 @@
33	.\" Manual:	33	.\" Manual:
34	.\" Source:	34	.\" Source:
35	.\"	35	.\"
36	-.TH "REC_CONTROL" "1" "12/29/2009" "" ""	36	-.TH "REC_CONTROL" "1" "09/22/2009" "" ""
37	+.TH "REC_CONTROL" "8" "12/29/2009" "" ""	37	+.TH "REC_CONTROL" "8" "09/22/2009" "" ""
38	.\" disable hyphenation	38	.\" disable hyphenation
39	.nh	39	.nh
40	.\" disable justification (adjust text to left margin only)	40	.\" disable justification (adjust text to left margin only)
Lines 47-58 Link Here
47	.sp	47	.sp
48	The commands that can be passed to the recursor are described on http://doc\&.powerdns\&.com/rec\-control\&.html	48	The commands that can be passed to the recursor are described on http://doc\&.powerdns\&.com/rec\-control\&.html
49	.sp	49	.sp
50	@@ -105,7 +105,7 @@	50	@@ -110,7 +110,7 @@
51	Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com	51	Website: http://wiki\&.powerdns\&.com, http://www\&.powerdns\&.com
52	.sp	52	.sp
53	.SH "SEE ALSO"	53	.SH "SEE ALSO"
54	-pdns_recursor(1)	54	-pdns_recursor(1)
55	+pdns_recursor(8)	55	+pdns_recursor(8)
56	.sp	56	.sp
57	.SH "COPYING"	57	.SH "COPYING"
58	Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.	58	Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.