Date: Thursday, July 6, 2017 @ 11:46:03
Author: spupykin
Revision: 242544
upgpkg: libreoffice-online 2.1.1-2: remove git master files
Modified:
libreoffice-online/trunk/PKGBUILD
libreoffice-online/trunk/build-fix.patch
libreoffice-online/trunk/libreoffice-online.install
libreoffice-online/trunk/loolwsd.service
----------------------------+
PKGBUILD | 8 ++++----
build-fix.patch | 30 +++++++++++++++---------------
libreoffice-online.install | 10 +++++-----
loolwsd.service | 1 +
4 files changed, 25 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-06 11:26:07 UTC (rev 242543)
+++ PKGBUILD 2017-07-06 11:46:03 UTC (rev 242544)
@@ -5,7 +5,7 @@
pkgname=libreoffice-online
pkgver=2.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="HTML5-based/cloud-based version of the office suite"
arch=('x86_64' 'i686')
url="https://cgit.freedesktop.org/libreoffice/online/";
@@ -18,8 +18,8 @@
"loolwsd.service"
"build-fix.patch")
sha512sums=('fbb939631e9938800389e09842cf0bf079c0c2907f93ba13cc2e1c2dc4950f36a7206f2145c9f905c916820fed4fcd02b1b72765f0d299df804b67d82e3d045f'
-
'71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6'
-
'c39fbba5d5f46e201b7db8dceb4af305e4210894aca7c2d7282af13ad1878f57065bbc7329ac69c52de10a7d5661f2697ea2156d9f275045a03737dc240ccbba')
+
'4a809d8420f42eef99a831b32c94d9ce336b5aa5ccac3c44b99346b94e9d7a6ae8b4e06760057f20e844837c3ab2175146bef63ba99e1a50d016a890704cc2c9'
+
'049036898f59f1a7f18c6f186042b7ecee84b010256c813c633e0854b206b1b94343972cc8a374990eb22919a223429de4db712f70a89851f266e6500b67c2b1')
prepare() {
cd "${srcdir}/online-${pkgver}"
@@ -30,7 +30,7 @@
cd "${srcdir}/online-${pkgver}"
./autogen.sh
export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
- CPPFLAGS="-I/usr/include/openssl-1.0" \
+ CPPFLAGS="-I/usr/include/openssl-1.0 -Wno-implicit-fallthrough
-Wno-format-truncation" \
CFLAGS="-I/usr/include/openssl-1.0" \
LDFLAGS="-L/usr/lib/openssl-1.0" \
./configure --enable-silent-rules \
Modified: build-fix.patch
===================================================================
--- build-fix.patch 2017-07-06 11:26:07 UTC (rev 242543)
+++ build-fix.patch 2017-07-06 11:46:03 UTC (rev 242544)
@@ -1,6 +1,6 @@
diff -wbBur online-2.1.1/common/Protocol.cpp online-2.1.1.q/common/Protocol.cpp
--- online-2.1.1/common/Protocol.cpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Protocol.cpp 2017-05-29 17:57:28.305871286 +0300
++++ online-2.1.1.q/common/Protocol.cpp 2017-07-06 13:44:08.216542616 +0300
@@ -17,7 +17,7 @@
#include <string>
@@ -12,7 +12,7 @@
diff -wbBur online-2.1.1/common/Protocol.hpp online-2.1.1.q/common/Protocol.hpp
--- online-2.1.1/common/Protocol.hpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Protocol.hpp 2017-05-29 17:57:28.305871286 +0300
++++ online-2.1.1.q/common/Protocol.hpp 2017-07-06 13:57:16.563171891 +0300
@@ -22,7 +22,7 @@
#include <Poco/Net/WebSocket.h>
@@ -27,13 +27,13 @@
inline std::string getAbbreviatedMessage(const std::string& message)
{
- const auto pos = getDelimiterPosition(message.data(),
std::min(message.size(), 500UL), '\n');
-+ const auto pos = getDelimiterPosition(message.data(),
std::min(message.size(), (unsigned int)500UL), '\n');
++ const auto pos = getDelimiterPosition(message.data(),
std::min((unsigned int)message.size(), (unsigned int)500UL), '\n');
// If first line is less than the length (minus newline), add
ellipsis.
if (pos < static_cast<std::string::size_type>(message.size()) - 1)
diff -wbBur online-2.1.1/common/Seccomp.cpp online-2.1.1.q/common/Seccomp.cpp
--- online-2.1.1/common/Seccomp.cpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Seccomp.cpp 2017-05-29 19:29:09.912474712 +0300
++++ online-2.1.1.q/common/Seccomp.cpp 2017-07-06 13:44:08.216542616 +0300
@@ -36,6 +36,12 @@
#if defined(__x86_64__)
# define AUDIT_ARCH_NR AUDIT_ARCH_X86_64
@@ -66,7 +66,7 @@
KILL_SYSCALL(uselib),
diff -wbBur online-2.1.1/common/Util.hpp online-2.1.1.q/common/Util.hpp
--- online-2.1.1/common/Util.hpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Util.hpp 2017-05-29 17:57:28.305871286 +0300
++++ online-2.1.1.q/common/Util.hpp 2017-07-06 13:44:08.216542616 +0300
@@ -25,7 +25,7 @@
#include <Poco/RegularExpression.h>
@@ -78,7 +78,7 @@
{
diff -wbBur online-2.1.1/kit/ChildSession.cpp
online-2.1.1.q/kit/ChildSession.cpp
--- online-2.1.1/kit/ChildSession.cpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/kit/ChildSession.cpp 2017-05-29 17:57:28.305871286
+0300
++++ online-2.1.1.q/kit/ChildSession.cpp 2017-07-06 13:44:08.216542616
+0300
@@ -19,6 +19,8 @@
#include <Poco/StringTokenizer.h>
#include <Poco/URI.h>
@@ -90,7 +90,7 @@
#include "Log.hpp"
diff -wbBur online-2.1.1/kit/DummyLibreOfficeKit.cpp
online-2.1.1.q/kit/DummyLibreOfficeKit.cpp
--- online-2.1.1/kit/DummyLibreOfficeKit.cpp 2017-05-18 22:03:26.000000000
+0300
-+++ online-2.1.1.q/kit/DummyLibreOfficeKit.cpp 2017-05-29 17:57:28.305871286
+0300
++++ online-2.1.1.q/kit/DummyLibreOfficeKit.cpp 2017-07-06 13:44:08.216542616
+0300
@@ -14,7 +14,7 @@
#include <cstring>
#include <memory>
@@ -102,7 +102,7 @@
struct LibLODocument_Impl : public _LibreOfficeKitDocument
diff -wbBur online-2.1.1/kit/Kit.cpp online-2.1.1.q/kit/Kit.cpp
--- online-2.1.1/kit/Kit.cpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/kit/Kit.cpp 2017-05-29 17:57:28.305871286 +0300
++++ online-2.1.1.q/kit/Kit.cpp 2017-07-06 13:44:08.216542616 +0300
@@ -1,3 +1,4 @@
+#include <sys/sysmacros.h>
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
@@ -110,7 +110,7 @@
* This file is part of the LibreOffice project.
diff -wbBur online-2.1.1/kit/KitHelper.hpp online-2.1.1.q/kit/KitHelper.hpp
--- online-2.1.1/kit/KitHelper.hpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/kit/KitHelper.hpp 2017-05-29 17:57:28.305871286 +0300
++++ online-2.1.1.q/kit/KitHelper.hpp 2017-07-06 13:44:08.216542616 +0300
@@ -14,7 +14,7 @@
#include <string>
@@ -132,7 +132,7 @@
return std::to_string(type);
diff -wbBur online-2.1.1/net/WebSocketHandler.hpp
online-2.1.1.q/net/WebSocketHandler.hpp
--- online-2.1.1/net/WebSocketHandler.hpp 2017-05-18 22:03:26.000000000
+0300
-+++ online-2.1.1.q/net/WebSocketHandler.hpp 2017-05-29 17:58:29.125870587
+0300
++++ online-2.1.1.q/net/WebSocketHandler.hpp 2017-07-06 13:44:08.216542616
+0300
@@ -358,14 +358,14 @@
else
{
@@ -158,7 +158,7 @@
// Copy the data.
diff -wbBur online-2.1.1/test/TileQueueTests.cpp
online-2.1.1.q/test/TileQueueTests.cpp
--- online-2.1.1/test/TileQueueTests.cpp 2017-05-18 22:03:26.000000000
+0300
-+++ online-2.1.1.q/test/TileQueueTests.cpp 2017-05-29 19:38:13.742468460
+0300
++++ online-2.1.1.q/test/TileQueueTests.cpp 2017-07-06 13:44:08.256542614
+0300
@@ -281,7 +281,7 @@
// Empty queue
@@ -289,7 +289,7 @@
void TileQueueTests::testCallbackInvalidation()
diff -wbBur online-2.1.1/test/WhiteBoxTests.cpp
online-2.1.1.q/test/WhiteBoxTests.cpp
--- online-2.1.1/test/WhiteBoxTests.cpp 2017-05-18 22:03:26.000000000
+0300
-+++ online-2.1.1.q/test/WhiteBoxTests.cpp 2017-05-29 19:46:37.935795998
+0300
++++ online-2.1.1.q/test/WhiteBoxTests.cpp 2017-07-06 13:44:08.326542611
+0300
@@ -80,53 +80,53 @@
CPPUNIT_ASSERT(LOOLProtocol::getTokenKeywordFromMessage(message,
"mumble", map, mumble));
CPPUNIT_ASSERT_EQUAL(2, mumble);
@@ -422,7 +422,7 @@
CPPUNIT_ASSERT_EQUAL(std::string("width=256"), tokens[2]);
diff -wbBur online-2.1.1/wsd/Admin.cpp online-2.1.1.q/wsd/Admin.cpp
--- online-2.1.1/wsd/Admin.cpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/wsd/Admin.cpp 2017-05-29 18:06:37.882531636 +0300
++++ online-2.1.1.q/wsd/Admin.cpp 2017-07-06 13:44:08.326542611 +0300
@@ -326,7 +326,7 @@
if (memWait <= 0)
{
@@ -434,7 +434,7 @@
_lastTotalMemory = totalMem;
diff -wbBur online-2.1.1/wsd/Storage.cpp online-2.1.1.q/wsd/Storage.cpp
--- online-2.1.1/wsd/Storage.cpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/wsd/Storage.cpp 2017-05-29 18:19:20.949189530 +0300
++++ online-2.1.1.q/wsd/Storage.cpp 2017-07-06 13:44:08.326542611 +0300
@@ -224,7 +224,7 @@
const auto lastModified = file.getLastModified();
const auto size = file.getSize();
@@ -446,7 +446,7 @@
return std::unique_ptr<LocalStorage::LocalFileInfo>(new
LocalFileInfo({"localhost", std::string("Local Host #") +
std::to_string(LastLocalStorageId++)}));
diff -wbBur online-2.1.1/wsd/TraceFile.hpp online-2.1.1.q/wsd/TraceFile.hpp
--- online-2.1.1/wsd/TraceFile.hpp 2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/wsd/TraceFile.hpp 2017-05-29 18:13:52.345859974 +0300
++++ online-2.1.1.q/wsd/TraceFile.hpp 2017-07-06 13:44:08.326542611 +0300
@@ -406,7 +406,7 @@
_records[0].Dir != TraceFileRecord::Direction::Event ||
_records[0].Payload.find("NewSession") != 0)
Modified: libreoffice-online.install
===================================================================
--- libreoffice-online.install 2017-07-06 11:26:07 UTC (rev 242543)
+++ libreoffice-online.install 2017-07-06 11:46:03 UTC (rev 242544)
@@ -1,6 +1,8 @@
post_install() {
- getent group lool > /dev/null || groupadd -r lool > /dev/null
- getent passwd lool > /dev/null || useradd -g lool lool > /dev/null
+ getent group lool > /dev/null || \
+ groupadd -r lool > /dev/null
+ getent passwd lool > /dev/null || \
+ useradd -r -g lool -s /sbin/nologin -d /var/lib/lool -c "Libreoffice
Online" lool > /dev/null
post_upgrade
}
@@ -15,7 +17,5 @@
}
post_remove() {
- getent passwd lool > /dev/null && userdel lool
- getent group lool > /dev/null && groupdel lool
- rm -r /var/lib/lool
+ echo "You may want to remove /var/lib/lool and loop user/group"
}
Modified: loolwsd.service
===================================================================
--- loolwsd.service 2017-07-06 11:26:07 UTC (rev 242543)
+++ loolwsd.service 2017-07-06 11:46:03 UTC (rev 242544)
@@ -3,6 +3,7 @@
[Service]
User=lool
+Group=lool
ExecStart=/usr/bin/loolwsd --o:sys_template_path=/var/lib/lool/systemplate
--o:lo_template_path=/usr/lib/libreoffice
--o:child_root_path=/var/lib/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
