Dimitar Zhekov <jimmy@is-vn.bg>:

- devfs.patch: use the devfs names by default
- devpts.patch: allow openvt from a non-vc terminal
  (without switching back to the original terminal)
- an option to change w3m build model (baby...monster)


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1344 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -1,4 +1,9 @@
 
+*) 2003-09-09 (2.0.0-rc1 - 2.0.0-rc2)
+
+ - Dimitar Zhekov: fxed kbd for DevFS and DevPTS and config option for w3m
+                   build style
+
 *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Sebastian Jaenicke: slrn patches

package/base/kbd/devfs.patch

@@ -0,0 +1,13 @@
+--- ./openvt/openvt.h.orig	2002-10-11 14:08:59.000000000 +0300
++++ ./openvt/openvt.h	2003-08-16 15:48:07.000000000 +0300
+@@ -33,8 +33,8 @@
+  * Where your VTs are hidden
+  */
+ #ifdef __linux__
+-#define VTNAME "/dev/tty%d"
+-#define VTNAME2 "/dev/vc/%d"
++#define VTNAME "/dev/vc/%d"
++#define VTNAME2 "/dev/tty%d"
+ #endif
+ 
+ #ifdef ESIX_5_3_2_D

package/base/kbd/devpts.patch

@@ -0,0 +1,36 @@
+--- ./openvt/openvt.c.orig	2003-08-16 16:44:04.000000000 +0300
++++ ./openvt/openvt.c	2003-08-16 16:42:01.000000000 +0300
+@@ -100,18 +100,18 @@
+    }
+ 
+    consfd = getfd();
+-   if (consfd < 0) {
+-      fprintf(stderr,
+-	      _("Couldnt get a file descriptor referring to the console\n"));
+-      return(2);
+-   }
+ 
+-   if (ioctl(consfd, VT_GETSTATE, &vtstat) < 0) {
++   if (consfd >= 0 && ioctl(consfd, VT_GETSTATE, &vtstat) < 0) {
+ 	perror("openvt: VT_GETSTATE");
+         return(4);
+    }
+ 
+    if (vtno == -1) {
++     if (consfd < 0) {
++        fprintf(stderr,
++	      _("Couldnt get a file descriptor referring to the console\n"));
++        return(2);
++     }
+      if ((ioctl(consfd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) {
+         perror("openvt: VT_OPENQRY");
+ 	fprintf(stderr, _("openvt: cannot find a free vt\n"));
+@@ -267,7 +267,7 @@
+ 
+    if ( do_wait ) {
+       wait(NULL);
+-      if (show) { /* Switch back... */
++      if (show && consfd >= 0) { /* Switch back... */
+ 	 if (ioctl(consfd, VT_ACTIVATE, vtstat.v_active)) {
+ 	    perror("VT_ACTIVATE");
+ 	    return 8;

package/esden/w3m/config.in

@@ -0,0 +1,20 @@
+if pkgcheck w3m X
+then
+	menu_begin MENU_PKG_W3M 'W3M options (build model)'
+	if pkgcheck openssl X ; then
+	    choice ROCKCFG_PKG_W3M_MODEL monster \
+		baby "Baby (no color, no menu, no mouse, no cookie, no SSL)" \
+		little "Little (color, menu, no mouse, no cookie, no SSL)" \
+		mouse "Mouse (color, menu, mouse, no cookie, no SSL)" \
+		cookie "Cookie (color, menu, mouse, cookie, no SSL)" \
+		monster "Monster (everything)"
+	else
+	    choice ROCKCFG_PKG_W3M_MODEL cookie \
+		baby "Baby (no color, no menu, no mouse, no cookie, no SSL)" \
+		little "Little (color, menu, no mouse, no cookie, no SSL)" \
+		mouse "Mouse (color, menu, mouse, no cookie, no SSL)" \
+		cookie "Cookie (color, menu, mouse, cookie, no SSL)"
+	fi
+	menu_end
+fi
+

package/esden/w3m/w3m.conf

@@ -20,5 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-var_append extraconfopt ' ' "-yes -lang=en -model=monster -helpdir=\$docdir"
+var_append extraconfopt ' ' "-yes -lang=en -helpdir=\$docdir"
+var_append extraconfopt ' ' "-model=${ROCKCFG_PKG_W3M_MODEL:-monster}"