simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed lintian errors.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@195 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com 2009-12-02 08:21:03 +00:00
parent cc4caca982
commit 571d3738df
18 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -11,6 +11,8 @@
* Updated the Standards-Version in debian/control. Still need to * Updated the Standards-Version in debian/control. Still need to
review whether we are in full compliance, though. review whether we are in full compliance, though.
* Fixed lintian errors.
2009-11-29 Markus Gutschke <markus@shellinabox.com> 2009-11-29 Markus Gutschke <markus@shellinabox.com>
* Preparations for packaging ShellInABox in a way that makes it * Preparations for packaging ShellInABox in a way that makes it

9
commit
View file

@ -64,6 +64,9 @@ debian_package() {
# Reset compatibility level # Reset compatibility level
echo 7 >"${prj}-${ver}/debian/compat" echo 7 >"${prj}-${ver}/debian/compat"
sed -i -e 's/debhelper *([^0-9]*[^)]*)/debhelper (>= 7.0.0)/' \
"${prj}-${ver}/debian/control"
sed -i -e 's/dh_clean *-k/dh_prep/' "${prj}-${ver}/debian/rules"
# Check that the version number in the debian/changelog file matches # Check that the version number in the debian/changelog file matches
if [ "$(sed -e 's/^'"${prj}"' *(\([^-]*\)-.*).*/\1/;t1;d;:1;q' \ if [ "$(sed -e 's/^'"${prj}"' *(\([^-]*\)-.*).*/\1/;t1;d;:1;q' \
@ -72,11 +75,13 @@ debian_package() {
exit 1 exit 1
fi fi
# Build Debian packages. # Build Debian packages.
(cd "${prj}-${ver}" (cd "${prj}-${ver}"
fakeroot dpkg-buildpackage -sa -us -uc || :) fakeroot dpkg-buildpackage -sa -us -uc || :)
trap '' EXIT trap '' EXIT
# Run lintian
lintian --verbose ${prj}_${ver}*_*.changes
) || exit 1 ) || exit 1
# Revert any changes that might be pending in distributions/debian/* # Revert any changes that might be pending in distributions/debian/*
@ -167,6 +172,8 @@ svn st | egrep '^[MA]' | awk '{ print $2 }' |
# compatibility level at 6. Once we no longer care about maintaining strict # compatibility level at 6. Once we no longer care about maintaining strict
# backwards compatibility, we can lift this restriction. # backwards compatibility, we can lift this restriction.
echo 6 >debian/compat echo 6 >debian/compat
sed -i -e 's/debhelper *([^0-9]*[^)]*)/debhelper (>= 6.0.0)/' debian/control
sed -i -e 's/dh_prep/dh_clean *-k/' debian/rules
# Build all the sources, create the distribution tar archive, and run some # Build all the sources, create the distribution tar archive, and run some
# basic sanity checks. # basic sanity checks.

2
config.h
View file

@ -138,7 +138,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "194" #define VCS_REVISION "195"
/* Version number of package */ /* Version number of package */
#define VERSION "2.10" #define VERSION "2.10"

2
configure vendored
View file

@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=194 VCS_REVISION=195
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.10, markus@shellinabox.com) AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
VCS_REVISION=194 VCS_REVISION=195
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

7
debian/control vendored
View file

@ -1,17 +1,20 @@
Source: shellinabox Source: shellinabox
Section: web Section: web
Priority: optional Priority: optional
Homepage: http://shellinabox.com
Maintainer: Markus Gutschke <markus@shellinabox.com> Maintainer: Markus Gutschke <markus@shellinabox.com>
Build-Depends: debhelper (>= 4.0.0), binutils, libssl-dev, libpam0g-dev, Build-Depends: debhelper (>= 6.0.0), binutils, libssl-dev, libpam0g-dev,
zlib1g-dev zlib1g-dev
Standards-Version: 3.8.3 Standards-Version: 3.8.3
Package: shellinabox Package: shellinabox
Section: web Section: web
Priority: optional
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, adduser, lsb-base Depends: ${shlibs:Depends}, adduser, lsb-base
Suggests: libssl0.9.8, libpam0g, openssl Suggests: libssl0.9.8, libpam0g, openssl
Description: publish command line shell through AJAX interface Description: publish command line shell through AJAX interface
Shellinabox can export arbitrary command line programs to any JavaScript Shellinabox can export arbitrary command line programs to any JavaScript
enabled web browser. By default, it prompts for username and password enabled web browser. By default, it prompts for username and password
and then exports a SSL/TLS encrypted login shell. and then exports a SSL/TLS encrypted login shell. Shellinabox provides
a VT100 compatible terminal emulator that runs within any modern browser.

1
debian/docs vendored
View file

@ -5,4 +5,3 @@ INSTALL
NEWS NEWS
README README
TODO TODO
shellinabox/cgi-mode-example.sh

9
debian/rules vendored
View file

@ -55,7 +55,7 @@ clean:
dh_testroot dh_testroot
rm -f build-stamp rm -f build-stamp
@# Add here commands to clean up after the build process. @# Add here commands to clean up after the build process.
-$(MAKE) distclean [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" "" ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub cp -f /usr/share/misc/config.sub config.sub
endif endif
@ -89,6 +89,13 @@ install: build
"$(CURDIR)/debian/tmp/etc/shellinabox/options-available/README" "$(CURDIR)/debian/tmp/etc/shellinabox/options-available/README"
cp "$(CURDIR)/debian/README.enabled" \ cp "$(CURDIR)/debian/README.enabled" \
"$(CURDIR)/debian/tmp/etc/shellinabox/options-enabled/README" "$(CURDIR)/debian/tmp/etc/shellinabox/options-enabled/README"
# Add Lintian override. ShellInABox has an explicit exemption allowing
# the linking its GPLv2 code with OpenSSL.
mkdir -p "$(CURDIR)/debian/tmp/usr/share/lintian/overrides/"
{ echo '# ShellInABox has an explicit exemption allowing the linking';\
echo '# of its GPLv2 code with OpenSSL'; \
echo 'shellinabox binary: possible-gpl-code-linked-with-openssl'; } \
>"$(CURDIR)/debian/tmp/usr/share/lintian/overrides/shellinabox"
# Build architecture-independent files here. # Build architecture-independent files here.
binary-indep: build install binary-indep: build install

1
debian/shellinabox.examples vendored Normal file
View file

@ -0,0 +1 @@
shellinabox/cgi-mode-example.sh

1
debian/shellinabox.install vendored
View file

@ -1,4 +1,5 @@
etc/shellinabox/options-available etc/shellinabox/options-available
etc/shellinabox/options-enabled etc/shellinabox/options-enabled
usr/bin usr/bin
usr/share/lintian/overrides
usr/share/man/man1 usr/share/man/man1

11
debian/shellinabox.postinst vendored
View file

@ -30,13 +30,4 @@ case "$1" in
;; ;;
esac esac
# Automatically added by dh_installinit #DEBHELPER#
if [ -x "/etc/init.d/shellinabox" ]; then
update-rc.d shellinabox start 30 2 3 4 5 . stop 01 0 1 6 . >/dev/null
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
invoke-rc.d shellinabox start || exit $?
else
/etc/init.d/shellinabox start || exit $?
fi
fi
# End automatically added section

7
debian/shellinabox.postrm vendored
View file

@ -2,12 +2,7 @@
set -e set -e
# Automatically added by dh_installinit #DEBHELPER#
if [ "$1" = "purge" ] ; then
update-rc.d shellinabox remove >/dev/null || exit $?
fi
# End automatically added section
if [ "$1" = "purge" ] ; then if [ "$1" = "purge" ] ; then
deluser --quiet --system --remove-home shellinabox > /dev/null || true deluser --quiet --system --remove-home shellinabox > /dev/null || true

2
demo/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 194)" + alert("VT100 Terminal Emulator " + "2.10 (revision 195)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

BIN
distributions/debian/shellinabox_2.10-1.diff.gz
View file

Binary file not shown.

17
distributions/debian/shellinabox_2.10-1.dsc
View file

@ -4,14 +4,15 @@ Binary: shellinabox
Architecture: any Architecture: any
Version: 2.10-1 Version: 2.10-1
Maintainer: Markus Gutschke <markus@shellinabox.com> Maintainer: Markus Gutschke <markus@shellinabox.com>
Standards-Version: 3.6.1 Homepage: http://shellinabox.com
Build-Depends: debhelper (>= 4.0.0), binutils, libssl-dev, libpam0g-dev, zlib1g-dev Standards-Version: 3.8.3
Build-Depends: debhelper (>= 7.0.0), binutils, libssl-dev, libpam0g-dev, zlib1g-dev
Checksums-Sha1: Checksums-Sha1:
1847ca3684a3cd07b0831b977a6dadf5775f0d58 516377 shellinabox_2.10.orig.tar.gz 9aad731c32128d71442fcf6608b922b41b96e3ff 516590 shellinabox_2.10.orig.tar.gz
d724b4320311d93976bc70aceaaf3d3b9883cc1d 6073 shellinabox_2.10-1.diff.gz 0547e6c6ff2944e0f2504b4c5df119bf473d33f1 6235 shellinabox_2.10-1.diff.gz
Checksums-Sha256: Checksums-Sha256:
32d5307bd920232f21918a1edfe015da44b31991458a18e5760e60540052ceb2 516377 shellinabox_2.10.orig.tar.gz df60cd564d2463ef46fc5e84e38c542fd23328f55e976cceba2924629ba28924 516590 shellinabox_2.10.orig.tar.gz
119748a3a3e7d274ad9603ae5a751199c830f6e09ce6b699061c053ac03db549 6073 shellinabox_2.10-1.diff.gz c8b7ad912c67b5182c761bef708715f324510177a17579a5bd838b465685990f 6235 shellinabox_2.10-1.diff.gz
Files: Files:
b3474662e46077f023de95ca44154c80 516377 shellinabox_2.10.orig.tar.gz 5fd7662d35cb30be92c25bc6bf860b87 516590 shellinabox_2.10.orig.tar.gz
af657b1c3410a8c60225bb324642c26e 6073 shellinabox_2.10-1.diff.gz 675290cc72ad53a0947ab9aef3adf444 6235 shellinabox_2.10-1.diff.gz

BIN
distributions/debian/shellinabox_2.10.orig.tar.gz
View file

Binary file not shown.

2
shellinabox/shell_in_a_box.js
View file

@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { ShellInABox.prototype.about = function() {
alert("Shell In A Box version " + "2.10 (revision 194)" + alert("Shell In A Box version " + "2.10 (revision 195)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

2
shellinabox/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 194)" + alert("VT100 Terminal Emulator " + "2.10 (revision 195)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };