Fix compile errors on systems with libtool-2 (#261189). Add readline and libpcap dependency atoms.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 56 insertions, 18 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 6ae8dda48041..c0ab3360e8f6 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.86 2009/03/01 13:57:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.87 2009/03/05 22:50:39 mrness Exp $
+
+*freeradius-2.1.3-r1 (05 Mar 2009)
+
+  05 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  files/freeradius-2.1.3-qafixes.patch, -freeradius-2.1.3.ebuild,
+  +freeradius-2.1.3-r1.ebuild:
+  Fix compile errors on systems with libtool-2 (#261189). Add readline and
+  libpcap dependency atoms.
 
 *freeradius-2.1.3 (01 Mar 2009)
 
diff --git a/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch
index 37a31a97391b..088784c368c0 100644
--- a/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch
+++ b/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch
@@ -1,6 +1,42 @@
+diff -Nru freeradius-server-2.1.3.orig/configure.in freeradius-server-2.1.3/configure.in
+--- freeradius-server-2.1.3.orig/configure.in	2008-12-05 16:37:56.000000000 +0000
++++ freeradius-server-2.1.3/configure.in	2009-03-05 22:25:53.000000000 +0000
+@@ -544,7 +544,19 @@
+ 	],
+ 	[ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ])
+ 
+-AC_LIB_READLINE
++AC_CHECK_LIB(readline, readline,
++	[ LIBREADLINE="-lreadline"
++	AC_DEFINE(HAVE_LIBREADLINE, 1,
++		[Define to 1 if you have a readline compatible library.])
++	AC_DEFINE(HAVE_READLINE_READLINE_H, 1,
++		[Define to 1 if you have the <readline/readline.h> header file.])
++	AC_DEFINE(HAVE_READLINE_HISTORY, 1,
++		[Define if your readline library has \`add_history'])
++	AC_DEFINE(HAVE_READLINE_HISTORY_H, 1,
++		[Define to 1 if you have the <readline/history.h> header file.])
++	],
++	[ LIBREADLINE="" ])
++AC_SUBST(LIBREADLINE)
+ 
+ dnl #############################################################
+ dnl #
+diff -Nru freeradius-server-2.1.3.orig/src/lib/Makefile freeradius-server-2.1.3/src/lib/Makefile
+--- freeradius-server-2.1.3.orig/src/lib/Makefile	2009-03-05 22:24:10.000000000 +0000
++++ freeradius-server-2.1.3/src/lib/Makefile	2009-03-05 22:25:53.000000000 +0000
+@@ -41,7 +41,7 @@
+ 
+ $(TARGET).la: $(LT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+-	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
++	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ -lpthread
+ 
+ $(LT_OBJS): $(INCLUDES)
+ 
 diff -Nru freeradius-server-2.1.3.orig/src/main/listen.c freeradius-server-2.1.3/src/main/listen.c
 --- freeradius-server-2.1.3.orig/src/main/listen.c	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/src/main/listen.c	2009-03-01 12:16:55.000000000 +0000
++++ freeradius-server-2.1.3/src/main/listen.c	2009-03-05 22:25:53.000000000 +0000
 @@ -45,6 +45,9 @@
  #include <fcntl.h>
  #endif
@@ -11,14 +47,3 @@ diff -Nru freeradius-server-2.1.3.orig/src/main/listen.c freeradius-server-2.1.3
  
  /*
   *	We'll use this below.
-diff -Nru freeradius-server-2.1.3.orig/src/main/radmin.c freeradius-server-2.1.3/src/main/radmin.c
---- freeradius-server-2.1.3.orig/src/main/radmin.c	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/src/main/radmin.c	2009-03-01 12:22:44.000000000 +0000
-@@ -47,6 +47,7 @@
- #else /* !defined(HAVE_READLINE_H) */
- extern char *readline ();
- #endif /* !defined(HAVE_READLINE_H) */
-+#include <readline/history.h>
- char *cmdline = NULL;
- #else /* !defined(HAVE_READLINE_READLINE_H) */
-   /* no readline */
diff --git a/net-dialup/freeradius/freeradius-2.1.3.ebuild b/net-dialup/freeradius/freeradius-2.1.3-r1.ebuild
index b51ad4e6c22d..82b2e62053e1 100644
--- a/net-dialup/freeradius/freeradius-2.1.3.ebuild
+++ b/net-dialup/freeradius/freeradius-2.1.3-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.3.ebuild,v 1.1 2009/03/01 13:57:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.3-r1.ebuild,v 1.1 2009/03/05 22:50:39 mrness Exp $
 
 EAPI="2"
-WANT_AUTOMAKE="none"
 
-inherit eutils multilib pam
+inherit eutils multilib pam autotools libtool
 
 DESCRIPTION="Highly configurable free RADIUS server"
 SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
@@ -20,6 +19,8 @@ RDEPEND="!net-dialup/cistronradius
 	!net-dialup/gnuradius
 	>=sys-libs/db-3.2
 	sys-libs/gdbm
+	sys-libs/readline
+	net-libs/libpcap
 	dev-lang/perl
 	snmp? ( net-analyzer/net-snmp )
 	mysql? ( virtual/mysql )
@@ -30,8 +31,7 @@ RDEPEND="!net-dialup/cistronradius
 	ldap? ( net-nds/openldap )
 	kerberos? ( virtual/krb5 )
 	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-server-${PV}"
 
@@ -87,6 +87,11 @@ src_unpack() {
 		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
 		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
 	fi
+
+	# These are needed for fixing libtool-2 related issues (#261189)
+	# Keep these lines even if you don't patch *.{in,am} files!
+	eautoreconf
+	elibtoolize
 }
 
 src_configure() {