[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freewrt-commits
Subject:    [FreeWRT-commits] r3891 - in trunk/freewrt/package: haserl
From:       tg () freewrt ! org
Date:       2009-10-18 20:17:27
Message-ID: 20091018201727.8C68F1C006 () frozenfish ! freewrt ! org
[Download RAW message or body]

Author: tg
Date: 2009-10-18 22:17:26 +0200 (Sun, 18 Oct 2009)
New Revision: 3891

Added:
   trunk/freewrt/package/haserl/patches/
   trunk/freewrt/package/haserl/patches/patch-src_haserl_c
Modified:
   trunk/freewrt/package/haserl/Makefile
   trunk/freewrt/package/mksh/Makefile.inc
   trunk/freewrt/package/mksh/patches/patch-dot_mkshrc
Log:
upgrade mksh to a snapshot, so that I can fix haserl


Modified: trunk/freewrt/package/haserl/Makefile
===================================================================
--- trunk/freewrt/package/haserl/Makefile	2009-10-18 19:49:41 UTC (rev 3890)
+++ trunk/freewrt/package/haserl/Makefile	2009-10-18 20:17:26 UTC (rev 3891)
@@ -8,7 +8,7 @@
 
 PKG_NAME:=		haserl
 PKG_VERSION:=		0.8.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		bd9195d086566f56634c0bcbbbcbebea
 MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=haserl/}
 
@@ -16,8 +16,21 @@
 
 $(eval $(call PKG_template,HASERL,haserl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
-TCFLAGS+=		-DMAX_UPLOAD_KB=8192
+# haserl 0.9.x can do "/bin/mksh -o sh" and thus will not
+# need this workaround, but for some reason, both OpenWrt
+# and FreeWRT are stuck with haserl 0.8.0 – which puzzles
+# the haserl developers just the same
+
+# "/bin/mksh -o sh" is required (and mksh 39.9.20091018 and up) so that
+#	echo -n 'foo\040bar'; echo baz
+# outputs (Debian Policy 10.4; POSIX but not XSI):
+#	foo\040barbaz
+
+# Since we *always* have mksh in trunk… no problem ☺
+
+TCFLAGS+=		-DMAX_UPLOAD_KB=8192 -Dmksh_workaround
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--enable-subshell=/bin/mksh
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 

Added: trunk/freewrt/package/haserl/patches/patch-src_haserl_c
===================================================================
--- trunk/freewrt/package/haserl/patches/patch-src_haserl_c	                        (rev 0)
+++ trunk/freewrt/package/haserl/patches/patch-src_haserl_c	2009-10-18 20:17:26 UTC (rev 3891)
@@ -0,0 +1,20 @@
+$FreeWRT$
+
+	Temporary workaround until we update to haserl 0.9.x
+	see FreeWRT package Makefile for description
+
+--- haserl-0.8.0.orig/src/haserl.c	2004-11-10 18:59:35.000000000 +0100
++++ haserl-0.8.0/src/haserl.c	2009-10-18 21:05:50.000000000 +0200
+@@ -1006,7 +1006,11 @@ int OpenSubshell ( void ) {
+ 				close ( global_subshell_pipe[CHILD_CTRLOUT] );
+ 				}
+ 			//system ( SUBSHELL_CMD );
+-			execlp ( SUBSHELL_CMD, SUBSHELL_CMD, NULL);
++			execlp ( SUBSHELL_CMD, SUBSHELL_CMD,
++#ifdef mksh_workaround
++			    "-o", "sh",
++#endif
++			    NULL);
+ 			/* if we get here, we had a failure, so close down all the pipes */
+ 			PrintParseError("Unable to start subshell - critical error.", 0 );
+ 			/* loop stdin in to stdout so we don't hang */

Modified: trunk/freewrt/package/mksh/Makefile.inc
===================================================================
--- trunk/freewrt/package/mksh/Makefile.inc	2009-10-18 19:49:41 UTC (rev 3890)
+++ trunk/freewrt/package/mksh/Makefile.inc	2009-10-18 20:17:26 UTC (rev 3891)
@@ -5,10 +5,12 @@
 # or at http://www.freewrt.org/licence for details.
 
 PKG_NAME=		mksh
-PKG_VERSION=		39
+PKG_VERSION=		39.9.20091018
 PKG_RELEASE=		1
-DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.cpio.gz
-PKG_MD5SUM=		b2eeb4fe4ccac2704e1440e53cd2672c
+#DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.cpio.gz
+DISTFILES=		${PKG_NAME}-20091018.cpio.gz
+PKG_MD5SUM=		d07bb304ac7259d01e18395d17594633
 
-MASTER_SITES=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+#MASTER_SITES=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+MASTER_SITES=		${MASTER_SITE_FREEWRT}
 WRKDIST=		${WRKDIR}/${PKG_NAME}

Modified: trunk/freewrt/package/mksh/patches/patch-dot_mkshrc
===================================================================
--- trunk/freewrt/package/mksh/patches/patch-dot_mkshrc	2009-10-18 19:49:41 UTC (rev 3890)
+++ trunk/freewrt/package/mksh/patches/patch-dot_mkshrc	2009-10-18 20:17:26 UTC (rev 3891)
@@ -5,9 +5,9 @@
 	  – ls has no -o
 	  – yofuh doesn't like $? in $PS1
 
---- mksh.orig/dot.mkshrc	2009-06-22 19:39:03.000000000 +0200
-+++ mksh/dot.mkshrc	2009-08-04 16:39:24.000000000 +0200
-@@ -20,13 +20,15 @@
+--- mksh.orig/dot.mkshrc	2009-08-27 18:52:36.000000000 +0200
++++ mksh/dot.mkshrc	2009-10-18 21:01:55.000000000 +0200
+@@ -21,13 +21,15 @@
  #-
  # ~/.mkshrc: mksh initialisation file for interactive shells
  
@@ -26,7 +26,7 @@
  PS1='
 $(precmd)${USER:=$(ulimit -c 0;id -un 2>&-||print \?)}@${HOSTNAME%%.*}:$(
  	typeset d=${PWD:-?} n p=~; [[ $p = ?(*/) ]] || d=${d/#$p/~}
-@@ -38,7 +40,7 @@ unalias ls
+@@ -39,7 +41,7 @@ unalias ls
  alias l='ls -F'
  alias la='l -a'
  alias ll='l -l'

_______________________________________________
freewrt-commits mailing list
freewrt-commits@freewrt.org
https://www.freewrt.org/lists/listinfo/freewrt-commits

[prev in list] [next in list] [prev in thread] [next in thread]