summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/src/etc/services0
-rw-r--r--package/icinga/Makefile6
-rw-r--r--package/icinga/files/icinga.init2
-rw-r--r--package/icinga/src/etc/icinga/objects/commands.cfg16
-rw-r--r--package/nagios-plugins/Makefile9
-rw-r--r--package/nagios-plugins/patches/patch-perlmods_Makefile451
-rw-r--r--package/nagios-plugins/patches/patch-perlmods_Makefile.orig451
-rw-r--r--package/nagios-plugins/patches/patch-pkg_solaris_pkginfo16
-rw-r--r--package/nagios-plugins/patches/patch-pkg_solaris_pkginfo.orig16
-rw-r--r--package/nagios-plugins/patches/patch-plugins_Makefile_in8
-rw-r--r--package/openvpn/Makefile2
-rw-r--r--package/php/Makefile2
-rw-r--r--package/postfix/Makefile32
-rw-r--r--package/postfix/files/main.cf13
-rw-r--r--package/postfix/files/postfix.init35
-rw-r--r--package/postfix/files/postfix.postinst9
-rw-r--r--package/postfix/patches/patch-makedefs23
-rw-r--r--package/postfix/patches/patch-src_util_dict_open_c24
-rw-r--r--package/util-linux/Makefile96
-rw-r--r--package/util-linux/patches/patch-libmount_src_tab_parse_c11
21 files changed, 265 insertions, 959 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b00b81918..cb2b2430b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 49
+PKG_RELEASE:= 50
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
diff --git a/package/base-files/src/etc/services b/package/base-files/src/etc/services
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/src/etc/services
diff --git a/package/icinga/Makefile b/package/icinga/Makefile
index 96d439e45..0486c495c 100644
--- a/package/icinga/Makefile
+++ b/package/icinga/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 7b32e589235dd74ea020f12cbc90ec31
PKG_DESCR:= network monitoring
PKG_SECTION:= net
-PKG_DEPENDS:= mini-sendmail
+PKG_DEPENDS:= libpthread
PKG_URL:= http://www.icinga.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=icinga/1.6.1/}
@@ -20,8 +20,8 @@ $(eval $(call PKG_template,ICINGA,icinga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
CONFIGURE_ARGS+= --sysconfdir=/etc/icinga
icinga-install:
- $(INSTALL_DIR) $(IDIR_ICINGA)/etc
- $(CP) ./src/etc/icinga $(IDIR_ICINGA)/etc
+ $(INSTALL_DIR) $(IDIR_ICINGA)/etc/icinga/modules
+ $(CP) ./src/etc/icinga/* $(IDIR_ICINGA)/etc/icinga
$(INSTALL_DIR) $(IDIR_ICINGA)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/icinga \
$(IDIR_ICINGA)/usr/bin
diff --git a/package/icinga/files/icinga.init b/package/icinga/files/icinga.init
index 239175ff2..e66944522 100644
--- a/package/icinga/files/icinga.init
+++ b/package/icinga/files/icinga.init
@@ -21,7 +21,7 @@ start)
icinga -d /etc/icinga/icinga.cfg
;;
stop)
- kill $(pgrep -f /usr/bin/icinga)
+ kill $(pgrep -f icinga)
;;
restart)
sh $0 stop
diff --git a/package/icinga/src/etc/icinga/objects/commands.cfg b/package/icinga/src/etc/icinga/objects/commands.cfg
index 7e57f3b7c..5f29d7115 100644
--- a/package/icinga/src/etc/icinga/objects/commands.cfg
+++ b/package/icinga/src/etc/icinga/objects/commands.cfg
@@ -72,10 +72,10 @@ define command{
################################################################################
# 'check_local_disk' command definition
-define command{
- command_name check_local_disk
- command_line $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
- }
+#define command{
+# command_name check_local_disk
+# command_line $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+# }
# 'check_local_load' command definition
@@ -86,10 +86,10 @@ define command{
# 'check_local_procs' command definition
-define command{
- command_name check_local_procs
- command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
- }
+#define command{
+# command_name check_local_procs
+# command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+# }
# 'check_local_users' command definition
diff --git a/package/nagios-plugins/Makefile b/package/nagios-plugins/Makefile
index 9ef1f2689..eb95f694a 100644
--- a/package/nagios-plugins/Makefile
+++ b/package/nagios-plugins/Makefile
@@ -11,14 +11,17 @@ PKG_DESCR:= Nagios plugins
PKG_SECTION:= net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nagiosplug/}
+PKG_HOST_DEPENDS:= !darwin
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,NAGIOS_PLUGINS,nagios-plugins,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ENV+= ac_cv_lib_nsl_main=no
+
nagios-plugins-install:
- $(INSTALL_DIR) $(IDIR_NAGIOS_PLUGINS)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/nagios-plugins \
- $(IDIR_NAGIOS_PLUGINS)/usr/bin
+ $(INSTALL_DIR) $(IDIR_NAGIOS_PLUGINS)/usr/libexec
+ $(CP) $(WRKINST)/usr/libexec/* \
+ $(IDIR_NAGIOS_PLUGINS)/usr/libexec
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nagios-plugins/patches/patch-perlmods_Makefile b/package/nagios-plugins/patches/patch-perlmods_Makefile
deleted file mode 100644
index ad11babd5..000000000
--- a/package/nagios-plugins/patches/patch-perlmods_Makefile
+++ /dev/null
@@ -1,451 +0,0 @@
---- nagios-plugins-1.4.15.orig/perlmods/Makefile 2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/perlmods/Makefile 2011-12-03 12:13:10.000000000 +0100
-@@ -29,8 +29,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i386-apple-darwin9.8.0
--host_triplet = i386-apple-darwin9.8.0
-+build_triplet = i686-apple-darwin10
-+host_triplet = i586-openadk-linux-gnu
- subdir = perlmods
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -132,36 +132,36 @@ CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run aclocal-1.10
-+ACLOCAL = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run aclocal-1.10
- ALLOCA =
- ALLOCA_H = alloca.h
--AMTAR = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run tar
-+AMTAR = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run tar
- APPLE_UNIVERSAL_BUILD = 0
--AR = ar
--ASM_SYMBOL_PREFIX = "_"
--AUTOCONF = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoconf
--AUTOHEADER = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoheader
--AUTOMAKE = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run automake-1.10
--AWK = awk
-+AR = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ar
-+ASM_SYMBOL_PREFIX = ""
-+AUTOCONF = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoconf
-+AUTOHEADER = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoheader
-+AUTOMAKE = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run automake-1.10
-+AWK = gawk
- BASENAME = /usr/bin/basename
--BITSIZEOF_PTRDIFF_T = 32
--BITSIZEOF_SIG_ATOMIC_T = 32
--BITSIZEOF_SIZE_T = 32
--BITSIZEOF_WCHAR_T = 32
--BITSIZEOF_WINT_T = 32
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS =
-+BITSIZEOF_PTRDIFF_T =
-+BITSIZEOF_SIG_ATOMIC_T =
-+BITSIZEOF_SIZE_T =
-+BITSIZEOF_WCHAR_T =
-+BITSIZEOF_WINT_T =
-+CC = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe
-+CPP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc -E
-+CPPFLAGS = -DNDEBUG
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
- DEPLIBS =
--DSYMUTIL = dsymutil
-+DSYMUTIL =
- DUMPBIN =
--ECHO_C = \c
--ECHO_N =
-+ECHO_C =
-+ECHO_N = -n
- ECHO_T =
- EGREP = /usr/bin/grep -E
- EMULTIHOP_HIDDEN =
-@@ -172,19 +172,19 @@ EOVERFLOW_HIDDEN =
- EOVERFLOW_VALUE =
- ERRNO_H =
- EXEEXT =
--EXTRAS = check_ldap check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
-+EXTRAS = check_ide_smart check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
- EXTRAS_ROOT =
- EXTRA_NETOBJS =
- EXTRA_TEST =
- FGREP = /usr/bin/grep -F
- FLOAT_H =
--FLOORF_LIBM =
-+FLOORF_LIBM = -lm
- GETADDRINFO_LIB =
- GETHOSTNAME_LIB =
--GETLOADAVG_LIBS =
-+GETLOADAVG_LIBS = -lelf
- GETOPT_H = getopt.h
- GETTEXT_MACRO_VERSION = 0.18
--GLIBC21 = no
-+GLIBC21 = yes
- GMSGFMT = /opt/local/bin/msgfmt
- GMSGFMT_015 = /opt/local/bin/msgfmt
- GNULIB_ACCEPT = 0
-@@ -425,7 +425,7 @@ HAVE_DECL_ATANL = 1
- HAVE_DECL_CEILF = 1
- HAVE_DECL_CEILL = 1
- HAVE_DECL_COSL = 1
--HAVE_DECL_ENVIRON = 0
-+HAVE_DECL_ENVIRON = 1
- HAVE_DECL_EXPL = 1
- HAVE_DECL_FLOORF = 1
- HAVE_DECL_FLOORL = 1
-@@ -436,7 +436,7 @@ HAVE_DECL_GAI_STRERROR = 1
- HAVE_DECL_GETADDRINFO = 1
- HAVE_DECL_GETDELIM = 1
- HAVE_DECL_GETLINE = 1
--HAVE_DECL_GETLOADAVG = 1
-+HAVE_DECL_GETLOADAVG = 0
- HAVE_DECL_GETLOGIN_R = 1
- HAVE_DECL_GETNAMEINFO = 1
- HAVE_DECL_GETPAGESIZE = 1
-@@ -456,8 +456,8 @@ HAVE_DECL_SINL = 1
- HAVE_DECL_SNPRINTF = 1
- HAVE_DECL_SQRTL = 1
- HAVE_DECL_STRDUP = 1
--HAVE_DECL_STRNDUP = 0
--HAVE_DECL_STRNLEN = 0
-+HAVE_DECL_STRNDUP = 1
-+HAVE_DECL_STRNLEN = 1
- HAVE_DECL_STRSIGNAL = 1
- HAVE_DECL_STRTOK_R = 1
- HAVE_DECL_TANL = 1
-@@ -550,9 +550,9 @@ HAVE_RENAMEAT = 1
- HAVE_RPMATCH = 1
- HAVE_SA_FAMILY_T = 1
- HAVE_SETENV = 1
--HAVE_SIGNED_SIG_ATOMIC_T = 1
--HAVE_SIGNED_WCHAR_T = 1
--HAVE_SIGNED_WINT_T = 1
-+HAVE_SIGNED_SIG_ATOMIC_T =
-+HAVE_SIGNED_WCHAR_T =
-+HAVE_SIGNED_WINT_T =
- HAVE_SINL = 1
- HAVE_SLEEP = 1
- HAVE_SQRTL = 1
-@@ -568,13 +568,13 @@ HAVE_STRTOD = 1
- HAVE_STRTOLL = 1
- HAVE_STRTOULL = 1
- HAVE_STRUCT_ADDRINFO = 1
--HAVE_STRUCT_RANDOM_DATA = 0
-+HAVE_STRUCT_RANDOM_DATA = 1
- HAVE_STRUCT_SOCKADDR_STORAGE = 1
- HAVE_STRVERSCMP = 1
- HAVE_SYMLINK = 1
- HAVE_SYMLINKAT = 1
--HAVE_SYS_BITYPES_H = 0
--HAVE_SYS_INTTYPES_H = 0
-+HAVE_SYS_BITYPES_H =
-+HAVE_SYS_INTTYPES_H =
- HAVE_SYS_LOADAVG_H = 0
- HAVE_SYS_PARAM_H = 0
- HAVE_SYS_SOCKET_H = 1
-@@ -600,54 +600,54 @@ HAVE_WCTYPE_H = 1
- HAVE_WINSOCK2_H = 0
- HAVE_WINT_T = 1
- HAVE_WS2TCPIP_H = 0
--HAVE_XLOCALE_H = 1
-+HAVE_XLOCALE_H = 0
- HAVE__BOOL = 1
- HOSTENT_LIB =
- HOSTNAME = /bin/hostname
- INCLUDE_NEXT = include_next
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE = include_next
- INET_NTOP_LIB =
--INSTALL = /usr/bin/install -c
-+INSTALL = /Volumes/adk/openadk/scripts/install -c
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
- INTLLIBS =
--INTL_MACOSX_LIBS = -Wl,-framework -Wl,CoreFoundation
-+INTL_MACOSX_LIBS =
- KMEM_GROUP =
- KRBINCLUDE =
--LD = /usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld
--LDAPINCLUDE = -I/usr/include/ldap
--LDAPLIBS = -lldap -llber
--LDFLAGS = -L.
-+LD = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ld
-+LDAPINCLUDE =
-+LDAPLIBS =
-+LDFLAGS = -L/Volumes/adk/openadk/target_i586_uclibc/lib -L/Volumes/adk/openadk/target_i586_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i586_uclibc/usr/lib -L.
- LIBGNUTLS_CONFIG =
- LIBGNU_LIBDEPS =
- LIBGNU_LTLIBDEPS =
- LIBICONV = -liconv
- LIBINTL =
--LIBOBJS = ${LIBOBJDIR}error$U.o
-+LIBOBJS = ${LIBOBJDIR}strtod$U.o
- LIBS = -lpthread -ldl
- LIBSOCKET =
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
--LIPO = lipo
-+LIPO =
- LN_S = ln -s
- LOCALCHARSET_TESTS_ENVIRONMENT = CHARSETALIASDIR="$(top_builddir)/gl"
--LOCALE_FR = fr_FR.ISO8859-1
--LOCALE_FR_UTF8 = fr_FR.UTF-8
-+LOCALE_FR = none
-+LOCALE_FR_UTF8 = none
- LOCALE_JA = ja_JP.eucJP
--LOCALE_ZH_CN = zh_CN.GB18030
-+LOCALE_ZH_CN = none
- LTLIBICONV = -liconv
- LTLIBINTL =
--LTLIBOBJS = ${LIBOBJDIR}error$U.lo
--MAKEINFO = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run makeinfo
-+LTLIBOBJS = ${LIBOBJDIR}strtod$U.lo
-+MAKEINFO = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run makeinfo
- MATHLIBS = -lm
--MKDIR_P = ../build-aux/install-sh -c -d
-+MKDIR_P = /opt/local/bin/gmkdir -p
- MSGFMT = /opt/local/bin/msgfmt
- MSGFMT_015 = /opt/local/bin/msgfmt
- MSGMERGE = /opt/local/bin/msgmerge
--MYSQLCFLAGS = -I/usr/local/mysql/include -Os -arch i386 -fno-common -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -DDONT_DECLARE_CXA_PURE_VIRTUAL
--MYSQLINCLUDE = -I/usr/local/mysql/include
--MYSQLLIBS = -L/usr/local/mysql/lib -lmysqlclient -lz -lm
-+MYSQLCFLAGS =
-+MYSQLINCLUDE =
-+MYSQLLIBS =
- NEED_SETGID = false
- NETINET_IN_H =
- NEXT_ARPA_INET_H = <arpa/inet.h>
-@@ -692,13 +692,13 @@ NEXT_TIME_H = <time.h>
- NEXT_UNISTD_H = <unistd.h>
- NEXT_WCHAR_H = <wchar.h>
- NEXT_WCTYPE_H = <wctype.h>
--NM = /usr/bin/nm -p
--NMEDIT = nmedit
-+NM = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-nm
-+NMEDIT =
- NP_RELEASE = 1.4.15
--OBJDUMP = false
-+OBJDUMP = i586-openadk-linux-objdump
- OBJEXT = o
--OTOOL = otool
--OTOOL64 = :
-+OTOOL =
-+OTOOL64 =
- PACKAGE = nagios-plugins
- PACKAGE_BUGREPORT =
- PACKAGE_NAME = nagios-plugins
-@@ -728,21 +728,21 @@ PATH_TO_SWAP =
- PATH_TO_SWAPINFO =
- PATH_TO_UPTIME = /usr/bin/uptime
- PATH_TO_WHO = /usr/bin/who
--PERL = /usr/bin/perl
-+PERL = /opt/local/bin/perl
- PERLMODS_DIR =
- PGINCLUDE =
- PGLIBS =
- PKG_ARCH = i386
- PLUGIN_TEST = t/check_by_ssh.t t/check_cluster.t t/check_dig.t t/check_disk.t t/check_dns.t t/check_dummy.t t/check_fping.t t/check_ftp.t t/check_hpjd.t t/check_http.t t/check_imap.t t/check_jabber.t t/check_load.t t/check_mysql.t t/check_mysql_query.t t/check_nagios.t t/check_ntp.t t/check_ping.t t/check_pop.t t/check_procs.t t/check_smtp.t t/check_snmp.t t/check_swap.t t/check_tcp.t t/check_time.t t/check_udp.t t/check_users.t t/negate.t
- POSUB =
--POW_LIB =
-+POW_LIB = -lm
- PRAGMA_SYSTEM_HEADER = #pragma GCC system_header
- PST3CFLAGS =
- PTHREAD_H_DEFINES_STRUCT_TIMESPEC = 0
- PTRDIFF_T_SUFFIX =
- PYTHON = /usr/bin/python
- RADIUSLIBS =
--RANLIB = ranlib
-+RANLIB = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ranlib
- RELEASE = 1
- REPLACE_BTOWC = 0
- REPLACE_CANONICALIZE_FILE_NAME = 0
-@@ -752,7 +752,7 @@ REPLACE_CHOWN = 0
- REPLACE_CLOSE = 0
- REPLACE_DPRINTF = 0
- REPLACE_DUP = 0
--REPLACE_DUP2 = 0
-+REPLACE_DUP2 = 1
- REPLACE_DUPLOCALE = 0
- REPLACE_FCHOWNAT = 0
- REPLACE_FCLOSE = 0
-@@ -796,19 +796,19 @@ REPLACE_MBSINIT = 0
- REPLACE_MBSNRTOWCS = 0
- REPLACE_MBSRTOWCS = 0
- REPLACE_MBSTATE_T = 0
--REPLACE_MEMCHR = 0
-+REPLACE_MEMCHR = 1
- REPLACE_MEMMEM = 0
- REPLACE_MKDIR = 0
- REPLACE_MKFIFO = 0
- REPLACE_MKNOD = 0
- REPLACE_MKSTEMP = 0
--REPLACE_MKTIME = 0
-+REPLACE_MKTIME = 1
- REPLACE_NAN = 0
- REPLACE_NANOSLEEP = GNULIB_PORTCHECK
- REPLACE_NL_LANGINFO = 0
- REPLACE_NULL = 0
- REPLACE_OBSTACK_PRINTF = 0
--REPLACE_OPEN = 1
-+REPLACE_OPEN = 0
- REPLACE_OPENAT = 0
- REPLACE_PERROR = 0
- REPLACE_POPEN = 0
-@@ -839,19 +839,19 @@ REPLACE_STRDUP = 0
- REPLACE_STRERROR = 0
- REPLACE_STRNCAT = 0
- REPLACE_STRNDUP = 0
--REPLACE_STRNLEN = 0
-+REPLACE_STRNLEN = 1
- REPLACE_STRSIGNAL = 0
--REPLACE_STRSTR = 0
-+REPLACE_STRSTR = 1
- REPLACE_STRTOD = 0
- REPLACE_STRTOK_R = 0
- REPLACE_SYMLINK = 0
--REPLACE_TIMEGM = 0
-+REPLACE_TIMEGM = 1
- REPLACE_TMPFILE = 0
- REPLACE_TRUNCL = 0
- REPLACE_TTYNAME_R = 0
- REPLACE_UNLINK = 0
- REPLACE_UNLINKAT = 0
--REPLACE_UNSETENV = 0
-+REPLACE_UNSETENV = 1
- REPLACE_USLEEP = 0
- REPLACE_UTIMENSAT = 0
- REPLACE_VASPRINTF = 0
-@@ -866,23 +866,23 @@ REPLACE_WCSRTOMBS = 0
- REPLACE_WCTOB = 0
- REPLACE_WCWIDTH = 0
- REPLACE_WRITE = 0
--REV_DATESTAMP = 2010.07.27.21.48
--REV_TIMESTAMP = 20100727214823
-+REV_DATESTAMP = 2011.12.03.12.12
-+REV_TIMESTAMP = 20111203121222
- SCRIPT_TEST = t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
--SED = /usr/bin/sed
-+SED = /Volumes/adk/openadk/scripts/sed
- SERVENT_LIB =
- SET_MAKE =
- SH = /bin/sh
--SHELL = /bin/sh
-+SHELL = /bin/bash
- SIG_ATOMIC_T_SUFFIX =
--SIZE_T_SUFFIX = ul
--SOCKETLIBS = -lresolv
-+SIZE_T_SUFFIX =
-+SOCKETLIBS = -lnsl -lresolv
- SSLINCLUDE = -I/usr/include
- SSLLIBS = -lssl -lcrypto
- STDBOOL_H =
- STDDEF_H =
--STDINT_H = stdint.h
--STRIP = strip
-+STDINT_H =
-+STRIP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-strip
- SUPPORT = Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n
- SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = 0
- TIME_H_DEFINES_STRUCT_TIMESPEC = 1
-@@ -897,62 +897,62 @@ WINT_T_SUFFIX =
- XGETTEXT = /opt/local/bin/xgettext
- XGETTEXT_015 = /opt/local/bin/xgettext
- XGETTEXT_EXTRA_OPTIONS = --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format
--abs_builddir = /tmp/nagiosplugins/perlmods
--abs_srcdir = /tmp/nagiosplugins/perlmods
--abs_top_builddir = /tmp/nagiosplugins
--abs_top_srcdir = /tmp/nagiosplugins
--ac_ct_CC = gcc
-+abs_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_top_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+abs_top_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+ac_ct_CC =
- ac_ct_DUMPBIN =
- am__include = include
- am__leading_dot = .
- am__quote =
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
--bindir = ${exec_prefix}/bin
--build = i386-apple-darwin9.8.0
--build_alias =
--build_cpu = i386
--build_os = darwin9.8.0
-+bindir = /usr/bin
-+build = i686-apple-darwin10
-+build_alias = i686-apple-darwin10
-+build_cpu = i686
-+build_os = darwin10
- build_vendor = apple
- builddir = .
- check_tcp_ssl = check_simap check_spop check_jabber check_nntps check_ssmtp
--datadir = ${datarootdir}
-+datadir = /usr/share
- datarootdir = ${prefix}/share
- docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
- dvidir = ${docdir}
- exec_prefix = ${prefix}
--gl_LIBOBJS = asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o error.o fcntl.o fd-safer.o fsusage.o getopt.o getopt1.o mountlist.o open.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strndup.o strnlen.o vasnprintf.o xmalloc.o
--gl_LTLIBOBJS = asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo error.lo fcntl.lo fd-safer.lo fsusage.lo getopt.lo getopt1.lo mountlist.lo open.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strndup.lo strnlen.lo vasnprintf.lo xmalloc.lo
-+gl_LIBOBJS = asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o dup2.o fcntl.o fd-safer.o getloadavg.o getopt.o getopt1.o memchr.o mktime.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strnlen.o strstr.o timegm.o unsetenv.o vasnprintf.o xmalloc.o
-+gl_LTLIBOBJS = asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo dup2.lo fcntl.lo fd-safer.lo getloadavg.lo getopt.lo getopt1.lo memchr.lo mktime.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strnlen.lo strstr.lo timegm.lo unsetenv.lo vasnprintf.lo xmalloc.lo
- gltests_LIBOBJS =
- gltests_LTLIBOBJS =
- gltests_WITNESS = IN_NAGIOS_PLUGINS_GNULIB_TESTS
--host = i386-apple-darwin9.8.0
--host_alias =
--host_cpu = i386
--host_os = darwin9.8.0
--host_vendor = apple
-+host = i586-openadk-linux-gnu
-+host_alias = i586-openadk-linux
-+host_cpu = i586
-+host_os = linux-gnu
-+host_vendor = openadk
- htmldir = ${docdir}
- includedir = ${prefix}/include
- infodir = ${datarootdir}/info
--install_sh = $(SHELL) /tmp/nagiosplugins/build-aux/install-sh
-+install_sh = $(SHELL) /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
-+libexecdir = /usr/libexec
- localedir = ${datarootdir}/locale
--localstatedir = ${prefix}/var
--lt_ECHO = /bin/echo
--mandir = ${datarootdir}/man
--mkdir_p = $(top_builddir)/build-aux/install-sh -c -d
--np_mysql_config = /usr/local/mysql/bin/mysql_config
-+localstatedir = /var
-+lt_ECHO = echo
-+mandir = /usr/share/man
-+mkdir_p = /opt/local/bin/gmkdir -p
-+np_mysql_config =
- oldincludedir = /usr/include
- pdfdir = ${docdir}
--prefix = /usr/local/nagios
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s&$$&&;s&^&&
- psdir = ${docdir}
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
- srcdir = .
--sysconfdir = ${prefix}/etc
--target_alias =
-+sysconfdir = /etc
-+target_alias = i586-openadk-linux
- top_builddir = ..
- top_srcdir = ..
- with_trusted_path = /bin:/sbin:/usr/bin:/usr/sbin
diff --git a/package/nagios-plugins/patches/patch-perlmods_Makefile.orig b/package/nagios-plugins/patches/patch-perlmods_Makefile.orig
deleted file mode 100644
index 218680da8..000000000
--- a/package/nagios-plugins/patches/patch-perlmods_Makefile.orig
+++ /dev/null
@@ -1,451 +0,0 @@
---- nagios-plugins-1.4.15.orig/perlmods/Makefile 2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/perlmods/Makefile 2011-12-03 12:09:09.000000000 +0100
-@@ -29,8 +29,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i386-apple-darwin9.8.0
--host_triplet = i386-apple-darwin9.8.0
-+build_triplet = i686-apple-darwin10
-+host_triplet = i586-openadk-linux-gnu
- subdir = perlmods
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -132,36 +132,36 @@ CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run aclocal-1.10
-+ACLOCAL = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run aclocal-1.10
- ALLOCA =
- ALLOCA_H = alloca.h
--AMTAR = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run tar
-+AMTAR = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run tar
- APPLE_UNIVERSAL_BUILD = 0
--AR = ar
--ASM_SYMBOL_PREFIX = "_"
--AUTOCONF = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoconf
--AUTOHEADER = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoheader
--AUTOMAKE = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run automake-1.10
--AWK = awk
-+AR = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ar
-+ASM_SYMBOL_PREFIX = ""
-+AUTOCONF = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoconf
-+AUTOHEADER = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoheader
-+AUTOMAKE = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run automake-1.10
-+AWK = gawk
- BASENAME = /usr/bin/basename
--BITSIZEOF_PTRDIFF_T = 32
--BITSIZEOF_SIG_ATOMIC_T = 32
--BITSIZEOF_SIZE_T = 32
--BITSIZEOF_WCHAR_T = 32
--BITSIZEOF_WINT_T = 32
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS =
-+BITSIZEOF_PTRDIFF_T =
-+BITSIZEOF_SIG_ATOMIC_T =
-+BITSIZEOF_SIZE_T =
-+BITSIZEOF_WCHAR_T =
-+BITSIZEOF_WINT_T =
-+CC = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe
-+CPP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc -E
-+CPPFLAGS = -DNDEBUG
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
- DEPLIBS =
--DSYMUTIL = dsymutil
-+DSYMUTIL =
- DUMPBIN =
--ECHO_C = \c
--ECHO_N =
-+ECHO_C =
-+ECHO_N = -n
- ECHO_T =
- EGREP = /usr/bin/grep -E
- EMULTIHOP_HIDDEN =
-@@ -172,19 +172,19 @@ EOVERFLOW_HIDDEN =
- EOVERFLOW_VALUE =
- ERRNO_H =
- EXEEXT =
--EXTRAS = check_ldap check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
-+EXTRAS = check_ide_smart check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
- EXTRAS_ROOT =
- EXTRA_NETOBJS =
- EXTRA_TEST =
- FGREP = /usr/bin/grep -F
- FLOAT_H =
--FLOORF_LIBM =
-+FLOORF_LIBM = -lm
- GETADDRINFO_LIB =
- GETHOSTNAME_LIB =
--GETLOADAVG_LIBS =
-+GETLOADAVG_LIBS = -lelf
- GETOPT_H = getopt.h
- GETTEXT_MACRO_VERSION = 0.18
--GLIBC21 = no
-+GLIBC21 = yes
- GMSGFMT = /opt/local/bin/msgfmt
- GMSGFMT_015 = /opt/local/bin/msgfmt
- GNULIB_ACCEPT = 0
-@@ -425,7 +425,7 @@ HAVE_DECL_ATANL = 1
- HAVE_DECL_CEILF = 1
- HAVE_DECL_CEILL = 1
- HAVE_DECL_COSL = 1
--HAVE_DECL_ENVIRON = 0
-+HAVE_DECL_ENVIRON = 1
- HAVE_DECL_EXPL = 1
- HAVE_DECL_FLOORF = 1
- HAVE_DECL_FLOORL = 1
-@@ -436,7 +436,7 @@ HAVE_DECL_GAI_STRERROR = 1
- HAVE_DECL_GETADDRINFO = 1
- HAVE_DECL_GETDELIM = 1
- HAVE_DECL_GETLINE = 1
--HAVE_DECL_GETLOADAVG = 1
-+HAVE_DECL_GETLOADAVG = 0
- HAVE_DECL_GETLOGIN_R = 1
- HAVE_DECL_GETNAMEINFO = 1
- HAVE_DECL_GETPAGESIZE = 1
-@@ -456,8 +456,8 @@ HAVE_DECL_SINL = 1
- HAVE_DECL_SNPRINTF = 1
- HAVE_DECL_SQRTL = 1
- HAVE_DECL_STRDUP = 1
--HAVE_DECL_STRNDUP = 0
--HAVE_DECL_STRNLEN = 0
-+HAVE_DECL_STRNDUP = 1
-+HAVE_DECL_STRNLEN = 1
- HAVE_DECL_STRSIGNAL = 1
- HAVE_DECL_STRTOK_R = 1
- HAVE_DECL_TANL = 1
-@@ -550,9 +550,9 @@ HAVE_RENAMEAT = 1
- HAVE_RPMATCH = 1
- HAVE_SA_FAMILY_T = 1
- HAVE_SETENV = 1
--HAVE_SIGNED_SIG_ATOMIC_T = 1
--HAVE_SIGNED_WCHAR_T = 1
--HAVE_SIGNED_WINT_T = 1
-+HAVE_SIGNED_SIG_ATOMIC_T =
-+HAVE_SIGNED_WCHAR_T =
-+HAVE_SIGNED_WINT_T =
- HAVE_SINL = 1
- HAVE_SLEEP = 1
- HAVE_SQRTL = 1
-@@ -568,13 +568,13 @@ HAVE_STRTOD = 1
- HAVE_STRTOLL = 1
- HAVE_STRTOULL = 1
- HAVE_STRUCT_ADDRINFO = 1
--HAVE_STRUCT_RANDOM_DATA = 0
-+HAVE_STRUCT_RANDOM_DATA = 1
- HAVE_STRUCT_SOCKADDR_STORAGE = 1
- HAVE_STRVERSCMP = 1
- HAVE_SYMLINK = 1
- HAVE_SYMLINKAT = 1
--HAVE_SYS_BITYPES_H = 0
--HAVE_SYS_INTTYPES_H = 0
-+HAVE_SYS_BITYPES_H =
-+HAVE_SYS_INTTYPES_H =
- HAVE_SYS_LOADAVG_H = 0
- HAVE_SYS_PARAM_H = 0
- HAVE_SYS_SOCKET_H = 1
-@@ -600,54 +600,54 @@ HAVE_WCTYPE_H = 1
- HAVE_WINSOCK2_H = 0
- HAVE_WINT_T = 1
- HAVE_WS2TCPIP_H = 0
--HAVE_XLOCALE_H = 1
-+HAVE_XLOCALE_H = 0
- HAVE__BOOL = 1
- HOSTENT_LIB =
- HOSTNAME = /bin/hostname
- INCLUDE_NEXT = include_next
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE = include_next
- INET_NTOP_LIB =
--INSTALL = /usr/bin/install -c
-+INSTALL = /Volumes/adk/openadk/scripts/install -c
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
- INTLLIBS =
--INTL_MACOSX_LIBS = -Wl,-framework -Wl,CoreFoundation
-+INTL_MACOSX_LIBS =
- KMEM_GROUP =
- KRBINCLUDE =
--LD = /usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld
--LDAPINCLUDE = -I/usr/include/ldap
--LDAPLIBS = -lldap -llber
--LDFLAGS = -L.
-+LD = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ld
-+LDAPINCLUDE =
-+LDAPLIBS =
-+LDFLAGS = -L/Volumes/adk/openadk/target_i586_uclibc/lib -L/Volumes/adk/openadk/target_i586_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i586_uclibc/usr/lib -L.
- LIBGNUTLS_CONFIG =
- LIBGNU_LIBDEPS =
- LIBGNU_LTLIBDEPS =
- LIBICONV = -liconv
- LIBINTL =
--LIBOBJS = ${LIBOBJDIR}error$U.o
-+LIBOBJS = ${LIBOBJDIR}strtod$U.o
- LIBS = -lpthread -ldl
- LIBSOCKET =
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
--LIPO = lipo
-+LIPO =
- LN_S = ln -s
- LOCALCHARSET_TESTS_ENVIRONMENT = CHARSETALIASDIR="$(top_builddir)/gl"
--LOCALE_FR = fr_FR.ISO8859-1
--LOCALE_FR_UTF8 = fr_FR.UTF-8
-+LOCALE_FR = none
-+LOCALE_FR_UTF8 = none
- LOCALE_JA = ja_JP.eucJP
--LOCALE_ZH_CN = zh_CN.GB18030
-+LOCALE_ZH_CN = none
- LTLIBICONV = -liconv
- LTLIBINTL =
--LTLIBOBJS = ${LIBOBJDIR}error$U.lo
--MAKEINFO = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run makeinfo
-+LTLIBOBJS = ${LIBOBJDIR}strtod$U.lo
-+MAKEINFO = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run makeinfo
- MATHLIBS = -lm
--MKDIR_P = ../build-aux/install-sh -c -d
-+MKDIR_P = /opt/local/bin/gmkdir -p
- MSGFMT = /opt/local/bin/msgfmt
- MSGFMT_015 = /opt/local/bin/msgfmt
- MSGMERGE = /opt/local/bin/msgmerge
--MYSQLCFLAGS = -I/usr/local/mysql/include -Os -arch i386 -fno-common -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -DDONT_DECLARE_CXA_PURE_VIRTUAL
--MYSQLINCLUDE = -I/usr/local/mysql/include
--MYSQLLIBS = -L/usr/local/mysql/lib -lmysqlclient -lz -lm
-+MYSQLCFLAGS =
-+MYSQLINCLUDE =
-+MYSQLLIBS =
- NEED_SETGID = false
- NETINET_IN_H =
- NEXT_ARPA_INET_H = <arpa/inet.h>
-@@ -692,13 +692,13 @@ NEXT_TIME_H = <time.h>
- NEXT_UNISTD_H = <unistd.h>
- NEXT_WCHAR_H = <wchar.h>
- NEXT_WCTYPE_H = <wctype.h>
--NM = /usr/bin/nm -p
--NMEDIT = nmedit
-+NM = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-nm
-+NMEDIT =
- NP_RELEASE = 1.4.15
--OBJDUMP = false
-+OBJDUMP = i586-openadk-linux-objdump
- OBJEXT = o
--OTOOL = otool
--OTOOL64 = :
-+OTOOL =
-+OTOOL64 =
- PACKAGE = nagios-plugins
- PACKAGE_BUGREPORT =
- PACKAGE_NAME = nagios-plugins
-@@ -728,21 +728,21 @@ PATH_TO_SWAP =
- PATH_TO_SWAPINFO =
- PATH_TO_UPTIME = /usr/bin/uptime
- PATH_TO_WHO = /usr/bin/who
--PERL = /usr/bin/perl
-+PERL = /opt/local/bin/perl
- PERLMODS_DIR =
- PGINCLUDE =
- PGLIBS =
- PKG_ARCH = i386
- PLUGIN_TEST = t/check_by_ssh.t t/check_cluster.t t/check_dig.t t/check_disk.t t/check_dns.t t/check_dummy.t t/check_fping.t t/check_ftp.t t/check_hpjd.t t/check_http.t t/check_imap.t t/check_jabber.t t/check_load.t t/check_mysql.t t/check_mysql_query.t t/check_nagios.t t/check_ntp.t t/check_ping.t t/check_pop.t t/check_procs.t t/check_smtp.t t/check_snmp.t t/check_swap.t t/check_tcp.t t/check_time.t t/check_udp.t t/check_users.t t/negate.t
- POSUB =
--POW_LIB =
-+POW_LIB = -lm
- PRAGMA_SYSTEM_HEADER = #pragma GCC system_header
- PST3CFLAGS =
- PTHREAD_H_DEFINES_STRUCT_TIMESPEC = 0
- PTRDIFF_T_SUFFIX =
- PYTHON = /usr/bin/python
- RADIUSLIBS =
--RANLIB = ranlib
-+RANLIB = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ranlib
- RELEASE = 1
- REPLACE_BTOWC = 0
- REPLACE_CANONICALIZE_FILE_NAME = 0
-@@ -752,7 +752,7 @@ REPLACE_CHOWN = 0
- REPLACE_CLOSE = 0
- REPLACE_DPRINTF = 0
- REPLACE_DUP = 0
--REPLACE_DUP2 = 0
-+REPLACE_DUP2 = 1
- REPLACE_DUPLOCALE = 0
- REPLACE_FCHOWNAT = 0
- REPLACE_FCLOSE = 0
-@@ -796,19 +796,19 @@ REPLACE_MBSINIT = 0
- REPLACE_MBSNRTOWCS = 0
- REPLACE_MBSRTOWCS = 0
- REPLACE_MBSTATE_T = 0
--REPLACE_MEMCHR = 0
-+REPLACE_MEMCHR = 1
- REPLACE_MEMMEM = 0
- REPLACE_MKDIR = 0
- REPLACE_MKFIFO = 0
- REPLACE_MKNOD = 0
- REPLACE_MKSTEMP = 0
--REPLACE_MKTIME = 0
-+REPLACE_MKTIME = 1
- REPLACE_NAN = 0
- REPLACE_NANOSLEEP = GNULIB_PORTCHECK
- REPLACE_NL_LANGINFO = 0
- REPLACE_NULL = 0
- REPLACE_OBSTACK_PRINTF = 0
--REPLACE_OPEN = 1
-+REPLACE_OPEN = 0
- REPLACE_OPENAT = 0
- REPLACE_PERROR = 0
- REPLACE_POPEN = 0
-@@ -839,19 +839,19 @@ REPLACE_STRDUP = 0
- REPLACE_STRERROR = 0
- REPLACE_STRNCAT = 0
- REPLACE_STRNDUP = 0
--REPLACE_STRNLEN = 0
-+REPLACE_STRNLEN = 1
- REPLACE_STRSIGNAL = 0
--REPLACE_STRSTR = 0
-+REPLACE_STRSTR = 1
- REPLACE_STRTOD = 0
- REPLACE_STRTOK_R = 0
- REPLACE_SYMLINK = 0
--REPLACE_TIMEGM = 0
-+REPLACE_TIMEGM = 1
- REPLACE_TMPFILE = 0
- REPLACE_TRUNCL = 0
- REPLACE_TTYNAME_R = 0
- REPLACE_UNLINK = 0
- REPLACE_UNLINKAT = 0
--REPLACE_UNSETENV = 0
-+REPLACE_UNSETENV = 1
- REPLACE_USLEEP = 0
- REPLACE_UTIMENSAT = 0
- REPLACE_VASPRINTF = 0
-@@ -866,23 +866,23 @@ REPLACE_WCSRTOMBS = 0
- REPLACE_WCTOB = 0
- REPLACE_WCWIDTH = 0
- REPLACE_WRITE = 0
--REV_DATESTAMP = 2010.07.27.21.48
--REV_TIMESTAMP = 20100727214823
-+REV_DATESTAMP = 2011.12.03.12.08
-+REV_TIMESTAMP = 20111203120820
- SCRIPT_TEST = t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
--SED = /usr/bin/sed
-+SED = /Volumes/adk/openadk/scripts/sed
- SERVENT_LIB =
- SET_MAKE =
- SH = /bin/sh
--SHELL = /bin/sh
-+SHELL = /bin/bash
- SIG_ATOMIC_T_SUFFIX =
--SIZE_T_SUFFIX = ul
--SOCKETLIBS = -lresolv
-+SIZE_T_SUFFIX =
-+SOCKETLIBS = -lnsl -lresolv
- SSLINCLUDE = -I/usr/include
- SSLLIBS = -lssl -lcrypto
- STDBOOL_H =
- STDDEF_H =
--STDINT_H = stdint.h
--STRIP = strip
-+STDINT_H =
-+STRIP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-strip
- SUPPORT = Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n
- SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = 0
- TIME_H_DEFINES_STRUCT_TIMESPEC = 1
-@@ -897,62 +897,62 @@ WINT_T_SUFFIX =
- XGETTEXT = /opt/local/bin/xgettext
- XGETTEXT_015 = /opt/local/bin/xgettext
- XGETTEXT_EXTRA_OPTIONS = --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format
--abs_builddir = /tmp/nagiosplugins/perlmods
--abs_srcdir = /tmp/nagiosplugins/perlmods
--abs_top_builddir = /tmp/nagiosplugins
--abs_top_srcdir = /tmp/nagiosplugins
--ac_ct_CC = gcc
-+abs_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_top_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+abs_top_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+ac_ct_CC =
- ac_ct_DUMPBIN =
- am__include = include
- am__leading_dot = .
- am__quote =
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
--bindir = ${exec_prefix}/bin
--build = i386-apple-darwin9.8.0
--build_alias =
--build_cpu = i386
--build_os = darwin9.8.0
-+bindir = /usr/bin
-+build = i686-apple-darwin10
-+build_alias = i686-apple-darwin10
-+build_cpu = i686
-+build_os = darwin10
- build_vendor = apple
- builddir = .
- check_tcp_ssl = check_simap check_spop check_jabber check_nntps check_ssmtp
--datadir = ${datarootdir}
-+datadir = /usr/share
- datarootdir = ${prefix}/share
- docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
- dvidir = ${docdir}
- exec_prefix = ${prefix}
--gl_LIBOBJS = asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o error.o fcntl.o fd-safer.o fsusage.o getopt.o getopt1.o mountlist.o open.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strndup.o strnlen.o vasnprintf.o xmalloc.o
--gl_LTLIBOBJS = asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo error.lo fcntl.lo fd-safer.lo fsusage.lo getopt.lo getopt1.lo mountlist.lo open.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strndup.lo strnlen.lo vasnprintf.lo xmalloc.lo
-+gl_LIBOBJS = asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o dup2.o fcntl.o fd-safer.o getloadavg.o getopt.o getopt1.o memchr.o mktime.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strnlen.o strstr.o timegm.o unsetenv.o vasnprintf.o xmalloc.o
-+gl_LTLIBOBJS = asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo dup2.lo fcntl.lo fd-safer.lo getloadavg.lo getopt.lo getopt1.lo memchr.lo mktime.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strnlen.lo strstr.lo timegm.lo unsetenv.lo vasnprintf.lo xmalloc.lo
- gltests_LIBOBJS =
- gltests_LTLIBOBJS =
- gltests_WITNESS = IN_NAGIOS_PLUGINS_GNULIB_TESTS
--host = i386-apple-darwin9.8.0
--host_alias =
--host_cpu = i386
--host_os = darwin9.8.0
--host_vendor = apple
-+host = i586-openadk-linux-gnu
-+host_alias = i586-openadk-linux
-+host_cpu = i586
-+host_os = linux-gnu
-+host_vendor = openadk
- htmldir = ${docdir}
- includedir = ${prefix}/include
- infodir = ${datarootdir}/info
--install_sh = $(SHELL) /tmp/nagiosplugins/build-aux/install-sh
-+install_sh = $(SHELL) /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
-+libexecdir = /usr/libexec
- localedir = ${datarootdir}/locale
--localstatedir = ${prefix}/var
--lt_ECHO = /bin/echo
--mandir = ${datarootdir}/man
--mkdir_p = $(top_builddir)/build-aux/install-sh -c -d
--np_mysql_config = /usr/local/mysql/bin/mysql_config
-+localstatedir = /var
-+lt_ECHO = echo
-+mandir = /usr/share/man
-+mkdir_p = /opt/local/bin/gmkdir -p
-+np_mysql_config =
- oldincludedir = /usr/include
- pdfdir = ${docdir}
--prefix = /usr/local/nagios
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s&$$&&;s&^&&
- psdir = ${docdir}
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
- srcdir = .
--sysconfdir = ${prefix}/etc
--target_alias =
-+sysconfdir = /etc
-+target_alias = i586-openadk-linux
- top_builddir = ..
- top_srcdir = ..
- with_trusted_path = /bin:/sbin:/usr/bin:/usr/sbin
diff --git a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo b/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo
deleted file mode 100644
index 196c4bc1d..000000000
--- a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo
+++ /dev/null
@@ -1,16 +0,0 @@
---- nagios-plugins-1.4.15.orig/pkg/solaris/pkginfo 2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/pkg/solaris/pkginfo 2011-12-03 12:13:10.000000000 +0100
-@@ -2,11 +2,11 @@ PKG="NAGplugin"
- NAME="nagios-plugins"
- DESC="Nagios network monitoring plugins"
- ARCH="i386"
--VERSION="1.4.15,REV=2010.07.27.21.48"
-+VERSION="1.4.15,REV=2011.12.03.12.12"
- CATEGORY="application"
- VENDOR="Nagios Plugin Development Team"
- EMAIL="nagiosplug-devel@lists.sourceforge.net"
--PSTAMP="nag20100727214823"
-+PSTAMP="nag20111203121222"
- BASEDIR="/"
- CLASSES="none"
-
diff --git a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo.orig b/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo.orig
deleted file mode 100644
index 152a0c36b..000000000
--- a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo.orig
+++ /dev/null
@@ -1,16 +0,0 @@
---- nagios-plugins-1.4.15.orig/pkg/solaris/pkginfo 2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/pkg/solaris/pkginfo 2011-12-03 12:09:09.000000000 +0100
-@@ -2,11 +2,11 @@ PKG="NAGplugin"
- NAME="nagios-plugins"
- DESC="Nagios network monitoring plugins"
- ARCH="i386"
--VERSION="1.4.15,REV=2010.07.27.21.48"
-+VERSION="1.4.15,REV=2011.12.03.12.08"
- CATEGORY="application"
- VENDOR="Nagios Plugin Development Team"
- EMAIL="nagiosplug-devel@lists.sourceforge.net"
--PSTAMP="nag20100727214823"
-+PSTAMP="nag20111203120820"
- BASEDIR="/"
- CLASSES="none"
-
diff --git a/package/nagios-plugins/patches/patch-plugins_Makefile_in b/package/nagios-plugins/patches/patch-plugins_Makefile_in
index 2cdb325fd..a22bcc070 100644
--- a/package/nagios-plugins/patches/patch-plugins_Makefile_in
+++ b/package/nagios-plugins/patches/patch-plugins_Makefile_in
@@ -1,14 +1,16 @@
--- nagios-plugins-1.4.15.orig/plugins/Makefile.in 2010-07-27 22:48:10.000000000 +0200
-+++ nagios-plugins-1.4.15/plugins/Makefile.in 2011-12-03 12:15:23.000000000 +0100
-@@ -31,7 +31,7 @@ PRE_UNINSTALL = :
++++ nagios-plugins-1.4.15/plugins/Makefile.in 2011-12-03 13:26:49.709669796 +0100
+@@ -31,8 +31,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
+- check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
+libexec_PROGRAMS = check_cluster$(EXEEXT) \
- check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
++ check_dummy$(EXEEXT) check_http$(EXEEXT) \
check_load$(EXEEXT) check_mrtg$(EXEEXT) \
check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
+ check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \
@@ -46,7 +46,7 @@ EXTRA_PROGRAMS = check_mysql$(EXEEXT) ch
check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \
check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index be089f0c4..526ada9dd 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= net/security
PKG_DEPENDS:= kmod-tun libopenssl ip
PKG_BUILDDEP:= openssl
PKG_URL:= http://openvpn.net/
-PKG_SITES:= http://openvpn.net/release/
+PKG_SITES:= http://swupdate.openvpn.org/community/releases/
PKG_SUBPKGS:= OPENVPN OPENVPN_EASY_RSA
PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS SERVER CLIENT
diff --git a/package/php/Makefile b/package/php/Makefile
index a4ff5d26e..33f07fbce 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= f4ce40d5d156ca66a996dbb8a0e7666a
PKG_DESCR:= PHP language interpreter
PKG_SECTION:= lang
-PKG_DEPENDS:= libopenssl zlib
+PKG_DEPENDS:= libopenssl zlib libpthread
PKG_BUILDDEP:= openssl zlib
PHP_URL:= http://www.php.net/
PKG_SITES:= http://de.php.net/distributions/
diff --git a/package/postfix/Makefile b/package/postfix/Makefile
index 20b37cfbe..c34530fd6 100644
--- a/package/postfix/Makefile
+++ b/package/postfix/Makefile
@@ -10,9 +10,12 @@ PKG_MD5SUM:= b3ff47a38db920fc15bb207f42da53db
PKG_DESCR:= Postfix MTA
PKG_SECTION:= mail
PKG_BUILDDEP:= db
+PKG_DEPENDS:= libdb
PKG_URL:= http://www.postfix.org/
PKG_SITES:= http://de.postfix.org/ftpmirror/official/
+PKG_HOST_DEPENDS:= !darwin
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,POSTFIX,postfix,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -20,10 +23,33 @@ $(eval $(call PKG_template,POSTFIX,postfix,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
CONFIG_STYLE:= manual
ALL_TARGET:=
+INSTALL_STYLE:= manual
postfix-install:
- $(INSTALL_DIR) $(IDIR_POSTFIX)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/postfix \
- $(IDIR_POSTFIX)/usr/bin
+ $(INSTALL_DIR) $(IDIR_POSTFIX)/etc/postfix
+ $(CP) $(WRKBUILD)/conf/* $(IDIR_POSTFIX)/etc/postfix
+ $(CP) ./files/main.cf $(IDIR_POSTFIX)/etc/postfix
+ $(INSTALL_DIR) $(IDIR_POSTFIX)/usr/sbin
+ $(CP) $(WRKBUILD)/bin/* $(IDIR_POSTFIX)/usr/sbin
+ $(INSTALL_DIR) $(IDIR_POSTFIX)/usr/libexec/postfix
+ $(CP) $(WRKBUILD)/libexec/* $(IDIR_POSTFIX)/usr/libexec/postfix
+ rm $(IDIR_POSTFIX)/usr/libexec/postfix/master.cf
+ rm $(IDIR_POSTFIX)/usr/libexec/postfix/main.cf
+ rm $(IDIR_POSTFIX)/usr/libexec/postfix/postfix-script
+ mv $(IDIR_POSTFIX)/etc/postfix/postfix-script \
+ $(IDIR_POSTFIX)/usr/libexec/postfix/
+ rm $(IDIR_POSTFIX)/usr/libexec/postfix/postfix-files
+ mv $(IDIR_POSTFIX)/etc/postfix/postfix-files \
+ $(IDIR_POSTFIX)/usr/libexec/postfix/
+ rm $(IDIR_POSTFIX)/usr/libexec/postfix/post-install
+ mv $(IDIR_POSTFIX)/etc/postfix/post-install \
+ $(IDIR_POSTFIX)/usr/libexec/postfix/
+ rm $(IDIR_POSTFIX)/usr/libexec/postfix/postfix-wrapper
+ mv $(IDIR_POSTFIX)/etc/postfix/postfix-wrapper \
+ $(IDIR_POSTFIX)/usr/libexec/postfix/
+ rm $(IDIR_POSTFIX)/usr/libexec/postfix/postmulti-script
+ mv $(IDIR_POSTFIX)/etc/postfix/postmulti-script \
+ $(IDIR_POSTFIX)/usr/libexec/postfix/
+ chmod 755 $(IDIR_POSTFIX)/usr/libexec/postfix/*
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/postfix/files/main.cf b/package/postfix/files/main.cf
new file mode 100644
index 000000000..c2640dc5d
--- /dev/null
+++ b/package/postfix/files/main.cf
@@ -0,0 +1,13 @@
+queue_directory = /var/spool/postfix
+command_directory = /usr/sbin
+daemon_directory = /usr/libexec/postfix
+data_directory = /var/lib/postfix
+mail_owner = postfix
+unknown_local_recipient_reject_code = 550
+debug_peer_level = 2
+debugger_command =
+ PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+ ddd $daemon_directory/$process_name $process_id & sleep 5
+
+sendmail_path = /usr/sbin/sendmail
+setgid_group = postdrop
diff --git a/package/postfix/files/postfix.init b/package/postfix/files/postfix.init
new file mode 100644
index 000000000..a4eb13c79
--- /dev/null
+++ b/package/postfix/files/postfix.init
@@ -0,0 +1,35 @@
+#!/bin/sh
+#PKG postfix
+#INIT 80
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ test x"${postfix:-NO}" = x"NO" && exit 0
+ exec sh $0 start
+ ;;
+start)
+ [ -d /var/spool/postfix ] || mkdir -p /var/spool/postfix
+ [ -d /var/lib/postfix ] || mkdir -p /var/lib/postfix
+ chown postfix /var/lib/postfix
+ mount -o remount,rw /
+ chgrp postdrop /usr/sbin/postqueue
+ chgrp postdrop /usr/sbin/postdrop
+ chmod 2755 /usr/sbin/postqueue /usr/sbin/postdrop
+ mount -o remount,ro /
+ postfix start
+ ;;
+stop)
+ postfix stop
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "Usage: $0 {start | stop | restart}"
+ exit 1
+ ;;
+esac
+exit $?
diff --git a/package/postfix/files/postfix.postinst b/package/postfix/files/postfix.postinst
new file mode 100644
index 000000000..8c9fbba60
--- /dev/null
+++ b/package/postfix/files/postfix.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf postfix postfix NO
+gid=$(get_next_gid)
+add_group postfix $gid
+add_user postfix $(get_next_uid) $gid /etc/postfix
+gid=$(get_next_gid)
+add_group postdrop $gid
+add_service smtp 25/tcp
diff --git a/package/postfix/patches/patch-makedefs b/package/postfix/patches/patch-makedefs
index 385150c0c..cb064c6e3 100644
--- a/package/postfix/patches/patch-makedefs
+++ b/package/postfix/patches/patch-makedefs
@@ -1,5 +1,5 @@
--- postfix-2.8.7.orig/makedefs 2011-11-03 00:46:22.000000000 +0100
-+++ postfix-2.8.7/makedefs 2011-12-03 13:06:00.000000000 +0100
++++ postfix-2.8.7/makedefs 2011-12-03 13:36:33.561684585 +0100
@@ -97,8 +97,8 @@ error() {
case $# in
@@ -11,3 +11,24 @@
VERSION=`(uname -v) 2>/dev/null`
case "$VERSION" in
dcosx*) SYSTEM=$VERSION;;
+@@ -343,20 +343,6 @@ EOF
+ esac
+ ;;
+ Linux.3*) SYSTYPE=LINUX3
+- if [ -f /usr/include/db.h ]
+- then
+- : we are all set
+- elif [ -f /usr/include/db/db.h ]
+- then
+- CCARGS="$CCARGS -I/usr/include/db"
+- else
+- # On a properly installed system, Postfix builds
+- # by including <db.h> and by linking with -ldb
+- echo "No <db.h> include file found." 1>&2
+- echo "Install the appropriate db*-devel package first." 1>&2
+- echo "See the RELEASE_NOTES file for more information." 1>&2
+- exit 1
+- fi
+ SYSLIBS="-ldb"
+ for name in nsl resolv
+ do
diff --git a/package/postfix/patches/patch-src_util_dict_open_c b/package/postfix/patches/patch-src_util_dict_open_c
new file mode 100644
index 000000000..48555d4e9
--- /dev/null
+++ b/package/postfix/patches/patch-src_util_dict_open_c
@@ -0,0 +1,24 @@
+--- postfix-2.8.7.orig/src/util/dict_open.c 2011-04-11 19:37:49.000000000 +0200
++++ postfix-2.8.7/src/util/dict_open.c 2011-12-03 13:38:06.889686949 +0100
+@@ -202,8 +202,6 @@
+ #include <dict_sdbm.h>
+ #include <dict_dbm.h>
+ #include <dict_db.h>
+-#include <dict_nis.h>
+-#include <dict_nisplus.h>
+ #include <dict_ni.h>
+ #include <dict_pcre.h>
+ #include <dict_regexp.h>
+@@ -242,12 +240,6 @@ static const DICT_OPEN_INFO dict_open_in
+ DICT_TYPE_HASH, dict_hash_open,
+ DICT_TYPE_BTREE, dict_btree_open,
+ #endif
+-#ifdef HAS_NIS
+- DICT_TYPE_NIS, dict_nis_open,
+-#endif
+-#ifdef HAS_NISPLUS
+- DICT_TYPE_NISPLUS, dict_nisplus_open,
+-#endif
+ #ifdef HAS_NETINFO
+ DICT_TYPE_NETINFO, dict_ni_open,
+ #endif
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
new file mode 100644
index 000000000..c70f91a1e
--- /dev/null
+++ b/package/util-linux/Makefile
@@ -0,0 +1,96 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= util-linux
+PKG_VERSION:= 2.20.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 079b37517fd4e002a2e6e992e8b4e361
+PKG_DESCR:= Linux utilities
+PKG_SECTION:= fs
+PKG_BUILDDEP:= ncurses
+PKG_SITES:= ftp://ftp.infradead.org/pub/util-linux/v2.20/
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MOUNT MCOOKIE
+PKG_SUBPKGS+= LIBUUID LIBBLKID LIBUUID_DEV
+PKGSD_LIBUUID:= UUID library
+PKGSC_LIBUUID:= libs
+PKGSD_LIBUUID_DEV:= UUID headers
+PKGSC_LIBUUID_DEV:= devel
+PKGSD_LIBBLKID:= BLKID library
+PKGSC_LIBBLKID:= libs
+PKGSD_FDISK:= Partition table manipulation utility
+PKGSD_SFDISK:= Scriptable Partition table manipulation utility
+PKGSD_SWAP_UTILS:= Swap space management utilities
+PKGSS_SWAP_UTILS:= libblkid
+PKGSD_LOSETUP:= Loop devices management utilities
+PKGSS_LOSETUP:= kmod-blk-dev-loop
+PKGSD_MOUNT:= mount/umount utilities
+PKGSS_MOUNT:= libblkid
+PKGSD_MCOOKIE:= Generate magic cookies for xauth
+PKGSC_MCOOKIE:= x11/apps
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKG_SECTION}))
+$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKG_SECTION}))
+$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKG_SECTION}))
+$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION}))
+$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MOUNT},${PKG_SECTION}))
+$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE}))
+$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
+$(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV}))
+$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
+
+CONFIGURE_ENV+= scanf_cv_type_modifier=yes
+CONFIGURE_ARGS+= --disable-use-tty-group \
+ --disable-schedutils \
+ --disable-cramfs \
+ --enable-libuuid \
+ --enable-libblkid \
+ --enable-libmount \
+ --enable-mount
+FAKE_FLAGS+= INSTALLSUID="install -m 4755"
+TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
+
+fdisk-install:
+ ${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
+ ${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin
+
+sfdisk-install:
+ ${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin
+ ${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
+
+losetup-install:
+ ${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin
+ ${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin
+
+swap-utils-install:
+ ${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin
+ ${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
+ ${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
+
+mount-install:
+ ${INSTALL_DIR} ${IDIR_MOUNT}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/{u,}mount ${IDIR_MOUNT}/usr/bin
+
+mcookie-install:
+ ${INSTALL_DIR} ${IDIR_MCOOKIE}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/mcookie ${IDIR_MCOOKIE}/usr/bin
+
+libuuid-install:
+ ${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libuuid.so* ${IDIR_LIBUUID}/usr/lib
+
+libuuid-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUUID_DEV}/usr/include
+
+libblkid-install:
+ ${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libblkid.so* ${IDIR_LIBBLKID}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/util-linux/patches/patch-libmount_src_tab_parse_c b/package/util-linux/patches/patch-libmount_src_tab_parse_c
new file mode 100644
index 000000000..89be40800
--- /dev/null
+++ b/package/util-linux/patches/patch-libmount_src_tab_parse_c
@@ -0,0 +1,11 @@
+--- util-linux-2.20.1.orig/libmount/src/tab_parse.c 2011-10-18 14:22:27.000000000 +0200
++++ util-linux-2.20.1/libmount/src/tab_parse.c 2011-12-03 09:43:31.713340136 +0100
+@@ -10,6 +10,8 @@
+ #include <dirent.h>
+ #include <fcntl.h>
+
++#define UL_SCNsA "%ms"
++
+ #include "at.h"
+ #include "mangle.h"
+ #include "mountP.h"