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

package/libnids/Makefile

@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libnids
 PKG_VERSION:=		1.24
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		72d37c79c85615ffe158aa524d649610
 PKG_DESCR:=		Network Intrusion Detection System library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libnet libpcap glib
-PKG_BUILDDEP:=		libnet libpcap glib
+PKG_BUILDDEP:=		autotool libnet libpcap glib
 PKG_URL:=		http://libnids.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnids/}
 PKG_OPTS:=		dev
@@ -21,10 +21,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 TARGET_LDFLAGS+=	-lpthread
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--with-libpcap=${STAGING_TARGET_DIR}/usr
+AUTOTOOL_STYLE:=	autoreconf
 XAKE_FLAGS+=		install_prefix="${WRKINST}"
 
 libnids-install:

package/libnids/patches/patch-configure

@@ -1,17 +0,0 @@
---- libnids-1.24.orig/configure	2006-05-01 19:14:51.000000000 +0200
-+++ libnids-1.24/configure	2011-05-16 16:03:49.766610900 +0200
-@@ -3919,11 +3919,11 @@ echo "${ECHO_T}no" >&6
-   *)
-      echo "$as_me:$LINENO: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
-+     if test -f $withval/include/pcap.h; then
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
--	PCAP_CFLAGS="-I$withval -I$withval/bpf"
--	PCAPLIB="-L$withval -lpcap"
-+	PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf"
-+	PCAPLIB="-L$withval/lib -lpcap"
-      else
-         { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5
- echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;}

package/libnids/patches/patch-configure_in

@@ -0,0 +1,20 @@
+--- libnids-1.24.orig/configure.in	2006-05-01 19:14:51.000000000 +0200
++++ libnids-1.24/configure.in	2014-01-06 16:25:57.765584034 +0100
+@@ -65,13 +65,13 @@ AC_ARG_WITH(libpcap,
+      ;;
+   *)
+      AC_MSG_RESULT($withval)
+-     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
++     if test -f $withval/include/pcap.h; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+-	PCAP_CFLAGS="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
++	PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf"
++	PCAPLIB="-L$withval/lib -lpcap"
+      else
+-        AC_ERROR(pcap.h or libpcap.a not found in $withval)
++        AC_ERROR(pcap.h not found in $withval)
+      fi
+      ;;
+   esac ],

package/mtr/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mtr
 PKG_VERSION:=		0.75
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		23baca52d0922c2ecba7eba05317868c
 PKG_DESCR:=		ncurses traceroute/ping tool
 PKG_SECTION:=		net
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ENV+=		ac_cv_lib_resolv_res_mkquery=yes
 CONFIGURE_ARGS+=	--without-gtk
 

scripts/adkprepare.sh

@@ -6,23 +6,14 @@ os=$(uname)
 ver=$(uname -r)
 arch=$(uname -m)
 
-ext=0
-while getopts "el" option
-do
-	case $option in
-		e) ext=1 ;;
-		l) lux=1 ;;
-		*) printf "Option not recognized\n";exit 1 ;;
-	esac
-done
-shift $(($OPTIND - 1))
-
 linux() {
-	echo "Preparing Linux for OpenADK"
+	echo "Preparing Linux for OpenADK is not implemented, yet"
+	exit 1
 }
 
 darwin() {
-	echo "Preparing MacOS X for OpenADK"
+	echo "Preparing MacOS X for OpenADK, is not implemented, yet"
+	exit 1
 }
 
 openbsd() {
@@ -30,6 +21,7 @@ openbsd() {
 	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
 	export PKG_PATH
 	pkg_add -v gmake
+	pkg_add -v rsync--
 	pkg_add -v git
 	pkg_add -v bash
 	pkg_add -v unzip
@@ -38,21 +30,8 @@ openbsd() {
 	pkg_add -v gawk
 	pkg_add -v gsed
 	pkg_add -v xz
-}
-
-openbsd_full() {
-	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
-	export PKG_PATH
-	pkg_add -v zip
+	pkg_add -v lzop
 	pkg_add -v intltool
-	pkg_add -v libIDL
-	pkg_add -v m4
-	pkg_add -v gperf
-}
-
-openbsd_lux() {
-	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
-	export PKG_PATH
 	pkg_add -v screen--
 	pkg_add -v vim--no_x11
 }
@@ -66,29 +45,11 @@ netbsd() {
 	pkg_add -vu gmake
 	pkg_add -vu bash
 	pkg_add -vu wget
-	pkg_add -vu pkg-config
 	pkg_add -vu unzip
 	pkg_add -vu gtar
 	pkg_add -vu gsed
 	pkg_add -vu gawk
-	pkg_add -vu gperf
-}
-
-netbsd_full() {
-	echo "Preparing NetBSD for full OpenADK package builds"
-	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/${ver}/All/"
-	export PKG_PATH
 	pkg_add -vu intltool
-	pkg_add -vu lynx
-	pkg_add -vu zip
-	pkg_add -vu libIDL
-	pkg_add -vu xkbcomp
-}
-
-netbsd_lux() {
-	echo "Preparing NetBSD for deluxe OpenADK package builds"
-	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/${ver}/All/"
-	export PKG_PATH
 	pkg_add -vu vim
 	pkg_add -vu screen
 	pkg_add -vu mksh
@@ -96,42 +57,24 @@ netbsd_lux() {
 
 freebsd() {
 	echo "Preparing FreeBSD for OpenADK"
-	pkg_add -r git gmake bash wget unzip gtar gsed gawk gperf
-}
-
-freebsd_full() {
-	echo "Preparing FreeBSD for full OpenADK package builds"
-	pkg_add -r intltool lynx zip xkbcomp glib20 libIDL libxslt swig
-}
-
-freebsd_lux() {
-	echo "Preparing FreeBSD for deluxe OpenADK package builds"
-	pkg_add -r screen mksh vim
+	pkg_add -r git gmake bash wget unzip gtar gsed gawk intltool screen mksh vim
 }
 
 case $os in 
 	Linux)
 		linux
-		[ $ext -eq 1 ] && linux_full
 		;;
 	FreeBSD)
 		freebsd
-		[ $ext -eq 1 ] && freebsd_full
-		[ $lux -eq 1 ] && freebsd_lux
 		;;
 	OpenBSD)
 		openbsd
-		[ $ext -eq 1 ] && openbsd_full
-		[ $lux -eq 1 ] && openbsd_lux
 		;;
 	NetBSD)
 		netbsd
-		[ $ext -eq 1 ] && netbsd_full
-		[ $lux -eq 1 ] && netbsd_lux
 		;;
 	Darwin)
 		darwin
-		[ $ext -eq 1 ] && darwin_full
 		;;
 	*)
 		echo "OS not supported"