22624911 EOF and removal of X11 Network Proxies [PSARC/2016/011]

oracle · Jan 29, 2016 · 4753c6b · 4753c6b
1 parent b91bba1
commit 4753c6b
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 497 deletions.
diff --git a/open-src/app/Makefile b/open-src/app/Makefile
@@ -1,6 +1,6 @@
 # Makefile for X Consolidation Open Source Application modules
 #
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -44,14 +44,12 @@ OS_SUBDIRS_common = \
 	iceauth \
 	ico \
 	installalias \
-	lbxproxy \
 	listres \
 	luit \
 	kbd_mode \
 	mesa-demos \
 	mkcookie \
 	oclock \
-	proxymngr \
 	sessreg \
 	setxkbmap \
 	showfont \
@@ -80,11 +78,9 @@ OS_SUBDIRS_common = \
 	xev \
 	xeyes \
 	xfd \
-	xfindproxy \
 	xfontsel \
 	xfs \
 	xfsinfo \
-	xfwp \
 	xgamma \
 	xgc \
 	xhost \
@@ -129,8 +125,12 @@ OS_SUBDIRS_i386 = $(OS_SUBDIRS_common) \
 	intel-gpu-tools
 
 OBSOLETE_SUBDIRS = \
+	lbxproxy \
 	rstart \
+	proxymngr \
 	xlswins \
+	xfindproxy \
+	xfwp \
 	xplsprinters \
 	xpm \
 	xprehashprinterlist \

diff --git a/open-src/app/lbxproxy/6718029.patch b/open-src/app/lbxproxy/6718029.patch
diff --git a/open-src/app/lbxproxy/Makefile b/open-src/app/lbxproxy/Makefile
diff --git a/open-src/app/proxymngr/Makefile b/open-src/app/proxymngr/Makefile
diff --git a/open-src/app/xfindproxy/Makefile b/open-src/app/xfindproxy/Makefile
diff --git a/open-src/app/xfwp/Makefile b/open-src/app/xfwp/Makefile
diff --git a/open-src/lib/Makefile b/open-src/lib/Makefile
@@ -1,6 +1,6 @@
 # Makefile for X Consolidation Open Source Library modules
 #
-# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -116,7 +116,6 @@ OS_SUBDIRS_common = \
 	libfontenc \
 	libFS \
 	libICE \
-	liblbxutil \
 	libpciaccess \
 	libSM \
 	libXt \
@@ -158,6 +157,7 @@ OS_SUBDIRS_i386 = $(OS_SUBDIRS_common)
 OBSOLETE_SUBDIRS = \
 	DPS \
 	hwc \
+	liblbxutil \
 	libowconfig \
 	libXaw4 \
 	libXaw5 \