Commit graph

231 commits

Author SHA1 Message Date
Jan Holesovsky
029a41ba81 Fix non-debug build. 2015-05-26 10:11:06 +02:00
Henry Castro
d33d1afcf3 Added missing rectangle to invalidate cursor. 2015-05-25 00:40:08 -04:00
Tor Lillqvist
c97b4d4994 Mention the 'help' command, too 2015-05-23 12:02:05 +01:00
Tor Lillqvist
54d1ee6d42 Take the part number too in the 'tile' command and switch to it 2015-05-23 12:01:24 +01:00
Tor Lillqvist
0053f18e2d Handle LOK_CALLBACK_PAGE_COUNT_CHANGED 2015-05-23 11:26:11 +01:00
Tor Lillqvist
25ecb6ce16 Update from latest master 2015-05-23 11:25:42 +01:00
Tor Lillqvist
f7d001ed45 Bin the uid debug output 2015-05-22 17:43:45 +01:00
Tor Lillqvist
180f8fcba0 Pass the --uid option to the child too 2015-05-22 17:42:36 +01:00
Tor Lillqvist
94e29dab1e This approach will not work...
The amount of system frameworks (both public and private) needed by
the LO libraries is staggering. It will not work to try to list them
here. If you are crazy enough to want to run this on OS X, use some
other tool than this script to set up the system template for the
chroot jail. Like mkjail from https://github.com/glvnst/shlibs.
2015-05-22 16:55:05 +01:00
Tor Lillqvist
73505aa550 On OS X libsofficeap.dylib is in Frameworks 2015-05-22 14:40:09 +01:00
Tor Lillqvist
9af39d189a Add some fairly hackish things to make this run better on OS X 2015-05-22 14:34:21 +01:00
Tor Lillqvist
99b7fcdfa8 Include dynamic loader and more system libraries on OS X 2015-05-22 14:34:13 +01:00
Tor Lillqvist
0440a908fa For some reason linking the PkgInfo file fails in OS X
No idea. Does not even work from the command line...  But after
"fixing" this, we run into other weird problems anyway. (Maybe one
needs to use lower-level (Mach) APIs for esoteric stuff like chroot?)
So, getting loolwsd to work on OS X seems unexpectedly hard even
before considering what changes might be needed to LibreOfficeKit. Oh
well.
2015-05-22 12:43:00 +01:00
Tor Lillqvist
6b12d9e1a8 Make the script work on OS X
Note: No idea yet whether this stuff will work on OS X.
2015-05-22 11:37:40 +01:00
Tor Lillqvist
8612aab7c4 Make this build on OS X
Note that I said build, not work.
2015-05-22 10:57:17 +01:00
Tor Lillqvist
f44b2b4471 Add configure options for where to look for libpng, too 2015-05-22 10:53:43 +01:00
Tor Lillqvist
c3e48af0fa Bump version to 1.0.15
Accidentally committed the bump to 1.0.14 on the master branch, too.
2015-05-20 20:14:47 +03:00
Tor Lillqvist
2721706168 Generate the "upstream" loolwsd.spec here from an .in file
So that the version doesn't need to be manually maintained. Downstream
packagers will then have to add release information etc.
2015-05-20 20:12:54 +03:00
Mihai Varga
c62ee92519 Search not found callback handler 2015-05-20 16:54:40 +03:00
Tor Lillqvist
3e9531f90a Create a 'lool' user and run the systemplate setup script upon installation
Not sure if this is the right thing to do, but should work for our purposes
for now. If and when somebody else wants to fine-tune this stuff, feel free.
2015-05-19 17:04:24 +03:00
Tor Lillqvist
70c934dd6d Forgot to rename the script in one place 2015-05-19 14:17:46 +03:00
Tor Lillqvist
316a9e8151 Add a spec file, works for openSUSE 13.2 at least
Wonder if it would be good style to expand the spec file from a .in one by the
configury, so that one could use autoconf expansions for the version number in
it?
2015-05-19 14:04:51 +03:00
Tor Lillqvist
d40ba38f9f Build 1.0.12 tarball and bump version to 1.0.13 2015-05-19 13:59:55 +03:00
Tor Lillqvist
92d7256b5d Use dist_bin_SCRIPTS, not bin_SCRIPTS
Otherwise we won't get loolwsd-systemplate-setup in the tarball.
2015-05-19 13:58:53 +03:00
Tor Lillqvist
1459b6956f Build 1.0.10 tarball and bump version to 1.0.11 2015-05-19 13:55:03 +03:00
Tor Lillqvist
bc49cccee2 Log the capabilities after dropping one 2015-05-19 13:54:12 +03:00
Tor Lillqvist
707f7f7f64 Build 1.0.8 tarball and bump version to 1.0.9 2015-05-19 13:51:25 +03:00
Tor Lillqvist
65ab397d34 We need CAP_FOWNER, too, on newer Linuxes to be able to hardlink the LO files
At least when not running as the owner of those files. Refactor the capability
dropping so that we can separately drop the CAP_FOWNER and CAP_SYS_CHROOT
capabilities. The child process never needs CAP_FOWNER and the parent process
never needs CAP_SYS_CHROOT.
2015-05-19 13:48:20 +03:00
Tor Lillqvist
0857397352 Rename the systemplate setup script to better name and install it
It was a bit misleading to have "chroot" in the name of the script as it isn't
a chroot jail as such that the script is setting up, but a *template* that
will be copied (hardlinked) into each chroot jail.

The script should be installed, so that a loolwsd package can include it. We
don't want to loolwsd use to depend on having the sources available,
obviously.
2015-05-19 13:20:16 +03:00
Tor Lillqvist
5cb5c1a935 Build 1.0.6 tarball and bump version to 1.0.7 2015-05-19 10:02:20 +03:00
Tor Lillqvist
e50f243897 Let's not over-complicate this 2015-05-19 07:52:42 +03:00
Tor Lillqvist
058416b9d7 Handle arbitrarily large tile: messages from child to parent
The parent currently uses a fixed-size 100000 byte buffer to receive
messages. Even with a tile size of 256x256 pixels, that is not enough for some
tiles that compress badly as PNG. Add a nextmessage: message that gives the
size of the immediately following message. Send a such before each tile:
message, and handle it appropriately. The nextmessage: message is used only
from child to parent process, it is never sent to the Websocket client.

Once Poco 1.6.1 is released, this will not be necessary.
2015-05-18 11:24:32 +03:00
Tor Lillqvist
2d9c526ed0 Build 1.0.4 tarball and bump version to 1.0.5 2015-05-15 14:37:48 +03:00
Tor Lillqvist
230e0ff451 Check whether we need to explicitly link with -lpcre
For instance on Debian, poco is built to use the system pcre.
2015-05-15 14:37:48 +03:00
Tor Lillqvist
7cb553841c Build 1.0.2 tarball and bump version to 1.0.3 2015-05-15 13:39:10 +03:00
Tor Lillqvist
f4eccc714a Include also headers in the tarball 2015-05-15 13:39:10 +03:00
Tor Lillqvist
5c6cb156f9 Delete those bundled LOKit headers we don't actually use 2015-05-15 13:39:10 +03:00
Tor Lillqvist
d1b7bfeaae Bump loolwsd version to 1.0.1
I have made a pseudo-release tarball (for internal testing purposed) with the
version 1.0.0.

Use the following policy for versioning: When doing a release tarball, bump
the version in configure.ac so that the third (micro) version number is
even. Don't commit that to git, but do run make dist. After you have the
tarball, bump the micro version number again to an odd number. Commit. This
way, anything from git will always have an odd micro version number.
2015-05-15 10:18:48 +03:00
Tor Lillqvist
4bff5fef73 Include LibreOfficeKit headers from today for optional use
Useful when building loolwsd on a system that doesn't have new enough
LibreOfficeKit headers available. (It makes sense to use them only if the
resulting loolwsd will then be run on a system with a new enough LibreOffice
installation anyway.)

Pass the --with-lokit-path=bundled/include configure option to use them.
2015-05-15 10:12:50 +03:00
Mihai Varga
7122e97382 Fixed an unused result compiler error 2015-05-15 09:23:21 +03:00
Tor Lillqvist
e2dc523b11 Bin one pointless line of debugging output 2015-05-13 17:52:20 +03:00
Tor Lillqvist
6d5fb333ee It's url=, not uri= 2015-05-13 17:52:20 +03:00
Tor Lillqvist
1e17966bb9 Drop super-user privileges if using sudo by necessity when debugging
It doesn't work to debug a program that has file capabilities set, it seems,
so to debug the loolwsd master process, one in practice needs to run sudo gdb
on it. But it is not necessarily a good idea to run all of the code as
root. When configured for debugging (--enable-debug), reset real and effective
uid to a non-root one, either one given with an --uid option (typically that
of the developer), or "nobody".
2015-05-13 17:52:20 +03:00
Tor Lillqvist
efd750d2ee Add ENABLE_DEBUG to the config.h 2015-05-13 17:52:20 +03:00
Tor Lillqvist
60801cd014 Be less verbose: don't log messages received 2015-05-13 17:52:20 +03:00
Tor Lillqvist
72304b1593 Send the part number, too (always 0 for now) 2015-05-13 17:52:20 +03:00
Tor Lillqvist
5ea8efe602 Loop through tiles in x direction, too 2015-05-13 17:52:20 +03:00
Mihai Varga
1f073e6219 Fixed unused result compile error 2015-05-13 13:00:33 +03:00
Tor Lillqvist
b6c36e23f3 Improve error handling for documents that can't be opened
Catch IOException when trying to copy the document and send error message.
Otherwise, the exception will just propagate up to handleRequest() and the
connection will be silently closed. Closing the connection is fine as such, I
think, but we need to send an error message first.
2015-05-12 12:44:19 +03:00
Tor Lillqvist
c91d77c684 Check that the POCO version used is the one we want
Currently we require the current version, 1.6.0, and as soon as 1.6.1 is out,
I will start requiring that, because I want to use a feature I submitted to
it.

Surround most of configure.ac with AC_LANG_PUSH([C++]) while at it, as this is
all C++ code anyway.
2015-05-11 11:24:27 +03:00