From b289db8925f82e83048caa34332ccd654d12f62d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 20 Nov 2009 09:31:11 +0100
Subject: package updates and compile fixes

- update ctorrent, cups, gnutls and freeradius-server
- compile kerberos (heimdal,krb5) with com_err library from
  e2fsprogs to allow both to be build without installing local
  copys of libcom_err
- cleanup lynx package add zlib dependency
---
 package/ipset/Makefile               |  4 ++--
 package/ipset/patches/patch-Makefile | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 package/ipset/patches/patch-Makefile

(limited to 'package/ipset')

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 6db433527..97a2b70dd 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -17,7 +17,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${ADK_TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		PREFIX=/usr
 BUILD_STYLE:=		auto
@@ -28,7 +28,7 @@ INSTALL_TARGET:=	binaries_install
 pre-build:
 	V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
 	PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
-	LD=$(TARGET_CROSS)gcc
+	LD=$(TARGET_CROSS)gcc \
 	$(MAKE) -C ${WRKBUILD} modules
 
 post-install:
diff --git a/package/ipset/patches/patch-Makefile b/package/ipset/patches/patch-Makefile
new file mode 100644
index 000000000..9eaf33095
--- /dev/null
+++ b/package/ipset/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- ipset-3.0.orig/Makefile	2009-05-16 21:09:38.000000000 +0200
++++ ipset-3.0/Makefile	2009-11-19 23:32:37.000000000 +0100
+@@ -5,7 +5,7 @@
+ ######################################################################
+ 
+ ifndef KERNEL_DIR
+-KERNEL_DIR=/usr/src/linux
++KERNEL_DIR?=/usr/src/linux
+ endif
+ ifndef KBUILD_OUTPUT
+ KBUILD_OUTPUT=$(KERNEL_DIR)
-- 
cgit v1.2.3