Committags/v1.4.90f0fffd4d7f
makes ldnow patch unnecessary. Commit0dc36a501e
makes format-security patch unnecessary.
@@ -1,11 +0,0 @@ | |||
--- a/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 | |||
+++ b/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:51:47.013241342 +0200 | |||
@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
-I$(top_srcdir)/include \ | |||
${XSERVERLIBS_CFLAGS} -I$(includedir) | |||
-libvnc_la_LDFLAGS = -module -avoid-version | |||
+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
@@ -6,6 +6,5 @@ | |||
# Upstream patches | |||
504_tigervnc-cookie.patch | |||
510_tigervnc11-ldnow.patch | |||
511_tigervnc11-gethomedir.patch | |||
516_tigervnc-xorg-manpages.patch |
@@ -1,11 +0,0 @@ | |||
--- a/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 | |||
+++ b/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:51:47.013241342 +0200 | |||
@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
-I$(top_srcdir)/include \ | |||
${XSERVERLIBS_CFLAGS} -I$(includedir) | |||
-libvnc_la_LDFLAGS = -module -avoid-version | |||
+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
@@ -1,12 +0,0 @@ | |||
diff -up tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security tigervnc-1.3.0/vncviewer/vncviewer.cxx | |||
--- tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security 2013-12-03 16:47:04.802800182 +0000 | |||
+++ tigervnc-1.3.0/vncviewer/vncviewer.cxx 2013-12-03 16:47:08.680820024 +0000 | |||
@@ -309,7 +309,7 @@ interpretViaParam(char *remoteHost, int | |||
snprintf(vncServerName, VNCSERVERNAMELEN, "localhost::%d", localPort); | |||
vncServerName[VNCSERVERNAMELEN - 1] = '\0'; | |||
- vlog.error(vncServerName); | |||
+ vlog.error("%s", vncServerName); | |||
return 0; | |||
} |
@@ -6,7 +6,5 @@ | |||
# Upstream patches | |||
504_tigervnc-cookie.patch | |||
510_tigervnc11-ldnow.patch | |||
511_tigervnc11-gethomedir.patch | |||
516_tigervnc-xorg-manpages.patch | |||
517_tigervnc-format-security.patch |
@@ -0,0 +1,29 @@ | |||
--- a/configure 2015-02-22 16:20:48.000000000 -0500 | |||
+++ b/configure 2015-02-22 16:21:52.000000000 -0500 | |||
@@ -6793,7 +6793,7 @@ | |||
# See if we find them without any special options. | |||
# Don't add to $LIBS permanently. | |||
ac_save_LIBS=$LIBS | |||
- LIBS="-lX11 $LIBS" | |||
+ LIBS="-lX11 -lXrender -lxcb -lXdmcp -lXau $LIBS" | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |||
/* end confdefs.h. */ | |||
#include <X11/Xlib.h> | |||
@@ -6935,7 +6935,7 @@ | |||
# Martyn Johnson says this is needed for Ultrix, if the X | |||
# libraries were built with DECnet support. And Karl Berry says | |||
# the Alpha needs dnet_stub (dnet does not exist). | |||
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" | |||
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11 -lXrender -lxcb -lXdmcp -lXau" | |||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |||
/* end confdefs.h. */ | |||
@@ -7359,7 +7359,7 @@ | |||
$as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE_LIBS\" requested by configure." >&2;} | |||
fi | |||
- LIBS="$LIBS -lX11 $X_EXTRA_LIBS" | |||
+ LIBS="$LIBS -lX11 -lXrender -lxcb -lXdmcp -lXau $X_EXTRA_LIBS" | |||
CFLAGS="$CFLAGS $X_CFLAGS" | |||
CXXFLAGS="$CXXFLAGS $X_CFLAGS" | |||
LDFLAGS="$X_LIBS $LDFLAGS" |
@@ -1,12 +0,0 @@ | |||
diff -up tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am | |||
--- tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow 2010-05-18 15:48:02.000000000 +0200 | |||
+++ tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am 2010-07-21 17:05:45.242942531 +0200 | |||
@@ -50,7 +50,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
-I$(top_srcdir)/hw/xfree86/os-support/bus \ | |||
-I$(includedir)/pixman-1 -I$(includedir) | |||
-libvnc_la_LDFLAGS = -module -avoid-version | |||
+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
@@ -128,7 +128,6 @@ Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 | |||
# tigervnc patches | |||
Patch4: tigervnc-cookie.patch | |||
Patch10: tigervnc11-ldnow.patch | |||
Patch11: tigervnc11-gethomedir.patch | |||
Patch12: tigervnc14-static-build-fixes.patch | |||
@@ -267,7 +266,6 @@ cp %SOURCE9 cmake/Modules/ | |||
sed -i -e "s#@_includedir@#%{xorg_buildroot}%{_includedir}#" cmake/Modules/FindX11.cmake | |||
sed -i -e "s#@_libdir@#%{xorg_buildroot}%{_libdir}#" cmake/Modules/FindX11.cmake | |||
%patch4 -p1 -b .cookie | |||
%patch10 -p1 -b .ldnow | |||
%patch11 -p1 -b .gethomedir | |||
%patch12 -p1 -b .static-build-fixes | |||
@@ -1,12 +0,0 @@ | |||
diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am | |||
--- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow 2011-10-31 09:14:40.000000000 +0100 | |||
+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:51:47.013241342 +0200 | |||
@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
-I$(top_srcdir)/include \ | |||
${XSERVERLIBS_CFLAGS} -I$(includedir) | |||
-libvnc_la_LDFLAGS = -module -avoid-version | |||
+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
@@ -46,7 +46,6 @@ Provides: tightvnc = 1.5.0-0.15.20090204svn3586 | |||
Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 | |||
Patch4: tigervnc-cookie.patch | |||
Patch10: tigervnc11-ldnow.patch | |||
Patch11: tigervnc11-gethomedir.patch | |||
Patch16: tigervnc-xorg-manpages.patch | |||
@@ -140,7 +139,6 @@ This package contains icons for TigerVNC viewer | |||
# sed -i -e 's/80/0/g' CMakeLists.txt | |||
%patch4 -p1 -b .cookie | |||
%patch10 -p1 -b .ldnow | |||
%patch11 -p1 -b .gethomedir | |||
tar xzf %SOURCE11 |