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

10 files changed, 48 insertions, 135 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index e0cadbf9a..9659fe685 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:=		36
+PKG_RELEASE:=		37
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -43,14 +43,10 @@ endif
 ifneq (${ADK_PACKAGE_ZSH},)
 	echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells
 endif
-	mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt}
 	mkdir -p $(IDIR_BASE_FILES)/etc/crontabs
-	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-pre-up.d
-	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-up.d
-	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-down.d
-	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-post-down.d
-	mkdir -p $(IDIR_BASE_FILES)/usr/lib
-	mkdir -p $(IDIR_BASE_FILES)/usr/bin
+	mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt}
+	mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d}
+	mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin}
 	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
 	ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
@@ -65,8 +61,8 @@ endif
 	test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \
 	    cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
-	    echo $(ADK_RUNTIME_HOSTNAME) > \
-	    $(IDIR_BASE_FILES)/etc/hostname
+	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
+	    echo "127.0.0.1	$(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts
 	test -z $(ADK_RUNTIME_PASSWORD) || \
 	    $(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/tools/mkcrypt \
 	    ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
diff --git a/package/base-files/src/etc/hosts b/package/base-files/src/etc/hosts
index 87d837fc7..085363292 100644
--- a/package/base-files/src/etc/hosts
+++ b/package/base-files/src/etc/hosts
@@ -1,2 +1,2 @@
-::1 localhost
-127.0.0.1 localhost
+::1	localhost
+127.0.0.1	localhost
diff --git a/package/base-files/src/etc/sysctl.conf b/package/base-files/src/etc/sysctl.conf
index f45e98632..51bccf6b0 100644
--- a/package/base-files/src/etc/sysctl.conf
+++ b/package/base-files/src/etc/sysctl.conf
@@ -15,4 +15,3 @@ net.ipv4.conf.default.rp_filter = 1
 net.ipv4.conf.all.rp_filter = 1
 # Enable SYN cookies
 #net.ipv4.tcp_syncookies = 1
-
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 35fea912d..b5a195c6f 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		3.6.12
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		80f4d83f23a7c45fc3f1904964ea2a5a
+PKG_VERSION:=		3.6.13
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d7c90aed8209beefa74badf02e8eeae1
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libnotify
@@ -18,7 +18,7 @@ PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 
 PKG_TARGET_DEPENDS:=	alix x86 x86_64 mips mipsel mips64 mips64el
-PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin !darwin
+PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 WRKDIST=		${WRKDIR}/mozilla-1.9.2
@@ -37,7 +37,8 @@ endif
 
 CONFIGURE_ENV+=		CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
 			HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \
-			HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \
+			HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \
+			HOST_RANLIB="ranlib" HOST_AR="ar" \
 			CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \
 			ac_cv_sqlite_secure_delete=yes \
 			ac_cv_thread_keyword=no \
@@ -64,6 +65,8 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-mathml \
 			--disable-crashreporter
 
+XAKE_FLAGS+=		OS_RELEASE="2.6"
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index bb6138223..a5f6df0b9 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,5 +1,5 @@
 --- mozilla-1.9.2.orig/configure	2010-10-27 05:09:28.000000000 +0200
-+++ mozilla-1.9.2/configure	2010-11-25 20:36:24.969435934 +0100
++++ mozilla-1.9.2/configure	2010-12-12 12:03:54.000000000 +0100
 @@ -3970,7 +3970,7 @@ else
      echo "$ac_t""yes" 1>&6    
  fi
@@ -9,7 +9,15 @@
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -17895,7 +17895,7 @@ echo "configure:17889: checking for SQLI
+@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino
+ CYGWIN_WRAPPER=
+ WIN_TOP_SRC=
+ MOZ_USER_DIR=".mozilla"
+-HOST_AR='$(AR)'
+ HOST_AR_FLAGS='$(AR_FLAGS)'
+ 
+ MOZ_JPEG_CFLAGS=
+@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI
  else
    
          if test "$cross_compiling" = yes; then
@@ -18,14 +26,3 @@
          
  else
    cat > conftest.$ac_ext <<EOF
-@@ -21465,8 +21465,8 @@ if test -n "$CROSS_COMPILE"; then
-         HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
-     fi
-     if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
--        HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
--        HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
-+        HOST_LIBIDL_CFLAGS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --cflags`
-+        HOST_LIBIDL_LIBS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --libs`
-     else
-         HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
-         HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 1a025f37e..f4d562e3a 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -4,25 +4,22 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rrdcollect
-PKG_VERSION:=		0.2.3
-PKG_RELEASE:=		8
-PKG_MD5SUM:=		5e4305c612bc3cccbaf802c275c81a11
+PKG_VERSION:=		0.2.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1e94eb0f8d55ebf0f042c10baebc2d3d
 PKG_DESCR:=		Round-Robin Database (RRD) collecting daemon
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		librrd
 PKG_BUILDDEP:=		rrdtool
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rrdcollect/}
 
-PKG_SUBPKGS:=		RRDCOLLECT RRDCOLLECT_EXAMPLE
-
 ifneq (${ADK_PACKAGE_LIBRRD},)
-RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng
+RRDTOOL_LIBS:=		-lart_lgpl_2 -lfreetype -lpng
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		LIBS="${RRDTOOL_LIBS} -lz" \
 			ac_cv_func_malloc_0_nonnull=yes
@@ -37,14 +34,8 @@ post-install:
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect \
 		${IDIR_RRDCOLLECT}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc
-	${INSTALL_DATA} ./files/rrd.conf ./files/rrdcollect.conf \
-		${IDIR_RRDCOLLECT_EXAMPLE}/etc/
-	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin
-	${INSTALL_BIN} ./files/rrd.sh ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin/
-	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin
-	ln -sf /var/lib/rrdcollect/rrd.cgi \
-		${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin/rrd.cgi
-	ln -sf /var/lib/rrdcollect/img ${IDIR_RRDCOLLECT_EXAMPLE}/www/img
+	${INSTALL_DIR} ${IDIR_RRDCOLLECT}/etc
+	${INSTALL_DATA} ./files/rrdcollect.conf \
+		${IDIR_RRDCOLLECT}/etc/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf
index e34c9bff7..392661e87 100644
--- a/package/rrdcollect/files/rrdcollect.conf
+++ b/package/rrdcollect/files/rrdcollect.conf
@@ -1,5 +1,5 @@
 step = 360
-directory = /var/lib/rrdcollect/rrd
+directory = /var/lib/rrdcollect
 
 file:///proc/stat
 "cpu0 %d %d %d %d"		                 SYS.rrd:cu,cn,cs,ci
@@ -14,20 +14,20 @@ file:///proc/meminfo
 file:///proc/loadavg
 "%f %f %f %d/%d %*d"		                 SYS.rrd:l1,l2,l3,pr,pt
 
-exec:///bin/df
-"/dev/mtdblock/4 %*d %d %d"	                 SYS.rrd:us,av
+#exec:///bin/df
+#"/dev/mtdblock/4 %*d %d %d"	                 SYS.rrd:us,av
 
 # LAN: vlan0, WAN: vlan1, WIFI: eth1
-file:///proc/net/dev
-" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d"    IF.rrd:Labi,Lapi,Labo,Lapo
-" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d"    IF.rrd:Wabi,Wapi,Wabo,Wapo
-" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d"     IF.rrd:Wibi,Wipi,Wibo,Wipo
+#file:///proc/net/dev
+#" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d"    IF.rrd:Labi,Lapi,Labo,Lapo
+#" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d"    IF.rrd:Wabi,Wapi,Wabo,Wapo
+#" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d"     IF.rrd:Wibi,Wipi,Wibo,Wipo
 #" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d"	 IF.rrd:tbi,tpi,tbo,tpo
 
-file:///proc/slabinfo
-"ip_conntrack  %d %*d %*d %*d %*d %*d"		 SYS.rrd:con
-"arp_cache     %d %*d %*d %*d %*d %*d"           SYS.rrd:arp
+#file:///proc/slabinfo
+#"ip_conntrack  %d %*d %*d %*d %*d %*d"		 SYS.rrd:con
+#"arp_cache     %d %*d %*d %*d %*d %*d"           SYS.rrd:arp
 
-file:///proc/interrupts
-"  4: %d MIPS  eth1"				 SYS.rrd:irw
-"  5: %d MIPS  eth0"				 SYS.rrd:ire
+#file:///proc/interrupts
+#"  4: %d MIPS  eth1"				 SYS.rrd:irw
+#"  5: %d MIPS  eth0"				 SYS.rrd:ire
diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init
index 5c83ae013..478150e90 100644
--- a/package/rrdcollect/files/rrdcollect.init
+++ b/package/rrdcollect/files/rrdcollect.init
@@ -4,11 +4,6 @@
 
 . /etc/rc.conf
 
-LIB_D=/var/lib/rrdcollect
-CGI_S=$LIB_D/rrd.cgi
-RRD_D=$LIB_D/rrd
-RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null)
-
 case $1 in
 autostop) ;;
 autostart)
@@ -16,9 +11,7 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	[ -d $LIB_D/img ] || mkdir -p $LIB_D/img
-	[ -n "$RRD_F" ] || /usr/bin/rrd.sh init
-	[ -x $CGI_S ] || /usr/bin/rrd.sh cgi
+	[ -d /var/lib/rrdcollect ] || mkdir -p /var/lib/rrdcollect
 	rrdcollect
 	;;
 stop)
diff --git a/package/rrdcollect/patches/rrdcollect-scan.patch b/package/rrdcollect/patches/rrdcollect-scan.patch
deleted file mode 100644
index f47301ed1..000000000
--- a/package/rrdcollect/patches/rrdcollect-scan.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ruN rrdcollect-0.2.3.orig/src/scan.c rrdcollect-0.2.3/src/scan.c
---- rrdcollect-0.2.3.orig/src/scan.c	2005-01-20 18:42:17.000000000 +0100
-+++ rrdcollect-0.2.3/src/scan.c	2006-01-22 00:51:52.000000000 +0100
-@@ -74,6 +74,11 @@
- 						} while (isdigit(*fmt));
- 					}
- 
-+					/* skip white spaces like scanf does */
-+					if (strchr("difuoxX", *fmt))
-+						while (isspace(*buf))
-+							buf++;
-+					
- 					/* FIXME: we should check afterward:
- 					 * if (start == buf || start == '-' && buf-start == 1)
- 					 * 	die("WTF???  zero-length number???");
-@@ -150,27 +155,22 @@
- 								buf++, length--;
- 							}
- 
--							/* ignore if value not found */
--							if(value == 0)
--								return 0;
--
- 							if (!ignore)
--								counter[i++]->value = valuedup(value);
-+								counter[i++]->value = strndup(start, buf - start);
- 							break;
- 							
- 						case 'c':
-+							if (length < 0)
-+							     length = 1;	// default length is 1
-+							
- 							while (*buf && length > 0) {
- 								buf++, length--;
- 							}
- 							if (length > 0)
- 								return 2;
- 
--							/* ignore if value not found */
--							if(value == 0)
--								return 0;
--							
- 							if (!ignore)
--								counter[i++]->value = valuedup(value);
-+								counter[i++]->value = strndup(start, buf - start);
- 							break;
- 							
- 							
-@@ -192,7 +192,7 @@
- 			case '\f':
- 			case '\v':
- 				/* don't match if not at least one space */
--				if(!isspace(*(buf)))
-+				if(!isspace(*buf))
- 					return 0;
- 				else
- 					buf++;
-@@ -208,7 +208,7 @@
- 					case '\v':
- 						break;
- 					default:
--						while (isspace(*(buf)))
-+						while (isspace(*buf))
- 							buf++;
- 				}
- 				fmt++;
diff --git a/package/xorg-server/files/xorg-server.postinst b/package/xorg-server/files/xorg-server.postinst
index 4d8403d7d..e26e54f3f 100644
--- a/package/xorg-server/files/xorg-server.postinst
+++ b/package/xorg-server/files/xorg-server.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/X;fi
+if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/Xorg;fi
 . $IPKG_INSTROOT/etc/functions.sh
 gid=$(get_next_gid)
 add_group video $gid