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

10 files changed, 161 insertions, 68 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f325d2210..81fb1f6df 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:=		69
+PKG_RELEASE:=		70
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index f79d9348d..75ae760e0 100644
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -2,66 +2,17 @@
 #INIT 60
 [[ $1 = autostart ]] || exit 0
 
-# activate swap
-[ -x /sbin/swapon ] && { swapon -a; }
-
-# activate any logical volumes
-[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
-
-# filesystem checks
-[ -x /sbin/fsck.ext2 ] && {
-	for i in $(grep ext2 /etc/fstab|awk '{ print $1}');do fsck.ext2 $i;done;
-}
-[ -x /sbin/fsck.ext3 ] && {
-	for i in $(grep ext3 /etc/fstab|awk '{ print $1}');do fsck.ext3 $i;done;
-}
-[ -x /sbin/fsck.ext4 ] && {
-	for i in $(grep ext4 /etc/fstab|awk '{ print $1}');do fsck.ext4 $i;done;
-}
-[ -x /sbin/fsck.xfs ] && {
-	for i in $(grep xfs /etc/fstab|awk '{ print $1}');do xfs_repair $i;done;
-}
-# local filesystems
-grep ext2 /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep ext2 /etc/fstab  >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t ext2
-	fi
-fi
-grep ext3 /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep ext3 /etc/fstab  >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t ext3
-	fi
-fi
-grep ext4 /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep ext4 /etc/fstab  >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t ext4
-	fi
-fi
-grep xfs /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep xfs /etc/fstab  >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t xfs
-	fi
-fi
-
 # mount net filesystems (nfs/cifs)
 grep nfs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep nfs /etc/fstab  >/dev/null 2>&1
+	grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
 		mount -a -t nfs
 	fi
 fi
 grep cifs /proc/filesystems  >/dev/null 2>&1
 if [ $? -eq 0 ];then
-	grep cifs /etc/fstab >/dev/null 2>&1
+	grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
 	if [ $? -eq 0 ];then
 		mount -a -t cifs
 	fi
diff --git a/package/base-files/src/etc/init.d/fsnet b/package/base-files/src/etc/init.d/fsnet
new file mode 100644
index 000000000..8f4397897
--- /dev/null
+++ b/package/base-files/src/etc/init.d/fsnet
@@ -0,0 +1,53 @@
+#!/bin/sh
+#INIT 20
+[[ $1 = autostart ]] || exit 0
+
+# activate swap
+[ -x /sbin/swapon ] && { swapon -a; }
+
+# activate any logical volumes
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
+
+# filesystem checks
+[ -x /sbin/fsck.ext2 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done;
+}
+[ -x /sbin/fsck.ext3 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done;
+}
+[ -x /sbin/fsck.ext4 ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done;
+}
+[ -x /sbin/fsck.xfs ] && {
+	for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done;
+}
+# local filesystems
+grep ext2 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext2
+	fi
+fi
+grep ext3 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext3
+	fi
+fi
+grep ext4 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext4
+	fi
+fi
+grep xfs /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t xfs
+	fi
+fi
+exit 0
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index 9b6c365a1..1dd82182a 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -4,26 +4,29 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dosfstools
-PKG_VERSION:=		3.0.9
+PKG_VERSION:=		3.0.26
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		bd273cf8aa6341c0b52cbac72050bcf4
-PKG_DESCR:=		Utilities to create and check MS-DOS FAT filesystems
+PKG_MD5SUM:=		45012f5f56f2aae3afcd62120b9e5a08
+PKG_DESCR:=		utilities to create and check FAT filesystems
 PKG_SECTION:=		fs
+PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools/
-PKG_SITES:=		http://www.daniel-baumann.ch/software/dosfstools/
+PKG_SITES:=		http://daniel-baumann.ch/files/software/dosfstools/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-XAKE_FLAGS+=		PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64"
+XAKE_FLAGS+=		PREFIX=""
 
-post-install:
+dosfstools-install:
 	${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin
 	${CP} ${WRKINST}/sbin/dosfsck ${IDIR_DOSFSTOOLS}/sbin/
-	${CP} ${WRKINST}/sbin/fsck.{msdos,vfat} ${IDIR_DOSFSTOOLS}/sbin/
+	${CP} ${WRKINST}/sbin/fsck.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/sbin/
 	${CP} ${WRKINST}/sbin/mkdosfs ${IDIR_DOSFSTOOLS}/sbin/
-	${CP} ${WRKINST}/sbin/mkfs.{msdos,vfat} ${IDIR_DOSFSTOOLS}/sbin/
+	${CP} ${WRKINST}/sbin/mkfs.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile
index c20b7f4dc..1d127acbc 100644
--- a/package/dosfstools/patches/patch-Makefile
+++ b/package/dosfstools/patches/patch-Makefile
@@ -1,11 +1,13 @@
---- dosfstools-3.0.9.orig/Makefile	2009-10-04 11:03:23.000000000 +0200
-+++ dosfstools-3.0.9/Makefile	2011-01-07 21:50:15.000000000 +0100
-@@ -29,7 +29,7 @@ OPTFLAGS = -O2 -fomit-frame-pointer $(sh
+--- dosfstools-3.0.26.orig/Makefile	2014-01-17 07:09:28.000000000 +0100
++++ dosfstools-3.0.26/Makefile	2014-03-13 08:58:52.000000000 +0100
+@@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G
  #WARNFLAGS = -Wall -pedantic -std=c99
- WARNFLAGS = -Wall
+ WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes
  DEBUGFLAGS = -g
 -CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
++CFLAGS ?=
 +CFLAGS += $(WARNFLAGS)
++LDLIBS = -liconv
  
  VPATH = src
  
diff --git a/package/samba/Makefile b/package/samba/Makefile
index f29bf52e0..34cbeec8a 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		samba
-PKG_VERSION:=		3.6.21
+PKG_VERSION:=		3.6.23
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		faa67c625508dc495c082357913ccea6
+PKG_MD5SUM:=		2f7aee1dc5d31aefcb364600915b31dc
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net/fs
 PKG_BUILDDEP:=		gettext-tiny util-linux popt
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 890e64328..f8e6aaf72 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		squid
 PKG_VERSION:=		3.4.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b36ab3696485a86b43d9194ac9b6b7fe
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		proxy
diff --git a/package/squid/patches/patch-acinclude_lib-checks_m4 b/package/squid/patches/patch-acinclude_lib-checks_m4
new file mode 100644
index 000000000..b44b4eb27
--- /dev/null
+++ b/package/squid/patches/patch-acinclude_lib-checks_m4
@@ -0,0 +1,72 @@
+--- squid-3.4.4.orig/acinclude/lib-checks.m4	2014-03-09 10:40:56.000000000 +0100
++++ squid-3.4.4/acinclude/lib-checks.m4	2014-03-11 19:44:28.088928982 +0100
+@@ -95,69 +95,6 @@ AC_DEFUN([SQUID_CHECK_LIBIPHLPAPI],[
+   SQUID_STATE_ROLLBACK(iphlpapi)
+ ])
+ 
+-dnl Checks whether the OpenSSL SSL_get_certificate crashes squid and if a
+-dnl workaround can be used instead of using the SSL_get_certificate
+-AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[
+-  AH_TEMPLATE(SQUID_SSLGETCERTIFICATE_BUGGY, "Define to 1 if the SSL_get_certificate crashes squid")
+-  AH_TEMPLATE(SQUID_USE_SSLGETCERTIFICATE_HACK, "Define to 1 to use squid workaround for SSL_get_certificate")
+-  SQUID_STATE_SAVE(check_SSL_get_certificate)
+-  LIBS="$SSLLIB $LIBS"
+-  if test "x$SSLLIBDIR" != "x"; then
+-     LIBS="$LIBS -Wl,-rpath -Wl,$SSLLIBDIR"
+-  fi
+-
+-  AC_MSG_CHECKING(whether the SSL_get_certificate is buggy)
+-  AC_RUN_IFELSE([
+-  AC_LANG_PROGRAM(
+-    [
+-     #include <openssl/ssl.h>
+-     #include <openssl/err.h>
+-    ],
+-    [
+-    SSLeay_add_ssl_algorithms();
+-    SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
+-    SSL *ssl = SSL_new(sslContext);
+-    X509* cert = SSL_get_certificate(ssl);
+-    return 0;
+-    ])
+-  ],
+-  [
+-   AC_MSG_RESULT([no])
+-  ],
+-  [
+-   AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1)
+-   AC_MSG_RESULT([yes])
+-  ],
+-  [])
+-
+-  AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works)
+-  AC_RUN_IFELSE([
+-  AC_LANG_PROGRAM(
+-    [
+-     #include <openssl/ssl.h>
+-     #include <openssl/err.h>
+-    ],
+-    [
+-    SSLeay_add_ssl_algorithms();
+-    SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
+-    X509 ***pCert = (X509 ***)sslContext->cert;
+-    X509 *sslCtxCert = pCert && *pCert ? **pCert : (X509 *)0x1;
+-    if (sslCtxCert != NULL)
+-        return 1;
+-    return 0;
+-    ])
+-  ],
+-  [
+-   AC_MSG_RESULT([yes])
+-   AC_DEFINE(SQUID_USE_SSLGETCERTIFICATE_HACK, 1)
+-  ],
+-  [
+-   AC_MSG_RESULT([no])
+-  ],
+-[])
+-
+-SQUID_STATE_ROLLBACK(check_SSL_get_certificate)
+-])
+ 
+ dnl Checks whether the  SSL_CTX_new and similar functions require 
+ dnl a const 'SSL_METHOD *' argument
diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am
new file mode 100644
index 000000000..9aec4eca3
--- /dev/null
+++ b/package/squid/patches/patch-src_Makefile_am
@@ -0,0 +1,11 @@
+--- squid-3.4.4.orig/src/Makefile.am	2014-03-09 10:40:56.000000000 +0100
++++ squid-3.4.4/src/Makefile.am	2014-03-12 09:46:23.001434141 +0100
+@@ -981,7 +981,7 @@ cache_cf.o: cf_parser.cci
+ 
+ # cf_gen builds the configuration files.
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
+-	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++	$(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ 
+ # squid.conf.default is built by cf_gen when making cf_parser.cci
+ squid.conf.default squid.conf.documented: cf_parser.cci
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 78e30a09a..c06803164 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -9,8 +9,9 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d6159f7a664d95b4c150d580399d4400
 PKG_DESCR:=		Utilities for XFS filesystems
 PKG_SECTION:=		fs
-PKG_BUILDDEP:=		e2fsprogs util-linux
+PKG_BUILDDEP:=		e2fsprogs util-linux ncurses
 PKG_DEPENDS:=		libuuid libpthread libblkid librt libgcc
+PKG_DEPENDS+=		libncurses
 PKG_URL:=		http://oss.sgi.com/projects/xfs
 PKG_SITES:=		ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 			ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/