Attachment 82816 Details for Bug 118425 – file.diff

[patch] file.diff

file.diff (text/plain), 3.25 KB, created by David Wood on 2007-12-04 15:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Wood

Created: 2007-12-04 15:30:01 UTC

Size: 3.25 KB

patch

obsolete

>Index: files/patch-src-modules-rlm_attr_rewrite-rlm_attr_rewrite.c
>===================================================================
>--- files/patch-src-modules-rlm_attr_rewrite-rlm_attr_rewrite.c	(.../branches/FreeBSD-ports-tree/freeradius)	(revision 128)
>+++ files/patch-src-modules-rlm_attr_rewrite-rlm_attr_rewrite.c	(.../trunk/freeradius)	(revision 128)
>@@ -1,10 +0,0 @@
>---- src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c.orig	Sat Jun 18 14:29:43 2005
>-+++ src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c	Sat Jun 18 14:31:48 2005
>-@@ -27,6 +27,7 @@
>- #include <stdio.h>
>- #include <stdlib.h>
>- #include <string.h>
>-+#include <sys/types.h>
>- #ifdef HAVE_REGEX_H
>- #	include <regex.h>
>- #endif
>Index: files/radiusd.sh.in
>===================================================================
>--- files/radiusd.sh.in	(.../branches/FreeBSD-ports-tree/freeradius)	(revision 128)
>+++ files/radiusd.sh.in	(.../trunk/freeradius)	(revision 128)
>@@ -14,13 +14,19 @@
> 
> name=radiusd
> rcvar=`set_rcvar`
>+load_rc_config $name
> 
> command=%%PREFIX%%/sbin/radiusd
>-radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/radiusd.conf"}
>-required_files=${radiusd_config}
> pidfile=/var/run/radiusd/radiusd.pid
> 
>+# The radiusd_config parameter is now obsolete. Instead, derive the
>+# configuration directory name from radiusd_flags if possible, otherwise
>+# default to %%PREFIX%%/etc/raddb
>+required_dirs=`echo ${radiusd_flags} | sed -Ee 's:.*\-[^[:space:]d]*d[[:space:]]*([^[:space:]]+).*:\1:'`
>+required_dirs=${required_dirs:-"%%PREFIX%%/etc/raddb"}
>+
>+required_files="${required_dirs}/radiusd.conf"
>+
> radiusd_enable=${radiusd_enable-"NO"}
> 
>-load_rc_config $name
> run_rc_command "$1"
>Index: files/patch-radiusd-no-pie
>===================================================================
>--- files/patch-radiusd-no-pie	(.../branches/FreeBSD-ports-tree/freeradius)	(revision 0)
>+++ files/patch-radiusd-no-pie	(.../trunk/freeradius)	(revision 128)
>@@ -0,0 +1,11 @@
>+--- src/main/Makefile.in	Wed Feb 14 15:44:23 2007
>++++ src/main/Makefile.in	Mon Dec  3 14:26:53 2007
>+@@ -61,7 +61,7 @@
>+ 
>+ radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
>+ 	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
>+-		$(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
>++		$(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
>+ 		$(MODULE_LIBS) $(LIBS) $(SNMP_LIBS) $(PTHREADLIB) \
>+ 		$(LIBLTDL) $(OPENSSL_LIBS)
>+ 
>Index: Makefile
>===================================================================
>--- Makefile	(.../branches/FreeBSD-ports-tree/freeradius)	(revision 128)
>+++ Makefile	(.../trunk/freeradius)	(revision 128)
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	freeradius
> PORTVERSION?=	1.1.7
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES=	net
> MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
> 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \
>@@ -61,12 +61,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 700042
>-.if ${ARCH} == "amd64"
>-BROKEN=		Does not compile with GCC 4.2
>-.endif
>-.endif
>-
> # Default requirements for rc script
> _REQUIRE=	NETWORKING SERVERS
> 
>@@ -110,7 +104,7 @@
> 
> .ifdef(WITH_KERBEROS)
> .ifdef(WITH_HEIMDAL)
>-LIB_DEPENDS+=	krb5.21:${PORTSDIR}/security/heimdal
>+LIB_DEPENDS+=	krb5.23:${PORTSDIR}/security/heimdal
> CONFIGURE_ARGS+=--enable-heimdal-krb5
> .else
> LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5

Actions: View | Diff

Attachments on bug 118425: 82816