Attachment 77766 Details for Bug 111915 – file.diff

[patch] file.diff

file.diff (text/plain), 3.51 KB, created by Sten Spans on 2007-04-19 20:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sten Spans

Created: 2007-04-19 20:40:10 UTC

Size: 3.51 KB

patch

obsolete

>diff -Nru powerdns-recursor/Makefile powerdns-recursor.new/Makefile
>--- Makefile.orig	Tue Feb  6 22:59:35 2007
>+++ Makefile	Thu Apr 19 02:44:48 2007
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	powerdns-recursor
> PORTVERSION=	3.1.4
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/ \
> 		http://mirrors.evolva.ro/powerdns.com/releases/
>@@ -20,9 +20,10 @@
> 
> USE_BZIP2=	yes
> USE_GMAKE=	yes
>-USE_GCC=	3.4
>+USE_GCC=	3.4+
> 
>-OPTIONS=	STATIC	"Enable Full STATIC" off
>+OPTIONS=	STATIC	"Enable Full STATIC" off \
>+		SETUID	"Run as pdns_recursor user" on
> 
> CXXFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>@@ -41,6 +42,10 @@
> PLIST_SUB+=	STATIC="@comment "
> .endif
> 
>+.if defined(WITH_SETUID)
>+EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-setuid
>+.endif
>+
> .if exists(/usr/include/ucontext.h) && ${OSVERSION} >= 500000
> UCONTEXT!=	${AWK} '/setcontext/ { print "YES" }' \
> 		/usr/include/ucontext.h
>@@ -58,8 +63,10 @@
> 		${WRKSRC}/config.h
> 
>+.if defined(WITH_SETUID)
> pre-install:
> 		@${ECHO} "==>  Creating custom user to run pdns_recursor..."
> 		@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>+.endif
> 
> post-install:
> .if !exists(${PREFIX}/etc/pdns/recursor.conf)
>diff -Nru powerdns-recursor/files/extrapatch-setuid powerdns-recursor.new/files/extrapatch-setuid
>--- files/extrapatch-setuid	Thu Jan  1 01:00:00 1970
>+++ files/extrapatch-setuid	Thu Apr 19 02:43:41 2007
>@@ -0,0 +1,13 @@
>+--- pdns_recursor.cc.orig	Wed Jan 17 23:45:51 2007
>++++ pdns_recursor.cc	Thu Jan 18 00:01:47 2007
>+@@ -1669,8 +1669,8 @@
>+     ::arg().set("daemon","Operate as a daemon")="yes";
>+     ::arg().set("log-common-errors","If we should log rather common errors")="yes";
>+     ::arg().set("chroot","switch to chroot jail")="";
>+-    ::arg().set("setgid","If set, change group id to this gid for more security")="";
>+-    ::arg().set("setuid","If set, change user id to this uid for more security")="";
>++    ::arg().set("setgid","If set, change group id to this gid for more security")="pdns";
>++    ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor";
>+ #ifdef WIN32
>+     ::arg().set("quiet","Suppress logging of questions and answers")="off";
>+     ::arg().setSwitch( "register-service", "Register the service" )= "no";
>diff -Nru powerdns-recursor/files/patch-pdns_nameserver.cc powerdns-recursor.new/files/patch-pdns_nameserver.cc
>--- patch-pdns_nameserver.cc	Thu Jan 18 19:57:26 2007
>+++ files/patch-pdns_nameserver.cc	Thu Apr 19 02:43:59 2007
>@@ -1,16 +1,5 @@
> --- pdns_recursor.cc.orig	Wed Jan 17 23:45:51 2007
> +++ pdns_recursor.cc	Thu Jan 18 00:01:47 2007
>-@@ -1669,8 +1669,8 @@
>-     ::arg().set("daemon","Operate as a daemon")="yes";
>-     ::arg().set("log-common-errors","If we should log rather common errors")="yes";
>-     ::arg().set("chroot","switch to chroot jail")="";
>--    ::arg().set("setgid","If set, change group id to this gid for more security")="";
>--    ::arg().set("setuid","If set, change user id to this uid for more security")="";
>-+    ::arg().set("setgid","If set, change group id to this gid for more security")="pdns";
>-+    ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor";
>- #ifdef WIN32
>-     ::arg().set("quiet","Suppress logging of questions and answers")="off";
>-     ::arg().setSwitch( "register-service", "Register the service" )= "no";
> @@ -1691,7 +1691,7 @@
>      ::arg().set("client-tcp-timeout","Timeout in seconds when talking to TCP clients")="2";
>      ::arg().set("max-tcp-clients","Maximum number of simultaneous TCP clients")="128";

Actions: View | Diff

Attachments on bug 111915: 77766