Hello community, here is the log from the commit of package shellinabox for openSUSE:Factory checked in at 2013-02-08 14:44:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shellinabox (Old) and /work/SRC/openSUSE:Factory/.shellinabox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shellinabox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/shellinabox/shellinabox.changes 2012-12-07 14:51:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shellinabox.new/shellinabox.changes 2013-02-08 23:25:49.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Feb 7 08:55:38 UTC 2013 - [email protected] + +- added Susefirewall service description file +- restart on update +- do not package INSTALL file + +------------------------------------------------------------------- +Wed Feb 6 20:47:08 UTC 2013 - [email protected] + +- fixed not working "_" and "-" keys in Firefox (bnc#793123) + (in 0001-add-new-keyCodes-used-by-FF15.patch file) + +------------------------------------------------------------------- +Wed Feb 6 14:18:16 UTC 2013 - [email protected] + +- updated to version 2.14: + - removed executable stack flags in binary + - blinking cursor can be disabled + - optional on-screen keyboard + - fixed some scaling related issues +- removed shellinabox-ia64-ppc-s390.patch (build has been fixed in + upstream Makefiles) +- removed libopenssl-devel runtime dependency + +------------------------------------------------------------------- Old: ---- shellinabox-2.10.tar.bz2 shellinabox-ia64-ppc-s390.patch New: ---- 0001-add-new-keyCodes-used-by-FF15.patch shellinabox shellinabox-2.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shellinabox.spec ++++++ --- /var/tmp/diff_new_pack.lMJ87T/_old 2013-02-08 23:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.lMJ87T/_new 2013-02-08 23:25:54.000000000 +0100 @@ -10,14 +10,14 @@ # BuildRequires: libopenssl-devel pam-devel zlib-devel -PreReq: pam openssl libopenssl-devel +PreReq: pam openssl Summary: AJAX/Web based terminal emulator Name: shellinabox # %define pkg_name shellinabox # -Version: 2.10 +Version: 2.14 Release: 1.1 License: SUSE-GPL-2.0-with-openssl-exception URL: http://code.google.com/p/shellinabox/ @@ -32,8 +32,9 @@ Source0: %{name}-%{version}.tar.bz2 # Fix possible buffer overwrite error in launcher.c Patch: shellinabox.patch -Patch1: shellinabox-ia64-ppc-s390.patch +Patch1: 0001-add-new-keyCodes-used-by-FF15.patch Source1: rcshellinabox +Source2: shellinabox %description Shell In A Box implements a web server that can export arbitrary command l @@ -49,7 +50,7 @@ %prep %setup -q -%patch -p0 +%patch -p1 %patch1 -p1 %configure @@ -58,6 +59,10 @@ %install %makeinstall + +# remove INSTALL, not needed in installed package (fixes rpmlint warning) +rm $RPM_BUILD_ROOT/usr/share/doc/shellinabox/INSTALL + %{__install} -d -m 0755 \ %{buildroot}%{pkg_home}/ \ %{buildroot}%{_sbindir} @@ -73,6 +78,10 @@ # configure certificates mkdir -p $RPM_BUILD_ROOT/etc/%{pkg_name}/certs +# firewall service definition +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services +install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services + %post %fillup_and_insserv @@ -94,6 +103,7 @@ # Cleanup after install # --------------------------------------------------------------------------------- %postun +%restart_on_update shellinabox %insserv_cleanup test -e /var/run/shellinabox.pid || rm -rf /var/run/shellinabox.pid && : @@ -111,5 +121,6 @@ %dir /etc/shellinabox/ %dir /etc/shellinabox/certs %{_sbindir}/rc%{pkg_name} +%config /etc/sysconfig/SuSEfirewall2.d/services/shellinabox %changelog ++++++ 0001-add-new-keyCodes-used-by-FF15.patch ++++++ >From ea7fea87a2cdba9df40f27464ce27f5d192ac389 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian <[email protected]> Date: Mon, 7 Jan 2013 19:11:49 +0100 Subject: [PATCH 1/2] add new keyCodes used by >=FF15 --- shellinabox/vt100.jspp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp index 7a72d0c..578a1b6 100755 --- a/shellinabox/vt100.jspp +++ b/shellinabox/vt100.jspp @@ -2898,10 +2898,10 @@ VT100.prototype.keyDown = function(event) { event.keyCode == 226; var normalKey = alphNumKey || - event.keyCode == 59 || event.keyCode == 61 || + event.keyCode >= 59 && event.keyCode <= 64 || event.keyCode == 106 || event.keyCode == 107 || event.keyCode >= 109 && event.keyCode <= 111 || - event.keyCode >= 186 && event.keyCode <= 192 || + event.keyCode >= 160 && event.keyCode <= 192 || event.keyCode >= 219 && event.keyCode <= 223 || event.keyCode == 252; try { -- 1.8.1-zedat ++++++ shellinabox ++++++ # SuSEfirewall2 service definition ## Name: Shellinabox ## Description: Web based AJAX terminal emulator # space separated list of allowed TCP ports TCP="4200" ++++++ shellinabox-2.10.tar.bz2 -> shellinabox-2.14.tar.bz2 ++++++ ++++ 12330 lines of diff (skipped) ++++++ shellinabox.patch ++++++ --- /var/tmp/diff_new_pack.lMJ87T/_old 2013-02-08 23:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.lMJ87T/_new 2013-02-08 23:25:54.000000000 +0100 @@ -1,6 +1,7 @@ ---- shellinabox/launcher.c.orig 2011-05-02 22:37:22.000000000 +0200 -+++ shellinabox/launcher.c 2011-05-02 22:25:58.000000000 +0200 -@@ -425,7 +425,7 @@ +diff -Pdpur shellinabox-2.14.orig/shellinabox/launcher.c shellinabox-2.14/shellinabox/launcher.c +--- shellinabox-2.14.orig/shellinabox/launcher.c 2012-04-21 19:30:44.000000000 +0200 ++++ shellinabox-2.14/shellinabox/launcher.c 2013-02-06 15:03:12.205151893 +0100 +@@ -523,7 +523,7 @@ int launchChild(int service, struct Sess request->width = session->width; request->height = session->height; strncat(request->peerName, httpGetPeerName(session->http), @@ -9,36 +10,18 @@ request->urlLength = strlen(u); memcpy(&request->url, u, request->urlLength); free(u); -@@ -476,10 +476,10 @@ - #ifdef HAVE_UTMPX_H - utmp->utmpx.ut_type = useLogin ? LOGIN_PROCESS : USER_PROCESS; - dcheck(!strncmp(ptyPath, "/dev/pts", 8)); -- strncat(&utmp->utmpx.ut_line[0], ptyPath + 5, sizeof(utmp->utmpx.ut_line)); -- strncat(&utmp->utmpx.ut_id[0], ptyPath + 8, sizeof(utmp->utmpx.ut_id)); -- strncat(&utmp->utmpx.ut_user[0], "SHELLINABOX", sizeof(utmp->utmpx.ut_user)); -- strncat(&utmp->utmpx.ut_host[0], peerName, sizeof(utmp->utmpx.ut_host)); -+ strncat(&utmp->utmpx.ut_line[0], ptyPath + 5, sizeof(utmp->utmpx.ut_line) - strlen(utmp->utmpx.ut_line) - 1 ); -+ strncat(&utmp->utmpx.ut_id[0], ptyPath + 8, sizeof(utmp->utmpx.ut_id) - strlen(utmp->utmpx.ut_line) - 1 ); -+ strncat(&utmp->utmpx.ut_user[0], "SHELLINABOX", sizeof(utmp->utmpx.ut_user) - strlen(utmp->utmpx.ut_line) - 1 ); -+ strncat(&utmp->utmpx.ut_host[0], peerName, sizeof(utmp->utmpx.ut_host) - strlen(utmp->utmpx.ut_line) - 1); +@@ -576,10 +576,10 @@ void initUtmp(struct Utmp *utmp, int use + dcheck(!strncmp(ptyPath, "/dev/pts", 8) || + !strncmp(ptyPath, "/dev/pty", 8) || + !strncmp(ptyPath, "/dev/tty", 8)); +- strncat(&utmp->utmpx.ut_line[0], ptyPath + 5, sizeof(utmp->utmpx.ut_line) - 1); +- strncat(&utmp->utmpx.ut_id[0], ptyPath + 8, sizeof(utmp->utmpx.ut_id) - 1); +- strncat(&utmp->utmpx.ut_user[0], "SHELLINABOX", sizeof(utmp->utmpx.ut_user) - 1); +- strncat(&utmp->utmpx.ut_host[0], peerName, sizeof(utmp->utmpx.ut_host) - 1); ++ strncat(&utmp->utmpx.ut_line[0], ptyPath + 5, sizeof(utmp->utmpx.ut_line) - strlen(utmp->utmpx.ut_line) - 1); ++ strncat(&utmp->utmpx.ut_id[0], ptyPath + 8, sizeof(utmp->utmpx.ut_id) - strlen(utmp->utmpx.ut_id) - 1); ++ strncat(&utmp->utmpx.ut_user[0], "SHELLINABOX", sizeof(utmp->utmpx.ut_user) - strlen(utmp->utmpx.ut_user) - 1); ++ strncat(&utmp->utmpx.ut_host[0], peerName, sizeof(utmp->utmpx.ut_host) - strlen(utmp->utmpx.ut_host) - 1); struct timeval tv; check(!gettimeofday(&tv, NULL)); utmp->utmpx.ut_tv.tv_sec = tv.tv_sec; -@@ -1023,7 +1023,7 @@ - if (service->authUser != 2 /* SSH */) { - memset(&utmp->utmpx.ut_user, 0, sizeof(utmp->utmpx.ut_user)); - strncat(&utmp->utmpx.ut_user[0], service->user, -- sizeof(utmp->utmpx.ut_user)); -+ sizeof(utmp->utmpx.ut_user) - strlen(utmp->utmpx.ut_user) - 1 ); - setutxent(); - pututxline(&utmp->utmpx); - endutxent(); -@@ -1310,7 +1310,7 @@ - endutxent(); - if (!utmp->useLogin) { - memset(&utmpx.ut_user, 0, sizeof(utmpx.ut_user)); -- strncat(&utmpx.ut_user[0], "LOGIN", sizeof(utmpx.ut_user)); -+ strncat(&utmpx.ut_user[0], "LOGIN", sizeof(utmpx.ut_user) - strlen(utmpx.ut_user) - 1); - updwtmpx("/var/log/wtmp", &utmpx); - } - #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
