Skip to content

Commit

Permalink
net/tightvnc: add patches
Browse files Browse the repository at this point in the history
Security: CVE-2014-6053
Security: CVE-2018-7225
Security: CVE-2018-20021
Security: CVE-2018-20022
Security: CVE-2019-8287
Security: CVE-2019-15678
Security: CVE-2019-15679
Security: CVE-2019-15680
Security: CVE-2019-15681
MFC:    2023Q3

Fix build with clang16
Replace deprecated XKeycodeToKeysym
Allow for space characters in the home directory name
  • Loading branch information
Dirk Meyer authored and Dirk Meyer committed Jul 24, 2023
1 parent d713cd1 commit 02a2810
Show file tree
Hide file tree
Showing 13 changed files with 11 additions and 143 deletions.
9 changes: 8 additions & 1 deletion net/tightvnc/Makefile
Expand Up @@ -5,6 +5,9 @@ CATEGORIES= net java
MASTER_SITES= SF/vnc-tight/TightVNC-unix/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}_unixsrc

PATCH_SITES= ftp://ftp.dinoex.org/pub/tightvnc/
PATCHFILES= tightvnc-patch-ansi

MAINTAINER= dinoex@FreeBSD.org
COMMENT= Enhanced version of VNC
WWW= https://www.tightvnc.com/
Expand All @@ -20,13 +23,17 @@ USES= cpe imake jpeg shebangfix perl5 tar:bzip2 xorg
USE_XORG= ice sm x11 xaw xext xmu xt xpm

CFLAGS+= -fcommon # for build with clang-11, see https://sourceforge.net/p/vnc-tight/bugs/1523/
CFLAGS+= -DEVENT_SWAP_PTR=1 -DEXTENSION_PROC_ARGS=void

MAKE_JOBS_UNSAFE= yes
CONFLICTS= tigervnc
WRKSRC= ${WRKDIR}/vnc_unixsrc
SHEBANG_FILES= vncserver
CFLAGS+= -Wno-return-type
CFLAGS+= -Wno-int-conversion
CFLAGS+= -Wno-pointer-sign -Wno-deprecated-non-prototype -Wno-variadic-macros
CFLAGS+= -Wno-switch -Wno-format-extra-args -Wno-format-pedantic
CFLAGS+= -Wno-knr-promoted-parameter
ALL_TARGET= World
MAKE_ARGS= CC=${CC}

Expand Down Expand Up @@ -54,7 +61,7 @@ post-patch:
.for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def
@${REINPLACE_CMD} -i '' -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/${file}
.endfor
@${REINPLACE_CMD} -i '' -e "s|/usr/local/vnc/classes|${DATADIR}/classes|g" \
@${REINPLACE_CMD} -i '' -e "s|/usr/local/share/tightvnc/classes|${DATADIR}/classes|g" \
${WRKSRC}/vncserver
@${REINPLACE_CMD} -i '' -e "s|%%CC%%|${CC}|g ; \
s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/Xvnc/config/cf/FreeBSD.cf
Expand Down
4 changes: 3 additions & 1 deletion net/tightvnc/distinfo
@@ -1,3 +1,5 @@
TIMESTAMP = 1681652343
TIMESTAMP = 1690175854
SHA256 (tightvnc-1.3.10_unixsrc.tar.bz2) = f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d
SIZE (tightvnc-1.3.10_unixsrc.tar.bz2) = 1780510
SHA256 (tightvnc-patch-ansi) = c3efc5c0995881939ff280649efdb4f31addbeb33dd6b27b805106b409d9a159
SIZE (tightvnc-patch-ansi) = 245794
10 changes: 0 additions & 10 deletions net/tightvnc/files/patch-Imakefile

This file was deleted.

15 changes: 0 additions & 15 deletions net/tightvnc/files/patch-Xvnc_config_cf_Imake.cf

This file was deleted.

21 changes: 0 additions & 21 deletions net/tightvnc/files/patch-Xvnc_config_imake_imakemdep.h

This file was deleted.

10 changes: 0 additions & 10 deletions net/tightvnc/files/patch-Xvnc_include_Xos.h

This file was deleted.

20 changes: 0 additions & 20 deletions net/tightvnc/files/patch-Xvnc_programs_Xserver_dix_Imakefile

This file was deleted.

10 changes: 0 additions & 10 deletions net/tightvnc/files/patch-Xvnc_programs_Xserver_hw_vnc_sockets.c

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions net/tightvnc/files/patch-Xvnc_programs_Xserver_os_Imakefile

This file was deleted.

11 changes: 0 additions & 11 deletions net/tightvnc/files/patch-Xvnc_programs_Xserver_os_access.c

This file was deleted.

11 changes: 0 additions & 11 deletions net/tightvnc/files/patch-vncserver

This file was deleted.

11 changes: 0 additions & 11 deletions net/tightvnc/files/patch-vncviewer_rfbproto.c

This file was deleted.

0 comments on commit 02a2810

Please sign in to comment.