Commit b46c7b56 authored by Laurent Bigonville's avatar Laurent Bigonville

Drop the patches merged upstream

parent 0adea730
When --enable-pie in configuration, -PIE is only enabled on
spice-vdagentd, this patch enables -PIE on spice-vdaget too.
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,8 @@
bin_PROGRAMS = src/spice-vdagent
sbin_PROGRAMS = src/spice-vdagentd
-src_spice_vdagent_CFLAGS = $(X_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS) $(ALSA_CFLAGS) -DUDSCS_NO_SERVER
-src_spice_vdagent_LDADD = $(X_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS) $(ALSA_LIBS)
+src_spice_vdagent_CFLAGS = $(X_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS) $(PIE_CFLAGS) $(ALSA_CFLAGS) -DUDSCS_NO_SERVER
+src_spice_vdagent_LDADD = $(X_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS) $(PIE_LDFLAGS) $(ALSA_LIBS)
src_spice_vdagent_SOURCES = src/vdagent.c \
src/vdagent-x11.c \
src/vdagent-x11-randr.c \
Fix typo
--- a/data/spice-vdagent.1.in
+++ b/data/spice-vdagent.1.in
@@ -21,7 +21,7 @@
Support of copy and paste (text and images) between the active X11 session
and the client, this supports both the primary selection and the clipboard
.P
-Support for transfering files from the client to the agent
+Support for transferring files from the client to the agent
.SH OPTIONS
.TP
\fB-h\fP
--- a/data/spice-vdagentd.1.in
+++ b/data/spice-vdagentd.1.in
@@ -20,7 +20,7 @@
Support of copy and paste (text and images) between the active X11 session
and the client, this supports both the primary selection and the clipboard
.P
-Support for transfering files from the client to the agent
+Support for transferring files from the client to the agent
.SH OPTIONS
.TP
\fB-h\fP
Fix typo
--- a/src/vdagentd.c
+++ b/src/vdagentd.c
@@ -277,7 +277,7 @@
VDAgentFileXferStartMessage *s = (VDAgentFileXferStartMessage *)data;
if (!active_session_conn) {
send_file_xfer_status(vport,
- "Could not find an agent connnection belonging to the "
+ "Could not find an agent connection belonging to the "
"active session, cancelling client file-xfer request %u",
s->id, VD_AGENT_FILE_XFER_STATUS_CANCELLED);
return;
@@ -1010,7 +1010,7 @@
udscs_destroy_server(server);
if (unlink(vdagentd_socket) != 0)
syslog(LOG_ERR, "unlink %s: %s", vdagentd_socket, strerror(errno));
- syslog(LOG_INFO, "vdagentd quiting, returning status %d", retval);
+ syslog(LOG_INFO, "vdagentd quitting, returning status %d", retval);
if (do_daemonize)
unlink(pidfilename);
fix-typo-in-vdagentd-c.patch
fix-spelling-error-in-manpage.patch
enable-pie-on-spice-vdagent.patch
systemd_service_default_file.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment