Fix from upstream/ChromiumOS for cleaning up shared memory.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 142 insertions, 4 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index c93384ec3cd5..e32aed267662 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.101 2012/07/10 19:11:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.102 2012/11/15 21:06:42 vapier Exp $
+
+*x11vnc-0.9.13-r1 (15 Nov 2012)
+
+  15 Nov 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/x11vnc-0.9.13-shm-cleanup.patch, +x11vnc-0.9.13-r1.ebuild:
+  Fix from upstream/ChromiumOS for cleaning up shared memory.
 
   10 Jul 2012; Brent Baude <ranger@gentoo.org> x11vnc-0.9.13.ebuild:
   Marking x11vnc-0.9.13 ppc64 for bug 381699
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index f3a4ae3c56b8..b2f040542aee 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,11 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX x11vnc-0.9.11-rename-pointer.patch 9787 SHA256 061878de912b01c73dc597a5985b70cf95acdecfe679b0015f87f7e4d0f00f38 SHA512 f285888e5f43bbd17c1df2ff98b0481b52c7c8e32c9548b9c5f0eec735f4a87522f9f3ce02f4c8d7e1b17afac71b73d9a71beda1a1f0771d59d1a8fa4ed49adc WHIRLPOOL a72ced0d1c21d910eb524a3d37add66ca14940b3f0cdffe0bf298958319f8833795f4cec1534f3145a0c92e81a30a4306bce269dedc86aa2226cb345b0f8a855
 AUX x11vnc-0.9.12-warnings.patch 2374 SHA256 470901cfa68bb85f911959eb99c24f20e20872ea214a963251304f88ce054b43 SHA512 418dc3ba55f2327524ac9f5564bd023d77b1b3afb6886aa45a8a11f6c2bb2ac7e2f933ac5dcf369084b9b9c725dcf258b99abd619c396a39f587ef25beeee271 WHIRLPOOL 73efce73bab38b93c25b6f581994a849a8a4f89d7e61640b83dd3ae78fdff7abf6d326664a439253176789d382ba8e8c038049d51527b04c5851368abc9520fd
+AUX x11vnc-0.9.13-shm-cleanup.patch 1256 SHA256 86d86614cf64899c8da507b35b3131e39ce8f8e34848d99ad33d21314577be64 SHA512 8acccb3c543f8656e633b8c30fe037e15d50db12dc7c2aea07b04d01c8591a619f712327260c3e3b22991fcab01c34be239803ef02431bb4882d18b85f856b76 WHIRLPOOL 44adc1bc044de10f6b76478eaa80704db2b328e794693cc5cc2afec15c6bc7a5b2179ac102b3822d63bf9cc6a55387deff748457fb784315f1203d20b85c57b5
 AUX x11vnc-0.9.13-warnings.patch 1363 SHA256 4db7b0b699e009362eaef6be222041cc333541273cf47db52dc71e521a0c4ffe SHA512 42de5aaa3f5f67f3f7f0b8af693811d6070bb05270a3b41e88705c09e436e37beb343433d5a4cd2d6922f2eb7e67c1584de1278b0ed0f92b3d01f2f233050ab1 WHIRLPOOL 408f7e7f887703aae39c9ffff70cdb7334cbb9d410d80d9b36c9cdfbef0aeaca8ff1dc1d53fb7c1f53c37cb90959b3e8815d5dc077eadf66deea5bb799ff8de7
-DIST x11vnc-0.9.12.tar.gz 2757806 SHA256 60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79
-DIST x11vnc-0.9.13.tar.gz 2853769 SHA256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b
+DIST x11vnc-0.9.12.tar.gz 2757806 SHA256 60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79 SHA512 c9bcca13858fd239ffdfacb34112d1994ee7fe46c4a848982a1f9521b2a0691394cf7d4a1e7c3106be2c788069d99532a9e780e2a729d21396b9590bb76f465f WHIRLPOOL 1985a9598a93fe20db76c481ccb879ab7afa00f77d7156c7e18e4b53f7229f720759a04eb8ff0a8ce58bf5329a90723170fbd160a5aeec5d83aaf4883e0cd6e3
+DIST x11vnc-0.9.13.tar.gz 2853769 SHA256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b SHA512 7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908 WHIRLPOOL d812b257e70d6caccc6669c7fca89cacc590b5908c7877f62bdd14a159b0712b5b60e8587b6a385a5a68c46e15296ab838b07196786ac354fccb0759725685c4
 DIST x11vnc-0.9.9.tar.gz 2671958 SHA256 6b960267b1f842efe5fb76b5d36fbee79ca8ea31528ee83877623e1cca0fbbe9
 EBUILD x11vnc-0.9.12.ebuild 2062 SHA256 1b942a8ef06bea142bb122038c895c1651cc2e3a05d8c89b9c0b766b7cc7184f SHA512 8045f0ad7040b9ae9474dfbfa73cb6fdff3a16613691413c021d6728f429ea5da143837be2d31541b3efb96fc1ddc4f02815bba8b9622a0c9d54d6baf6e17349 WHIRLPOOL 33cf3c9d43ec1bf85e91c48ebe829276b95e882718b35520805475ad8d32bfa3a21b81e03a363af175b2eb248ff8293484b97e403d1e582c18d700e866e89a05
+EBUILD x11vnc-0.9.13-r1.ebuild 2100 SHA256 843be514116f28bcaa91fc17e8d51bb8b0fbd372a1f9638ba013dfb99c503dbc SHA512 14baad3d1896281431b9147bdd3e02f5fe78f93942ede0e7a85874d127111e5f2d2c062abb0cb26ed7e4ad1dae1ff60b2e1f01bfb3d567ab0b148c90ac24e1b1 WHIRLPOOL 5a42cb2dbdf0a65c4cd8fda349dd8eefa1e80bc899f7a8f9cb115f3743414cd57c3c634defa37d3180a40896cd7abe0e34bf29911da0fbed14673e6ed1ef2db2
 EBUILD x11vnc-0.9.13.ebuild 2042 SHA256 f7fec50dabdf9ae5c9eff13c30ce7d4de9bc2e4a7173ba2f305d9dddcacfebc1 SHA512 61e394d920f016a7de98e9324ab85e805c5de6c3fcc2fdb918cd6ef456cec4a9fd90819bd57e1dd0701f88d5f78955a692db3e7e734a691df24f7496910e8403 WHIRLPOOL 599ec9ce0909f3a5642a92c11c4105e687d2df5510d56341fd5120395d0e9bd8ca3daabb559607c6cfc2b3286bbf68adcd28d2c83bb2fa2842e6a69512536a77
 EBUILD x11vnc-0.9.9.ebuild 2020 SHA256 7908dc27443cd9a3f9e70e8943975b9c8b1d1fa7ed37af1fa586ea42e2ea71dc SHA512 02ae42a383d2b9e07cd3adedf46a430b17ece09d11411c3bed803c71acdd52bcc574c3bbbc40f155c4e20960e79e35971aa37678533da7576588817bde5c0a98 WHIRLPOOL 7800fb91418af9cb99f3a96cbc76388ae89a83528544956743ef2ed12efec43331fc6dd9b2da6d890d8a44e2a4226c25261bfcea9bdc4d52ad6436b324e9755d
-MISC ChangeLog 13610 SHA256 d9d6a1f8aa8cdfe736b8c2cb921afc63d6d6e6163c12e2a17860d986b50fda47 SHA512 59bacd5664e6819d2e25397879e1131f18847fac09b2919a066a441bf572f481f02128d9d5c64ba6ff96d001201e48a2b81df108a1d9c249239f461aa12a52cd WHIRLPOOL 355fe699879bbdab42ec471617ecd2b9edd22e6bd918bec00443e102fcd20988e0ac59b86171ddd13762d57f7c9411fddf69cb6a2ced700422f630cc24832b0e
+MISC ChangeLog 13824 SHA256 2968a69404faebf7eca7157d1af5c35156053776222bd417ffa9cb5742723617 SHA512 5c3f5028f58a4fb7a8760280bf82ea2c1b75ee4a99f07cab1689f0d7e775ef8c5d874a53342ac94e75df3d2f6d0bf05748db99755a67affe521ccacb15acb902 WHIRLPOOL 555fc63ef29a45d7996c577030b4e2aa74c518bbf1ce5aed871125a3031f66fcb58888be39bcc967fffac9b3928bad356620f38d9126109f05c8abaccf80a3cd
 MISC metadata.xml 641 SHA256 cfa5030109f940dfb245882713ec5793a58166b3efccdb299f6318cbc810f4a1 SHA512 d6c5bfa0b1d50931698dd17e23c26d428817df0f1c8bb89ccfdc86f766e39f655aa9f7a4b658d9f96c68a16cebc24c72bab6b82f03069dc97624366f07de40dd WHIRLPOOL c94e0a87b3052ef53503a5ad27bcab4948128fed1a2848f63579b74dd250450e1502cc2674e9c74dffc5a815aabd3f2548c1a725faf4c15c7547e34484e732c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQpVl3AAoJELEHsLL7fEFWgX4P/3HIARvtjtABZgJvGfSWGKQ/
+DzGRNZDnWaPJpVJ8ASzo8ETD0IprPBvesOUVQK+6oOrJhyM+LUf8HYzNgV7PCqp3
+1f+G/Q7SoZKZUNfHVZGUyCIT7Uqc9/Nw9cYAA4GB5DQFOugE0UT3obye7irgzFWN
+i1EieIAbahf7ZeasGCXaX8NDaappGI1zUgLLDXsemm9zs/oxExOO5pTYKHT2cUgE
+NiMsBa9p7LiF9BdjAfXRGW1ZbXuCzqpLZ7DKlVZa9w7awDCFQSSc8r4N6VTFx3WU
+o3POVD2O1A2Ttjbir+bF25iiXJ06ORr7o05pzSWL7o4mxCKL8lbcOSqS5tett5Se
+9sUgsHSA1IFliIlqQcO7nAVHgbqHM8a9VoHVr0QOekZX7CLcBg53jZcG9a7xz87S
+BpqnHxLyTBprF3fDQwrmR9NDjvPH51Dl5O40C8jjhBCjmKoL/K0WF6cJ7Au41lYZ
+i42dyOxOuL64LO+758E+ngYj7QYb4gEUj0x3bJvE6Nfd7BC/2NIEL5dgjRNQKi1V
+anD3ZBGERqIDBbDH0ZFokgvgicC9DUTvMbVCgy/fYOr8r6z4jyHmQ/pgYCMTl/up
+moj3y4GobWss9ggvrA9GKsw6ZlX80n05e7M3zIZxP8rpxIqsLYEEZcgp6uQJijt4
+SpI7i6r4xKUDbkkE6/uu
+=tTGv
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
new file mode 100644
index 000000000000..876ed9eb6de0
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
@@ -0,0 +1,35 @@
+fix that is already in upstream x11vnc-0.9.14 dev
+
+from ChromiumOS:
+
+x11vnc: Fix shm close on early shutdown.
+
+Global structures {scanline,fullscreen,scanrect}_shm are initialized to
+zero, including the .shmid field. This creates problems when shutdown /
+clean_shm is called before these structures are properly initialized in
+initialize_polling_images. shm_delete will be called on the structure,
+and since the shmid isn't -1, shmctl(id, IPC_RMID...) will be called for
+id=0. id=0 is in fact a valid shmid, and it might belong to some other
+shared memory for some other processes, creating many potential problems.
+
+Fix is to initialize shmid to -1 to indicate that it is in fact
+uninitialized.
+
+https://gerrit.chromium.org/gerrit/37971
+
+--- a/x11vnc/x11vnc_defs.c
++++ b/x11vnc/x11vnc_defs.c
+@@ -82,10 +82,10 @@
+ XImage *raw_fb_image = NULL;	/* the raw fb */
+
+ /* corresponding shm structures */
+-XShmSegmentInfo scanline_shm;
+-XShmSegmentInfo fullscreen_shm;
++XShmSegmentInfo scanline_shm = {.shmid = -1};
++XShmSegmentInfo fullscreen_shm = {.shmid = -1};
+ XShmSegmentInfo *tile_row_shm;	/* for all possible row runs */
+-XShmSegmentInfo snaprect_shm;
++XShmSegmentInfo snaprect_shm = {.shmid = -1};
+
+ /* rfb screen info */
+ rfbScreenInfoPtr screen = NULL;
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
new file mode 100644
index 000000000000..0aee5827110d
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild,v 1.1 2012/11/15 21:06:42 vapier Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/"
+SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
+
+RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
+	!system-libvncserver? (
+		zlib? ( sys-libs/zlib )
+		jpeg? ( virtual/jpeg:0 )
+	)
+	ssl? ( dev-libs/openssl )
+	tk? ( dev-lang/tk )
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	>=x11-libs/libXtst-1.1.0
+	x11-libs/libXdamage
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+pkg_setup() {
+	if use avahi && ! use threads ; then
+		ewarn "Non-native avahi support has been enabled."
+		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-warnings.patch
+	epatch "${FILESDIR}"/${P}-shm-cleanup.patch
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		$(use_with system-libvncserver) \
+		$(use_with avahi) \
+		$(use_with xinerama) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		$(use_with crypt) \
+		--without-v4l \
+		$(use_with jpeg) \
+		$(use_with zlib) \
+		$(use_with threads pthread) \
+		$(use_with fbcon fbdev)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc x11vnc/{ChangeLog,README}
+	# Remove include files, which conflict with net-libs/libvncserver
+	rm -rf "${D}"/usr/include
+}