CVS commit: pkgsrc/net/synergy

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Mar 28 10:08:31 UTC 2023

Modified Files:
        pkgsrc/net/synergy: Makefile distinfo
Added Files:
        pkgsrc/net/synergy/patches: patch-src_lib_synergy_unix_AppUtilUnix.cpp

Log Message:
synergy: patch a use-after-free issue, from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/net/synergy/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/synergy/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/synergy/patches/patch-src_lib_synergy_unix_AppUtilUnix.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/synergy/Makefile
diff -u pkgsrc/net/synergy/Makefile:1.78 pkgsrc/net/synergy/Makefile:1.79
--- pkgsrc/net/synergy/Makefile:1.78    Tue Jan  3 17:38:03 2023
+++ pkgsrc/net/synergy/Makefile Tue Mar 28 10:08:30 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2023/01/03 17:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2023/03/28 10:08:30 tnn Exp $
 
 DISTNAME=              synergy-core-1.14.4.37
-PKGREVISION=           3
+PKGREVISION=           4
 PKGNAME=               ${DISTNAME:S/-core//}
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=symless/}

Index: pkgsrc/net/synergy/distinfo
diff -u pkgsrc/net/synergy/distinfo:1.41 pkgsrc/net/synergy/distinfo:1.42
--- pkgsrc/net/synergy/distinfo:1.41    Fri Jun 17 18:09:24 2022
+++ pkgsrc/net/synergy/distinfo Tue Mar 28 10:08:30 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2022/06/17 18:09:24 tnn Exp $
+$NetBSD: distinfo,v 1.42 2023/03/28 10:08:30 tnn Exp $
 
 BLAKE2s (googletest-1.10.0.tar.gz) = 53d218b6e7821bf20289e24c4efec5b7a3cc2be8f06373c07a5af078dc4ee892
 SHA512 (googletest-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
@@ -16,3 +16,4 @@ SHA1 (patch-src_lib_platform_CMakeLists.
 SHA1 (patch-src_lib_platform_XWindowsKeyState.cpp) = 8c7715c4c569a180f825946e11b2b3967b9c84c1
 SHA1 (patch-src_lib_platform_XWindowsPowerManager.cpp) = 630c648cf31aea19d4b8ccd4f200c96401157459
 SHA1 (patch-src_lib_server_Config.cpp) = dc6a00fd33e71480a5f002cf15b8f876143f82a3
+SHA1 (patch-src_lib_synergy_unix_AppUtilUnix.cpp) = 63b6329203ebd1be011e378c5766746fd0c26ce2

Added files:

Index: pkgsrc/net/synergy/patches/patch-src_lib_synergy_unix_AppUtilUnix.cpp
diff -u /dev/null pkgsrc/net/synergy/patches/patch-src_lib_synergy_unix_AppUtilUnix.cpp:1.1
--- /dev/null   Tue Mar 28 10:08:31 2023
+++ pkgsrc/net/synergy/patches/patch-src_lib_synergy_unix_AppUtilUnix.cpp       Tue Mar 28 10:08:31 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lib_synergy_unix_AppUtilUnix.cpp,v 1.1 2023/03/28 10:08:31 tnn Exp $
+
+Fix use-after-free.
+https://github.com/symless/synergy-core/pull/7208
+
+--- src/lib/synergy/unix/AppUtilUnix.cpp.orig  2022-06-08 15:33:52.000000000 +0000
++++ src/lib/synergy/unix/AppUtilUnix.cpp
+@@ -148,8 +148,8 @@ AppUtilUnix::getCurrentLanguageCode()
+           groupStartI = strI + 1;
+       }
+ 
+-      XFree(kbdDescr);
+       XkbFreeNames(kbdDescr, XkbSymbolsNameMask, true);
++      XFree(kbdDescr);
+       XCloseDisplay(display);
+ 
+       result = X11LayoutsParser::convertLayotToISO("/usr/share/X11/xkb/rules/evdev.xml", result);