From 79460a7e3a45dc5ad90e1b1dc63786c55cbf5074 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 10 Jan 2010 17:15:04 +0100
Subject: update and fix nfs-utils with kerberos support

---
 package/librpcsecgss/Makefile                      | 15 ++++++-------
 package/librpcsecgss/files/librpcsecgss.pc.in      | 12 +++++++++++
 .../librpcsecgss/files/librpcsecgss.pc.in.gssglue  | 12 -----------
 package/librpcsecgss/patches/patch-configure_in    | 25 ----------------------
 4 files changed, 19 insertions(+), 45 deletions(-)
 create mode 100644 package/librpcsecgss/files/librpcsecgss.pc.in
 delete mode 100644 package/librpcsecgss/files/librpcsecgss.pc.in.gssglue
 delete mode 100644 package/librpcsecgss/patches/patch-configure_in

(limited to 'package/librpcsecgss')

diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index ed47b9cd5..50b856deb 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -4,23 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		librpcsecgss
-PKG_VERSION:=		0.18
+PKG_VERSION:=		0.19
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f2c4a69c5a32f62b762a569b8d962156
+PKG_MD5SUM:=		b45ed565bdc3099023aa35830ec92997
 PKG_DESCR:=		Secure RPC library for NFSv4
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		libgssglue
+PKG_BUILDDEP+=		libgssglue
 PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autotool gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
-
-post-extract:
-	$(CP) ./files/librpcsecgss.pc* $(WRKSRC)/
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBRPCSECGSS)/usr/lib
diff --git a/package/librpcsecgss/files/librpcsecgss.pc.in b/package/librpcsecgss/files/librpcsecgss.pc.in
new file mode 100644
index 000000000..d67b7e4b6
--- /dev/null
+++ b/package/librpcsecgss/files/librpcsecgss.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: librpcsecgss
+Description: Library that implements rpcsec_gss interface.
+Requires: libgssglue
+Version: @PACKAGE_VERSION@
+Libs: -L@libdir@ -lrpcsecgss
+Cflags: -I@includedir@/rpcsecgss
+
diff --git a/package/librpcsecgss/files/librpcsecgss.pc.in.gssglue b/package/librpcsecgss/files/librpcsecgss.pc.in.gssglue
deleted file mode 100644
index d67b7e4b6..000000000
--- a/package/librpcsecgss/files/librpcsecgss.pc.in.gssglue
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: librpcsecgss
-Description: Library that implements rpcsec_gss interface.
-Requires: libgssglue
-Version: @PACKAGE_VERSION@
-Libs: -L@libdir@ -lrpcsecgss
-Cflags: -I@includedir@/rpcsecgss
-
diff --git a/package/librpcsecgss/patches/patch-configure_in b/package/librpcsecgss/patches/patch-configure_in
deleted file mode 100644
index a57facbc6..000000000
--- a/package/librpcsecgss/patches/patch-configure_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- librpcsecgss-0.18.orig/configure.in	2008-04-09 00:05:40.000000000 +0200
-+++ librpcsecgss-0.18/configure.in	2009-01-30 16:11:01.000000000 +0100
-@@ -10,12 +10,17 @@ AM_PROG_LIBTOOL
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- # Checks for libraries.
--PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], [],
--  [AC_MSG_ERROR([Unable to locate information required to use libgssglue.
--  If you have pkgconfig installed, you might try setting environment
--  variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])
-+PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1],
-+  [echo GSSGLUE found; cp librpcsecgss.pc.in.gssglue librpcsecgss.pc.in],
-+  [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi],
-+    [echo HEIMDAL found; cp librpcsecgss.pc.in.heimdal librpcsecgss.pc.in],
-+    [AC_MSG_ERROR([Unable to locate information required to use libgssglue.
-+    If you have pkgconfig installed, you might try setting environment
-+    variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])])
-+
- 
- # Checks for header files.
- AC_HEADER_STDC
-- 
cgit v1.2.3