maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import Debian changes 1.5.2-2 

syncevolution (1.5.2-2) unstable; urgency=medium
.
  * Add missing service file for syncevo-dbus-server (Closes: #854941)
This commit is contained in:
Tino Mettler 2017-02-24 12:17:56 +01:00 committed by Jonas Smedegaard
parent 448b37c80b
commit 0819d57e03
7 changed files with 57 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
.gitignore vendored
View File

@ -1,133 +0,0 @@
# general
*.la
*.lo
*.o
*.pyc
*~
.deps
.dirstamp
.libs
Makefile
Makefile.in
# top level
/INSTALL
/autom4te.cache
/aclocal.m4
/compile
/config.guess
/config.h
/config.h.in
/config.log
/config.status
/config.sub
/configure
/depcomp
/INSTALL
/install-sh
/libtool
/ltmain.sh
/m4
/missing
/mkinstalldirs
/README
/README.html
/stamp-h1
/syncevolution.1
/syncevolution-*.tar.gz
/test-driver
# for Maemo build
/libsynthesis
# po
/po/*.gmo
/po/.intltool-merge-cache
/po/LINGUAS
/po/Makefile.in.in
/po/POTFILES
/po/stamp-it
# src
/src/autotroll.mk
/src/Client_Source_*.log
/src/Client_Sync_*.log
/src/Client_Sync_*.A
/src/client-test
/src/LogDirTest
/src/LogRedirectTest_glib.out
/src/N7SyncEvo*.log
/src/synccompare
/src/syncevo-dbus-server
/src/syncevo-http-server
/src/syncevolution
/src/testcases/
# src/backends
/src/backends/backends.am
# src/backends/webdav
/src/backends/webdav/syncevo-webdav-lookup
# src/dbus/glib
/src/dbus/glib/stamp-syncevo-connection-bindings.h
/src/dbus/glib/stamp-syncevo-connection-glue.h
/src/dbus/glib/stamp-syncevo-server-bindings.h
/src/dbus/glib/stamp-syncevo-server-glue.h
/src/dbus/glib/stamp-syncevo-session-bindings.h
/src/dbus/glib/stamp-syncevo-session-glue.h
/src/dbus/glib/syncevo-connection-glue.h
/src/dbus/glib/syncevo-connection-bindings.h
/src/dbus/glib/syncevo-connection.xml
/src/dbus/glib/syncevo-dbus.pc
/src/dbus/glib/syncevo-marshal.c
/src/dbus/glib/syncevo-marshal.h
/src/dbus/glib/syncevo-server-glue.h
/src/dbus/glib/syncevo-server-bindings.h
/src/dbus/glib/syncevo-server.xml
/src/dbus/glib/syncevo-session-glue.h
/src/dbus/glib/syncevo-session-bindings.h
/src/dbus/glib/syncevo-session.xml
/src/dbus/glib/test-syncevo-dbus
# src/dbus/interfaces
/src/dbus/interfaces/syncevo-connection-doc.xml
/src/dbus/interfaces/syncevo-dbus-api-doc.html
/src/dbus/interfaces/syncevo-dbus-api-doc.xml
/src/dbus/interfaces/syncevo-server-doc.xml
/src/dbus/interfaces/syncevo-session-doc.xml
# src/dbus/qt
/src/dbus/qt/autotroll.mk
/src/dbus/qt/syncevolution-qt-dbus.pc
/src/dbus/qt/stamp-connection
/src/dbus/qt/stamp-server
/src/dbus/qt/stamp-session
/src/dbus/qt/syncevo-connection-full.cpp
/src/dbus/qt/syncevo-connection-full.h
/src/dbus/qt/syncevo-connection-full.moc.cpp
/src/dbus/qt/syncevo-server-full.cpp
/src/dbus/qt/syncevo-server-full.h
/src/dbus/qt/syncevo-server-full.moc.cpp
/src/dbus/qt/syncevo-session-full.cpp
/src/dbus/qt/syncevo-session-full.h
/src/dbus/qt/syncevo-session-full.moc.cpp
# src/dbus/server
/src/dbus/server/org.syncevolution.service
/src/dbus/server/syncevo-dbus-server-startup.sh
/src/dbus/server/syncevo-dbus-server.desktop
# src/gdbus
/src/gdbus/example
# src/gtk-ui
/src/gtk-ui/sync-ui
/src/gtk-ui/sync.desktop
/src/gtk-ui/ui.xml
# src/syncevo
/src/syncevo-phone-config
/src/syncevo/CmdlineHelp.c
/src/syncevo/SyncEvolutionXML.c
/src/syncevo/syncevolution.pc

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
syncevolution (1.5.2-2) unstable; urgency=medium
* Add missing service file for syncevo-dbus-server (Closes: #854941)
-- Tino Mettler <tino+debian@tikei.de> Fri, 24 Feb 2017 12:17:56 +0100
syncevolution (1.5.2-1) unstable; urgency=medium
* New upstream version

48
debian/patches/0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch vendored Normal file
View File

@ -0,0 +1,48 @@
From aabb99048290c0662629fe88588a80a0544fd8c5 Mon Sep 17 00:00:00 2001
From: Tino Mettler <tino+debian@tikei.de>
Date: Sun, 26 Oct 2014 12:54:31 +0100
Subject: [PATCH] Fix FTBFS on kfreebsd due to missing SOCK_CLOEXEC
Work around missing SOCK_CLOEXEC on kfreebsd by setting FD_CLOEXEC
afterwards.
---
src/gdbusxx/gdbus-cxx-bridge.cpp | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/src/gdbusxx/gdbus-cxx-bridge.cpp b/src/gdbusxx/gdbus-cxx-bridge.cpp
index 238b52f0..4f259576 100644
--- a/src/gdbusxx/gdbus-cxx-bridge.cpp
+++ b/src/gdbusxx/gdbus-cxx-bridge.cpp
@@ -276,6 +276,10 @@ void DBusConnectionPtr::setDisconnect(const Disconnect_t &func)
true);
}
+#ifndef SOCK_CLOEXEC
+#define SOCK_CLOEXEC 0
+#endif
+
boost::shared_ptr<DBusServerCXX> DBusServerCXX::listen(const NewConnection_t &newConnection, DBusErrorCXX *)
{
// Create two fds connected via a two-way stream. The parent
@@ -286,6 +290,21 @@ boost::shared_ptr<DBusServerCXX> DBusServerCXX::listen(const NewConnection_t &ne
if (retval) {
SE_THROW(StringPrintf("socketpair: %s", strerror(errno)));
}
+
+ if(SOCK_CLOEXEC == 0) {
+ int flags;
+ int i;
+ for(i = 0; i < 2; i++) {
+ flags = fcntl(fds[i], F_GETFD);
+ if (flags == -1){
+ SE_THROW(StringPrintf("fcntl: %s", strerror(errno)));
+ }
+ flags |= FD_CLOEXEC;
+ if (fcntl(fds[i], F_SETFD, flags) == -1){
+ SE_THROW(StringPrintf("fcntl: %s", strerror(errno)));
+ }
+ }
+ }
GuardFD parentfd(fds[0]);
GuardFD childfd(fds[1]);

2
debian/patches/series vendored Normal file
View File

@ -0,0 +1,2 @@
# debian/source/git-patches exported from git by quilt-patches-deb-export-hook
0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch

1
debian/syncevolution-dbus.install vendored
View File

@ -1,4 +1,5 @@
usr/share/dbus-1/services/org.syncevolution.service
usr/lib/systemd/user/*.service
usr/lib/*/syncevolution/syncevo-dbus-server
usr/lib/*/syncevolution/syncevo-dbus-helper

1
src/gdbusxx/.gitignore vendored
View File

@ -1 +0,0 @@
/example

19
src/gdbusxx/gdbus-cxx-bridge.cpp
View File

@ -276,10 +276,6 @@ void DBusConnectionPtr::setDisconnect(const Disconnect_t &func)
true);
}
#ifndef SOCK_CLOEXEC
#define SOCK_CLOEXEC 0
#endif
boost::shared_ptr<DBusServerCXX> DBusServerCXX::listen(const NewConnection_t &newConnection, DBusErrorCXX *)
{
// Create two fds connected via a two-way stream. The parent
@ -290,21 +286,6 @@ boost::shared_ptr<DBusServerCXX> DBusServerCXX::listen(const NewConnection_t &ne
if (retval) {
SE_THROW(StringPrintf("socketpair: %s", strerror(errno)));
}
if(SOCK_CLOEXEC == 0) {
int flags;
int i;
for(i = 0; i < 2; i++) {
flags = fcntl(fds[i], F_GETFD);
if (flags == -1){
SE_THROW(StringPrintf("fcntl: %s", strerror(errno)));
}
flags |= FD_CLOEXEC;
if (fcntl(fds[i], F_SETFD, flags) == -1){
SE_THROW(StringPrintf("fcntl: %s", strerror(errno)));
}
}
}
GuardFD parentfd(fds[0]);
GuardFD childfd(fds[1]);