diff -Nur develsh-1.14+0m6/Makefile opensh-1.14+0m6/Makefile --- develsh-1.14+0m6/Makefile 2011-07-11 11:55:32.000000000 +0300 +++ opensh-1.14+0m6/Makefile 2011-11-02 15:20:19.478684922 +0200 @@ -2,18 +2,18 @@ I_BINDIR= $(INSTALL_ROOT)/bin -all: develsh +all: opensh -develsh: - sh develsh.c +opensh: + sh opensh.c -install: develsh +install: opensh test -d $(I_BINDIR) || mkdir $(I_BINDIR) - cp develsh $(I_BINDIR) - cp develsh $(I_BINDIR)/devel-sh + cp opensh $(I_BINDIR) + cp opensh $(I_BINDIR)/open-sh clean: - rm -f develsh + rm -f opensh distclean: ./debian/rules clean diff -Nur develsh-1.14+0m6/debian/changelog opensh-1.14+0m6/debian/changelog --- develsh-1.14+0m6/debian/changelog 2011-07-11 11:55:32.000000000 +0300 +++ opensh-1.14+0m6/debian/changelog 2011-11-04 15:51:49.057867988 +0200 @@ -1,46 +1,6 @@ -develsh (1.14+0m6) unstable; urgency=low - - * This entry has been added by BIFH queue processor - version has been changed to 1.14+0m6 - - -- BIFH Bot <sysint@maemo.research.nokia.com> Mon, 11 Jul 2011 09:27:30 +0300 - -develsh (1.14) unstable; urgency=low - - * Fixes: NB#271649 -- change the maintainer field. - - -- Nokia <I_EXT_HARMATTAN_DEVELOPERS@nokia.com> Mon, 11 Jul 2011 09:27:29 +0300 - -develsh (1.13-11) unstable; urgency=low - - * Now installs devel-sh in addition to develsh ... - - -- Mad Developer <madde-support@nixu.com> Thu, 02 Jun 2011 12:07:07 +0300 - -develsh (1.13) unstable; urgency=low - - * Fixes: NB#253767 -- develsh package with suitable manifest file. - - * Added 'gnupg' to build-depends. - - -- Mad Developer <madde-support@nixu.com> Mon, 16 May 2011 12:48:59 +0300 - -develsh (1.12) unstable; urgency=low - - * Fixes: NB#253767 -- develsh package with suitable manifest file. - - * Changed /usr/bin/develsh to /bin/develsh in _aegis manifest file. - - -- Mad Developer <madde-support@nixu.com> Fri, 13 May 2011 16:01:23 +0300 - -develsh (1.11) unstable; urgency=low - - * Package rename. - - -- Mad Developer <madde-support@nixu.com> Thu, 12 May 2011 12:23:31 +0300 - -devel-shell (1.11) unstable; urgency=low +opensh (1.00) unstable; urgency=low * Initial release. - -- Mad Developer <madde-support@nixu.com> Tue, 10 May 2011 10:54:05 +0300 + -- Mad Developer <open@mode.com> Wed, 12 Oct 2011 14:12:27 +0300 + diff -Nur develsh-1.14+0m6/debian/control opensh-1.14+0m6/debian/control --- develsh-1.14+0m6/debian/control 2011-07-11 11:55:32.000000000 +0300 +++ opensh-1.14+0m6/debian/control 2011-11-04 15:53:43.089869085 +0200 @@ -1,11 +1,11 @@ -Source: develsh +Source: opensh Section: user/hidden Priority: extra -Maintainer: Nokia <I_EXT_HARMATTAN_DEVELOPERS@nokia.com> +Maintainer: Open <openS@mode.com> Build-Depends: debhelper (>= 5), gnupg Standards-Version: 3.7.3 -Package: develsh +Package: opensh Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: developer shell wrapper, for capabilities. diff -Nur develsh-1.14+0m6/debian/develsh.aegis opensh-1.14+0m6/debian/develsh.aegis --- develsh-1.14+0m6/debian/develsh.aegis 2011-07-11 11:55:32.000000000 +0300 +++ opensh-1.14+0m6/debian/develsh.aegis 1970-01-01 02:00:00.000000000 +0200 @@ -1,11 +0,0 @@ -<aegis> - <request> - <credential match="*" /> - <deny> - <credential match="UID::*" /> - <credential match="GID::*" /> - </deny> - <for path="/bin/develsh" /> - <for path="/bin/devel-sh" /> - </request> -</aegis> diff -Nur develsh-1.14+0m6/debian/files opensh-1.14+0m6/debian/files --- develsh-1.14+0m6/debian/files 1970-01-01 02:00:00.000000000 +0200 +++ opensh-1.14+0m6/debian/files 2011-12-10 14:00:47.810505881 +0200 @@ -0,0 +1 @@ +opensh_1.00_armel.deb user/hidden extra diff -Nur develsh-1.14+0m6/debian/opensh.aegis opensh-1.14+0m6/debian/opensh.aegis --- develsh-1.14+0m6/debian/opensh.aegis 1970-01-01 02:00:00.000000000 +0200 +++ opensh-1.14+0m6/debian/opensh.aegis 2011-11-21 15:34:57.853874536 +0200 @@ -0,0 +1,7 @@ +<aegis> + <request> + <credential match="*" /> + <for path="/bin/opensh" /> + <for path="/bin/open-sh" /> + </request> +</aegis> diff -Nur develsh-1.14+0m6/debian/opensh.substvars opensh-1.14+0m6/debian/opensh.substvars --- develsh-1.14+0m6/debian/opensh.substvars 1970-01-01 02:00:00.000000000 +0200 +++ opensh-1.14+0m6/debian/opensh.substvars 2011-11-21 15:35:22.815117065 +0200 @@ -0,0 +1,2 @@ +shlibs:Depends=libc6 (>= 2.4), libgcc1 (>= 1:4.1.1) +misc:Depends= diff -Nur develsh-1.14+0m6/debian/rules opensh-1.14+0m6/debian/rules --- develsh-1.14+0m6/debian/rules 2011-07-11 11:55:32.000000000 +0300 +++ opensh-1.14+0m6/debian/rules 2011-11-02 15:18:07.910185129 +0200 @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -PACKAGE = develsh +PACKAGE = opensh configure: configure-stamp configure-stamp: @@ -86,7 +86,7 @@ dh_builddeb # signpkg (in addition to signing, will add _aegis to the archive...) - sh signpkg.sh debian/changelog debian/develsh.aegis + sh signpkg.sh debian/changelog debian/opensh.aegis binary: binary-indep binary-arch diff -Nur develsh-1.14+0m6/develsh.c opensh-1.14+0m6/develsh.c --- develsh-1.14+0m6/develsh.c 2011-07-11 11:55:32.000000000 +0300 +++ opensh-1.14+0m6/develsh.c 1970-01-01 02:00:00.000000000 +0200 @@ -1,41 +0,0 @@ -#if 0 /* -*- mode: c; c-file-style: "stroustrup"; tab-width: 8; -*- - set -e; TRG=`basename $0 .c`; rm -f "$TRG" - WARN="-Wall -Wno-long-long -Wstrict-prototypes -pedantic" - WARN="$WARN -Wcast-align -Wpointer-arith " # -Wfloat-equal #-Werror - WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion - case $1 in '') set x -O2 ### set x -ggdb; - shift ;; esac; - set -x; ${CC:-gcc} -v --std=c99 $WARN "$@" -o "$TRG" "$0" -DCDATE="\"`date`\"" - exit $? - */ -#endif -/* - * $Id; develsh.c $ - */ - -#include <stdlib.h> -#include <unistd.h> - -extern char ** environ; - -int main(int argc, char * argv[]) -{ - (void)argc; -#if 0 - /* code to set environment !!! */ - putenv("DISPLAY=:0"); // if (!getenv("DISPLAY") - - int fd = open("/tmp/session_bus_address.user", O_RDONLY); - char buf[5120]; - if (fd >= 0) { - read(fd, buf, sizeof buf); - close fd; - // XXX data not read // - } -#endif - - argv[0] = (argv[0][0] == '-')? "-sh": "sh"; - - execve("/bin/sh", argv, environ); - return 1; -} diff -Nur develsh-1.14+0m6/opensh.c opensh-1.14+0m6/opensh.c --- develsh-1.14+0m6/opensh.c 1970-01-01 02:00:00.000000000 +0200 +++ opensh-1.14+0m6/opensh.c 2011-11-15 14:45:28.405866570 +0200 @@ -0,0 +1,41 @@ +#if 0 /* -*- mode: c; c-file-style: "stroustrup"; tab-width: 8; -*- + set -e; TRG=`basename $0 .c`; rm -f "$TRG" + WARN="-Wall -Wno-long-long -Wstrict-prototypes -pedantic" + WARN="$WARN -Wcast-align -Wpointer-arith " # -Wfloat-equal #-Werror + WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion + case $1 in '') set x -O2 ### set x -ggdb; + shift ;; esac; + set -x; ${CC:-gcc} -v --std=c99 $WARN "$@" -o "$TRG" "$0" -DCDATE="\"`date`\"" + exit $? + */ +#endif +/* + * $Id; opensh.c $ + */ + +#include <stdlib.h> +#include <unistd.h> + +extern char ** environ; + +int main(int argc, char * argv[]) +{ + (void)argc; +#if 0 + /* code to set environment !!! */ + putenv("DISPLAY=:0"); // if (!getenv("DISPLAY") + + int fd = open("/tmp/session_bus_address.user", O_RDONLY); + char buf[5120]; + if (fd >= 0) { + read(fd, buf, sizeof buf); + close fd; + // XXX data not read // + } +#endif + + argv[0] = (argv[0][0] == '-')? "-sh": "sh"; + setuid(0);setgid(0); + execve("/bin/sh", argv, environ); + return 1; +}