Merge branch 'master' of git+ssh://openadk.org/git/openadk

Config.in

@@ -102,7 +102,7 @@ source "target/config/Config.in.runtime"
 endmenu
 
 menu "Kernel configuration"
-	visible if !ADK_CHOOSE_APPLIANCE
+	visible if !ADK_CHOOSE_APPLIANCE && ADK_TARGET_KERNEL_CUSTOMISING
 source "target/linux/Config.in"
 endmenu
 

mk/build.mk

@@ -223,7 +223,7 @@ kernelconfig:
 	${KERNEL_MAKE_ENV} ${MAKE} \
 		ARCH=$(ADK_TARGET_ARCH) \
 		${KERNEL_MAKE_OPTS} \
-		-C $(BUILD_DIR)/linux menuconfig
+		menuconfig
 
 # create a new package from package/.template
 newpackage:
@@ -514,7 +514,7 @@ endif
 	@if [ ! -z "$(ADK_TARGET_SYSTEM)" ];then \
 		system=$$(echo "$(ADK_TARGET_SYSTEM)" |sed -e "s/-/_/g"); \
 		grep -h "^config" target/*/Config.in.systems \
-			|grep -i "$$system" \
+			|grep -i "$$system$$" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/all.config; \
 	fi

mk/fetch.mk

@@ -28,7 +28,7 @@ ifeq ($(strip ${PKG_NOCHECKSUM}),)
 ${_CHECKSUM_COOKIE}: ${FULLDISTFILES}
 	-rm -rf ${WRKDIR}
 ifneq ($(ADK_DISABLE_CHECKSUM),y)
-	@if [ ! -e "${FULLDISTFILES}.nohash" ]; then \
+	@if [ ! -e $(firstword ${FULLDISTFILES}).nohash ]; then \
 	OK=n; \
 	allsums="$(strip ${PKG_HASH})"; \
 	(shasum -a 256 ${FULLDISTFILES}; echo exit) | while read sum name; do \

mk/image.mk

@@ -37,7 +37,7 @@ else
 $(error No login shell configured!)
 endif
 
-imageprepare: image-prepare-post extra-install
+imageprepare: image-prepare-post extra-install prelink
 
 # if an extra directory exist in ADK_TOPDIR, copy all content over the 
 # root directory, do the same if make extra=/dir/to/extra is used
@@ -79,6 +79,19 @@ ifneq ($(ADK_TARGET_ARCH_AARCH64)$(ADK_TARGET_ARCH_X86_64)$(ADK_TARGET_ARCH_PPC6
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 
+ifeq (${ADK_PRELINK},)
+prelink:
+else
+${TARGET_DIR}/etc/prelink.conf:
+	echo '/' > $@
+
+prelink: ${TARGET_DIR}/etc/prelink.conf
+	$(TRACE) target/prelink
+	${TARGET_CROSS}prelink ${ADK_PRELINK_OPTS} \
+		--ld-library-path=${STAGING_TARGET_DIR}/usr/lib:${STAGING_TARGET_DIR}/lib \
+		--root=${TARGET_DIR} -a $(MAKE_TRACE)
+endif
+
 KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
 KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(ADK_TARGET_CPU_ARCH).$(PKG_SUFFIX)
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel
@@ -203,7 +216,7 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
 		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
 endif
 	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
+	env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \
 		-j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 

mk/kernel-build.mk

@@ -35,18 +35,18 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(ADK_TO
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
 	-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config
-	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
+	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/.config
 
 $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
-	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
+	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/$(KERNEL_FILE)
 
 $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
 	rm -rf $(LINUX_BUILD_DIR)/modules
-	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} DEPMOD=true \
+	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \
 		INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
 		LOCALVERSION="" \
 		modules_install $(MAKE_TRACE)

mk/kernel-vars.mk

@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-KERNEL_MAKE_OPTS:=	V=1 \
+KERNEL_MAKE_OPTS:=	V=1 -C "${LINUX_DIR}" \
 			ARCH="$(ADK_TARGET_KARCH)" \
 			CROSS_COMPILE="$(TARGET_CROSS)" \
 			CC="$(TARGET_CC)" \

mk/kernel-ver.mk

@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION).0
 KERNEL_RELEASE:=	1
 KERNEL_HASH:=		be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_18_6),y)
-KERNEL_VERSION:=	3.18.6
+ifeq ($(ADK_KERNEL_VERSION_3_18_8),y)
+KERNEL_VERSION:=	3.18.8
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_HASH:=		c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
+KERNEL_HASH:=		9cfbd9d403f2b27951893f5ed73f694f65409c63f20a2fd394598a3d7004aadb
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_14_28),y)
 KERNEL_VERSION:=	3.14.28

mk/modules.mk

@@ -473,13 +473,13 @@ $(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\
 	$(MODULES_DIR)/kernel/net/netfilter/xt_conntrack \
 ,41))
 
-$(eval $(call KMOD_template,NETFILTER_XT_NAT,netfilter-xt-nat,\
-	$(MODULES_DIR)/kernel/net/netfilter/xt_nat \
-,40))
-
 $(eval $(call KMOD_template,NF_NAT,nf-nat,\
 	$(MODULES_DIR)/kernel/net/netfilter/nf_nat \
-,45))
+,42))
+
+$(eval $(call KMOD_template,NETFILTER_XT_NAT,netfilter-xt-nat,\
+	$(MODULES_DIR)/kernel/net/netfilter/xt_nat \
+,43))
 
 $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_defrag_ipv4 \
@@ -488,6 +488,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\
 
 $(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \
+	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_masquerade_ipv4 \
 ,50))
 
 $(eval $(call KMOD_template,IP_NF_NAT,ip-nf-nat,\
@@ -588,6 +589,7 @@ $(eval $(call KMOD_template,IP_NF_FILTER,ip-nf-filter,\
 ,55))
 
 $(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\
+	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_reject_ipv4 \
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \
 ,60))
 
@@ -677,6 +679,7 @@ $(eval $(call KMOD_template,IP6_NF_FILTER,ip6-nf-filter,\
 ,55))
 
 $(eval $(call KMOD_template,IP6_NF_TARGET_REJECT,ip6-nf-target-reject,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_reject_ipv6 \
 	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_REJECT \
 ,60))
 
@@ -1099,6 +1102,7 @@ $(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\
 ,26))
 
 $(eval $(call KMOD_template,LOCKD,lockd,\
+	$(MODULES_DIR)/kernel/fs/nfs_common/grace \
 	$(MODULES_DIR)/kernel/fs/lockd/lockd \
 ,27))
 

mk/os.mk

@@ -0,0 +1,11 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+# operating system quirks
+ifeq (${OStype},Darwin)
+HOST_CC:=clang -fbracket-depth=1024
+HOST_CXX:=clang++ -fbracket-depth=1024
+else
+HOST_CC:=${CC}
+HOST_CXX:=${CXX}
+endif

mk/package.mk

@@ -308,7 +308,7 @@ clean-targets:
 clean:
 	@$(CMD_TRACE) "cleaning... "
 	@$(MAKE) clean-targets $(MAKE_TRACE)
-	rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}
${PKG_VERSION}
+	rm -rf ${WRKDIR} ${ALL_IPKGS} ${_IPKGS_COOKIE}
 
 distclean: clean
 	rm -f ${FULLDISTFILES}

mk/vars.mk

@@ -107,6 +107,7 @@ TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O1 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib
 
+# for archiectures where gcc --with-cpu matches -mcpu=
 ifneq ($(ADK_TARGET_GCC_CPU),)
 ifeq ($(ADK_CPU_ARC700),y)
 TARGET_CFLAGS+=		-mcpu=ARC700
@@ -117,16 +118,44 @@ TARGET_CXXFLAGS+=	-mcpu=$(ADK_TARGET_GCC_CPU)
 endif
 endif
 
+# for archiectures where gcc --with-arch matches -march=
 ifneq ($(ADK_TARGET_GCC_ARCH),)
 TARGET_CFLAGS+=		-march=$(ADK_TARGET_GCC_ARCH)
 TARGET_CXXFLAGS+=	-march=$(ADK_TARGET_GCC_ARCH)
 endif
 
+ifneq ($(ADK_TARGET_CPU_FLAGS),)
+TARGET_CFLAGS+=		$(ADK_TARGET_CPU_FLAGS)
+TARGET_CXXFLAGS+=	$(ADK_TARGET_CPU_FLAGS)
+endif
+
+ifneq ($(ADK_TARGET_FPU),)
+TARGET_CFLAGS+=		-mfpu=$(ADK_TARGET_FPU)
+TARGET_CXXFLAGS+=	-mfpu=$(ADK_TARGET_FPU)
+endif
+
+ifneq ($(ADK_TARGET_FLOAT),)
+ifeq ($(ADK_TARGET_ARCH_ARM),y)
+TARGET_CFLAGS+=		-mfloat-abi=$(ADK_TARGET_FLOAT)
+TARGET_CXXFLAGS+=	-mfloat-abi=$(ADK_TARGET_FLOAT)
+endif
+ifeq ($(ADK_TARGET_ARCH_MIPS),y)
+TARGET_CFLAGS+=		-m$(ADK_TARGET_FLOAT)-float
+TARGET_CXXFLAGS+=	-m$(ADK_TARGET_FLOAT)-float
+endif
+endif
+
+ifeq ($(ADK_TARGET_ARCH_ARM),y)
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
-TARGET_LDFLAGS+=	-elf2flt
+TARGET_CFLAGS+=		-Wl,-elf2flt
+TARGET_CXXFLAGS+=	-Wl,-elf2flt
+endif
 endif
 
 ifeq ($(ADK_TARGET_ARCH_M68K),y)
+ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
+TARGET_LDFLAGS+=	-elf2flt
+endif
 ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
 TARGET_CFLAGS+=		-msep-data
 TARGET_CXXFLAGS+=	-msep-data
@@ -215,6 +244,10 @@ TARGET_CXXFLAGS+=	-fno-unwind-tables -fno-asynchronous-unwind-tables
 endif
 
 ifeq ($(ADK_TARGET_ARCH_ARM),y)
+ifeq ($(ADK_TARGET_CPU_WITH_NEON),y)
+TARGET_CFLAGS+=		-funsafe-math-optimizations
+TARGET_CXXFLAGS+=	-funsafe-math-optimizations
+endif
 ifeq ($(ADK_TARGET_ARCH_ARM_WITH_THUMB),y)
 TARGET_CFLAGS+=		-mthumb -Wa,-mimplicit-it=thumb
 TARGET_CXXFLAGS+=	-mthumb -Wa,-mimplicit-it=thumb

package/aufs-util/Makefile

@@ -0,0 +1,44 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		aufs-util
+# branch aufs3.x-rcN (of around June 6th, 2014)
+PKG_VERSION:=		a0eb20c75c07299bfc50c3d80023e1d22c86b4cc
+PKG_RELEASE:=		1
+PKG_DESCR:=		aufs utilities (version 3 and above)
+PKG_SECTION:=		sys/fs
+PKG_URL:=		http://aufs.sf.net/
+PKG_SITES:=		git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util
+
+PKG_SUBPKGS:=		AUFS_UTIL LIBAU
+PKGSD_LIBAU:=		aufs userspace library
+PKGSC_LIBAU:=		libs/misc
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,AUFS_UTIL,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,LIBAU,libau,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBAU),$(PKGSC_LIBAU)))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		Install=install \
+			HOSTCC="$(HOST_CC)" \
+			CPPFLAGS_FOR_BUILD="-I$(STAGING_TARGET_DIR)/usr/include -I./libau"
+
+aufs-util-install:
+	$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin
+	$(INSTALL_BIN) $(WRKINST)/sbin/{{u,}mount.aufs,auplink} \
+		$(IDIR_AUFS_UTIL)/sbin
+	$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/au{brsync,chk} \
+		$(IDIR_AUFS_UTIL)/usr/bin
+	$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/etc/default
+	$(INSTALL_DATA) $(WRKINST)/etc/default/aufs \
+		$(IDIR_AUFS_UTIL)/etc/default
+
+libau-install:
+	$(INSTALL_DIR) $(IDIR_LIBAU)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libau* $(IDIR_LIBAU)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/aufs-util/patches/patch-Makefile

@@ -0,0 +1,23 @@
+	- Ensure correct (HOST-)FLAGS when compiling the intermediates
+	- Drop version test, this cant work anyway since there is no aufs3.12 branch anywhere
+--- w-aufs-util-3.x-rcN-050614-1.orig/Makefile	2014-05-06 15:36:53.000000000 +0200
++++ w-aufs-util-3.x-rcN-050614-1/Makefile	2014-06-05 14:32:53.496611173 +0200
+@@ -49,7 +49,7 @@ LibUtilObj = perror.o proc_mnt.o br.o pl
+ LibUtilHdr = au_util.h
+ export
+ 
+-all: ver_test ${Man} ${Bin} ${Etc}
++all: ${Man} ${Bin} ${Etc}
+ 	${MAKE} -C libau $@
+ 	ln -sf ./libau/libau*.so .
+ 
+@@ -85,6 +85,9 @@ aufs.5: aufs.in.5 c2tmac
+ 	chmod a-w $@
+ 
+ c2sh c2tmac ver: CC = ${HOSTCC}
++c2sh c2tmac ver: CFLAGS = ${CFLAGS_FOR_BUILD}
++c2sh c2tmac ver: LDFLAGS = ${LDFLAGS_FOR_BUILD}
++c2sh c2tmac ver: CPPFLAGS = ${CPPFLAGS_FOR_BUILD}
+ .INTERMEDIATE: c2sh c2tmac ver
+ 
+ Install = install -o root -g root -p

package/automake/Makefile

@@ -1,39 +1,38 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		automake
-PKG_VERSION:=		1.14.1
+PKG_VERSION:=		1.15
 PKG_RELEASE:=		1
-PKG_EXTRAVER:=		1.14
-PKG_HASH:=		a9b4f04b8b69cac2e832a38a718943aa976dbdad0097211f8b3448afdacf0669
+PKG_HASH:=		9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636
 PKG_DESCR:=		tool for automatically generating makefiles
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host autoconf-host autoconf
 HOST_BUILDDEP:=		autoconf-host
 PKG_URL:=		http://www.gnu.org/software/automake/
-PKG_SITES:=		${MASTER_SITE_GNU:=automake/}
+PKG_SITES:=		$(MASTER_SITE_GNU:=automake/)
 PKG_OPTS:=		noscripts
 
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call HOST_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call HOST_template,AUTOMAKE,automake,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,AUTOMAKE,automake,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 XAKE_FLAGS+=		PERL="/usr/bin/perl"
 
 automake-install:
-	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin
-	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER}
-	${CP} ${WRKINST}/usr/share/aclocal-${PKG_EXTRAVER} \
-		${IDIR_AUTOMAKE}/usr/share
-	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}
-	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER} \
-		${IDIR_AUTOMAKE}/usr/share
+	$(INSTALL_DIR) $(IDIR_AUTOMAKE)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/automake $(IDIR_AUTOMAKE)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/aclocal $(IDIR_AUTOMAKE)/usr/bin
+	$(INSTALL_DIR) $(IDIR_AUTOMAKE)/usr/share/aclocal-$(PKG_VERSION)
+	$(CP) $(WRKINST)/usr/share/aclocal-$(PKG_VERSION) \
+		$(IDIR_AUTOMAKE)/usr/share
+	$(INSTALL_DIR) $(IDIR_AUTOMAKE)/usr/share/automake-$(PKG_VERSION)
+	$(CP) $(WRKINST)/usr/share/automake-$(PKG_VERSION) \
+		$(IDIR_AUTOMAKE)/usr/share
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/busybox/Makefile

@@ -28,7 +28,8 @@ BB_MAKE_FLAGS:=		V=1 \
 			IPKG_ARCH="${ADK_TARGET_CPU_ARCH}" \
 			HOSTCC="${CC_FOR_BUILD}" \
 			HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
-			CROSS_COMPILE="$(TARGET_CROSS)"
+			CROSS_COMPILE="$(TARGET_CROSS)" \
+			SKIP_STRIP=y
 
 do-configure:
 	# get all symbols from top level config

package/busybox/config/networking/Config.in

@@ -488,6 +488,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
 	bool "Use busybox ip applet"
 	default y
 	depends on BUSYBOX_FEATURE_IFUPDOWN_IP
+	depends on !ADK_PACKAGE_IP
 	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_IP
 	select BUSYBOX_FEATURE_IP_ADDRESS

package/bzip2/Makefile

@@ -39,6 +39,7 @@ BIN_FILE:=		bzip2-shared
 else
 BIN_FILE:=		bzip2
 endif
+
 CONFIG_STYLE:=		manual
 TARGET_CFLAGS+=		-fPIC 
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr CROSS_COMPILE=1
@@ -52,6 +53,11 @@ bzip2-hostinstall:
 	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin
 	$(INSTALL_BIN) ${WRKBUILD}/bzip2 ${STAGING_HOST_DIR}/usr/bin/bzip2
 
+do-install:
+	${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include
+	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include
+	$(CP) ${WRKBUILD}/libbz2.a ${STAGING_TARGET_DIR}/usr/lib
+
 libbz2-install:
 	${INSTALL_DIR} ${IDIR_LIBBZ2}/usr/lib
 	$(CP) ${WRKBUILD}/libbz2.so* \
@@ -59,7 +65,6 @@ libbz2-install:
 	$(CP) ${WRKBUILD}/libbz2.so* \
 		${STAGING_TARGET_DIR}/usr/lib
 	(cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
-	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include
 	${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include
 	$(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include
 

package/cairo/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
-PKG_VERSION:=		1.12.16
-PKG_RELEASE:=		4
-PKG_HASH:=		2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
+PKG_VERSION:=		1.14.0
+PKG_RELEASE:=		1
+PKG_HASH:=		2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs/image
 PKG_DEPENDS:=		fontconfig libfreetype libx11 pixman
@@ -35,8 +35,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-
-
 HOST_CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-png=yes \
 			--enable-fc=yes \
@@ -88,8 +86,6 @@ else
 CONFIGURE_ARGS+=	--enable-tee=no
 endif
 
-
-
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-fc=yes \
 			--enable-xlib=yes \

package/cairo/patches/patch-Makefile_in

@@ -1,6 +1,6 @@
---- cairo-1.12.16.orig/Makefile.in	2013-08-26 19:00:44.000000000 +0200
-+++ cairo-1.12.16/Makefile.in	2014-02-10 14:44:58.000000000 +0100
-@@ -80,7 +80,7 @@ EXTRA_PROGRAMS =
+--- cairo-1.14.0.orig/Makefile.in	2014-10-14 03:47:28.000000000 +0200
++++ cairo-1.14.0/Makefile.in	2015-02-26 11:39:05.000000000 +0100
+@@ -63,7 +63,7 @@ EXTRA_PROGRAMS =
  TESTS =
  check_PROGRAMS =
  # libpng is required for our test programs
@@ -9,7 +9,7 @@
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -439,7 +439,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
+@@ -417,7 +417,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
  #	$(srcdir)/build/Makefile.win32.features-h \
  #	$(NULL)
  ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}

package/cairo/patches/patch-configure

@@ -0,0 +1,101 @@
+--- cairo-1.14.0.orig/configure	2014-10-14 03:47:29.000000000 +0200
++++ cairo-1.14.0/configure	2015-02-26 13:27:59.000000000 +0100
+@@ -18371,7 +18371,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -18418,7 +18418,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -18469,7 +18469,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -18516,7 +18516,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -18585,7 +18585,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -18641,7 +18641,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -20089,7 +20089,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -20136,7 +20136,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -33208,7 +33208,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -33327,7 +33327,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false ; then
+ 		cairo_cc_flag=no
+ 	fi
+ 
+@@ -33408,7 +33408,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-	if test "x$cairo_cc_stderr" != "x"; then
++	if false; then
+ 		cairo_cc_flag=no
+ 	fi
+ 

package/capi4k-utils/Makefile

@@ -0,0 +1,48 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		capi4k-utils
+PKG_VERSION:=		2005-07-18
+PKG_RELEASE:=		1
+PKG_HASH:=		b162d726a31310fc29e7c0a25a4f82a590457f6a95c1b1168bcd72b6497b5746
+PKG_DESCR:=		capi4linux utils
+PKG_SECTION:=		net/voip
+PKG_SITES:=		ftp://ftp.in-berlin.de/pub/capi4linux/
+
+PKG_CFLINE_CAPI4K_UTILS:=depends on ADK_BROKEN
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+WRKDIST=		$(WRKDIR)/$(PKG_NAME)
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CAPI4K_UTILS,capi4k-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		PPPVERSIONS=2.4.5
+
+do-configure:
+	echo "CONFIG_KERNELDIR='$(LINUX_DIR)'" >$(WRKDIST)/.config
+	echo "CONFIG_BINDIR='/usr/bin'" >>$(WRKDIST)/.config
+	echo "CONFIG_SBINDIR='/usr/sbin'" >>$(WRKDIST)/.config
+	echo "CONFIG_MANDIR='/usr/man'" >>$(WRKDIST)/.config
+	echo "CONFIG_RCAPID=y" >>$(WRKDIST)/.config
+	echo "CONFIG_PPPDCAPIPLUGIN=y" >>$(WRKDIST)/.config
+	(cd $(WRKDIST); \
+		cp Makefile Makefile.tmp; \
+		$(MAKE_ENV) $(MAKE) $(MAKE_FLAGS) -f Makefile.tmp subconfig; \
+		rm -f Makefile.tmp; \
+	)
+
+capi4k-utils-install:
+	$(INSTALL_DIR) $(IDIR_CAPI4K_UTILS)/usr/{bin,lib/pppd/2.4.5}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/capiinfo \
+		$(IDIR_CAPI4K_UTILS)/usr/bin
+	$(CP) $(WRKINST)/usr/lib/libcapi20.so* \
+		$(IDIR_CAPI4K_UTILS)/usr/lib
+	$(INSTALL_DATA) $(WRKINST)/usr/lib/pppd/2.4.5/*.so \
+		$(IDIR_CAPI4K_UTILS)/usr/lib/pppd/2.4.5
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/capi4k-utils/patches/patch-Makefile

@@ -0,0 +1,42 @@
+	- pass CC, CFLAGS and LDFLAGS when running subdir configure and make
+	- install without root-permissions, do not create device nodes
+	- need to pass PPPVERSIONS to subtargets
+--- capi4k-utils.orig/Makefile	2002-11-20 14:45:14.000000000 +0100
++++ capi4k-utils/Makefile	2011-07-15 14:15:21.446001582 +0200
+@@ -53,7 +53,7 @@ ifneq ($(SUBDIRS),)
+ endif
+ 
+ subtargets: $(CONFIGURATION)
+-	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i all; done
++	set -e; for i in `echo $(SUBDIRS)`; do CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PPPVERSIONS="${PPPVERSIONS}" $(MAKE) -C $$i all; done
+ 
+ rootperm:
+ 	@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
+@@ -62,16 +62,10 @@ rootperm:
+ 		exit 1; \
+ 	fi
+ 
+-install: rootperm
++install:
+ 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
+-	@if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
+-	then \
+-		echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
+-	else \
+-		sh scripts/makedev.sh $(DESTDIR) ; \
+-	fi
+ 
+-uninstall: rootperm
++uninstall:
+ 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
+ 
+ #
+@@ -134,7 +128,7 @@ subconfig: scripts/autoconf.h
+ 	@set -e; for i in `echo $(SUBDIRS)`; do \
+ 		if [ -x $$i/configure ] ; then \
+ 			echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
+-			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
++			(cd $$i; CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ 		elif [ -f $$i/Makefile.in ] ; then \
+ 			echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
+ 			$(MAKE) -C $$i -f Makefile.in config; \

package/capi4k-utils/patches/patch-capi20_capi20_h

@@ -0,0 +1,11 @@
+	- somehow this header misses sys/types.h (for size_t definition)
+--- capi4k-utils.orig/capi20/capi20.h	2000-11-19 11:15:01.000000000 +0100
++++ capi4k-utils/capi20/capi20.h	2011-07-14 17:26:51.680001337 +0200
+@@ -21,6 +21,7 @@
+ #define __CAPI20_H__
+ 
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {

package/capi4k-utils/patches/patch-capiinfo_Makefile_in

@@ -0,0 +1,18 @@
+	allow CFLAGS override
+--- capi4k-utils.orig/capiinfo/Makefile.in	2002-11-27 09:08:04.000000000 +0100
++++ capi4k-utils/capiinfo/Makefile.in	2011-07-14 18:55:40.657001559 +0200
+@@ -72,10 +72,10 @@ CLEANFILES = *~ comperr
+ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in 			  stamp-h.in comperr
+ 
+ 
+-INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+-LDADD = -lcapi20
++INCLUDES += -I../capi20 $(all_includes)
++CFLAGS += -Wall -O2
++LDFLAGS += -L../capi20/.libs -L../capi20 $(all_libraries)
++LDADD += -lcapi20
+ 
+ bin_PROGRAMS = capiinfo
+ 

package/capi4k-utils/patches/patch-pppdcapiplugin_Rules_make

@@ -0,0 +1,18 @@
+	allow CC, CFLAGS and LDFLAGS override
+--- capi4k-utils.orig/pppdcapiplugin/Rules.make	2001-05-01 14:43:49.000000000 +0200
++++ capi4k-utils/pppdcapiplugin/Rules.make	2011-07-14 17:13:53.567001779 +0200
+@@ -10,11 +10,11 @@
+ 
+ vpath %.c $(TOPDIR)
+ 
+-CC	= gcc
++CC	?= gcc
+ INC     = -I$(TOPDIR) -I$(CAPIINC) -Ipppd
+ DEFS    = -DPPPVER=$(shell $(TOPDIR)/pversion $(PPPVERSION))
+-CFLAGS	= -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
+-LDFLAGS	= -shared -L$(CAPILIB)
++CFLAGS	+= -O2 -Wall -fPIC $(DEFS) $(INC) -L$(CAPILIB)
++LDFLAGS	+= -shared -L$(CAPILIB)
+ 
+ ALL = capiplugin.so userpass.so
+ 

package/capi4k-utils/patches/patch-rcapid_Makefile_in

@@ -0,0 +1,23 @@
+	allow overriding things
+--- capi4k-utils.orig/rcapid/Makefile.in	2003-06-16 13:44:29.000000000 +0200
++++ capi4k-utils/rcapid/Makefile.in	2011-07-14 19:01:46.376001436 +0200
+@@ -57,7 +57,7 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-CC = @CC@
++CC ?= @CC@
+ CONFIG_MANDIR = @CONFIG_MANDIR@
+ CONFIG_SBINDIR = @CONFIG_SBINDIR@
+ CPP = @CPP@
+@@ -72,8 +72,8 @@ MAINTAINERCLEANFILES = configure aclocal
+ 
+ 
+ INCLUDES = -I../capi20 $(all_includes)
+-CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
++CFLAGS += -Wall -O2
++LDFLAGS += -L../capi20/.libs -L../capi20 $(all_libraries)
+ LDADD = -lcapi20
+ 
+ sbin_PROGRAMS = rcapid

package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/Makefile

@@ -0,0 +1,14 @@
+# Makefile for the capiplugin for pppd(8).
+#
+# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de)
+# Copyright 2000 AVM GmbH Berlin (info@avm.de)
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version
+#  2 of the License, or (at your option) any later version.
+
+PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+
+include $(TOPDIR)/Rules.make
+

package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/pppd/patchlevel.h

@@ -0,0 +1,2 @@
+#define VERSION		"2.4.5"
+#define DATE		"17 November 2009"

package/capi4k-utils/src/pppdcapiplugin/ppp-2.4.5/pppd/pppd.h

@@ -0,0 +1,909 @@
+/*
+ * pppd.h - PPP daemon global declarations.
+ *
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: pppd.h,v 1.96 2008/06/23 11:47:18 paulus Exp $
+ */
+
+/*
+ * TODO:
+ */
+
+#ifndef __PPPD_H__
+#define __PPPD_H__
+
+#include <stdio.h>		/* for FILE */
+#include <limits.h>		/* for NGROUPS_MAX */
+#include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
+#include <sys/types.h>		/* for u_int32_t, if defined */
+#include <sys/time.h>		/* for struct timeval */
+#include <net/ppp_defs.h>
+#include "patchlevel.h"
+
+#if defined(__STDC__)
+#include <stdarg.h>
+#define __V(x)	x
+#else
+#include <varargs.h>
+#define __V(x)	(va_alist) va_dcl
+#define const
+#define volatile
+#endif
+
+#ifdef INET6
+#include "eui64.h"
+#endif
+
+/*
+ * Limits.
+ */
+
+#define NUM_PPP		1	/* One PPP interface supported (per process) */
+#define MAXWORDLEN	1024	/* max length of word in file (incl null) */
+#define MAXARGS		1	/* max # args to a command */
+#define MAXNAMELEN	256	/* max length of hostname or name for auth */
+#define MAXSECRETLEN	256	/* max length of password or secret */
+
+/*
+ * Option descriptor structure.
+ */
+
+typedef unsigned char	bool;
+
+enum opt_type {
+	o_special_noarg = 0,
+	o_special = 1,
+	o_bool,
+	o_int,
+	o_uint32,
+	o_string,
+	o_wild
+};
+
+typedef struct {
+	char	*name;		/* name of the option */
+	enum opt_type type;
+	void	*addr;
+	char	*description;
+	unsigned int flags;
+	void	*addr2;
+	int	upper_limit;
+	int	lower_limit;
+	const char *source;
+	short int priority;
+	short int winner;
+} option_t;
+
+/* Values for flags */
+#define OPT_VALUE	0xff	/* mask for presupplied value */
+#define OPT_HEX		0x100	/* int option is in hex */
+#define OPT_NOARG	0x200	/* option doesn't take argument */
+#define OPT_OR		0x400	/* for u32, OR in argument to value */
+#define OPT_INC		0x400	/* for o_int, increment value */
+#define OPT_A2OR	0x800	/* for o_bool, OR arg to *(u_char *)addr2 */
+#define OPT_PRIV	0x1000	/* privileged option */
+#define OPT_STATIC	0x2000	/* string option goes into static array */
+#define OPT_NOINCR	0x2000	/* for o_int, value mustn't be increased */
+#define OPT_LLIMIT	0x4000	/* check value against lower limit */
+#define OPT_ULIMIT	0x8000	/* check value against upper limit */
+#define OPT_LIMITS	(OPT_LLIMIT|OPT_ULIMIT)
+#define OPT_ZEROOK	0x10000	/* 0 value is OK even if not within limits */
+#define OPT_HIDE	0x10000	/* for o_string, print value as ?????? */
+#define OPT_A2LIST	0x20000 /* for o_special, keep list of values */
+#define OPT_A2CLRB	0x20000 /* o_bool, clr val bits in *(u_char *)addr2 */
+#define OPT_ZEROINF	0x40000	/* with OPT_NOINCR, 0 == infinity */
+#define OPT_PRIO	0x80000	/* process option priorities for this option */
+#define OPT_PRIOSUB	0x100000 /* subsidiary member of priority group */
+#define OPT_ALIAS	0x200000 /* option is alias for previous option */
+#define OPT_A2COPY	0x400000 /* addr2 -> second location to rcv value */
+#define OPT_ENABLE	0x800000 /* use *addr2 as enable for option */
+#define OPT_A2CLR	0x1000000 /* clear *(bool *)addr2 */
+#define OPT_PRIVFIX	0x2000000 /* user can't override if set by root */
+#define OPT_INITONLY	0x4000000 /* option can only be set in init phase */
+#define OPT_DEVEQUIV	0x8000000 /* equiv to device name */
+#define OPT_DEVNAM	(OPT_INITONLY | OPT_DEVEQUIV)
+#define OPT_A2PRINTER	0x10000000 /* *addr2 is a fn for printing option */
+#define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
+#define OPT_NOPRINT	0x40000000 /* don't print this option at all */
+
+#define OPT_VAL(x)	((x) & OPT_VALUE)
+
+/* Values for priority */
+#define OPRIO_DEFAULT	0	/* a default value */
+#define OPRIO_CFGFILE	1	/* value from a configuration file */
+#define OPRIO_CMDLINE	2	/* value from the command line */
+#define OPRIO_SECFILE	3	/* value from options in a secrets file */
+#define OPRIO_ROOT	100	/* added to priority if OPT_PRIVFIX && root */
+
+#ifndef GIDSET_TYPE
+#define GIDSET_TYPE	gid_t
+#endif
+
+/* Structure representing a list of permitted IP addresses. */
+struct permitted_ip {
+    int		permit;		/* 1 = permit, 0 = forbid */
+    u_int32_t	base;		/* match if (addr & mask) == base */
+    u_int32_t	mask;		/* base and mask are in network byte order */
+};
+
+/*
+ * Unfortunately, the linux kernel driver uses a different structure
+ * for statistics from the rest of the ports.
+ * This structure serves as a common representation for the bits
+ * pppd needs.
+ */
+struct pppd_stats {
+    unsigned int	bytes_in;
+    unsigned int	bytes_out;
+    unsigned int	pkts_in;
+    unsigned int	pkts_out;
+};
+
+/* Used for storing a sequence of words.  Usually malloced. */
+struct wordlist {
+    struct wordlist	*next;
+    char		*word;
+};
+
+/* An endpoint discriminator, used with multilink. */
+#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
+struct epdisc {
+    unsigned char	class;
+    unsigned char	length;
+    unsigned char	value[MAX_ENDP_LEN];
+};
+
+/* values for epdisc.class */
+#define EPD_NULL	0	/* null discriminator, no data */
+#define EPD_LOCAL	1
+#define EPD_IP		2
+#define EPD_MAC		3
+#define EPD_MAGIC	4
+#define EPD_PHONENUM	5
+
+typedef void (*notify_func) __P((void *, int));
+
+struct notifier {
+    struct notifier *next;
+    notify_func	    func;
+    void	    *arg;
+};
+
+/*
+ * Global variables.
+ */
+
+extern int	hungup;		/* Physical layer has disconnected */
+extern int	ifunit;		/* Interface unit number */
+extern char	ifname[];	/* Interface name */
+extern char	hostname[];	/* Our hostname */
+extern u_char	outpacket_buf[]; /* Buffer for outgoing packets */
+extern int	devfd;		/* fd of underlying device */
+extern int	fd_ppp;		/* fd for talking PPP */
+extern int	phase;		/* Current state of link - see values below */
+extern int	baud_rate;	/* Current link speed in bits/sec */
+extern char	*progname;	/* Name of this program */
+extern int	redirect_stderr;/* Connector's stderr should go to file */
+extern char	peer_authname[];/* Authenticated name of peer */
+extern int	auth_done[NUM_PPP]; /* Methods actually used for auth */
+extern int	privileged;	/* We were run by real-uid root */
+extern int	need_holdoff;	/* Need holdoff period after link terminates */
+extern char	**script_env;	/* Environment variables for scripts */
+extern int	detached;	/* Have detached from controlling tty */
+extern GIDSET_TYPE groups[NGROUPS_MAX];	/* groups the user is in */
+extern int	ngroups;	/* How many groups valid in groups */
+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
+extern int	link_stats_valid; /* set if link_stats is valid */
+extern unsigned	link_connect_time; /* time the link was up for */
+extern int	using_pty;	/* using pty as device (notty or pty opt.) */
+extern int	log_to_fd;	/* logging to this fd as well as syslog */
+extern bool	log_default;	/* log_to_fd is default (stdout) */
+extern char	*no_ppp_msg;	/* message to print if ppp not in kernel */
+extern volatile int status;	/* exit status for pppd */
+extern bool	devnam_fixed;	/* can no longer change devnam */
+extern int	unsuccess;	/* # unsuccessful connection attempts */
+extern int	do_callback;	/* set if we want to do callback next */
+extern int	doing_callback;	/* set if this is a callback */
+extern int	error_count;	/* # of times error() has been called */
+extern char	ppp_devnam[MAXPATHLEN];
+extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
+extern int      ppp_session_number; /* Session number (eg PPPoE session) */
+extern int	fd_devnull;	/* fd open to /dev/null */
+
+extern int	listen_time;	/* time to listen first (ms) */
+extern bool	doing_multilink;
+extern bool	multilink_master;
+extern bool	bundle_eof;
+extern bool	bundle_terminating;
+
+extern struct notifier *pidchange;   /* for notifications of pid changing */
+extern struct notifier *phasechange; /* for notifications of phase changes */
+extern struct notifier *exitnotify;  /* for notification that we're exiting */
+extern struct notifier *sigreceived; /* notification of received signal */
+extern struct notifier *ip_up_notifier; /* IPCP has come up */
+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
+extern struct notifier *auth_up_notifier; /* peer has authenticated */
+extern struct notifier *link_down_notifier; /* link has gone down */
+extern struct notifier *fork_notifier;	/* we are a new child process */
+
+/* Values for do_callback and doing_callback */
+#define CALLBACK_DIALIN		1	/* we are expecting the call back */
+#define CALLBACK_DIALOUT	2	/* we are dialling out to call back */
+
+/*
+ * Variables set by command-line options.
+ */
+
+extern int	debug;		/* Debug flag */
+extern int	kdebugflag;	/* Tell kernel to print debug messages */
+extern int	default_device;	/* Using /dev/tty or equivalent */
+extern char	devnam[MAXPATHLEN];	/* Device name */
+extern int	crtscts;	/* Use hardware flow control */
+extern bool	modem;		/* Use modem control lines */
+extern int	inspeed;	/* Input/Output speed requested */
+extern u_int32_t netmask;	/* IP netmask to set on interface */
+extern bool	lockflag;	/* Create lock file to lock the serial dev */
+extern bool	nodetach;	/* Don't detach from controlling tty */
+extern bool	updetach;	/* Detach from controlling tty when link up */
+extern char	*initializer;	/* Script to initialize physical link */
+extern char	*connect_script; /* Script to establish physical link */
+extern char	*disconnect_script; /* Script to disestablish physical link */
+extern char	*welcomer;	/* Script to welcome client after connection */
+extern char	*ptycommand;	/* Command to run on other side of pty */
+extern int	maxconnect;	/* Maximum connect time (seconds) */
+extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
+extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
+extern bool	auth_required;	/* Peer is required to authenticate */
+extern bool	persist;	/* Reopen link after it goes down */
+extern bool	uselogin;	/* Use /etc/passwd for checking PAP */
+extern bool	session_mgmt;	/* Do session management (login records) */
+extern char	our_name[MAXNAMELEN];/* Our name for authentication purposes */
+extern char	remote_name[MAXNAMELEN]; /* Peer's name for authentication */
+extern bool	explicit_remote;/* remote_name specified with remotename opt */
+extern bool	demand;		/* Do dial-on-demand */
+extern char	*ipparam;	/* Extra parameter for ip up/down scripts */
+extern bool	cryptpap;	/* Others' PAP passwords are encrypted */
+extern int	idle_time_limit;/* Shut down link if idle for this long */
+extern int	holdoff;	/* Dead time before restarting */
+extern bool	holdoff_specified; /* true if user gave a holdoff value */
+extern bool	notty;		/* Stdin/out is not a tty */
+extern char	*pty_socket;	/* Socket to connect to pty */
+extern char	*record_file;	/* File to record chars sent/received */
+extern bool	sync_serial;	/* Device is synchronous serial device */
+extern int	maxfail;	/* Max # of unsuccessful connection attempts */
+extern char	linkname[MAXPATHLEN]; /* logical name for link */
+extern bool	tune_kernel;	/* May alter kernel settings as necessary */
+extern int	connect_delay;	/* Time to delay after connect script */
+extern int	max_data_rate;	/* max bytes/sec through charshunt */
+extern int	req_unit;	/* interface unit number to use */
+extern bool	multilink;	/* enable multilink operation */
+extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
+extern char	*bundle_name;	/* bundle name for multilink */
+extern bool	dump_options;	/* print out option values */
+extern bool	dryrun;		/* check everything, print options, exit */
+extern int	child_wait;	/* # seconds to wait for children at end */
+
+#ifdef MAXOCTETS
+extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
+extern int       maxoctets_dir;      /* Direction :
+				      0 - in+out (default)
+				      1 - in 
+				      2 - out
+				      3 - max(in,out) */
+extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
+#define PPP_OCTETS_DIRECTION_SUM        0
+#define PPP_OCTETS_DIRECTION_IN         1
+#define PPP_OCTETS_DIRECTION_OUT        2
+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
+/* same as previos, but little different on RADIUS side */
+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
+#endif
+
+#ifdef PPP_FILTER
+extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
+extern struct	bpf_program active_filter; /* Filter for link-active pkts */
+#endif
+
+#ifdef MSLANMAN
+extern bool	ms_lanman;	/* Use LanMan password instead of NT */
+				/* Has meaning only with MS-CHAP challenges */
+#endif
+
+/* Values for auth_pending, auth_done */
+#define PAP_WITHPEER	0x1
+#define PAP_PEER	0x2
+#define CHAP_WITHPEER	0x4
+#define CHAP_PEER	0x8
+#define EAP_WITHPEER	0x10
+#define EAP_PEER	0x20
+
+/* Values for auth_done only */
+#define CHAP_MD5_WITHPEER	0x40
+#define CHAP_MD5_PEER		0x80
+#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
+#define CHAP_MS_WITHPEER	0x100
+#define CHAP_MS_PEER		0x200
+#define CHAP_MS2_WITHPEER	0x400
+#define CHAP_MS2_PEER		0x800
+
+extern char *current_option;	/* the name of the option being parsed */
+extern int  privileged_option;	/* set iff the current option came from root */
+extern char *option_source;	/* string saying where the option came from */
+extern int  option_priority;	/* priority of current options */
+
+/*
+ * Values for phase.
+ */
+#define PHASE_DEAD		0
+#define PHASE_INITIALIZE	1
+#define PHASE_SERIALCONN	2
+#define PHASE_DORMANT		3
+#define PHASE_ESTABLISH		4
+#define PHASE_AUTHENTICATE	5
+#define PHASE_CALLBACK		6
+#define PHASE_NETWORK		7
+#define PHASE_RUNNING		8
+#define PHASE_TERMINATE		9
+#define PHASE_DISCONNECT	10
+#define PHASE_HOLDOFF		11
+#define PHASE_MASTER		12
+
+/*
+ * The following struct gives the addresses of procedures to call
+ * for a particular protocol.
+ */
+struct protent {
+    u_short protocol;		/* PPP protocol number */
+    /* Initialization procedure */
+    void (*init) __P((int unit));
+    /* Process a received packet */
+    void (*input) __P((int unit, u_char *pkt, int len));
+    /* Process a received protocol-reject */
+    void (*protrej) __P((int unit));
+    /* Lower layer has come up */
+    void (*lowerup) __P((int unit));
+    /* Lower layer has gone down */
+    void (*lowerdown) __P((int unit));
+    /* Open the protocol */
+    void (*open) __P((int unit));
+    /* Close the protocol */
+    void (*close) __P((int unit, char *reason));
+    /* Print a packet in readable form */
+    int  (*printpkt) __P((u_char *pkt, int len,
+			  void (*printer) __P((void *, char *, ...)),
+			  void *arg));
+    /* Process a received data packet */
+    void (*datainput) __P((int unit, u_char *pkt, int len));
+    bool enabled_flag;		/* 0 iff protocol is disabled */
+    char *name;			/* Text name of protocol */
+    char *data_name;		/* Text name of corresponding data protocol */
+    option_t *options;		/* List of command-line options */
+    /* Check requested options, assign defaults */
+    void (*check_options) __P((void));
+    /* Configure interface for demand-dial */
+    int  (*demand_conf) __P((int unit));
+    /* Say whether to bring up link for this pkt */
+    int  (*active_pkt) __P((u_char *pkt, int len));
+};
+
+/* Table of pointers to supported protocols */
+extern struct protent *protocols[];
+
+/*
+ * This struct contains pointers to a set of procedures for
+ * doing operations on a "channel".  A channel provides a way
+ * to send and receive PPP packets - the canonical example is
+ * a serial port device in PPP line discipline (or equivalently
+ * with PPP STREAMS modules pushed onto it).
+ */
+struct channel {
+	/* set of options for this channel */
+	option_t *options;
+	/* find and process a per-channel options file */
+	void (*process_extra_options) __P((void));
+	/* check all the options that have been given */
+	void (*check_options) __P((void));
+	/* get the channel ready to do PPP, return a file descriptor */
+	int  (*connect) __P((void));
+	/* we're finished with the channel */
+	void (*disconnect) __P((void));
+	/* put the channel into PPP `mode' */
+	int  (*establish_ppp) __P((int));
+	/* take the channel out of PPP `mode', restore loopback if demand */
+	void (*disestablish_ppp) __P((int));
+	/* set the transmit-side PPP parameters of the channel */
+	void (*send_config) __P((int, u_int32_t, int, int));
+	/* set the receive-side PPP parameters of the channel */
+	void (*recv_config) __P((int, u_int32_t, int, int));
+	/* cleanup on error or normal exit */
+	void (*cleanup) __P((void));
+	/* close the device, called in children after fork */
+	void (*close) __P((void));
+};
+
+extern struct channel *the_channel;
+
+/*
+ * Prototypes.
+ */
+
+/* Procedures exported from main.c. */
+void set_ifunit __P((int));	/* set stuff that depends on ifunit */
+void detach __P((void));	/* Detach from controlling tty */
+void die __P((int));		/* Cleanup and exit */
+void quit __P((void));		/* like die(1) */
+void novm __P((char *));	/* Say we ran out of memory, and die */
+void timeout __P((void (*func)(void *), void *arg, int s, int us));
+				/* Call func(arg) after s.us seconds */
+void untimeout __P((void (*func)(void *), void *arg));
+				/* Cancel call to func(arg) */
+void record_child __P((int, char *, void (*) (void *), void *, int));
+pid_t safe_fork __P((int, int, int));	/* Fork & close stuff in child */
+int  device_script __P((char *cmd, int in, int out, int dont_wait));
+				/* Run `cmd' with given stdin and stdout */
+pid_t run_program __P((char *prog, char **args, int must_exist,
+		       void (*done)(void *), void *arg, int wait));
+				/* Run program prog with args in child */
+void reopen_log __P((void));	/* (re)open the connection to syslog */
+void print_link_stats __P((void)); /* Print stats, if available */
+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
+void update_link_stats __P((int)); /* Get stats at link termination */
+void script_setenv __P((char *, char *, int));	/* set script env var */
+void script_unsetenv __P((char *));		/* unset script env var */
+void new_phase __P((int));	/* signal start of new phase */
+void add_notifier __P((struct notifier **, notify_func, void *));
+void remove_notifier __P((struct notifier **, notify_func, void *));
+void notify __P((struct notifier *, int));
+int  ppp_send_config __P((int, int, u_int32_t, int, int));
+int  ppp_recv_config __P((int, int, u_int32_t, int, int));
+const char *protocol_name __P((int));
+void remove_pidfiles __P((void));
+void lock_db __P((void));
+void unlock_db __P((void));
+
+/* Procedures exported from tty.c. */
+void tty_init __P((void));
+
+/* Procedures exported from utils.c. */
+void log_packet __P((u_char *, int, char *, int));
+				/* Format a packet and log it with syslog */
+void print_string __P((char *, int,  void (*) (void *, char *, ...),
+		void *));	/* Format a string for output */
+int slprintf __P((char *, int, char *, ...));		/* sprintf++ */
+int vslprintf __P((char *, int, char *, va_list));	/* vsprintf++ */
+size_t strlcpy __P((char *, const char *, size_t));	/* safe strcpy */
+size_t strlcat __P((char *, const char *, size_t));	/* safe strncpy */
+void dbglog __P((char *, ...));	/* log a debug message */
+void info __P((char *, ...));	/* log an informational message */
+void notice __P((char *, ...));	/* log a notice-level message */
+void warn __P((char *, ...));	/* log a warning message */
+void error __P((char *, ...));	/* log an error message */
+void fatal __P((char *, ...));	/* log an error message and die(1) */
+void init_pr_log __P((const char *, int)); /* initialize for using pr_log */
+void pr_log __P((void *, char *, ...));	/* printer fn, output to syslog */
+void end_pr_log __P((void));	/* finish up after using pr_log */
+void dump_packet __P((const char *, u_char *, int));
+				/* dump packet to debug log if interesting */
+ssize_t complete_read __P((int, void *, size_t));
+				/* read a complete buffer */
+
+/* Procedures exported from auth.c */
+void link_required __P((int));	  /* we are starting to use the link */
+void start_link __P((int));	  /* bring the link up now */
+void link_terminated __P((int));  /* we are finished with the link */
+void link_down __P((int));	  /* the LCP layer has left the Opened state */
+void upper_layers_down __P((int));/* take all NCPs down */
+void link_established __P((int)); /* the link is up; authenticate now */
+void start_networks __P((int));   /* start all the network control protos */
+void continue_networks __P((int)); /* start network [ip, etc] control protos */
+void np_up __P((int, int));	  /* a network protocol has come up */
+void np_down __P((int, int));	  /* a network protocol has gone down */
+void np_finished __P((int, int)); /* a network protocol no longer needs link */
+void auth_peer_fail __P((int, int));
+				/* peer failed to authenticate itself */
+void auth_peer_success __P((int, int, int, char *, int));
+				/* peer successfully authenticated itself */
+void auth_withpeer_fail __P((int, int));
+				/* we failed to authenticate ourselves */
+void auth_withpeer_success __P((int, int, int));
+				/* we successfully authenticated ourselves */
+void auth_check_options __P((void));
+				/* check authentication options supplied */
+void auth_reset __P((int));	/* check what secrets we have */
+int  check_passwd __P((int, char *, int, char *, int, char **));
+				/* Check peer-supplied username/password */
+int  get_secret __P((int, char *, char *, char *, int *, int));
+				/* get "secret" for chap */
+int  get_srp_secret __P((int unit, char *client, char *server, char *secret,
+    int am_server));
+int  auth_ip_addr __P((int, u_int32_t));
+				/* check if IP address is authorized */
+int  auth_number __P((void));	/* check if remote number is authorized */
+int  bad_ip_adrs __P((u_int32_t));
+				/* check if IP address is unreasonable */
+
+/* Procedures exported from demand.c */
+void demand_conf __P((void));	/* config interface(s) for demand-dial */
+void demand_block __P((void));	/* set all NPs to queue up packets */
+void demand_unblock __P((void)); /* set all NPs to pass packets */
+void demand_discard __P((void)); /* set all NPs to discard packets */
+void demand_rexmit __P((int));	/* retransmit saved frames for an NP */
+int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
+int  loop_frame __P((unsigned char *, int)); /* should we bring link up? */
+
+/* Procedures exported from multilink.c */
+#ifdef HAVE_MULTILINK
+void mp_check_options __P((void)); /* Check multilink-related options */
+int  mp_join_bundle __P((void));  /* join our link to an appropriate bundle */
+void mp_exit_bundle __P((void));  /* have disconnected our link from bundle */
+void mp_bundle_terminated __P((void));
+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
+int  str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
+#else
+#define mp_bundle_terminated()	/* nothing */
+#define mp_exit_bundle()	/* nothing */
+#define doing_multilink		0
+#define multilink_master	0
+#endif
+
+/* Procedures exported from sys-*.c */
+void sys_init __P((void));	/* Do system-dependent initialization */
+void sys_cleanup __P((void));	/* Restore system state before exiting */
+int  sys_check_options __P((void)); /* Check options specified */
+void sys_close __P((void));	/* Clean up in a child before execing */
+int  ppp_available __P((void));	/* Test whether ppp kernel support exists */
+int  get_pty __P((int *, int *, char *, int));	/* Get pty master/slave */
+int  open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
+int  tty_establish_ppp __P((int));  /* Turn serial port into a ppp interface */
+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
+int  generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
+int  bundle_attach __P((int));	/* Attach link to existing bundle */
+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
+void clean_check __P((void));	/* Check if line was 8-bit clean */
+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
+void restore_tty __P((int));	/* Restore port's original parameters */
+void setdtr __P((int, int));	/* Raise or lower port's DTR line */
+void output __P((int, u_char *, int)); /* Output a PPP packet */
+void wait_input __P((struct timeval *));
+				/* Wait for input, with timeout */
+void add_fd __P((int));		/* Add fd to set to wait for */
+void remove_fd __P((int));	/* Remove fd from set to wait for */
+int  read_packet __P((u_char *)); /* Read PPP packet */
+int  get_loop_output __P((void)); /* Read pkts from loopback */
+void tty_send_config __P((int, u_int32_t, int, int));
+				/* Configure i/f transmit parameters */
+void tty_set_xaccm __P((ext_accm));
+				/* Set extended transmit ACCM */
+void tty_recv_config __P((int, u_int32_t, int, int));
+				/* Configure i/f receive parameters */
+int  ccp_test __P((int, u_char *, int, int));
+				/* Test support for compression scheme */
+void ccp_flags_set __P((int, int, int));
+				/* Set kernel CCP state */
+int  ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
+int  get_idle_time __P((int, struct ppp_idle *));
+				/* Find out how long link has been idle */
+int  get_ppp_stats __P((int, struct pppd_stats *));
+				/* Return link statistics */
+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
+int  netif_get_mtu __P((int));      /* Get PPP interface MTU */
+int  sifvjcomp __P((int, int, int, int));
+				/* Configure VJ TCP header compression */
+int  sifup __P((int));		/* Configure i/f up for one protocol */
+int  sifnpmode __P((int u, int proto, enum NPmode mode));
+				/* Set mode for handling packets for proto */
+int  sifdown __P((int));	/* Configure i/f down for one protocol */
+int  sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
+				/* Configure IPv4 addresses for i/f */
+int  cifaddr __P((int, u_int32_t, u_int32_t));
+				/* Reset i/f IP addresses */
+#ifdef INET6
+int  sif6addr __P((int, eui64_t, eui64_t));
+				/* Configure IPv6 addresses for i/f */
+int  cif6addr __P((int, eui64_t, eui64_t));
+				/* Remove an IPv6 address from i/f */
+#endif
+int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
+				/* Create default route through i/f */
+int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
+				/* Delete default route through i/f */
+int  sifproxyarp __P((int, u_int32_t));
+				/* Add proxy ARP entry for peer */
+int  cifproxyarp __P((int, u_int32_t));
+				/* Delete proxy ARP entry for peer */
+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
+int  lock __P((char *));	/* Create lock file for device */
+int  relock __P((int));		/* Rewrite lock file with new pid */
+void unlock __P((void));	/* Delete previously-created lock file */
+void logwtmp __P((const char *, const char *, const char *));
+				/* Write entry to wtmp file */
+int  get_host_seed __P((void));	/* Get host-dependent random number seed */
+int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
+#ifdef PPP_FILTER
+int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
+				/* Set filter programs in kernel */
+#endif
+#ifdef IPX_CHANGE
+int  sipxfaddr __P((int, unsigned long, unsigned char *));
+int  cipxfaddr __P((int));
+#endif
+int  get_if_hwaddr __P((u_char *addr, char *name));
+char *get_first_ethernet __P((void));
+
+/* Procedures exported from options.c */
+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
+int  parse_args __P((int argc, char **argv));
+				/* Parse options from arguments given */
+int  options_from_file __P((char *filename, int must_exist, int check_prot,
+			    int privileged));
+				/* Parse options from an options file */
+int  options_from_user __P((void)); /* Parse options from user's .ppprc */
+int  options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
+int  options_from_list __P((struct wordlist *, int privileged));
+				/* Parse options from a wordlist */
+int  getword __P((FILE *f, char *word, int *newlinep, char *filename));
+				/* Read a word from a file */
+void option_error __P((char *fmt, ...));
+				/* Print an error message about an option */
+int int_option __P((char *, int *));
+				/* Simplified number_option for decimal ints */
+void add_options __P((option_t *)); /* Add extra options */
+void check_options __P((void));	/* check values after all options parsed */
+int  override_value __P((const char *, int, const char *));
+				/* override value if permitted by priority */
+void print_options __P((void (*) __P((void *, char *, ...)), void *));
+				/* print out values of all options */
+
+int parse_dotted_ip __P((char *, u_int32_t *));
+
+/*
+ * Hooks to enable plugins to change various things.
+ */
+extern int (*new_phase_hook) __P((int));
+extern int (*idle_time_hook) __P((struct ppp_idle *));
+extern int (*holdoff_hook) __P((void));
+extern int (*pap_check_hook) __P((void));
+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
+				 struct wordlist **paddrs,
+				 struct wordlist **popts));
+extern void (*pap_logout_hook) __P((void));
+extern int (*pap_passwd_hook) __P((char *user, char *passwd));
+extern int (*allowed_address_hook) __P((u_int32_t addr));
+extern void (*ip_up_hook) __P((void));
+extern void (*ip_down_hook) __P((void));
+extern void (*ip_choose_hook) __P((u_int32_t *));
+
+extern int (*chap_check_hook) __P((void));
+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
+extern void (*multilink_join_hook) __P((void));
+
+/* Let a plugin snoop sent and received packets.  Useful for L2TP */
+extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
+extern void (*snoop_send_hook) __P((unsigned char *p, int len));
+
+/*
+ * Inline versions of get/put char/short/long.
+ * Pointer is advanced; we assume that both arguments
+ * are lvalues and will already be in registers.
+ * cp MUST be u_char *.
+ */
+#define GETCHAR(c, cp) { \
+	(c) = *(cp)++; \
+}
+#define PUTCHAR(c, cp) { \
+	*(cp)++ = (u_char) (c); \
+}
+
+
+#define GETSHORT(s, cp) { \
+	(s) = *(cp)++ << 8; \
+	(s) |= *(cp)++; \
+}
+#define PUTSHORT(s, cp) { \
+	*(cp)++ = (u_char) ((s) >> 8); \
+	*(cp)++ = (u_char) (s); \
+}
+
+#define GETLONG(l, cp) { \
+	(l) = *(cp)++ << 8; \
+	(l) |= *(cp)++; (l) <<= 8; \
+	(l) |= *(cp)++; (l) <<= 8; \
+	(l) |= *(cp)++; \
+}
+#define PUTLONG(l, cp) { \
+	*(cp)++ = (u_char) ((l) >> 24); \
+	*(cp)++ = (u_char) ((l) >> 16); \
+	*(cp)++ = (u_char) ((l) >> 8); \
+	*(cp)++ = (u_char) (l); \
+}
+
+#define INCPTR(n, cp)	((cp) += (n))
+#define DECPTR(n, cp)	((cp) -= (n))
+
+/*
+ * System dependent definitions for user-level 4.3BSD UNIX implementation.
+ */
+
+#define TIMEOUT(r, f, t)	timeout((r), (f), (t), 0)
+#define UNTIMEOUT(r, f)		untimeout((r), (f))
+
+#define BCOPY(s, d, l)		memcpy(d, s, l)
+#define BZERO(s, n)		memset(s, 0, n)
+#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
+
+#define PRINTMSG(m, l)		{ info("Remote message: %0.*v", l, m); }
+
+/*
+ * MAKEHEADER - Add Header fields to a packet.
+ */
+#define MAKEHEADER(p, t) { \
+    PUTCHAR(PPP_ALLSTATIONS, p); \
+    PUTCHAR(PPP_UI, p); \
+    PUTSHORT(t, p); }
+
+/*
+ * Exit status values.
+ */
+#define EXIT_OK			0
+#define EXIT_FATAL_ERROR	1
+#define EXIT_OPTION_ERROR	2
+#define EXIT_NOT_ROOT		3
+#define EXIT_NO_KERNEL_SUPPORT	4
+#define EXIT_USER_REQUEST	5
+#define EXIT_LOCK_FAILED	6
+#define EXIT_OPEN_FAILED	7
+#define EXIT_CONNECT_FAILED	8
+#define EXIT_PTYCMD_FAILED	9
+#define EXIT_NEGOTIATION_FAILED	10
+#define EXIT_PEER_AUTH_FAILED	11
+#define EXIT_IDLE_TIMEOUT	12
+#define EXIT_CONNECT_TIME	13
+#define EXIT_CALLBACK		14
+#define EXIT_PEER_DEAD		15
+#define EXIT_HANGUP		16
+#define EXIT_LOOPBACK		17
+#define EXIT_INIT_FAILED	18
+#define EXIT_AUTH_TOPEER_FAILED	19
+#ifdef MAXOCTETS
+#define EXIT_TRAFFIC_LIMIT	20
+#endif
+#define EXIT_CNID_AUTH_FAILED	21
+
+/*
+ * Debug macros.  Slightly useful for finding bugs in pppd, not particularly
+ * useful for finding out why your connection isn't being established.
+ */
+#ifdef DEBUGALL
+#define DEBUGMAIN	1
+#define DEBUGFSM	1
+#define DEBUGLCP	1
+#define DEBUGIPCP	1
+#define DEBUGIPV6CP	1
+#define DEBUGUPAP	1
+#define DEBUGCHAP	1
+#endif
+
+#ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
+  || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
+  || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
+#define LOG_PPP LOG_LOCAL2
+#else
+#define LOG_PPP LOG_DAEMON
+#endif
+#endif /* LOG_PPP */
+
+#ifdef DEBUGMAIN
+#define MAINDEBUG(x)	if (debug) dbglog x
+#else
+#define MAINDEBUG(x)
+#endif
+
+#ifdef DEBUGSYS
+#define SYSDEBUG(x)	if (debug) dbglog x
+#else
+#define SYSDEBUG(x)
+#endif
+
+#ifdef DEBUGFSM
+#define FSMDEBUG(x)	if (debug) dbglog x
+#else
+#define FSMDEBUG(x)
+#endif
+
+#ifdef DEBUGLCP
+#define LCPDEBUG(x)	if (debug) dbglog x
+#else
+#define LCPDEBUG(x)
+#endif
+
+#ifdef DEBUGIPCP
+#define IPCPDEBUG(x)	if (debug) dbglog x
+#else
+#define IPCPDEBUG(x)
+#endif
+
+#ifdef DEBUGIPV6CP
+#define IPV6CPDEBUG(x)  if (debug) dbglog x
+#else
+#define IPV6CPDEBUG(x)
+#endif
+
+#ifdef DEBUGUPAP
+#define UPAPDEBUG(x)	if (debug) dbglog x
+#else
+#define UPAPDEBUG(x)
+#endif
+
+#ifdef DEBUGCHAP
+#define CHAPDEBUG(x)	if (debug) dbglog x
+#else
+#define CHAPDEBUG(x)
+#endif
+
+#ifdef DEBUGIPXCP
+#define IPXCPDEBUG(x)	if (debug) dbglog x
+#else
+#define IPXCPDEBUG(x)
+#endif
+
+#ifndef SIGTYPE
+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
+#define SIGTYPE void
+#else
+#define SIGTYPE int
+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
+#endif /* SIGTYPE */
+
+#ifndef MIN
+#define MIN(a, b)	((a) < (b)? (a): (b))
+#endif
+#ifndef MAX
+#define MAX(a, b)	((a) > (b)? (a): (b))
+#endif
+
+#ifndef offsetof
+#define offsetof(type, member) ((size_t) &((type *)0)->member)
+#endif
+
+#endif /* __PPP_H__ */

package/cdrkit/Makefile

@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		cdrkit
+PKG_VERSION:=		1.1.11
+PKG_RELEASE:=		1
+PKG_HASH:=		d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da
+PKG_DESCR:=		cd burning kit
+PKG_SECTION:=		sys/hw
+PKG_DEPENDS:=		libmagic zlib libbz2 libcap
+PKG_BUILDDEP:=		cmake-host file zlib bzip2 libcap
+PKG_SITES:=		http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit/
+
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
+PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
+
+DISTFILES:=             $(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CDRKIT,cdrkit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=          cmake
+CMAKE_FLAGS+=		-DUSE_LIBC_NLS=1 -DUSE_LIBXNET=0 -DUSE_LIBNLS=0
+
+cdrkit-install:
+	$(INSTALL_DIR) $(IDIR_CDRKIT)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+		$(IDIR_CDRKIT)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/cdrkit/patches/patch-Makefile

@@ -0,0 +1,466 @@
+--- cdrkit-1.1.11.orig/Makefile	2007-05-06 12:23:54.000000000 +0200
++++ cdrkit-1.1.11/Makefile	2015-02-25 10:54:08.000000000 +0100
+@@ -1,72 +1,409 @@
+-ifneq ($(CFLAGS),)
+-CMAKETWEAKS += ( cd build ; cmake .. -DCMAKE_C_FLAGS="$(CFLAGS)" ) || exit 1; 
+-endif
++# CMAKE generated file: DO NOT EDIT!
++# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+ 
+-ifneq ($(LDFLAGS),)
+-CMAKETWEAKS += (cd build ; cmake .. -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" ) || exit 1; 
+-endif
++# Default target executed when no arguments are given to make.
++default_target: all
++.PHONY : default_target
+ 
+-ifneq ($(PREFIX),)
+-CMAKETWEAKS += ( cd build ;  cmake .. -DCMAKE_INSTALL_PREFIX="$(PREFIX)") || exit 1; 
+-endif
++# Allow only one "make -f Makefile2" at a time, but pass parallelism.
++.NOTPARALLEL:
++.PHONY : .NOTPARALLEL
+ 
+-ifneq ($(MANSUBDIR),)
+-CMAKETWEAKS += ( cd build ;  cmake .. -DMANSUBDIR="$(MANSUBDIR)" ) || exit 1; 
+-endif
++#=============================================================================
++# Special targets provided by cmake.
+ 
+-default_target: all
++# Disable implicit rules so canonical targets will work.
++.SUFFIXES:
+ 
+-DISTNAME=cdrkit-$(shell cat VERSION)
+-DEBSRCNAME=cdrkit_$(shell cat VERSION | sed -e "s,pre,~pre,").orig.tar.gz
++# Remove some rules from gmake that .SUFFIXES does not remove.
++SUFFIXES =
+ 
+-build/Makefile:
+-	@-mkdir build 2>/dev/null
+-	cd build && cmake ..
++.SUFFIXES: .hpux_make_needs_suffix_list
+ 
+-cmakepurge:
+-	rm -rf install_manifest.txt progress.make CMakeFiles CMakeCache.txt cmake_install.cmake 
+-	rm -rf */install_manifest.txt */progress.make */CMakeFiles */CMakeCache.txt */cmake_install.cmake 
+-	rm -rf */*/install_manifest.txt */*/progress.make */*/CMakeFiles */*/CMakeCache.txt */*/cmake_install.cmake 
+-	rm */Makefile */*/Makefile
++# Suppress display of executed commands.
++$(VERBOSE).SILENT:
++
++# A target that is always out of date.
++cmake_force:
++.PHONY : cmake_force
++
++#=============================================================================
++# Set environment variables for the build.
++
++# The shell in which to execute make rules.
++SHELL = /bin/sh
++
++# The CMake executable.
++CMAKE_COMMAND = /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake
++
++# The command to remove a file.
++RM = /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -E remove -f
+ 
++# Escaping for special characters.
++EQUALS = =
++
++# The top-level source directory on which CMake was run.
++CMAKE_SOURCE_DIR = /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11
++
++# The top-level build directory on which CMake was run.
++CMAKE_BINARY_DIR = /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11
++
++#=============================================================================
++# Targets provided globally by CMake.
++
++# Special rule for the target install/strip
++install/strip: preinstall
++	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
++	/home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
++.PHONY : install/strip
++
++# Special rule for the target install/strip
++install/strip/fast: install/strip
++.PHONY : install/strip/fast
++
++# Special rule for the target edit_cache
++edit_cache:
++	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
++	/home/wbx/adk/host_x86_64-linux-gnu/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
++.PHONY : edit_cache
++
++# Special rule for the target edit_cache
++edit_cache/fast: edit_cache
++.PHONY : edit_cache/fast
++
++# Special rule for the target rebuild_cache
++rebuild_cache:
++	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
++	/home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
++.PHONY : rebuild_cache
++
++# Special rule for the target rebuild_cache
++rebuild_cache/fast: rebuild_cache
++.PHONY : rebuild_cache/fast
++
++# Special rule for the target install
++install: preinstall
++	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
++	/home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -P cmake_install.cmake
++.PHONY : install
++
++# Special rule for the target install
++install/fast: preinstall/fast
++	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
++	/home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -P cmake_install.cmake
++.PHONY : install/fast
++
++# Special rule for the target list_install_components
++list_install_components:
++	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
++.PHONY : list_install_components
++
++# Special rule for the target list_install_components
++list_install_components/fast: list_install_components
++.PHONY : list_install_components/fast
++
++# Special rule for the target install/local
++install/local: preinstall
++	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
++	/home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
++.PHONY : install/local
++
++# Special rule for the target install/local
++install/local/fast: install/local
++.PHONY : install/local/fast
++
++# The main all target
++all: cmake_check_build_system
++	$(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles/progress.marks
++	$(MAKE) -f CMakeFiles/Makefile2 all
++	$(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles 0
++.PHONY : all
++
++# The main clean target
+ clean:
+-	rm -rf build
++	$(MAKE) -f CMakeFiles/Makefile2 clean
++.PHONY : clean
+ 
+-tarball:
+-#	if test "$(shell svn status | grep -v -i make)" ; then echo Uncommited files found. Run \"svn status\" to display them. ; exit 1 ; fi
+-	@if test -f ../$(DISTNAME).tar.gz ; then echo ../$(DISTNAME).tar.gz exists, not overwritting ; exit 1; fi
+-	-svn up
+-	rm -rf tmp
+-	mkdir tmp
+-	svn export . tmp/$(DISTNAME)
+-	rm -rf tmp/$(DISTNAME)/debian
+-	tar -f - -c -C tmp $(DISTNAME) | gzip -9 > ../$(DISTNAME).tar.gz
+-	rm -rf tmp
+-	test -e /etc/debian_version && ln -f ../$(DISTNAME).tar.gz ../$(DEBSRCNAME) || true
+-	test -e ../tarballs && ln -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) || true
++# The main clean target
++clean/fast: clean
++.PHONY : clean/fast
+ 
+-tarball-remove:
+-	rm -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) ../$(DEBSRCNAME)
++# Prepare targets for installation.
++preinstall: all
++	$(MAKE) -f CMakeFiles/Makefile2 preinstall
++.PHONY : preinstall
+ 
+-SVNBASE=$(shell svn info | grep URL: | cut -f2 -d' ' | xargs dirname)
+-release: tarball
+-	svn ci
+-	svn cp $(SVNBASE)/trunk $(SVNBASE)/tags/release_$(shell cat VERSION)
++# Prepare targets for installation.
++preinstall/fast:
++	$(MAKE) -f CMakeFiles/Makefile2 preinstall
++.PHONY : preinstall/fast
+ 
+-#%::
+-#	$(MAKE) $(MAKE_FLAGS) build/Makefile
+-#	$(CMAKETWEAKS)
+-#	$(MAKE) -C build $(MAKE_FLAGS) $@
++# clear depends
++depend:
++	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
++.PHONY : depend
+ 
+-# needs to be explicite, for PHONY and install (AKA INSTALL) file on cygwin
+-install: build/Makefile
+-	$(CMAKETWEAKS)
+-	$(MAKE) -C build $(MAKE_FLAGS) $@
++#=============================================================================
++# Target rules for targets named devdump
+ 
+-all: build/Makefile
+-	$(CMAKETWEAKS)
+-	$(MAKE) -C build $(MAKE_FLAGS) $@
++# Build rule for target.
++devdump: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 devdump
++.PHONY : devdump
+ 
+-.PHONY: install all
++# fast build rule for target.
++devdump/fast:
++	$(MAKE) -f genisoimage/CMakeFiles/devdump.dir/build.make genisoimage/CMakeFiles/devdump.dir/build
++.PHONY : devdump/fast
+ 
++#=============================================================================
++# Target rules for targets named genisoimage
++
++# Build rule for target.
++genisoimage: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 genisoimage
++.PHONY : genisoimage
++
++# fast build rule for target.
++genisoimage/fast:
++	$(MAKE) -f genisoimage/CMakeFiles/genisoimage.dir/build.make genisoimage/CMakeFiles/genisoimage.dir/build
++.PHONY : genisoimage/fast
++
++#=============================================================================
++# Target rules for targets named isodebug
++
++# Build rule for target.
++isodebug: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 isodebug
++.PHONY : isodebug
++
++# fast build rule for target.
++isodebug/fast:
++	$(MAKE) -f genisoimage/CMakeFiles/isodebug.dir/build.make genisoimage/CMakeFiles/isodebug.dir/build
++.PHONY : isodebug/fast
++
++#=============================================================================
++# Target rules for targets named isodump
++
++# Build rule for target.
++isodump: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 isodump
++.PHONY : isodump
++
++# fast build rule for target.
++isodump/fast:
++	$(MAKE) -f genisoimage/CMakeFiles/isodump.dir/build.make genisoimage/CMakeFiles/isodump.dir/build
++.PHONY : isodump/fast
++
++#=============================================================================
++# Target rules for targets named isoinfo
++
++# Build rule for target.
++isoinfo: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 isoinfo
++.PHONY : isoinfo
++
++# fast build rule for target.
++isoinfo/fast:
++	$(MAKE) -f genisoimage/CMakeFiles/isoinfo.dir/build.make genisoimage/CMakeFiles/isoinfo.dir/build
++.PHONY : isoinfo/fast
++
++#=============================================================================
++# Target rules for targets named isovfy
++
++# Build rule for target.
++isovfy: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 isovfy
++.PHONY : isovfy
++
++# fast build rule for target.
++isovfy/fast:
++	$(MAKE) -f genisoimage/CMakeFiles/isovfy.dir/build.make genisoimage/CMakeFiles/isovfy.dir/build
++.PHONY : isovfy/fast
++
++#=============================================================================
++# Target rules for targets named wodim
++
++# Build rule for target.
++wodim: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 wodim
++.PHONY : wodim
++
++# fast build rule for target.
++wodim/fast:
++	$(MAKE) -f wodim/CMakeFiles/wodim.dir/build.make wodim/CMakeFiles/wodim.dir/build
++.PHONY : wodim/fast
++
++#=============================================================================
++# Target rules for targets named wodimstuff
++
++# Build rule for target.
++wodimstuff: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 wodimstuff
++.PHONY : wodimstuff
++
++# fast build rule for target.
++wodimstuff/fast:
++	$(MAKE) -f wodim/CMakeFiles/wodimstuff.dir/build.make wodim/CMakeFiles/wodimstuff.dir/build
++.PHONY : wodimstuff/fast
++
++#=============================================================================
++# Target rules for targets named edc
++
++# Build rule for target.
++edc: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 edc
++.PHONY : edc
++
++# fast build rule for target.
++edc/fast:
++	$(MAKE) -f libedc/CMakeFiles/edc.dir/build.make libedc/CMakeFiles/edc.dir/build
++.PHONY : edc/fast
++
++#=============================================================================
++# Target rules for targets named hfs_iso
++
++# Build rule for target.
++hfs_iso: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 hfs_iso
++.PHONY : hfs_iso
++
++# fast build rule for target.
++hfs_iso/fast:
++	$(MAKE) -f libhfs_iso/CMakeFiles/hfs_iso.dir/build.make libhfs_iso/CMakeFiles/hfs_iso.dir/build
++.PHONY : hfs_iso/fast
++
++#=============================================================================
++# Target rules for targets named paranoia
++
++# Build rule for target.
++paranoia: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 paranoia
++.PHONY : paranoia
++
++# fast build rule for target.
++paranoia/fast:
++	$(MAKE) -f libparanoia/CMakeFiles/paranoia.dir/build.make libparanoia/CMakeFiles/paranoia.dir/build
++.PHONY : paranoia/fast
++
++#=============================================================================
++# Target rules for targets named icedax
++
++# Build rule for target.
++icedax: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 icedax
++.PHONY : icedax
++
++# fast build rule for target.
++icedax/fast:
++	$(MAKE) -f icedax/CMakeFiles/icedax.dir/build.make icedax/CMakeFiles/icedax.dir/build
++.PHONY : icedax/fast
++
++#=============================================================================
++# Target rules for targets named usal
++
++# Build rule for target.
++usal: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 usal
++.PHONY : usal
++
++# fast build rule for target.
++usal/fast:
++	$(MAKE) -f libusal/CMakeFiles/usal.dir/build.make libusal/CMakeFiles/usal.dir/build
++.PHONY : usal/fast
++
++#=============================================================================
++# Target rules for targets named rols
++
++# Build rule for target.
++rols: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 rols
++.PHONY : rols
++
++# fast build rule for target.
++rols/fast:
++	$(MAKE) -f librols/CMakeFiles/rols.dir/build.make librols/CMakeFiles/rols.dir/build
++.PHONY : rols/fast
++
++#=============================================================================
++# Target rules for targets named unls
++
++# Build rule for target.
++unls: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 unls
++.PHONY : unls
++
++# fast build rule for target.
++unls/fast:
++	$(MAKE) -f libunls/CMakeFiles/unls.dir/build.make libunls/CMakeFiles/unls.dir/build
++.PHONY : unls/fast
++
++#=============================================================================
++# Target rules for targets named readom
++
++# Build rule for target.
++readom: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 readom
++.PHONY : readom
++
++# fast build rule for target.
++readom/fast:
++	$(MAKE) -f readom/CMakeFiles/readom.dir/build.make readom/CMakeFiles/readom.dir/build
++.PHONY : readom/fast
++
++#=============================================================================
++# Target rules for targets named netscsid
++
++# Build rule for target.
++netscsid: cmake_check_build_system
++	$(MAKE) -f CMakeFiles/Makefile2 netscsid
++.PHONY : netscsid
++
++# fast build rule for target.
++netscsid/fast:
++	$(MAKE) -f netscsid/CMakeFiles/netscsid.dir/build.make netscsid/CMakeFiles/netscsid.dir/build
++.PHONY : netscsid/fast
++
++# Help Target
++help:
++	@echo "The following are some of the valid targets for this Makefile:"
++	@echo "... all (the default if no target is provided)"
++	@echo "... clean"
++	@echo "... depend"
++	@echo "... install/strip"
++	@echo "... edit_cache"
++	@echo "... rebuild_cache"
++	@echo "... install"
++	@echo "... list_install_components"
++	@echo "... install/local"
++	@echo "... isodebug"
++	@echo "... genisoimage"
++	@echo "... isodump"
++	@echo "... isoinfo"
++	@echo "... devdump"
++	@echo "... isovfy"
++	@echo "... wodimstuff"
++	@echo "... wodim"
++	@echo "... edc"
++	@echo "... hfs_iso"
++	@echo "... paranoia"
++	@echo "... icedax"
++	@echo "... usal"
++	@echo "... rols"
++	@echo "... unls"
++	@echo "... readom"
++	@echo "... netscsid"
++.PHONY : help
++
++
++
++#=============================================================================
++# Special targets to cleanup operation of make.
++
++# Special rule to run CMake to check the build system integrity.
++# No rule that depends on this can have commands that come from listfiles
++# because they might be regenerated.
++cmake_check_build_system:
++	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
++.PHONY : cmake_check_build_system
+ 

package/cdrkit/patches/patch-include_xconfig_h_in

@@ -0,0 +1,10 @@
+--- cdrkit-1.1.11.orig/include/xconfig.h.in	2006-12-02 12:10:05.000000000 +0100
++++ cdrkit-1.1.11/include/xconfig.h.in	2015-02-21 21:20:01.000000000 +0100
+@@ -187,7 +187,6 @@
+  *	they are placed before the large file tests.
+  */
+ 
+-#define HAVE_RCMD 1		/* rcmd() is present in libc/libsocket */
+ #define HAVE_SOCKET 1		/* socket() is present in libc/libsocket */
+ #define HAVE_SOCKETPAIR 1		/* socketpair() is present in libc/libsocket */
+ #define HAVE_GETSERVBYNAME 1	/* getservbyname() is present in libc/libsocket */

package/cmake/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		cmake
-PKG_VERSION:=		3.1.2
+PKG_VERSION:=		3.1.3
 PKG_RELEASE:=		1
-PKG_HASH:=		2b210f7d867a1e716c1895357ebe63c7b9ae61fdb5f2d300ab2f01795f085b35
+PKG_HASH:=		45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0
 PKG_DESCR:=		build utility
 PKG_SECTION:=		dev/tools
 PKG_URL:=		http://www.cmake.org/

package/crda/Makefile

@@ -0,0 +1,53 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		crda
+PKG_VERSION:=		1.1.3
+PKG_RELEASE:=		1
+PKG_HASH:=		aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0
+PKG_DESCR:=		central regulatory domain agent for wireless networks
+PKG_SECTION:=		net/wifi
+PKG_DEPENDS:=		libnl
+PKG_BUILDDEP:=		libnl
+PKG_URL:=		http://wireless.kernel.org/en/developers/Regulatory
+PKG_SITES:=		http://linuxwireless.org/download/crda/
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+PKG_FLAVOURS_CRDA:=	WITH_UDEV
+PKGFD_WITH_UDEV:=	install shipped udev rules
+PKGFS_WITH_UDEV:=	udev
+PKGFB_WITH_UDEV:=	eudev
+
+PKG_CHOICES_CRDA:=	WITH_OPENSSL WITH_GCRYPT
+PKGCD_WITH_OPENSSL:=	ssl support via openssl library
+PKGCD_WITH_GCRYPT:=	ssl support via gcrypt library
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCB_WITH_GCRYPT:=	libgcrypt
+PKGCS_WITH_OPENSSL:=	libopenssl
+PKGCS_WITH_GCRYPT:=	libgcrypt
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CRDA,crda,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+ALL_TARGET:=		all_noverify
+
+ifneq ($(ADK_PACKAGE_CRDA_WITH_OPENSSL),)
+XAKE_FLAGS+=		USE_OPENSSL=1
+endif
+
+crda-install:
+	$(INSTALL_DIR) $(IDIR_CRDA)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/sbin/{crda,regdbdump} \
+		$(IDIR_CRDA)/usr/sbin
+ifneq ($(ADK_PACKAGE_CRDA_WITH_UDEV),)
+	$(INSTALL_DIR) $(IDIR_CRDA)/lib/udev/rules.d
+	$(INSTALL_DATA) $(WRKINST)/lib/udev/rules.d/85-regulatory.rules \
+		$(IDIR_CRDA)/lib/udev/rules.d
+endif
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/cryptodev-linux/Makefile

@@ -22,25 +22,23 @@ include ${ADK_TOPDIR}/mk/kernel-vars.mk
 $(eval $(call PKG_template,CRYPTODEV_LINUX,cryptodev-linux,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
+XAKE_FLAGS+=		CRYPTODEV_CFLAGS='-DENABLE_ASYNC -fhonour-copts' \
+			ARCH='${ADK_TARGET_KARCH}' \
+			KERNEL_DIR='${LINUX_DIR}' \
+			CROSS_COMPILE='${TARGET_CROSS}'
+ALL_TARGET:=		build
 INSTALL_STYLE:=		manual
 
-do-build:
-	${MAKE} -C "${WRKBUILD}"/tests check
-	${MAKE} -C "${WRKBUILD}" version.h
-	GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} -C ${LINUX_DIR} ${KERNEL_MAKE_OPTS} \
-			 M="${WRKBUILD}" modules
-	${INSTALL_DIR} ${WRKINST}/usr/include/crypto
-	${INSTALL_DATA} ${WRKBUILD}/crypto/cryptodev.h \
-		${WRKINST}/usr/include/crypto/
+post-build:
+	-${MAKE} -C "${WRKBUILD}"/tests check
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CRYPTODEV_LINUX}/usr/bin
 	for i in cipher cipher-aead hmac speed async_cipher async_hmac \
-        	async_speed sha_speed hashcrypt_speed fullspeed cipher-gcm \
-        	cipher-aead-srtp cipher_comp hash_comp hmac_comp; do \
+		async_speed sha_speed hashcrypt_speed fullspeed cipher-gcm \
+		cipher-aead-srtp cipher_comp hash_comp hmac_comp; do \
 		$(INSTALL_BIN) ${WRKBUILD}/tests/$$i ${IDIR_CRYPTODEV_LINUX}/usr/bin; \
-	done	
+	done
 	${INSTALL_DIR} ${IDIR_CRYPTODEV_LINUX}/usr/include/crypto
 	${INSTALL_DATA} ${WRKBUILD}/crypto/cryptodev.h \
 		${IDIR_CRYPTODEV_LINUX}/usr/include/crypto/

package/curl/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.40.0
+PKG_VERSION:=		7.41.0
 PKG_RELEASE:=		1
-PKG_HASH:=		c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b
+PKG_HASH:=		58c9f7cb1be9c26e6a2fd9326c14e054780dc4bb74b590a1d47fb3788a31535d
 PKG_DESCR:=		client-side url transfer tool
 PKG_SECTION:=		net/http
 PKG_DEPENDS:=		libcurl

package/dropbear/Makefile

@@ -15,7 +15,7 @@ PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_SUBPKGS:=		DROPBEAR DBCONVERT
-PKGSD_DBCONVERT:=	Utility for converting SSH private keys
+PKGSD_DBCONVERT:=	utility for converting ssh private keys
 
 PKG_FLAVOURS_DROPBEAR:=	WITH_UTMP
 PKGFD_WITH_UTMP:=	support writing /var/run/utmp

package/e2fsprogs/Makefile

@@ -4,28 +4,31 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		e2fsprogs
-PKG_VERSION:=		1.42.10
-PKG_RELEASE:=		3
-PKG_HASH:=		7b6e85c666d8fdd6062c75ba953de0e5481673bebef5f40f749a52a46476e29f
+PKG_VERSION:=		1.42.12
+PKG_RELEASE:=		1
+PKG_HASH:=		6dadcd3b759195150d20154ab9d6516e3b3cbb35d66d461f55ae94a2854e7de8
 PKG_DESCR:=		ext2/3/4 filesystem utilities
 PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		util-linux
 PKG_URL:=		http://e2fsprogs.sourceforge.net/
-PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=e2fsprogs/)
+PKG_SITES:=		https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
 PKG_OPTS:=		dev
 PKG_NOPARALLEL:=	1
 
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
 PKG_SUBPKGS:=		LIBE2FS LIBCOM_ERR LIBSS
 PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
+PKG_SUBPKGS+=		E2FSCK_STATIC TUNE2FS_STATIC
 PKGSD_LIBE2FS:=		e2fsprogs library
 PKGSC_LIBE2FS:=		libs/misc
 PKGSD_LIBCOM_ERR:=	common error library
 PKGSC_LIBCOM_ERR:=	libs/misc
 PKGSD_LIBSS:=		subsystem command parsing library
 PKGSC_LIBSS:=		libs/misc
+PKGSD_E2FSCK_STATIC:=	Static build of e2fsck
+PKGSC_E2FSCK_STATIC:=	sys/fs
+PKGSD_TUNE2FS_STATIC:=	Static build of tune2fs
+PKGSC_TUNE2FS_STATIC:=	sys/fs
 PKGSD_RESIZE2FS:=	ext2/3/4 resize utility
 PKGSC_RESIZE2FS:=	sys/fs
 PKGSS_RESIZE2FS:=	libe2fs libcom-err libblkid
@@ -48,21 +51,26 @@ $(eval $(call PKG_template,TUNE2FS,tune2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS
 $(eval $(call PKG_template,RESIZE2FS,resize2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_RESIZE2FS),$(PKGSD_RESIZE2FS),$(PKGSC_RESIZE2FS)))
 $(eval $(call PKG_template,MKE2FS,mke2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKE2FS),$(PKGSD_MKE2FS),$(PKGSC_MKE2FS)))
 $(eval $(call PKG_template,E2FSCK,e2fsck,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E2FSCK),$(PKGSD_E2FSCK),$(PKGSC_E2FSCK)))
+$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
+$(eval $(call PKG_template,TUNE2FS_STATIC,tune2fs-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
+
 
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
-CONFIGURE_ARGS+=	--disable-elf-shlibs \
-			--enable-libblkid
+CONFIGURE_ARGS+=	--disable-elf-shlibs
 else
-CONFIGURE_ARGS+=	--enable-elf-shlibs \
-			--disable-libblkid 
+CONFIGURE_ARGS+=	--enable-elf-shlibs
 endif
 
 CONFIGURE_ARGS+=	--disable-rpath \
-			--disable-libuuid \
+			--enable-libuuid \
+			--disable-uuidd \
+			--enable-libblkid \
 			--disable-testio-debug \
 			--disable-debugfs \
+			--enable-verbose-makecmds \
 			--disable-defrag
 TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
+#TARGET_LDFLAGS+=	-L${WRKSRC}/lib -L${WRKSRC}/lib/ext2fs
 MAKE_FLAGS+=		BUILD_CC="$(HOST_CC)" \
 			BUILD_CFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -I$(WRKSRC)/lib -I." \
 			BUILD_LDFLAGS="$(HOST_LDFLAGS)"
@@ -106,4 +114,16 @@ libss-install:
 	$(CP) $(WRKINST)/usr/lib/libss.so* \
 		$(IDIR_LIBSS)/usr/lib
 
+e2fsck-static-install:
+	${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static
+	${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static \
+			${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck
+
+tune2fs-static-install:
+	${MAKE} -C ${WRKBUILD}/misc tune2fs.static
+	${INSTALL_DIR} ${IDIR_TUNE2FS_STATIC}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/misc/tune2fs.static \
+		${IDIR_TUNE2FS_STATIC}/usr/sbin/tune2fs
+
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/e2fsprogs/patches/patch-debugfs_dump_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/debugfs/dump.c	2012-05-29 03:29:43.000000000 +0200
-+++ e2fsprogs-1.42.4/debugfs/dump.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/debugfs/dump.c	2014-08-05 00:58:23.000000000 +0200
++++ e2fsprogs-1.42.12/debugfs/dump.c	2015-02-24 13:49:24.673532944 +0100
 @@ -22,7 +22,6 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -16,10 +16,10 @@
  	int i;
  
  	if (fd != -1)
-@@ -93,11 +91,6 @@ static void fix_perms(const char *cmd, c
- 
- 	if (fd != -1)
- 		close(fd);
+@@ -90,11 +88,6 @@ static void fix_perms(const char *cmd, c
+ #endif
+ 	if (i == -1)
+ 		com_err(cmd, errno, "while changing ownership of %s", name);
 -
 -	ut.actime = inode->i_atime;
 -	ut.modtime = inode->i_mtime;

package/e2fsprogs/patches/patch-debugfs_logdump_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/debugfs/logdump.c	2012-06-04 18:42:23.000000000 +0200
-+++ e2fsprogs-1.42.4/debugfs/logdump.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/debugfs/logdump.c	2014-07-06 06:13:18.000000000 +0200
++++ e2fsprogs-1.42.12/debugfs/logdump.c	2015-02-24 13:49:37.416495054 +0100
 @@ -22,7 +22,6 @@
  #include <sys/types.h>
  #include <sys/stat.h>

package/e2fsprogs/patches/patch-debugfs_set_fields_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/debugfs/set_fields.c	2012-06-04 18:42:23.000000000 +0200
-+++ e2fsprogs-1.42.4/debugfs/set_fields.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/debugfs/set_fields.c	2014-08-19 14:24:52.000000000 +0200
++++ e2fsprogs-1.42.12/debugfs/set_fields.c	2015-02-24 13:49:44.483474041 +0100
 @@ -34,7 +34,6 @@
  #include <strings.h>
  #endif

package/e2fsprogs/patches/patch-e2fsck_Makefile_in

@@ -0,0 +1,11 @@
+--- e2fsprogs-1.42.12.orig/e2fsck/Makefile.in	2014-08-02 22:26:22.000000000 +0200
++++ e2fsprogs-1.42.12/e2fsck/Makefile.in	2015-02-24 13:53:08.463908514 +0100
+@@ -120,7 +120,7 @@ e2fsck: $(OBJS)  $(DEPLIBS)
+ 
+ e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
+ 	$(E) "	LD $@"
+-	$(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) 
++	$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) 
+ 
+ e2fsck.profiled: $(OBJS)  $(PROFILED_DEPLIBS)
+ 	$(E) "	LD $@"

package/e2fsprogs/patches/patch-misc_Makefile_in

@@ -1,50 +1,15 @@
---- e2fsprogs-1.42.10.orig/misc/Makefile.in	2014-05-15 19:04:08.000000000 +0200
-+++ e2fsprogs-1.42.10/misc/Makefile.in	2014-07-08 21:15:18.000000000 +0200
-@@ -17,9 +17,6 @@ INSTALL = @INSTALL@
- @IMAGER_CMT@E2IMAGE_PROG= e2image
- @IMAGER_CMT@E2IMAGE_MAN= e2image.8
- 
--@UUIDD_CMT@UUIDD_PROG= uuidd
--@UUIDD_CMT@UUIDD_MAN= uuidd.8
--
- @BLKID_CMT@BLKID_PROG= blkid
- @BLKID_CMT@BLKID_MAN= blkid.8
- 
-@@ -35,8 +32,8 @@ SMANPAGES=	tune2fs.8 mklost+found.8 mke2
- 			$(UUIDD_MAN) $(E4DEFRAG_MAN) @FSCK_MAN@
- FMANPAGES=	mke2fs.conf.5 ext4.5
- 
--UPROGS=		chattr lsattr @UUID_CMT@ uuidgen
--UMANPAGES=	chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
-+UPROGS=		chattr lsattr 
-+UMANPAGES=	chattr.1 lsattr.1
- 
- LPROGS=		@E2INITRD_PROG@
- 
-@@ -46,8 +43,6 @@ MKE2FS_OBJS=	mke2fs.o util.o profile.o p
- 			mk_hugefiles.o
- CHATTR_OBJS=	chattr.o
- LSATTR_OBJS=	lsattr.o
--UUIDGEN_OBJS=	uuidgen.o
--UUIDD_OBJS=	uuidd.o
- DUMPE2FS_OBJS=	dumpe2fs.o
- BADBLOCKS_OBJS=	badblocks.o
- E2IMAGE_OBJS=	e2image.o
-@@ -64,8 +59,6 @@ PROFILED_MKE2FS_OBJS=	profiled/mke2fs.o 
- 			profiled/prof_err.o profiled/default_profile.o
- PROFILED_CHATTR_OBJS=	profiled/chattr.o
- PROFILED_LSATTR_OBJS=	profiled/lsattr.o
--PROFILED_UUIDGEN_OBJS=	profiled/uuidgen.o
--PROFILED_UUIDD_OBJS=	profiled/uuidd.o
- PROFILED_DUMPE2FS_OBJS=	profiled/dumpe2fs.o
- PROFILED_BADBLOCKS_OBJS=	profiled/badblocks.o
- PROFILED_E2IMAGE_OBJS=	profiled/e2image.o
-@@ -80,7 +73,7 @@ PROFILED_E4DEFRAG_OBJS=	profiled/e4defra
- SRCS=	$(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c $(srcdir)/mk_hugefiles.c \
- 		$(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \
- 		$(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \
--		$(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \
-+		$(srcdir)/blkid.c $(srcdir)/logsave.c \
- 		$(srcdir)/filefrag.c $(srcdir)/base_device.c \
- 		$(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
- 		$(srcdir)/e2undo.c $(srcdir)/e2freefrag.c
+	when linking tune2fs.static, pass libs in the correct order
+	(libuuid.a depends on libext2fs.a and therefore needs to come before that)
+--- e2fsprogs-1.42.12.orig/misc/Makefile.in	2014-08-03 01:41:18.000000000 +0200
++++ e2fsprogs-1.42.12/misc/Makefile.in	2015-02-10 18:19:51.022952937 +0100
+@@ -165,8 +165,8 @@ tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DE
+ tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
+ 	$(E) "	LD $@"
+ 	$(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
+-		$(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
+-		$(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(LIBINTL) $(SYSLIBS)
++		$(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
++		$(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(STATIC_LIBS) $(LIBINTL) $(SYSLIBS)
+ 
+ tune2fs.profiled: $(TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
+ 		$(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) \

package/e2fsprogs/patches/patch-misc_e2initrd_helper_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/misc/e2initrd_helper.c	2012-03-18 19:18:33.000000000 +0100
-+++ e2fsprogs-1.42.4/misc/e2initrd_helper.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/misc/e2initrd_helper.c	2014-07-03 16:33:48.000000000 +0200
++++ e2fsprogs-1.42.12/misc/e2initrd_helper.c	2015-02-24 13:53:24.429861041 +0100
 @@ -24,7 +24,6 @@
  #include <sys/types.h>
  #include <sys/stat.h>

package/e2fsprogs/patches/patch-misc_e2undo_c

@@ -1,6 +1,6 @@
 	optind seems to need unistd.h, not only getopt.h
---- e2fsprogs-1.42.4.orig/misc/e2undo.c	2012-03-18 19:18:33.000000000 +0100
-+++ e2fsprogs-1.42.4/misc/e2undo.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/misc/e2undo.c	2014-07-03 16:33:48.000000000 +0200
++++ e2fsprogs-1.42.12/misc/e2undo.c	2015-02-24 13:53:30.092844203 +0100
 @@ -20,6 +20,7 @@
  #if HAVE_ERRNO_H
  #include <errno.h>

package/e2fsprogs/patches/patch-util_subst_c

@@ -1,6 +1,6 @@
---- e2fsprogs-1.42.10.orig/util/subst.c	2014-05-15 19:04:08.000000000 +0200
-+++ e2fsprogs-1.42.10/util/subst.c	2014-07-08 21:18:41.000000000 +0200
-@@ -358,7 +358,7 @@ int main(int argc, char **argv)
+--- e2fsprogs-1.42.12.orig/util/subst.c	2014-08-02 22:26:22.000000000 +0200
++++ e2fsprogs-1.42.12/util/subst.c	2015-02-24 13:53:42.034808695 +0100
+@@ -363,7 +363,7 @@ int main(int argc, char **argv)
  		if (fd > 0) {
  			/* save the original atime, if possible */
  			if (fstat(fd, &stbuf) == 0) {

package/ebtables/patches/patch-Makefile

@@ -22,66 +22,3 @@
  
  ifeq ($(shell uname -m),sparc64)
  CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
- scripts: ebtables-save ebtables.sysv ebtables-config
- 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
- 	mkdir -p $(DESTDIR)$(BINDIR)
--	install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
-+	install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
- 	cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
- 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi
--	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
-+	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
- 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
- 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi
--	if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
-+	if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
- 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
- 
- tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g')
- $(MANDIR)/man8/ebtables.8: ebtables.8
- 	mkdir -p $(DESTDIR)$(@D)
- 	sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_
--	install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
-+	install -m 0644 ebtables.8_ $(DESTDIR)$@
- 	rm -f ebtables.8_
- 
- $(DESTDIR)$(ETHERTYPESFILE): ethertypes
- 	mkdir -p $(@D)
--	install -m 0644 -o root -g root $< $@
-+	install -m 0644 $< $@
- 
- .PHONY: exec
- exec: ebtables ebtables-restore
- 	mkdir -p $(DESTDIR)$(BINDIR)
--	install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
--	install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
-+	install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
-+	install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
- 
- .PHONY: install
- install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts
-@@ -205,18 +205,18 @@ release:
- 	rm -f extensions/ebt_inat.c
- 	rm -rf $(CVSDIRS)
- 	mkdir -p include/linux/netfilter_bridge
--	install -m 0644 -o root -g root \
-+	install -m 0644 \
- 		$(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/
- # To keep possible compile error complaints about undefined ETH_P_8021Q
- # off my back
--	install -m 0644 -o root -g root \
-+	install -m 0644 \
- 		$(KERNEL_INCLUDES)/linux/if_ether.h include/linux/
--	install -m 0644 -o root -g root \
-+	install -m 0644 \
- 		$(KERNEL_INCLUDES)/linux/types.h include/linux/
--	install -m 0644 -o root -g root \
-+	install -m 0644 \
- 		$(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \
- 		include/linux/netfilter_bridge/
--	install -m 0644 -o root -g root \
-+	install -m 0644 \
- 		include/ebtables.h include/linux/netfilter_bridge/
- 	make clean
- 	touch *

package/elfutils/Makefile

@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		elfutils
+PKG_VERSION:=		0.161
+PKG_RELEASE:=		1
+PKG_HASH:=		570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070
+PKG_DESCR:=		libraries/utilities to handle elf objects (drop in replacement for libelf)
+PKG_SECTION:=		base/libs
+PKG_URL:=		https://fedorahosted.org/elfutils/
+PKG_SITES:=		https://fedorahosted.org/releases/e/l/elfutils/$(PKG_VERSION)/
+
+# require argp()
+PKG_LIBC_DEPENDS:=	glibc
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,ELFUTILS,elfutils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+# not only because we pass -DNDEBUG, this package won't build with -Werror
+TARGET_CFLAGS+=		-Wno-error
+
+elfutils-install:
+	$(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/lib/elfutils
+	$(CP) $(WRKINST)/usr/lib/lib{asm,dw,elf}*.so* \
+		$(IDIR_ELFUTILS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/elfutils/libebl*.so \
+		$(IDIR_ELFUTILS)/usr/lib/elfutils
+	$(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+		$(IDIR_ELFUTILS)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/gdb/Makefile

@@ -43,5 +43,7 @@ XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
 gdb-install:
 	${INSTALL_DIR} ${IDIR_GDB}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
+	# shipped libbfd conflicts with system wide one
+	rm -f ${WRKINST}/usr/lib/libbfd*
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/hwids/Makefile

@@ -0,0 +1,61 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		hwids
+PKG_VERSION:=		20150129
+PKG_RELEASE:=		1
+PKG_HASH:=		33a7f4dbf14704076b0fe1d0052e86bb618e386a1ff18107097311df44f979d7
+PKG_DESCR:=		combined repository of pci.ids and usb.ids
+PKG_SECTION:=		sys/hw
+PKG_URL:=		https://github.com/gentoo/hwids
+PKG_SITES:=		https://github.com/gentoo/hwids/archive/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+# typical problem of having tags like '<name>-<version>' in github
+WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SUBPKGS:=		HWIDS_NET HWIDS_PCI HWIDS_USB
+PKGSD_HWIDS_NET:=	HWIDS files oui.txt and iab.txt
+PKGSD_HWIDS_PCI:=	HWIDS file pci.ids
+PKGSD_HWIDS_USB:=	HWIDS file usb.ids
+
+PKG_FLAVOURS_HWIDS:=	WITH_GZIP
+PKGFD_WITH_GZIP:=	gzip pci.ids and usb.ids before installation
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,HWIDS_NET,hwids-net,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_NET),$(PKG_SECTION)))
+$(eval $(call PKG_template,HWIDS_PCI,hwids-pci,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_PCI),$(PKG_SECTION)))
+$(eval $(call PKG_template,HWIDS_USB,hwids-usb,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_USB),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		NET=yes \
+			PCI=yes \
+			UDEV=no \
+			USB=yes
+# note: Can't pass GZIP=yes to make, as this will turn it
+#       into an env var automatically which makes gzip trip.
+#       Therefore assume here that GZIP=yes is the default.
+ifneq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y)
+XAKE_FLAGS+=		GZIP=no
+endif
+
+define HWIDS_INSTALL_template
+$(2)-install:
+	$$(INSTALL_DIR) $$(IDIR_$(1))/usr/share/misc
+	$$(INSTALL_DATA) $$(patsubst %,$$(WRKINST)/usr/share/misc/%,$(3)) \
+		$$(IDIR_$(1))/usr/share/misc/
+endef
+
+$(eval $(call HWIDS_INSTALL_template,HWIDS_NET,hwids-net,oui.txt iab.txt))
+ifeq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y)
+$(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids.gz))
+$(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids.gz))
+else
+$(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids))
+$(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids))
+endif
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/i2400m-fw/Makefile

@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		i2400m-fw
+PKG_VERSION:=		1.5.0
+PKG_RELEASE:=		1
+PKG_HASH:=		edcb7c5322c0185173a2dc79b3df4bc74964edfa741ebf9a09cd70a32d758c3d
+PKG_DESCR:=		intel (R) wimax 5150/5350/6250 firmware
+PKG_SECTION:=		sys/firmware
+PKG_URL:=		http://www.linuxwimax.org
+PKG_SITES:=		"http://www.linuxwimax.org/Download?action=AttachFile&do=get&target="
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,I2400M_FW,i2400m-fw,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-install:
+	$(INSTALL_DIR) $(IDIR_I2400M_FW)/lib/firmware
+	$(INSTALL_DATA) $(WRKDIST)/*-fw-usb-*.sbcf \
+		$(IDIR_I2400M_FW)/lib/firmware/
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/inotify-tools/Makefile

@@ -0,0 +1,41 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		inotify-tools
+PKG_VERSION:=		3.14
+PKG_RELEASE:=		1
+PKG_HASH:=		222bcca8893d7bf8a1ce207fb39ceead5233b5015623d099392e95197676c92f
+PKG_DESCR:=		command line programs providing a simple interface to inotify
+PKG_SECTION:=		sys/fs
+PKG_URL:=		https://github.com/rvoicilas/inotify-tools/wiki
+PKG_SITES:=		http://github.com/downloads/rvoicilas/inotify-tools/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+PKG_SUBPKGS:=		INOTIFYWAIT INOTIFYWATCH LIBINOTIFYTOOLS
+PKGSC_LIBINOTIFYTOOLS:=	libs/misc
+PKGSD_INOTIFYWAIT:=	wait for changes to files using inotify
+PKGSD_INOTIFYWATCH:=	gather filesystem access statistics using inotify
+PKGSD_LIBINOTIFYTOOLS:=	inotify tools library
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,INOTIFYWAIT,inotifywait,$(PKG_VERSION)-$(PKG_RELEASE),libinotifytools,$(PKGSD_INOTIFYWAIT),$(PKG_SECTION)))
+$(eval $(call PKG_template,INOTIFYWATCH,inotifywatch,$(PKG_VERSION)-$(PKG_RELEASE),libinotifytools,$(PKGSD_INOTIFYWATCH),$(PKG_SECTION)))
+$(eval $(call PKG_template,LIBINOTIFYTOOLS,libinotifytools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBINOTIFYTOOLS),$(PKGSC_LIBINOTIFYTOOLS)))
+
+inotifywait-install:
+	$(INSTALL_DIR) $(IDIR_INOTIFYWAIT)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/inotifywait $(IDIR_INOTIFYWAIT)/usr/bin
+
+inotifywatch-install:
+	$(INSTALL_DIR) $(IDIR_INOTIFYWATCH)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/inotifywatch $(IDIR_INOTIFYWATCH)/usr/bin
+
+libinotifytools-install:
+	$(INSTALL_DIR) $(IDIR_LIBINOTIFYTOOLS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libinotifytools.so* $(IDIR_LIBINOTIFYTOOLS)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/ipmitool/Makefile

@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		ipmitool
+PKG_VERSION:=		1.8.15
+PKG_RELEASE:=		1
+PKG_HASH:=		f0964e644a8e693932a3e8da6929d5598ed24645bacd51fbb1a4a09b5e47cf78
+PKG_DESCR:=		utility for controlling ipmi enabled devices
+PKG_SECTION:=		net/misc
+PKG_URL:=		http://ipmitool.sf.net/
+PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=ipmitool/)
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,IPMITOOL,ipmitool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes
+
+ipmitool-install:
+	$(INSTALL_DIR) $(IDIR_IPMITOOL)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ipmitool \
+		$(IDIR_IPMITOOL)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/kexec-tools/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kexec-tools
-PKG_VERSION:=		2.0.8
-PKG_RELEASE:=		2
-PKG_HASH:=		f3abe96fa0793e63936725a4471429f070039a1e81e605deb378747194a50c47
+PKG_VERSION:=		2.0.9
+PKG_RELEASE:=		1
+PKG_HASH:=		8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71
 PKG_DESCR:=		kernel exec tools
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		zlib

package/kismet/patches/patch-Makefile_in

@@ -1,60 +0,0 @@
---- kismet-2011-01-R1.orig/Makefile.in	2010-12-19 15:20:16.000000000 +0100
-+++ kismet-2011-01-R1/Makefile.in	2011-02-04 23:14:39.000000000 +0100
-@@ -112,26 +112,26 @@ commoninstall:
- 
- 	if test -e $(NC); then \
- 		echo "Installing client"; \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet; \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC); \
-+		$(INSTALL) -m 555 scripts/kismet $(BIN)/kismet; \
-+		$(INSTALL) -m 555 $(NC) $(BIN)/$(NC); \
- 	fi;
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS); 
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
-+	$(INSTALL) -m 555 $(PS) $(BIN)/$(PS); 
-+	$(INSTALL) -m 555 $(DRONE) $(BIN)/$(DRONE);
- 
- 	mkdir -p $(MAN)/man1
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
-+	$(INSTALL) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
-+	$(INSTALL) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
- 
- 	mkdir -p $(MAN)/man5
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
--	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
-+	$(INSTALL) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
-+	$(INSTALL) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
- 
- 	mkdir -p $(WAV)
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new.wav $(WAV)/new.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/packet.wav $(WAV)/packet.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
-+	$(INSTALL) -m 644 wav/new.wav $(WAV)/new.wav
-+	$(INSTALL) -m 644 wav/packet.wav $(WAV)/packet.wav
-+	$(INSTALL) -m 644 wav/alert.wav $(WAV)/alert.wav
-+	$(INSTALL) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
-+	$(INSTALL) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
- 
- suidinstall: $(CS)
- 	-groupadd -f $(SUIDGROUP)
-@@ -174,7 +174,7 @@ install: $(INSTBINS)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		$(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
- 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
- 		echo "Installed config into $(ETC)/kismet.conf."; \
- 	fi
-@@ -183,7 +183,7 @@ install: $(INSTBINS)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		$(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
- 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
- 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
- 	fi

package/ldd/Makefile

@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/toolchain/glibc/Makefile.inc
+
+PKG_NAME:=		ldd
+PKG_DESCR:=		Shared library dependency display tool
+PKG_SECTION:=		dev/tools
+PKG_DEPENDS:=		glibc bash
+PKG_BUILDDEP:=		glibc
+NO_DISTFILES:=		1
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LDD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-install:
+	$(INSTALL_DIR) $(IDIR_LDD)/usr/bin
+	${INSTALL_BIN} ${STAGING_TARGET_DIR}/usr/bin/ldd ${IDIR_LDD}/usr/bin
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/libcap/Makefile

@@ -4,25 +4,31 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libcap
-PKG_VERSION:=		2.22
-PKG_RELEASE:=		3
+PKG_VERSION:=		2.24
+PKG_RELEASE:=		1
 PKG_HASH:=		73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f
 PKG_DESCR:=		capabilities library
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		pam
 PKG_URL:=		http://www.friedhoff.org/posixfilecaps.html
-PKG_SITES:=		http://openadk.org/distfiles/
+PKG_SITES:=		https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+# for Darwin hosts
 CPPFLAGS_FOR_BUILD+=	-I$(STAGING_TARGET_DIR)/usr/include
 CONFIG_STYLE:=		manual
 
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+ALL_TARGET:=		static progs
+INSTALL_TARGET:=	install-static
+else
+ALL_TARGET:=		shared progs
+INSTALL_TARGET:=	install-shared
+endif
+
 libcap-install:
 	$(INSTALL_DIR) $(IDIR_LIBCAP)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libcap*.so* \

package/libcap/patches/patch-Make_Rules

@@ -1,59 +1,61 @@
---- libcap-2.22.orig/Make.Rules	2011-07-25 04:18:23.000000000 +0200
-+++ libcap-2.22/Make.Rules	2013-11-08 16:22:41.000000000 +0100
-@@ -12,10 +12,6 @@ FAKEROOT=$(DESTDIR)
+--- libcap-2.24.orig/Make.Rules	2014-01-06 02:16:21.000000000 +0100
++++ libcap-2.24/Make.Rules	2015-02-26 14:01:28.000000000 +0100
+@@ -12,22 +12,12 @@ FAKEROOT=$(DESTDIR)
  # These choices are motivated by the fact that getcap and setcap are
  # administrative operations that could be needed to recover a system.
  
 -ifndef lib
--lib=$(shell ldd /usr/bin/ld|fgrep ld-linux|cut -d/ -f2)
+-lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2)
 -endif
 -
- ifdef prefix
- exec_prefix=$(prefix)
- lib_prefix=$(exec_prefix)
-@@ -23,7 +19,7 @@ inc_prefix=$(lib_prefix)
- man_prefix=$(prefix)/share
- else
+-ifdef prefix
+-exec_prefix=$(prefix)
+-lib_prefix=$(exec_prefix)
+-inc_prefix=$(lib_prefix)
+-man_prefix=$(prefix)/share
+-else
++lib=lib
  prefix=/usr
 -exec_prefix=
-+exec_prefix=/usr
++exec_prefix=$(prefix)
  lib_prefix=$(exec_prefix)
  inc_prefix=$(prefix)
  man_prefix=$(prefix)/share
-@@ -34,7 +30,7 @@ endif
- MANDIR=$(FAKEROOT)$(man_prefix)/man
- SBINDIR=$(FAKEROOT)$(exec_prefix)/sbin
- INCDIR=$(FAKEROOT)$(inc_prefix)/include
--LIBDIR=$(FAKEROOT)$(lib_prefix)/$(lib)
-+LIBDIR=$(FAKEROOT)$(lib_prefix)/lib
+-endif
  
- # common defines for libcap
- LIBTITLE=libcap
-@@ -47,12 +43,13 @@ MINOR=22
- KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+ # Target directories
+ 
+@@ -48,28 +38,28 @@ MINOR=24
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
  
 -CC := gcc
 -CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 +CC ?= gcc
-+CFLAGS ?= -O2 
-+CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  BUILD_CC := $(CC)
  BUILD_CFLAGS := $(CFLAGS) $(IPATH)
 -AR := ar
 -RANLIB := ranlib
+-DEBUG = -g #-DDEBUG
 +AR ?= ar
 +RANLIB ?= ranlib
- DEBUG = -g #-DDEBUG
++DEBUG = 
  WARNINGS=-Wall -Wwrite-strings \
          -Wpointer-arith -Wcast-qual -Wcast-align \
-@@ -64,11 +61,11 @@ LDFLAGS := #-g
+         -Wstrict-prototypes -Wmissing-prototypes \
+         -Wnested-externs -Winline -Wshadow
+-LD=$(CC) -Wl,-x -shared
+-LDFLAGS := #-g
++LD=$(CC) -shared
++LDFLAGS ?= #-g
+ 
  SYSTEM_HEADERS = /usr/include
  INCS=$(topdir)/libcap/include/sys/capability.h
  LDFLAGS += -L$(topdir)/libcap
--CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
-+CFLAGS += -Dlinux $(WARNINGS)
- PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
+-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
++PAM_CAP := no
  INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
 -LIBATTR := yes

package/libcap/patches/patch-Makefile

@@ -0,0 +1,25 @@
+--- libcap-2.24.orig/Makefile	2013-12-27 19:17:17.000000000 +0100
++++ libcap-2.24/Makefile	2015-02-26 20:36:58.000000000 +0100
+@@ -16,6 +16,22 @@ endif
+ 	$(MAKE) -C progs $@
+ 	$(MAKE) -C doc $@
+ 
++progs:
++	$(MAKE) -C progs all
++
++shared:
++	$(MAKE) -C libcap shared
++
++static:
++	$(MAKE) -C libcap static
++
++install-shared:
++	$(MAKE) -C libcap install-shared
++
++install-static:
++	$(MAKE) -C libcap install-static
++
++
+ all-here:
+ 
+ install-here:

package/libcap/patches/patch-libcap_Makefile

@@ -1,7 +1,17 @@
---- libcap-2.22.orig/libcap/Makefile	2010-08-09 00:26:04.000000000 +0200
-+++ libcap-2.22/libcap/Makefile	2013-10-28 10:46:10.000000000 +0100
-@@ -33,7 +33,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_
- endif
+--- libcap-2.24.orig/libcap/Makefile	2014-01-06 01:55:03.000000000 +0100
++++ libcap-2.24/libcap/Makefile	2015-02-26 20:34:47.000000000 +0100
+@@ -28,6 +28,9 @@ GPERF_OUTPUT = _caps_output.gperf
+ 
+ all: $(MINLIBNAME) $(STALIBNAME) libcap.pc
+ 
++static: $(STALIBNAME)
++shared: $(MINLIBNAME)
++
+ ifeq ($(shell gperf --version > /dev/null 2>&1 && echo yes),yes)
+ USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
+ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
+@@ -43,7 +46,7 @@ libcap.pc: libcap.pc.in
+ 		$< >$@
  
  _makenames: _makenames.c cap_names.list.h
 -	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
@@ -9,3 +19,24 @@
  
  cap_names.h: _makenames
  	./_makenames > cap_names.h
+@@ -70,6 +73,20 @@ $(MINLIBNAME): $(OBJS)
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+ 	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
++install-shared: install-headers
++	mkdir -p -m 0755 $(LIBDIR)
++	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
++	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
++	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
++
++install-static: install-headers
++	mkdir -p -m 0755 $(LIBDIR)
++	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
++
++install-headers:
++	mkdir -p -m 0755 $(INCDIR)/sys
++	install -m 0644 include/sys/capability.h $(INCDIR)/sys
++
+ install: all
+ 	mkdir -p -m 0755 $(INCDIR)/sys
+ 	install -m 0644 include/sys/capability.h $(INCDIR)/sys

package/libcap/patches/patch-pam_cap_Makefile

@@ -1,10 +0,0 @@
---- libcap-2.22.orig/pam_cap/Makefile	2010-08-09 02:08:01.000000000 +0200
-+++ libcap-2.22/pam_cap/Makefile	2013-11-08 16:29:05.000000000 +0100
-@@ -10,7 +10,6 @@ include ../Make.Rules
- LDLIBS += -L../libcap -lcap
- 
- all: pam_cap.so
--	$(MAKE) testcompile
- 
- install: all
- 	mkdir -p -m 0755 $(LIBDIR)/security

package/libpcap/Makefile

@@ -4,12 +4,11 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libpcap
-PKG_VERSION:=		1.6.1
+PKG_VERSION:=		1.6.2
 PKG_RELEASE:=		1
-PKG_HASH:=		116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476
+PKG_HASH:=		5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690
 PKG_DESCR:=		low-level packet capture library
 PKG_SECTION:=		libs/net
-PKG_BUILDDEP:=		m4-host flex-host bison-host libnl
 PKG_URL:=		http://www.tcpdump.org/
 PKG_SITES:=		http://www.tcpdump.org/release/
 PKG_OPTS:=		dev
@@ -23,23 +22,19 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ENV+=		ac_cv_linux_vers=26
 CONFIGURE_ARGS+=	--disable-yydebug \
-			--with-build-cc=$(CC_FOR_BUILD) \
 			--disable-dbus \
 			--without-libnl \
 			--with-pcap=linux
-TARGET_CFLAGS+=		${TARGET_CPPFLAGS}
 INSTALL_TARGET=		install install-shared
-MAKE_FLAGS+=		STAGING_TARGET_DIR=$(STAGING_TARGET_DIR)
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},)
 CONFIGURE_ARGS+=	--enable-ipv6
 else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
-#XAKE_FLAGS+=		M4=m4
 
 libpcap-install:
 	${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib

package/libpcap/patch-Makefile_in

@@ -0,0 +1,14 @@
+	Use $(sort) here, which implicitly removes duplicates.
+	Otherwise our CFLAGS are passed in via CCOPT and CFLAGS leading
+	to duplicate -fhonour-copts passing.
+--- libpcap-1.6.2.orig/Makefile.in	2014-07-03 00:12:49.000000000 +0200
++++ libpcap-1.6.2/Makefile.in	2014-09-12 15:12:48.567519024 +0200
+@@ -61,7 +61,7 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
+ PROG=libpcap
+ 
+ # Standard CFLAGS
+-FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
++FULL_CFLAGS = $(sort $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS))
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@

package/libqmi/Makefile

@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		libqmi
+PKG_VERSION:=		1.12.4
+PKG_RELEASE:=		1
+PKG_HASH:=		5527342bc869400d2a9c3038d66ec8ef87980aefb6c7aae593a13ebfee686a15
+PKG_DESCR:=		qmi modem protocol helper library
+PKG_SECTION:=		libs/net
+PKG_DEPENDS:=		glib
+PKG_BUILDDEP:=		glib
+PKG_URL:=		http://cgit.freedesktop.org/libqmi/
+PKG_SITES:=		http://cgit.freedesktop.org/libqmi/snapshot/
+PKG_OPTS:=		dev
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBQMI,libqmi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+AUTOTOOL_STYLE:=	autogen
+
+libqmi-install:
+	$(INSTALL_DIR) $(IDIR_LIBQMI)/usr/{bin,lib}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/qmi{-network,cli} \
+		$(IDIR_LIBQMI)/usr/bin
+	$(CP) $(WRKINST)/usr/lib/libqmi-glib.so* $(IDIR_LIBQMI)/usr/lib/
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/libqmi/patches/patch-Makefile_am

@@ -0,0 +1,13 @@
+	do not enable gtk-doc
+--- libqmi-1.12.4.orig/Makefile.am	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/Makefile.am	2015-02-20 18:20:29.213191733 +0100
+@@ -4,8 +4,7 @@ SUBDIRS = . data build-aux src utils doc
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+-	--with-udev-base-dir="$$dc_install_base" \
+-	--enable-gtk-doc
++	--with-udev-base-dir="$$dc_install_base"
+ 
+ EXTRA_DIST = \
+ 	gtester.make \

package/libqmi/patches/patch-autogen_sh

@@ -0,0 +1,11 @@
+	- drop doc stuff which we don't have
+--- libqmi-1.12.4.orig/autogen.sh	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/autogen.sh	2015-02-20 18:05:46.425974772 +0100
+@@ -14,7 +14,6 @@ PKG_NAME=libqmi
+ }
+ 
+ (cd $srcdir;
+-    gtkdocize || exit 1
+     mkdir -p m4
+     touch README NEWS ChangeLog
+     autoreconf --force --install --verbose

package/libqmi/patches/patch-configure_ac

@@ -0,0 +1,12 @@
+--- libqmi-1.12.4.orig/configure.ac	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/configure.ac	2015-02-27 22:15:42.000000000 +0100
+@@ -76,9 +76,6 @@ AC_SUBST(GLIB_LIBS)
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+ AC_SUBST(GLIB_MKENUMS)
+ 
+-dnl Documentation
+-GTK_DOC_CHECK(1.0)
+-
+ # QMI username
+ QMI_USERNAME="root"
+ AC_ARG_ENABLE(qmi-username,

package/libqmi/patches/patch-docs_reference_libqmi-glib_Makefile_am

@@ -0,0 +1,25 @@
+	- try to avoid having to have gtk-doc stuff
+	- and try to prevent the mess involved with it
+--- libqmi-1.12.4.orig/docs/reference/libqmi-glib/Makefile.am	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/docs/reference/libqmi-glib/Makefile.am	2015-02-20 18:24:30.739430307 +0100
+@@ -73,9 +73,9 @@ expand_content_files =
+ 
+ extra_files =
+ 
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+ 
+-EXTRA_DIST += \
++EXTRA_DIST = \
+ 	libqmi-glib-common.sections \
+ 	$(DOC_MODULE)-sections.txt \
+ 	$(DOC_MODULE)-sections.mstamp \
+@@ -83,7 +83,7 @@ EXTRA_DIST += \
+ 	$(DIAGRAMS) \
+ 	$(NULL)
+ 
+-CLEANFILES += \
++CLEANFILES = \
+ 	$(DOC_MODULE)-decl-list.txt \
+ 	$(DOC_MODULE)-decl.txt \
+ 	$(DOC_MODULE)-overrides.txt \

package/lvm/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		lvm
-PKG_VERSION:=		2.02.114
+PKG_VERSION:=		2.02.116
 PKG_RELEASE:=		1
-PKG_HASH:=		de9cb0acfb9c5a6afa6184160c9e066f19043677f91a72c741d153efcd2874a5
+PKG_HASH:=		2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767
 PKG_DESCR:=		logical volume management
 PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libdevmapper libncurses
@@ -39,7 +39,9 @@ CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
 			--disable-testing \
 			--with-lvm1=none
-CONFIGURE_ENV+=		ac_cv_flag_HAVE_PIE=no
+CONFIGURE_ENV+=		ac_cv_flag_HAVE_PIE=no \
+			ac_cv_func_malloc_0_nonnull=yes \
+			ac_cv_func_realloc_0_nonnull=yes
 
 lvm-install:
 	${INSTALL_DIR} ${IDIR_LVM}/usr/sbin

package/lvm/patches/patch-lib_commands_toolcontext_c

@@ -1,6 +1,6 @@
---- LVM2.2.02.106.orig/lib/commands/toolcontext.c	2014-04-10 17:38:44.000000000 +0200
-+++ LVM2.2.02.106/lib/commands/toolcontext.c	2014-05-29 17:55:05.101305501 +0200
-@@ -1334,6 +1334,8 @@ struct cmd_context *create_toolcontext(u
+--- LVM2.2.02.114.orig/lib/commands/toolcontext.c	2014-11-29 00:07:42.000000000 +0100
++++ LVM2.2.02.114/lib/commands/toolcontext.c	2015-02-28 09:27:09.000000000 +0100
+@@ -1433,6 +1433,8 @@ struct cmd_context *create_toolcontext(u
  {
  	struct cmd_context *cmd;
  	FILE *new_stream;
@@ -9,7 +9,7 @@
  	int flags;
  
  #ifdef M_MMAP_MAX
-@@ -1383,10 +1385,10 @@ struct cmd_context *create_toolcontext(u
+@@ -1482,10 +1484,10 @@ struct cmd_context *create_toolcontext(u
  		if (is_valid_fd(STDIN_FILENO) &&
  		    ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
  		    (flags & O_ACCMODE) != O_WRONLY) {
@@ -23,7 +23,7 @@
  				log_sys_error("setvbuf", "");
  				goto out;
  			}
-@@ -1395,10 +1397,10 @@ struct cmd_context *create_toolcontext(u
+@@ -1494,10 +1496,10 @@ struct cmd_context *create_toolcontext(u
  		if (is_valid_fd(STDOUT_FILENO) &&
  		    ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
  		    (flags & O_ACCMODE) != O_RDONLY) {
@@ -37,7 +37,7 @@
  				     _IOLBF, linebuffer_size)) {
  				log_sys_error("setvbuf", "");
  				goto out;
-@@ -1681,6 +1683,8 @@ void destroy_toolcontext(struct cmd_cont
+@@ -1805,6 +1807,8 @@ void destroy_toolcontext(struct cmd_cont
  {
  	struct dm_config_tree *cft_cmdline;
  	FILE *new_stream;
@@ -46,7 +46,7 @@
  	int flags;
  
  	if (cmd->dump_filter && cmd->filter && cmd->filter->dump &&
-@@ -1717,9 +1721,9 @@ void destroy_toolcontext(struct cmd_cont
+@@ -1840,9 +1844,9 @@ void destroy_toolcontext(struct cmd_cont
  		if (is_valid_fd(STDIN_FILENO) &&
  		    ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
  		    (flags & O_ACCMODE) != O_WRONLY) {
@@ -59,7 +59,7 @@
  			} else
  				cmd->linebuffer = NULL;	/* Leave buffer in place (deliberate leak) */
  		}
-@@ -1727,9 +1731,9 @@ void destroy_toolcontext(struct cmd_cont
+@@ -1850,9 +1854,9 @@ void destroy_toolcontext(struct cmd_cont
  		if (is_valid_fd(STDOUT_FILENO) &&
  		    ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
  		    (flags & O_ACCMODE) != O_RDONLY) {

package/lvm/patches/patch-lib_mm_memlock_c

@@ -0,0 +1,76 @@
+--- LVM2.2.02.114.orig/lib/mm/memlock.c	2014-11-29 00:07:42.000000000 +0100
++++ LVM2.2.02.114/lib/mm/memlock.c	2015-02-28 09:44:51.000000000 +0100
+@@ -25,7 +25,6 @@
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#include <malloc.h>
+ 
+ #ifndef DEVMAPPER_SUPPORT
+ 
+@@ -134,10 +133,8 @@ static void _touch_memory(void *mem, siz
+ static void _allocate_memory(void)
+ {
+ #ifndef VALGRIND_POOL
+-	void *stack_mem;
++	void *stack_mem, *temp_malloc_mem;
+ 	struct rlimit limit;
+-	int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
+-	char *areas[max_areas];
+ 
+ 	/* Check if we could preallocate requested stack */
+ 	if ((getrlimit (RLIMIT_STACK, &limit) == 0) &&
+@@ -146,50 +143,13 @@ static void _allocate_memory(void)
+ 		_touch_memory(stack_mem, _size_stack);
+ 	/* FIXME else warn user setting got ignored */
+ 
+-        /*
+-         *  When a brk() fails due to fragmented address space (which sometimes
+-         *  happens when we try to grab 8M or so), glibc will make a new
+-         *  arena. In this arena, the rules for using “direct” mmap are relaxed,
+-         *  circumventing the MAX_MMAPs and MMAP_THRESHOLD settings. We can,
+-         *  however, detect when this happens with mallinfo() and try to co-opt
+-         *  malloc into using MMAP as a MORECORE substitute instead of returning
+-         *  MMAP'd memory directly. Since MMAP-as-MORECORE does not munmap the
+-         *  memory on free(), this is good enough for our purposes.
+-         */
+-	while (missing > 0) {
+-		struct mallinfo inf = mallinfo();
+-		hblks = inf.hblks;
+-
+-		if ((areas[area] = malloc(_size_malloc_tmp)))
+-			_touch_memory(areas[area], _size_malloc_tmp);
+-
+-		inf = mallinfo();
+-
+-		if (hblks < inf.hblks) {
+-			/* malloc cheated and used mmap, even though we told it
+-			   not to; we try with twice as many areas, each half
+-			   the size, to circumvent the faulty logic in glibc */
+-			free(areas[area]);
+-			_size_malloc_tmp /= 2;
+-		} else {
+-			++ area;
+-			missing -= _size_malloc_tmp;
+-		}
+-
+-		if (area == max_areas && missing > 0) {
+-			/* Too bad. Warn the user and proceed, as things are
+-			 * most likely going to work out anyway. */
+-			log_warn("WARNING: Failed to reserve memory, %d bytes missing.", missing);
+-			break;
+-		}
+-	}
++	if ((temp_malloc_mem = malloc(_size_malloc_tmp)))
++		_touch_memory(temp_malloc_mem, _size_malloc_tmp);
+ 
+ 	if ((_malloc_mem = malloc(_size_malloc)))
+ 		_touch_memory(_malloc_mem, _size_malloc);
+ 
+-	/* free up the reserves so subsequent malloc's can use that memory */
+-	for (i = 0; i < area; ++i)
+-		free(areas[i]);
++	free(temp_malloc_mem);
+ #endif
+ }
+ 

package/lvm/patches/patch-tools_lvmcmdline_c

@@ -1,6 +1,6 @@
---- LVM2.2.02.106.orig/tools/lvmcmdline.c	2014-04-10 17:38:46.000000000 +0200
-+++ LVM2.2.02.106/tools/lvmcmdline.c	2014-05-29 16:57:14.221581766 +0200
-@@ -1252,9 +1252,12 @@ int lvm_split(char *str, int *argc, char
+--- LVM2.2.02.114.orig/tools/lvmcmdline.c	2014-11-29 00:07:43.000000000 +0100
++++ LVM2.2.02.114/tools/lvmcmdline.c	2015-02-28 09:27:09.000000000 +0100
+@@ -1536,9 +1536,12 @@ int lvm_split(char *str, int *argc, char
  static int _check_standard_fds(void)
  {
  	int err = is_valid_fd(STDERR_FILENO);
@@ -14,7 +14,7 @@
  		if (err)
  			perror("stdin stream open");
  		else
-@@ -1264,7 +1267,7 @@ static int _check_standard_fds(void)
+@@ -1548,7 +1551,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDOUT_FILENO) &&
@@ -23,7 +23,7 @@
  		if (err)
  			perror("stdout stream open");
  		/* else no stdout */
-@@ -1272,7 +1275,7 @@ static int _check_standard_fds(void)
+@@ -1556,7 +1559,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDERR_FILENO) &&

package/mISDN/Makefile

@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		mISDN
+PKG_VERSION:=		1_1_9_2
+PKG_RELEASE:=		1
+PKG_HASH:=		9ff96d8361891b9a15cf6dbdb57214c36ca13702d5bf7c18ebe259ec5d876c09
+PKG_DESCR:=		new isdn stack of the linux kernel
+PKG_SECTION:=		net/voip
+PKG_URL:=		http://www.misdn.org
+PKG_SITES:=		http://www.misdn.org/downloads/releases/
+
+PKG_CFLINE_MISDN:=	depends on ADK_BROKEN
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/kernel-ver.mk
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MISDN,misdn,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		LINUX=$(LINUX_DIR) KVERS=$(KERNEL_VERSION)
+FAKE_FLAGS+=		INSTALL_PREFIX=$(WRKINST)
+
+misdn-install:
+	$(INSTALL_DIR) $(IDIR_MISDN)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{mISDN,misdn-init} \
+		$(IDIR_MISDN)/usr/sbin
+	$(INSTALL_DIR) $(IDIR_MISDN)/lib/modules
+	$(CP) $(WRKINST)/lib/modules/* $(IDIR_MISDN)/lib/modules/
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/mISDN/patches/patch-Makefile

@@ -0,0 +1,53 @@
+	- do not use /lib for kernel source dir detection
+	- drop some non-compiling card drivers
+	- do not run depmod and stuff
+--- mISDN-1_1_9_2.orig/Makefile	2009-06-09 10:41:07.000000000 +0200
++++ mISDN-1_1_9_2/Makefile	2011-07-11 15:04:00.996001762 +0200
+@@ -14,9 +14,14 @@ ifndef KVERS
+ KVERS:=$(shell uname -r)
+ endif
+ 
++ifndef LINUX
+ MODS=/lib/modules/$(KVERS)
+ LINUX=$(MODS)/build
+ LINUX_SOURCE=$(MODS)/source
++else
++LINUX_SOURCE=${LINUX}
++endif
++
+ UPDATE_MODULES=$(shell which update-modules)
+ MODULES_UPDATE=$(shell which modules-update)
+ DEPMOD=$(shell which depmod)
+@@ -30,15 +35,15 @@ MISDN_SRC=$(MISDNDIR)/drivers/isdn/hardw
+ 
+ CONFIGS+=CONFIG_MISDN_DRV=m 
+ CONFIGS+=CONFIG_MISDN_DSP=m 
+-CONFIGS+=CONFIG_MISDN_HFCMULTI=m 
+-CONFIGS+=CONFIG_MISDN_HFCPCI=m
++#CONFIGS+=CONFIG_MISDN_HFCMULTI=m 
++#CONFIGS+=CONFIG_MISDN_HFCPCI=m
+ CONFIGS+=CONFIG_MISDN_HFCUSB=m
+ CONFIGS+=CONFIG_MISDN_XHFC=m
+-CONFIGS+=CONFIG_MISDN_HFCMINI=m
+-CONFIGS+=CONFIG_MISDN_W6692=m
+-CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
+-CONFIGS+=CONFIG_MISDN_AVM_FRITZ=m
+-CONFIGS+=CONFIG_MISDN_NETJET=m
++#CONFIGS+=CONFIG_MISDN_HFCMINI=m
++#CONFIGS+=CONFIG_MISDN_W6692=m
++#CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
++#CONFIGS+=CONFIG_MISDN_AVM_FRITZ=m
++#CONFIGS+=CONFIG_MISDN_NETJET=m
+ CONFIGS+=CONFIG_MISDN_DEBUGTOOL=m 
+ 
+ #CONFIGS+=CONFIG_MISDN_NETDEV=y
+@@ -52,9 +57,6 @@ all: VERSION test_old_misdn test_new_mis
+ 	export MINCLUDES=$(MISDNDIR)/include ; export MISDNVERSION=$(MISDNVERSION); make -C $(LINUX) SUBDIRS=$(MISDN_SRC) modules $(CONFIGS)  
+ 
+ install: all modules-install misdn-init
+-	$(DEPMOD) 
+-	$(UPDATE_MODULES)
+-	$(MODULES_UPDATE)
+ 	make -C config install
+ 
+ modules-install:

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_contr_c

@@ -0,0 +1,65 @@
+	- capi_ctr_reseted has been renamed in linux kernel commit
+	  4e329972052c3649367b91de783f6293b8653cb2
+	- kernel now wants a struc file_operations for proc files
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/contr.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/contr.c	2011-07-15 18:33:55.765001537 +0200
+@@ -367,17 +367,12 @@ procinfo(struct capi_ctr *ctrl)
+ }
+ 
+ static int
+-read_proc(char *page, char **start, off_t off, int count, int *eof, struct capi_ctr *ctrl)
++proc_show(struct seq_file *file, void *data)
+ {
+-       int len = 0;
++	struct capi_ctr *ctrl = file->private;
+ 
+-       len += sprintf(page+len, "mISDN_read_proc\n");
+-       if (off+count >= len)
+-          *eof = 1;
+-       if (len < off)
+-           return 0;
+-       *start = page + off;
+-       return ((count < len-off) ? count : len-off);
++       seq_printf(file, "mISDN_proc_show\n");
++       return 0;
+ };
+ 
+ 
+@@ -399,7 +394,7 @@ ResetController(struct capi_ctr *ctrl)
+ #ifdef OLDCAPI_DRIVER_INTERFACE
+ 	contr->ctrl->reseted(contr->ctrl);
+ #else
+-	capi_ctr_reseted(contr->ctrl);
++	capi_ctr_down(contr->ctrl);
+ #endif
+ }
+ 
+@@ -601,6 +596,19 @@ ControllerPutStatus(Controller_t *contr,
+ 	contrDebug(contr, CAPI_DBG_CONTR, "%s: %s", __FUNCTION__, msg);
+ }
+ 
++static int misdn_proc_open(struct inode *inode, struct file *file)
++{
++	return single_open(file, proc_show, PDE(inode)->data);
++}
++
++static const struct file_operations misdn_proc_fops = {
++	.owner		= THIS_MODULE,
++	.open		= misdn_proc_open,
++	.read		= seq_read,
++	.llseek		= seq_lseek,
++	.release	= single_release,
++};
++
+ int
+ ControllerConstr(Controller_t **contr_p, mISDNstack_t *st, mISDN_pid_t *pid, mISDNobject_t *ocapi)
+ {
+@@ -719,7 +727,7 @@ ControllerConstr(Controller_t **contr_p,
+ 	contr->ctrl->load_firmware = LoadFirmware;
+ 	contr->ctrl->reset_ctr = ResetController;
+ 	contr->ctrl->procinfo = procinfo;
+-	contr->ctrl->ctr_read_proc = read_proc;
++	contr->ctrl->proc_fops = &misdn_proc_fops;
+ 	retval = attach_capi_ctr(contr->ctrl);
+ #endif
+ 	if (!retval) {

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_core_c

@@ -0,0 +1,75 @@
+	- old lock initialisers got renamed
+	- init_MUTEX_LOCKED got dropped, use the real sema_init instead
+	- force sysfs-object creation
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/core.c	2009-06-09 10:08:45.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/core.c	2011-07-20 16:42:18.342001559 +0200
+@@ -23,10 +23,10 @@ static char		*mISDN_core_version = MISDN
+ static void (*dt_new_frame) (mISDNstack_t *stack, enum mISDN_dt_type type, struct sk_buff *skb, int duplicate_skb) = NULL;
+ 
+ LIST_HEAD(mISDN_objectlist);
+-static rwlock_t		mISDN_objects_lock = RW_LOCK_UNLOCKED;
++static rwlock_t		mISDN_objects_lock =  __RW_LOCK_UNLOCKED(old_style_rw_init);
+ 
+ LIST_HEAD(mISDN_modulelist);
+-static rwlock_t		mISDN_modules_lock = RW_LOCK_UNLOCKED;
++static rwlock_t		mISDN_modules_lock =  __RW_LOCK_UNLOCKED(old_style_rw_init);
+ struct modulelist {
+ 	struct list_head list;
+ 	struct module *module;
+@@ -35,7 +35,7 @@ struct modulelist {
+ int core_debug;
+ 
+ static u_char		entityarray[MISDN_MAX_ENTITY/8];
+-static spinlock_t	entity_lock = SPIN_LOCK_UNLOCKED;
++static spinlock_t	entity_lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
+ 
+ static uint debug;
+ static int obj_id;
+@@ -724,7 +724,7 @@ int mISDN_register(mISDNobject_t *obj) {
+ 			obj->id);
+ 	if (core_debug & DEBUG_CORE_FUNC)
+ 		printk(KERN_DEBUG "mISDN_register: obj(%p)\n", obj);
+-#ifndef SYSFS_SUPPORT_2_6_24
++//#ifndef SYSFS_SUPPORT_2_6_24
+ 	retval = mISDN_register_sysfs_obj(obj);
+ 	if (retval) {
+ 		printk(KERN_ERR "mISDN_register class_device_register return(%d)\n", retval);
+@@ -732,7 +732,7 @@ int mISDN_register(mISDNobject_t *obj) {
+ 		list_del(&obj->list);
+ 		write_unlock_irqrestore(&mISDN_objects_lock, flags);
+ 	}
+-#endif
++//#endif
+ 	return(retval);
+ }
+ 
+@@ -758,9 +758,10 @@ int mISDN_unregister(mISDNobject_t *obj)
+ 	if (core_debug & DEBUG_CORE_FUNC)
+ 		printk(KERN_DEBUG "mISDN_unregister: mISDN_objectlist(%p<-%p->%p)\n",
+ 			mISDN_objectlist.prev, &mISDN_objectlist, mISDN_objectlist.next);
++	mISDN_unregister_sysfs_obj(obj);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+ #ifdef SYSFS_SUPPORT
+-        device_unregister(&obj->class_dev);
++        //device_unregister(&obj->class_dev);
+ #endif
+ #else
+         class_device_unregister(&obj->class_dev);
+@@ -774,7 +775,7 @@ mISDNInit(void)
+ 	struct semaphore sem;
+ 	int err;
+ 
+-	init_MUTEX_LOCKED(&sem);
++	sema_init(&sem, 0);
+ 
+ 	printk(KERN_INFO "Modular ISDN Stack core version (%s) revision (%s)\n", mISDN_core_version, mISDN_core_revision);
+ 	core_debug = debug;
+@@ -817,7 +818,7 @@ sysfs_fail:
+ void mISDN_cleanup(void) {
+ 	struct semaphore sem;
+ 
+-	init_MUTEX_LOCKED(&sem);
++	sema_init(&sem, 0);
+ 
+ 	free_mISDNdev();
+ 	if (!list_empty(&mISDN_objectlist)) {

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_core_h

@@ -0,0 +1,19 @@
+	- daemonize is defined in linux/sched.h
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/core.h	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/core.h	2011-07-20 16:42:17.471001559 +0200
+@@ -4,6 +4,7 @@
+  *
+  */
+ 
++#include <linux/sched.h>
+ #include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/mISDNif.h>
+@@ -61,6 +62,7 @@ extern mISDNinstance_t	*get_instance(mIS
+ 
+ /* from sysfs_obj.c */
+ extern int		mISDN_register_sysfs_obj(mISDNobject_t *);
++extern void		mISDN_unregister_sysfs_obj(mISDNobject_t *);
+ extern int		mISDN_sysfs_init(void);
+ extern void		mISDN_sysfs_cleanup(void);
+ 

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_debugtool_c

@@ -0,0 +1,49 @@
+	- big kernel lock unavailable
+	- CLASS_ATTR callbacks changed signature
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/debugtool.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/debugtool.c	2011-07-11 14:46:28.845001528 +0200
+@@ -121,11 +121,11 @@ static void dt_run (void)
+ 	struct socket *sock;
+ 	struct sockaddr_in addr;
+ 
+-	lock_kernel();
++	//lock_kernel();
+ 	current->flags |= PF_NOFREEZE;
+ 	daemonize(MODULE_NAME);
+ 	allow_signal(SIGKILL);
+-	unlock_kernel();
++	//unlock_kernel();
+ 
+ 	/* init socket */
+ 	ret = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);
+@@ -181,12 +181,12 @@ static struct class dt_class = {
+ #endif
+ };
+ 
+-static ssize_t attr_show_enabled (struct class *class, char *buf)
++static ssize_t attr_show_enabled (struct class *class, struct class_attribute *attr, char *buf)
+ {
+ 	return sprintf(buf, "%d\n", dt_enabled);
+ }
+ 
+-static ssize_t attr_store_enabled (struct class *class, const char *buf, size_t count)
++static ssize_t attr_store_enabled (struct class *class, struct class_attribute *attr, const char *buf, size_t count)
+ {
+ 	if (count > 0 && *buf == '1') {
+ 		mISDN_dt_enable();
+@@ -241,13 +241,13 @@ void __exit dt_exit(void)
+ 	mISDN_module_unregister(THIS_MODULE);
+ 
+ 	if (thread) {
+-		lock_kernel();
++		//lock_kernel();
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+ 		ret = kill_pid(find_pid_ns(thread->pid, &init_pid_ns), SIGKILL, 1);
+ #else
+ 		ret = kill_proc(thread->pid, SIGKILL, 1);
+ #endif
+-		unlock_kernel();
++		//unlock_kernel();
+ 		if (ret < 0)
+ 			printk(KERN_INFO MODULE_NAME ": Unknown error (%d) while trying to terminate kernel thread!\n", -ret);
+ 		wake_up_interruptible(&skb_q_wait);

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_hfcs_usb_c

@@ -0,0 +1,17 @@
+	- add the viprinet ISDN USB device ID
+	- some debug output
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/hfcs_usb.c	2011-07-20 15:00:25.362001559 +0200
+@@ -208,6 +208,12 @@ static struct usb_device_id hfcsusb_idta
+ 	                  {LED_SCHEME1, {0x88, -64, -32, -16},
+ 	                   "ZyXEL OMNI.NET USB II"}),
+ 	},
++	{
++	 USB_DEVICE(0x18d8, 0x1020),
++	 .driver_info = (unsigned long) &((hfcsusb_vdata)
++			  {LED_SCHEME1, {0, 1, 0, 0},
++			   "Viprinet ISDN"}),
++	},
+ 	{ }
+ };
+ 

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_stack_c

@@ -0,0 +1,34 @@
+	- same as with core.c
+	- try forcing sysfs-object creation
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/stack.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/stack.c	2011-07-20 16:43:13.224001559 +0200
+@@ -9,9 +9,9 @@
+ #include "core.h"
+ 
+ static LIST_HEAD(mISDN_stacklist);
+-static rwlock_t	stacklist_lock = RW_LOCK_UNLOCKED;
++static rwlock_t	stacklist_lock = __RW_LOCK_UNLOCKED(old_style_rw_init);
+ static LIST_HEAD(mISDN_instlist);
+-static rwlock_t	instlist_lock = RW_LOCK_UNLOCKED;
++static rwlock_t	instlist_lock = __RW_LOCK_UNLOCKED(old_style_rw_init);
+ 
+ int
+ get_stack_cnt(void)
+@@ -793,7 +793,7 @@ delete_stack(mISDNstack_t *st)
+ 	struct semaphore sem;
+ 	u_long	flags;
+ 
+-	init_MUTEX_LOCKED(&sem);
++	sema_init(&sem, 0);
+ 
+ 	if (core_debug & DEBUG_CORE_FUNC)
+ 		printk(KERN_DEBUG "%s: st(%p:%08x)\n", __FUNCTION__, st, st->id);
+@@ -1216,7 +1216,7 @@ clear_stack(mISDNstack_t *st, int wait) 
+ 
+ 	if (wait) {
+ 		struct semaphore sem;
+-		init_MUTEX_LOCKED(&sem);
++		sema_init(&sem, 0);
+ 
+ 		hhe->data[0] = &sem;
+ 		_queue_message(st, skb);

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_inst_c

@@ -0,0 +1,30 @@
+	- see core.c
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/sysfs_inst.c	2009-06-09 10:09:20.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/sysfs_inst.c	2011-07-11 14:08:22.920000979 +0200
+@@ -82,7 +82,7 @@ static void release_mISDN_inst(struct de
+ #endif
+         if (core_debug & DEBUG_SYSFS)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-		printk(KERN_INFO "release instance class dev %s\n", dev->bus_id);
++		printk(KERN_INFO "release instance class dev %s\n", kobject_name(&dev->kobj));
+ #else
+                 printk(KERN_INFO "release instance class dev %s\n", dev->class_id);
+ #endif
+@@ -99,7 +99,7 @@ static void release_mISDN_inst(struct cl
+ #endif
+ 	if (core_debug & DEBUG_SYSFS)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-		printk(KERN_INFO "release instance class dev %s\n", dev->bus_id);
++		printk(KERN_INFO "release instance class dev %s\n", kobject_name(&dev->kobj));
+ #else
+ 		printk(KERN_INFO "release instance class dev %s\n", dev->class_id);
+ #endif
+@@ -127,7 +127,7 @@ mISDN_register_sysfs_inst(mISDNinstance_
+ 
+ 	inst->class_dev.class = &inst_dev_class;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-	snprintf(inst->class_dev.bus_id, BUS_ID_SIZE, "inst-%08x", inst->id);
++	dev_set_name(&inst->class_dev, "inst-%08x", inst->id);
+ 	err = device_register(&inst->class_dev);
+ #else
+ 	snprintf(inst->class_dev.class_id, BUS_ID_SIZE, "inst-%08x", inst->id);

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_obj_c

@@ -0,0 +1,33 @@
+	- bus_id field is gone from struct device now
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/sysfs_obj.c	2009-06-09 08:20:29.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/sysfs_obj.c	2011-07-20 16:49:35.771001557 +0200
+@@ -136,7 +136,7 @@ mISDN_register_sysfs_obj(mISDNobject_t *
+ 
+ 	obj->class_dev.class = &obj_dev_class;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+-        snprintf(obj->class_dev.bus_id, BUS_ID_SIZE, "obj-%d", obj->id);
++	dev_set_name(&obj->class_dev, "obj-%d", obj->id);
+         err = device_register(&obj->class_dev);
+ #else
+         snprintf(obj->class_dev.class_id, BUS_ID_SIZE, "obj-%d", obj->id);
+@@ -181,6 +181,20 @@ out:
+ 	return(err);
+ }
+ 
++void
++mISDN_unregister_sysfs_obj(mISDNobject_t *obj) {
++#ifdef SYSFS_SUPPORT
++	if (obj->owner)
++		sysfs_remove_link(&obj->class_dev.kobj, "module");
++	sysfs_remove_group(&obj->class_dev.kobj, &DPROTO_group);
++	sysfs_remove_group(&obj->class_dev.kobj, &BPROTO_group);
++#endif
++	device_remove_file(&obj->class_dev, &dev_attr_refcnt);
++	device_remove_file(&obj->class_dev, &dev_attr_name);
++	device_remove_file(&obj->class_dev, &dev_attr_id);
++        device_unregister(&obj->class_dev);
++}
++
+ int
+ mISDN_sysfs_init(void) {
+ 	int	err;

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_sysfs_st_c

@@ -0,0 +1,18 @@
+	yeah, same as always
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/sysfs_st.c	2009-06-09 10:10:16.000000000 +0200
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/sysfs_st.c	2011-07-11 14:10:50.061001669 +0200
+@@ -260,11 +260,11 @@ mISDN_register_sysfs_stack(mISDNstack_t 
+ 	st->class_dev.class = &stack_dev_class;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+         if (st->id & FLG_CHILD_STACK)
+-                snprintf(st->class_dev.bus_id, BUS_ID_SIZE, "chst-%08x", st->id);
++		dev_set_name(&st->class_dev, "chst-%08x", st->id);
+         else if (st->id & FLG_CLONE_STACK)
+-                snprintf(st->class_dev.bus_id, BUS_ID_SIZE, "clst-%08x", st->id);
++		dev_set_name(&st->class_dev, "clst-%08x", st->id);
+         else
+-                snprintf(st->class_dev.bus_id, BUS_ID_SIZE, "st-%08x", st->id);
++		dev_set_name(&st->class_dev, "st-%08x", st->id);
+         if (st->mgr)
+                 st->class_dev.parent = st->mgr->class_dev.parent;
+ 	err = device_register(&st->class_dev);

package/mISDN/patches/patch-drivers_isdn_hardware_mISDN_udevice_c

@@ -0,0 +1,36 @@
+	- same as with core.c
+--- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/udevice.c	2009-01-22 14:36:34.000000000 +0100
++++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/udevice.c	2011-07-11 13:54:44.650001546 +0200
+@@ -57,7 +57,7 @@ typedef struct entity_item {
+ } entity_item_t;
+ 
+ static LIST_HEAD(mISDN_devicelist);
+-static rwlock_t	mISDN_device_lock = RW_LOCK_UNLOCKED;
++static rwlock_t	mISDN_device_lock = __RW_LOCK_UNLOCKED(old_style_rw_init);
+ 
+ static mISDNobject_t	udev_obj;
+ static char MName[] = "UserDevice";
+@@ -1458,7 +1458,7 @@ init_device(u_int minor) {
+ 		init_waitqueue_head(&dev->wport.procq);
+ 		skb_queue_head_init(&dev->rport.queue);
+ 		skb_queue_head_init(&dev->wport.queue);
+-		init_MUTEX(&dev->io_sema);
++		sema_init(&dev->io_sema, 1);
+ 		INIT_LIST_HEAD(&dev->layerlist);
+ 		INIT_LIST_HEAD(&dev->stacklist);
+ 		INIT_LIST_HEAD(&dev->timerlist);
+@@ -1557,12 +1557,12 @@ mISDN_open(struct inode *ino, struct fil
+ 		return(-ENOMEM);
+ 	dev->open_mode |= filep->f_mode & (FMODE_READ | FMODE_WRITE);
+ 	if (dev->open_mode & FMODE_READ){
+-		dev->rport.lock = SPIN_LOCK_UNLOCKED;
++		dev->rport.lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
+ 		dev->rport.maxqlen = DEFAULT_PORT_QUEUELEN;
+ 		test_and_set_bit(FLG_mISDNPORT_OPEN, &dev->rport.Flag);
+ 	}
+ 	if (dev->open_mode & FMODE_WRITE) {
+-		dev->wport.lock = SPIN_LOCK_UNLOCKED;
++		dev->wport.lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
+ 		dev->wport.maxqlen = DEFAULT_PORT_QUEUELEN;
+ 		test_and_set_bit(FLG_mISDNPORT_OPEN, &dev->wport.Flag);
+ 	}

package/mISDNuser/Makefile

@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		mISDNuser
+PKG_VERSION:=		1_1_9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e174a60e7040c88d1184364714e55c1b
+PKG_DESCR:=		misdn kernel link library and includes, this is the out-of-tree version
+PKG_SECTION:=		net/voip
+PKG_DEPENDS:=		misdn
+PKG_BUILDDEP:=		mISDN
+PKG_URL:=		http://www.misdn.org
+PKG_SITES:=		http://www.misdn.org/downloads/releases/
+PKG_NOPARALLEL:=	1
+
+PKG_CFLINE_MISDNUSER:=	depends on ADK_BROKEN
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MISDNUSER,misdnuser,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		MISDNDIR=$(STAGING_TARGET_DIR)/usr INSTALL_PREFIX=$(WRKINST)
+
+misdnuser-install:
+	$(INSTALL_DIR) $(IDIR_MISDNUSER)/usr/{bin,lib}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{loadfirm,mISDNdebugtool,misdnportinfo} \
+		$(IDIR_MISDNUSER)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{sendhwctrl,testcon*,testlayer*} \
+		$(IDIR_MISDNUSER)/usr/bin/
+	$(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_MISDNUSER)/usr/lib/
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/mISDNuser/patches/patch-Makefile

@@ -0,0 +1,16 @@
+	allow CC override
+	allow CFLAGS enhancement
+--- mISDNuser-1_1_9.orig/Makefile	2009-01-21 18:06:34.000000000 +0100
++++ mISDNuser-1_1_9/Makefile	2011-07-11 17:14:13.425001831 +0200
+@@ -28,7 +28,10 @@ export INCLUDEDIR
+ LIBDIR=/usr/lib
+ export LIBDIR
+ 
+-CFLAGS:= -g -Wall -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
++CC ?= gcc
++export CC
++
++CFLAGS+= -g -Wall -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
+ CFLAGS+= -D CLOSE_REPORT=1
+ 
+ #disable this if your system does not support PIC (position independent code)

package/mISDNuser/patches/patch-debugtool_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/debugtool/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/debugtool/Makefile	2011-07-11 17:12:13.520001533 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ 
+ CFLAGS += -Wall
+ 

package/mISDNuser/patches/patch-i4lnet_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/i4lnet/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/i4lnet/Makefile	2011-07-11 17:12:22.313001562 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ AR = ar
+ RANLIB = ranlib
+ 

package/mISDNuser/patches/patch-lib_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/lib/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/lib/Makefile	2011-07-11 17:12:25.341001554 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ AR = ar
+ RANLIB = ranlib
+ 

package/mISDNuser/patches/patch-suppserv_Makefile

@@ -0,0 +1,9 @@
+	allow CC override
+--- mISDNuser-1_1_9.orig/suppserv/Makefile	2008-11-18 12:35:09.000000000 +0100
++++ mISDNuser-1_1_9/suppserv/Makefile	2011-07-11 17:12:30.613001557 +0200
+@@ -1,4 +1,4 @@
+-CC = gcc
++CC ?= gcc
+ AR = ar
+ RANLIB = ranlib
+ 

package/nand/Makefile

@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		nand
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_DESCR:=		nand flash utility
 PKG_SECTION:=		sys/fs
 

package/nand/src/nand.c

@@ -94,7 +94,6 @@ int nand_info(const char *nand) {
 
 	int fd, ret;
 	mtd_info_t nandinfo;
-	//struct nand_oobinfo oobinfo;
 	loff_t offset;
 
 	if ((fd = nand_open(nand, O_RDONLY)) < 0) {
@@ -131,17 +130,6 @@ int nand_info(const char *nand) {
 			}
 		}
 	}
-	
-	/*
-	if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0) {
-		fprintf(stderr, "Unable to get NAND oobinfo\n");
-		return 1;
-	}
-
-	if (oobinfo.useecc == MTD_NANDECC_AUTOPLACE) {
-		fprintf(stdout, "NAND device/driver supports autoplacement of OOB\n");
-	}
-	*/
 
 	return 0;
 }
@@ -214,7 +202,6 @@ int nand_write(const char *img, const char *nand, int quiet) {
 
 	static bool pad = true;
 	static const char *standard_input = "-";
-	static bool autoplace = true;
 	static bool markbad = true;
 	static int mtdoffset = 0;
 	int cnt = 0;
@@ -227,8 +214,6 @@ int nand_write(const char *img, const char *nand, int quiet) {
 	struct mtd_oob_buf oob;
 	loff_t offs;
 	int ret, readlen;
-	int oobinfochanged = 0;
-	struct nand_oobinfo old_oobinfo;
 
 	erase_buffer(oobbuf, sizeof(oobbuf));
 
@@ -255,28 +240,6 @@ int nand_write(const char *img, const char *nand, int quiet) {
 		exit (EXIT_FAILURE);
 	}
 
-	if (autoplace) {
-		/* Read the current oob info */
-		if (ioctl (fd, MEMGETOOBSEL, &old_oobinfo) != 0) {
-			perror ("MEMGETOOBSEL");
-			close (fd);
-			exit (EXIT_FAILURE);
-		}
-
-		// autoplace ECC ?
-		/*
-		if (autoplace && (old_oobinfo.useecc != MTD_NANDECC_AUTOPLACE)) {
-
-			if (ioctl (fd, MEMSETOOBSEL, &autoplace_oobinfo) != 0) {
-				perror ("MEMSETOOBSEL");
-				close (fd);
-				exit (EXIT_FAILURE);
-			}
-			oobinfochanged = 1;
-		}
-		*/
-	}
-
 	oob.length = meminfo.oobsize;
 	oob.ptr = oobbuf;
 
@@ -465,14 +428,6 @@ closeall:
 	close(ifd);
 
 restoreoob:
-	/*
-	if (oobinfochanged == 1) {
-		if (ioctl (fd, MEMSETOOBSEL, &old_oobinfo) != 0) {
-			perror ("MEMSETOOBSEL");
-			close (fd);
-			exit (EXIT_FAILURE);
-		}
-	}
 
 	close(fd);
 	/*

package/newt/Makefile

@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		newt
+PKG_VERSION:=		0.52.18
+PKG_RELEASE:=		1
+PKG_HASH:=		771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e
+PKG_DESCR:=		windowing toolkit
+PKG_SECTION:=		libs/misc
+PKG_DEPENDS:=		slang libpopt
+PKG_BUILDDEP:=		slang popt
+PKG_URL:=		https://fedorahosted.org/newt/
+PKG_SITES:=		https://fedorahosted.org/releases/n/e/$(PKG_NAME)/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,NEWT,newt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIGURE_ARGS+=	--without-python \
+			--without-tcl \
+			--without-gpm-support
+
+newt-install:
+	$(INSTALL_DIR) $(IDIR_NEWT)/usr/{bin,lib}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/whiptail \
+		$(IDIR_NEWT)/usr/bin
+	$(CP) $(WRKINST)/usr/lib/libnewt.so* \
+		$(IDIR_NEWT)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/oprofile/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		oprofile
-PKG_VERSION:=		0.9.9
-PKG_RELEASE:=		4
-PKG_HASH:=		1e523400daaba7b8d0d15269e977a08b40edfea53970774b69ae130e25117597
+PKG_VERSION:=		1.0.0
+PKG_RELEASE:=		1
+PKG_HASH:=		847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a
 PKG_DESCR:=		system-wide profiles
 PKG_SECTION:=		app/debug
 PKG_DEPENDS:=		libpopt libbfd libstdcxx
@@ -16,9 +16,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=oprofile/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_ARCH_DEPENDS:=	!m68k
-PKG_LIBC_DEPENDS:=	uclibc glibc
-
 PKG_CFLINE_OPROFILE:=	select BUSYBOX_EXPR
 
 include $(ADK_TOPDIR)/mk/package.mk
@@ -30,11 +27,20 @@ CONFIGURE_ARGS+=	--with-binutils-libname=binutils \
 			--with-binutils=${STAGING_TARGET_DIR}/usr/lib
 
 oprofile-install:
-	$(INSTALL_DIR) $(IDIR_OPROFILE)/usr/{bin,share}
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/opcontrol $(IDIR_OPROFILE)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/ophelp $(IDIR_OPROFILE)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/opreport $(IDIR_OPROFILE)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/oprofiled $(IDIR_OPROFILE)/usr/bin/
+	$(INSTALL_DIR) $(IDIR_OPROFILE)/usr/{bin,lib/oprofile,share}
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ocount \
+			$(WRKINST)/usr/bin/opannotate \
+			$(WRKINST)/usr/bin/oparchive \
+			$(WRKINST)/usr/bin/op-check-perfevents \
+			$(WRKINST)/usr/bin/operf \
+			$(WRKINST)/usr/bin/opgprof \
+			$(WRKINST)/usr/bin/ophelp \
+			$(WRKINST)/usr/bin/opimport \
+			$(WRKINST)/usr/bin/opjitconv \
+			$(WRKINST)/usr/bin/opreport \
+			$(IDIR_OPROFILE)/usr/bin/
 	${CP} ${WRKINST}/usr/share/oprofile ${IDIR_OPROFILE}/usr/share/
+	${CP} ${WRKINST}/usr/lib/oprofile/libopagent.so* \
+		${IDIR_OPROFILE}/usr/lib/oprofile
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/oprofile/patches/patch-libop_op_cpu_type_c

@@ -1,42 +0,0 @@
---- oprofile-0.9.9.orig/libop/op_cpu_type.c	2013-07-29 17:55:07.000000000 +0200
-+++ oprofile-0.9.9/libop/op_cpu_type.c	2013-11-05 20:55:54.000000000 +0100
-@@ -23,9 +23,17 @@
- #include <elf.h>
- #include <link.h>
- 
-+#include "config.h"
- #include "op_cpu_type.h"
- #include "op_hw_specific.h"
- 
-+ 
-+/* A macro to be used for ppc64 architecture-specific code.  The '__powerpc__' macro
-+ * is defined for both ppc64 and ppc32 architectures, so we must further qualify by
-+ * including the 'HAVE_LIBPFM' macro, since that macro will be defined only for ppc64.
-+ */
-+#define PPC64_ARCH (HAVE_LIBPFM) && ((defined(__powerpc__) || defined(__powerpc64__)))
-+
- struct cpu_descr {
- 	char const * pretty;
- 	char const * name;
-@@ -176,6 +184,7 @@ static char * _get_cpuinfo_cpu_type(char
- 	return _get_cpuinfo_cpu_type_line(buf, len, prefix, 1);
- }
- 
-+#if PPC64_ARCH
- // The aux vector stuff below is currently only used by ppc64 arch
- static ElfW(auxv_t) * auxv_buf = NULL;
- 
-@@ -313,6 +322,13 @@ static op_cpu _get_ppc64_cpu_type(void)
- 	return cpu_type;
- }
- 
-+#else
-+static op_cpu _get_ppc64_cpu_type(void)
-+{
-+	return CPU_NO_GOOD;
-+}
-+#endif
-+
- static op_cpu _get_arm_cpu_type(void)
- {
- 	unsigned long cpuid, vendorid;

package/pam/Makefile

@@ -15,6 +15,8 @@ PKG_SITES:=		http://www.linux-pam.org/library/
 PKG_OPTS:=		dev
 PKG_BB:=		1
 
+PKG_CFLINE_PAM:=	depends on !ADK_TARGET_USE_STATIC_LIBS
+
 DISTFILES:=		Linux-PAM-$(PKG_VERSION).tar.gz
 WRKDIST=                ${WRKDIR}/Linux-PAM-${PKG_VERSION}
 

package/pdnsd/Makefile

@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		pdnsd
-PKG_VERSION:=		1.2.7
-PKG_RELEASE:=		3
-PKG_HASH:=		2777d7317509df7c75c90bcfd7f9ceaec9ea2db164bf00eb797fa54e0b476a00
+PKG_VERSION:=		1.2.9a
+PKG_RELEASE:=		1
+PKG_HASH:=		bb5835d0caa8c4b31679d6fd6a1a090b71bdf70950db3b1d0cea9cf9cb7e2a7b
 PKG_DESCR:=		proxy dns server
 PKG_SECTION:=		net/dns
 PKG_DEPENDS:=		libpthread
-PKG_URL:=		http://www.phys.uu.nl/~rombouts/pdnsd.html
-PKG_SITES:=		http://www.phys.uu.nl/~rombouts/pdnsd/releases/
+PKG_URL:=		http://members.home.nl/p.a.rombouts/pdnsd/index.html
+PKG_SITES:=		http://members.home.nl/p.a.rombouts/pdnsd/releases/
 
 PKG_FLAVOURS_PDNSD:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable IPv6 support

package/pdnsd/patches/patch-src_Makefile_in

@@ -1,11 +0,0 @@
---- pdnsd-1.2.7.orig/src/Makefile.in	2008-09-04 18:20:37.000000000 +0200
-+++ pdnsd-1.2.7/src/Makefile.in	2010-05-29 17:45:45.937500000 +0200
-@@ -171,7 +171,7 @@ pdnsd_SOURCES = conf-parser.c conff.c co
- 	rr_types.h servers.h status.h thread.h cache.h hash.h pdnsd_assert.h \
- 	freebsd_netinet_ip_icmp.h
- 
--SUBDIRS = pdnsd-ctl rc test
-+SUBDIRS = pdnsd-ctl rc
- all: all-recursive
- 
- .SUFFIXES:

package/pdnsd/patches/patch-src_dns_query_c

@@ -1,12 +0,0 @@
-use the temporary port, not always the global one over and over again
---- pdnsd-1.2.7.orig/src/dns_query.c	2008-09-01 15:56:51.000000000 +0200
-+++ pdnsd-1.2.7/src/dns_query.c	2010-03-19 21:44:38.837858828 +0100
-@@ -650,7 +650,7 @@ static int bind_socket(int s)
- 				ELSE_IPV6 {
- 					memset(&sin.sin6,0,sizeof(struct sockaddr_in6));
- 					sin.sin6.sin6_family=AF_INET6;
--					sin.sin6.sin6_port=htons(global.port);
-+					sin.sin6.sin6_port=htons(prt);
- 					sin.sin6.sin6_flowinfo=IPV6_FLOWINFO;
- 					SET_SOCKA_LEN6(sin.sin6);
- 					sinl=sizeof(struct sockaddr_in6);

package/perf/Makefile

@@ -0,0 +1,43 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/mk/kernel-ver.mk
+
+PKG_NAME:=		perf
+PKG_VERSION:=		$(KERNEL_VERSION)
+PKG_RELEASE:=		1
+PKG_DESCR:=		userland tools for linux performance counters
+PKG_SECTION:=		app/debug
+PKG_DEPENDS:=		elfutils newt
+PKG_BUILDDEP:=		elfutils newt
+PKG_URL:=		https://perf.wiki.kernel.org/index.php/Main_Page
+
+# elfutils require argp()
+PKG_LIBC_DEPENDS:=	glibc
+
+NO_DISTFILES:=		1
+
+include $(ADK_TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/kernel-vars.mk
+
+$(eval $(call PKG_template,PERF,perf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-build:
+	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+		$(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" all
+
+do-install:
+	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+		$(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" \
+		prefix="$(WRKINST)" install
+
+perf-install:
+	$(INSTALL_DIR) $(IDIR_PERF)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/bin/perf $(IDIR_PERF)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk