commit xorg-x11-Xvnc for openSUSE:Factory

2013-09-17 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-09-17 15:07:28

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-09-11 13:25:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-09-17 15:07:29.0 +0200
@@ -1,0 +2,6 @@
+Mon Sep 16 21:24:29 UTC 2013 - m...@suse.com
+
+- u_tigervnc-1.3.0-fix-use-after-free.patch
+  * Fix use after free. (bnc#840433)
+
+---

New:

  u_tigervnc-1.3.0-fix-use-after-free.patch



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.F0IJE2/_old  2013-09-17 15:07:29.0 +0200
+++ /var/tmp/diff_new_pack.F0IJE2/_new  2013-09-17 15:07:29.0 +0200
@@ -64,6 +64,7 @@
 Patch1: tigervnc-1.2.80-fix-int-to-pointer.patch
 Patch2: u_aarch64-support.patch
 Patch3: N_xorg-server-xdmcp.patch
+Patch4: u_tigervnc-1.3.0-fix-use-after-free.patch
 %else
 Source0:Xvnc.pl
 %endif
@@ -84,6 +85,9 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+pushd ../..
+%patch4 -p1
+popd
 %endif
 
 %build

++ u_tigervnc-1.3.0-fix-use-after-free.patch ++
Author: Michal Srb 
Subject: Fix use after free in ZRLEEncoder.
Patch-Mainline: To be upstreamed
References: bnc#840433

There is use after free crash when client using zrle disconnects:
ZRLEEncoder contains zos variable (rdr::ZlibOutStream) and mos variable 
(pointer to rdr::MemOutStream).
mos is always allocated in constructor (it could be a copy of static sharedMos 
pointer if sharedMos != 0, but it is always 0). 
When ZRLEEncoder::writeRect is called, any of zrleEncode* functions sets mos as 
an underlying stream of zos.
When ZRLEEncoder is destructed, mos is deleted (sharedMos is always 0), then 
zos is implicitly destructed, but zos accesses it's underlying stream in it's 
destructor!

We need to destruct mos first and zos second when ZRLEEncoder is destructed.
As sharedMos is never used, we can remove that, simplify ZRLEEncoder and turn 
zos into a member variable same as mos. They will be both implicitly destructed 
in reverse order of declaration.

diff -ur tigervnc-1.3.0-orig/common/rfb/ZRLEEncoder.cxx 
tigervnc-1.3.0/common/rfb/ZRLEEncoder.cxx
--- tigervnc-1.3.0-orig/common/rfb/ZRLEEncoder.cxx  2013-09-17 
00:18:28.557911306 +0300
+++ tigervnc-1.3.0/common/rfb/ZRLEEncoder.cxx   2013-09-17 00:19:57.487915741 
+0300
@@ -26,7 +26,6 @@
 
 using namespace rfb;
 
-rdr::MemOutStream* ZRLEEncoder::sharedMos = 0;
 int ZRLEEncoder::maxLen = 4097 * 1024; // enough for width 16384 32-bit pixels
 
 IntParameter zlibLevel("ZlibLevel","Zlib compression level",-1);
@@ -55,33 +54,27 @@
 }
 
 ZRLEEncoder::ZRLEEncoder(SMsgWriter* writer_)
-  : writer(writer_), zos(0,0,zlibLevel)
+  : writer(writer_), zos(0,0,zlibLevel), mos(129*1024)
 {
-  if (sharedMos)
-mos = sharedMos;
-  else
-mos = new rdr::MemOutStream(129*1024);
 }
 
 ZRLEEncoder::~ZRLEEncoder()
 {
-  if (!sharedMos)
-delete mos;
 }
 
 bool ZRLEEncoder::writeRect(const Rect& r, TransImageGetter* ig, Rect* actual)
 {
   rdr::U8* imageBuf = writer->getImageBuf(64 * 64 * 4 + 4);
-  mos->clear();
+  mos.clear();
   bool wroteAll = true;
   *actual = r;
 
   switch (writer->bpp()) {
   case 8:
-wroteAll = zrleEncode8(r, mos, &zos, imageBuf, maxLen, actual, ig);
+wroteAll = zrleEncode8(r, &mos, &zos, imageBuf, maxLen, actual, ig);
 break;
   case 16:
-wroteAll = zrleEncode16(r, mos, &zos, imageBuf, maxLen, actual, ig);
+wroteAll = zrleEncode16(r, &mos, &zos, imageBuf, maxLen, actual, ig);
 break;
   case 32:
 {
@@ -94,16 +87,16 @@
   if ((fitsInLS3Bytes && pf.isLittleEndian()) ||
   (fitsInMS3Bytes && pf.isBigEndian()))
   {
-wroteAll = zrleEncode24A(r, mos, &zos, imageBuf, maxLen, actual, ig);
+wroteAll = zrleEncode24A(r, &mos, &zos, imageBuf, maxLen, actual, ig);
   }
   else if ((fitsInLS3Bytes && pf.isBigEndian()) ||
(fitsInMS3Bytes && pf.isLittleEndian()))
   {
-wroteAll = zrleEncode24B(r, mos, &zos, imageBuf, maxLen, actual, ig);
+wroteAll = zrleEncode24B(r, &mos, &zos, imageBuf, maxLen, actual, ig);
   }
   else
   {
-wroteAll = zrleEncode32(r, mos, &zos, imageBuf, maxLen, actual, ig);
+wroteAll = zrleEncode32(r, &mos, &zos, imageBuf, maxLen, actual, ig);
   }
   break;
 }
@@ -111,8 +104,8 @@
 
   writer->startRect(*actual, encodingZRLE);
   rdr::OutStream* os = writer->getOut

commit xorg-x11-Xvnc for openSUSE:Factory

2013-09-11 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-09-11 13:25:16

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-07-25 14:51:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-09-11 13:25:17.0 +0200
@@ -1,0 +2,5 @@
+Tue Sep 10 10:57:58 UTC 2013 - m...@suse.com
+
+- Install libvnc.so module. (fate#312636) 
+
+---

New:

  10-libvnc.conf



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.E9XjSZ/_old  2013-09-11 13:25:18.0 +0200
+++ /var/tmp/diff_new_pack.E9XjSZ/_new  2013-09-11 13:25:18.0 +0200
@@ -60,6 +60,7 @@
 Source1:tigervnc-1.3.0.tar.bz2
 Source2:xorg-server-1.13.0.tar.bz2
 Source3:vnc.xinetd
+Source4:10-libvnc.conf
 Patch1: tigervnc-1.2.80-fix-int-to-pointer.patch
 Patch2: u_aarch64-support.patch
 Patch3: N_xorg-server-xdmcp.patch
@@ -118,8 +119,11 @@
 %if %tigervnc
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1*
-rm -rf $RPM_BUILD_ROOT/usr/%{_lib}/xorg
+rm -f $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/extensions/libvnc.la
+rm -f $RPM_BUILD_ROOT/usr/%{_lib}/xorg/protocol.txt
 rm -rf $RPM_BUILD_ROOT/var/lib/xkb
+mkdir -p $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf
 %else
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 install -m 755 $RPM_SOURCE_DIR/Xvnc.pl  $RPM_BUILD_ROOT/usr/bin/Xvnc
@@ -142,6 +146,8 @@
 /usr/bin/Xvnc
 %if %tigervnc
 %{_mandir}/man1/Xvnc.1*
+%{_libdir}/xorg/modules/extensions/libvnc.so
+%config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
 %endif
 %config(noreplace) /etc/xinetd.d/vnc
 

++ 10-libvnc.conf ++
# This file contains configuration of libvnc.so module
#
# To get libvnc.so module working, do this:
# 1. run "vncpasswd" as root user
# 2. uncomment configuration lines below
#
# Please note you can specify any option which Xvnc accepts.
# Refer to `Xvnc -help` output for detailed list of options.

#Section "Module"
#Load "vnc"
#EndSection

#Section "Screen"
#Identifier "Screen0
#DefaultDepth 16
#Option "SecurityTypes" "VncAuth"
#Option "PasswordFile" "/root/.vnc/passwd"
#EndSection
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-07-25 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-07-25 14:51:13

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-07-12 20:59:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-07-25 14:51:14.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul 23 13:27:05 UTC 2013 - m...@suse.com
+
+- Add xinetd service for VNC. (Moved from tightvnc.) (bnc#800959)
+
+---

New:

  vnc.xinetd



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.wkcsKR/_old  2013-07-25 14:51:16.0 +0200
+++ /var/tmp/diff_new_pack.wkcsKR/_new  2013-07-25 14:51:16.0 +0200
@@ -45,6 +45,7 @@
 %else
 Requires:   x11vnc
 %endif
+Requires:   xinetd
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if %tigervnc
 Summary:TigerVNC implementation of Xvnc
@@ -58,6 +59,7 @@
 %if %tigervnc
 Source1:tigervnc-1.3.0.tar.bz2
 Source2:xorg-server-1.13.0.tar.bz2
+Source3:vnc.xinetd
 Patch1: tigervnc-1.2.80-fix-int-to-pointer.patch
 Patch2: u_aarch64-support.patch
 Patch3: N_xorg-server-xdmcp.patch
@@ -128,6 +130,8 @@
 ## Description: Opens ports for VNC Server
 TCP="5801 5901"
 EOF
+mkdir -m755 -p $RPM_BUILD_ROOT/etc/xinetd.d/
+cp %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -139,5 +143,6 @@
 %if %tigervnc
 %{_mandir}/man1/Xvnc.1*
 %endif
+%config(noreplace) /etc/xinetd.d/vnc
 
 %changelog

++ vnc.xinetd ++
# default: off
# description: This serves out a VNC connection which starts at a KDM login \
#   prompt. This VNC connection has a resolution of 1024x768, 16bit depth.
service vnc1
{
type= UNLISTED
port= 5901
socket_type = stream
protocol= tcp
wait= no
user= nobody
server  = /usr/bin/Xvnc
server_args = -noreset -inetd -once -query localhost -geometry 
1024x768 -depth 16 -securitytypes none
disable = yes
}
# default: off
# description: This serves out a VNC connection which starts at a KDM login \
#   prompt. This VNC connection has a resolution of 1280x1024, 16bit depth.
service vnc2
{
type= UNLISTED
port= 5902
socket_type = stream
protocol= tcp
wait= no
user= nobody
server  = /usr/bin/Xvnc
server_args = -noreset -inetd -once -query localhost -geometry 
1280x1024 -depth 16 -securitytypes none
disable = yes
}
# default: off
# description: This serves out a VNC connection which starts at a KDM login \
#   prompt. This VNC connection has a resolution of 1600x1200, 16bit depth.
service vnc3
{
type= UNLISTED
port= 5903
socket_type = stream
protocol= tcp
wait= no
user= nobody
server  = /usr/bin/Xvnc
server_args = -noreset -inetd -once -query localhost -geometry 
1600x1200 -depth 16 -securitytypes none
disable = yes
}
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-07-12 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-07-12 20:59:57

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-07-09 21:16:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-07-12 20:59:58.0 +0200
@@ -1,0 +2,7 @@
+Thu Jul 11 14:44:35 UTC 2013 - m...@suse.com
+
+- Fix tigervnc-1.2.80-fix-int-to-pointer.patch
+  * Prevents potentional ignoring of connection on 64 bit machine.
+(http://sourceforge.net/p/tigervnc/bug-tracker/121/)
+
+---



Other differences:
--
++ tigervnc-1.2.80-fix-int-to-pointer.patch ++
--- /var/tmp/diff_new_pack.Rx7WMe/_old  2013-07-12 20:59:59.0 +0200
+++ /var/tmp/diff_new_pack.Rx7WMe/_new  2013-07-12 20:59:59.0 +0200
@@ -1,11 +1,13 @@
 xserver.orig/hw/vnc/vncExtInit.cc  2012-09-18 14:05:39.276682941 +0200
-+++ xserver/hw/vnc/vncExtInit.cc   2012-09-18 14:04:22.734526621 +0200
-@@ -1067,7 +1067,7 @@
+Index: unix/xserver/hw/vnc/vncExtInit.cc
+===
+--- xserver/hw/vnc/vncExtInit.cc   (revision 5122)
 xserver/hw/vnc/vncExtInit.cc   (working copy)
+@@ -1068,7 +1068,7 @@
  {
REQUEST(xVncExtApproveConnectReq);
REQUEST_SIZE_MATCH(xVncExtApproveConnectReq);
 -  if (queryConnectId == (void*)stuff->opaqueId) {
-+  if (queryConnectId == (void*)(intptr_t)stuff->opaqueId) {
++  if ((CARD32)(long)queryConnectId == stuff->opaqueId) {
  for (int scr = 0; scr < screenInfo.numScreens; scr++) {
if (desktop[scr]) {
  desktop[scr]->approveConnection(queryConnectId, stuff->approve,

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-07-09 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-07-09 21:16:54

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-07-05 15:21:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-07-09 21:16:56.0 +0200
@@ -1,0 +2,10 @@
+Mon Jul  8 15:33:02 UTC 2013 - m...@suse.com
+
+- Update TigerVNC to 1.3.0
+  * obsoletes N_tigervnc_enable-glx.patch,
+N_tigervnc_keyboard-layout-handling.patch,
+N_tigervnc_level3switch.patch,
+tigervnc-1.2.80-snprintf-overflow.patch,
+xorg-server-xdmcp.patch
+
+---

Old:

  N_tigervnc_enable-glx.patch
  N_tigervnc_keyboard-layout-handling.patch
  N_tigervnc_level3switch.patch
  tigervnc-1.2.80-20120905svn4996.tar.bz2
  tigervnc-1.2.80-snprintf-overflow.patch
  xorg-server-xdmcp.patch

New:

  tigervnc-1.3.0.tar.bz2



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.mcGCXR/_old  2013-07-09 21:16:57.0 +0200
+++ /var/tmp/diff_new_pack.mcGCXR/_new  2013-07-09 21:16:57.0 +0200
@@ -56,16 +56,11 @@
 #License:MIT License (or similar)
 %endif
 %if %tigervnc
-Source1:tigervnc-1.2.80-20120905svn4996.tar.bz2
+Source1:tigervnc-1.3.0.tar.bz2
 Source2:xorg-server-1.13.0.tar.bz2
-Patch:  xorg-server-xdmcp.patch
 Patch1: tigervnc-1.2.80-fix-int-to-pointer.patch
-Patch2: N_tigervnc_keyboard-layout-handling.patch
-Patch3: u_aarch64-support.patch
-Patch4: tigervnc-1.2.80-snprintf-overflow.patch
-Patch5: N_tigervnc_enable-glx.patch
-Patch6: N_xorg-server-xdmcp.patch
-Patch7: N_tigervnc_level3switch.patch
+Patch2: u_aarch64-support.patch
+Patch3: N_xorg-server-xdmcp.patch
 %else
 Source0:Xvnc.pl
 %endif
@@ -80,17 +75,12 @@
 
 %prep
 %if %tigervnc
-%setup -T -n tigervnc-1.2.80-20120905svn4996/unix/xserver -b1 -b2
+%setup -T -n tigervnc-1.3.0/unix/xserver -b1 -b2
 cp -r ../../../xorg-server-*/* .
 patch -p1 < ../xserver113.patch
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-cd ../..
-%patch4 -p1
 %endif
 
 %build

++ tigervnc-1.2.80-20120905svn4996.tar.bz2 -> tigervnc-1.3.0.tar.bz2 ++
 7011 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-07-05 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-07-05 15:21:55

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-07-04 10:18:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-07-05 15:21:56.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul  4 16:24:38 UTC 2013 - m...@suse.com
+
+- N_tigervnc_level3switch.patch
+  * Use correct keycode for level3 shift. (bnc#809844)
+
+---

New:

  N_tigervnc_level3switch.patch



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.QJDAkt/_old  2013-07-05 15:21:57.0 +0200
+++ /var/tmp/diff_new_pack.QJDAkt/_new  2013-07-05 15:21:57.0 +0200
@@ -65,6 +65,7 @@
 Patch4: tigervnc-1.2.80-snprintf-overflow.patch
 Patch5: N_tigervnc_enable-glx.patch
 Patch6: N_xorg-server-xdmcp.patch
+Patch7: N_tigervnc_level3switch.patch
 %else
 Source0:Xvnc.pl
 %endif
@@ -87,6 +88,7 @@
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 cd ../..
 %patch4 -p1
 %endif

++ N_tigervnc_level3switch.patch ++
Author: Michal Srb 
Subject: Fix Level3 press detection.
Patch-Mainline: Never

Use detected keycode of ISO_LEVEL3 key instead of (not always correct) constant.


diff -ur a/hw/vnc/Input.cc b/hw/vnc/Input.cc
--- a/hw/vnc/Input.cc   2013-07-04 18:12:43.365404014 +0200
+++ b/hw/vnc/Input.cc   2013-07-04 18:13:10.317241522 +0200
@@ -672,7 +672,7 @@
 
xkbInfo = inputInfo.keyboard->key->xkbInfo;
group   = xkbInfo->state.group;
-   level   = (IS_PRESSED(inputInfo.keyboard->key, ISO_LEVEL3_KEY_CODE) ? 2 
: 0) |
+   level   = (IS_PRESSED(inputInfo.keyboard->key, modeSwitchKeyCode) ? 2 : 
0) |
  (XkbStateFieldFromRec(&xkbInfo->state) & ShiftMask ? 1 : 0);
 #ifdef DEBUG
ErrorF ("VNCkbd:\t%s Sym %04x\n", down ? "+":"-", (int)keysym);
@@ -771,7 +771,7 @@
down ? "+":"-", (int)keysym, keyCode, 
XkbStateFieldFromRec(&xkbInfo->state),
IS_PRESSED(inputInfo.keyboard->key, SHIFT_L_KEY_CODE) ? "Sl":"",
IS_PRESSED(inputInfo.keyboard->key, SHIFT_R_KEY_CODE) ? "Sr":"",
-   IS_PRESSED(inputInfo.keyboard->key, ISO_LEVEL3_KEY_CODE) ? 
"L3":"",
+   IS_PRESSED(inputInfo.keyboard->key, modeSwitchKeyCode) ? 
"L3":"",
shiftMustBePressed ? "+":"", shiftMustBeReleased ? "-":"",
level3MustBePressed ? "+":"", level3MustBeReleased ? "-":"");
 #endif
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-07-04 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-07-04 10:18:54

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-06-13 22:53:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-07-04 10:18:55.0 +0200
@@ -1,0 +2,6 @@
+Wed Jul  3 13:32:28 UTC 2013 - m...@suse.com
+
+- N_xorg-server-xdmcp.patch
+  * Do not send local-link ipv6 addresses over xdmcp. (bnc#808490)
+
+---

New:

  N_xorg-server-xdmcp.patch



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.FKv5ba/_old  2013-07-04 10:18:56.0 +0200
+++ /var/tmp/diff_new_pack.FKv5ba/_new  2013-07-04 10:18:56.0 +0200
@@ -64,6 +64,7 @@
 Patch3: u_aarch64-support.patch
 Patch4: tigervnc-1.2.80-snprintf-overflow.patch
 Patch5: N_tigervnc_enable-glx.patch
+Patch6: N_xorg-server-xdmcp.patch
 %else
 Source0:Xvnc.pl
 %endif
@@ -85,6 +86,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
+%patch6 -p1
 cd ../..
 %patch4 -p1
 %endif

++ N_xorg-server-xdmcp.patch ++
Index: xorg-server-1.12.1/os/access.c
===
--- xorg-server-1.12.1.orig/os/access.c
+++ xorg-server-1.12.1/os/access.c
@@ -714,7 +714,9 @@ DefineSelf(int fd)
 
 /* 
  * ignore 'localhost' entries as they're not useful
- * on the other end of the wire
+ * on the other end of the wire and because on hosts
+* with shared home dirs they'll result in conflicting
+* entries in ~/.Xauthority
  */
 if (ifr->ifa_flags & IFF_LOOPBACK)
 continue;
@@ -735,6 +737,14 @@ DefineSelf(int fd)
 else if (family == FamilyInternet6 &&
  IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))
 continue;
+
+   /* Ignore IPv6 link local addresses (fe80::/10), because
+* they need a scope identifier, which we have no way
+* of telling to the other end.
+*/
+   if (family == FamilyInternet6 &&
+   IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr))
+   continue;
 #endif
 XdmcpRegisterConnection(family, (char *) addr, len);
 #if defined(IPv6) && defined(AF_INET6)
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-06-13 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-06-13 22:53:26

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-03-20 10:05:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-06-13 22:53:27.0 +0200
@@ -1,0 +2,6 @@
+Wed Jun 12 15:54:27 UTC 2013 - m...@suse.com
+
+- N_tigervnc_enable-glx.patch
+  * Build with GLX extension. (bnc#823625)
+
+---

New:

  N_tigervnc_enable-glx.patch



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.giCLHK/_old  2013-06-13 22:53:27.0 +0200
+++ /var/tmp/diff_new_pack.giCLHK/_new  2013-06-13 22:53:27.0 +0200
@@ -63,6 +63,7 @@
 Patch2: N_tigervnc_keyboard-layout-handling.patch
 Patch3: u_aarch64-support.patch
 Patch4: tigervnc-1.2.80-snprintf-overflow.patch
+Patch5: N_tigervnc_enable-glx.patch
 %else
 Source0:Xvnc.pl
 %endif
@@ -83,6 +84,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch5 -p1
 cd ../..
 %patch4 -p1
 %endif

++ N_tigervnc_enable-glx.patch ++
Subject: Enagle GLX
Path-Mainline: N/A
References: bnc#823625
Signed-off-by: Michal Srb 
diff --git a/hw/vnc/Makefile.am b/hw/vnc/Makefile.am
index 5166ef2..5af9c92 100644
--- a/hw/vnc/Makefile.am
+++ b/hw/vnc/Makefile.am
@@ -7,6 +7,10 @@ NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
 XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
 COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
 
+if GLX
+GLX_LIB = $(top_srcdir)/glx/libglx.la
+endif
+
 noinst_LTLIBRARIES = libvnccommon.la
 
 HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \
@@ -34,7 +38,8 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \
-UHAVE_CONFIG_H \
-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \
-   -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
+   -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \
+   -I$(top_srcdir)/glx
 
 Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
@@ -55,7 +60,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) 
-I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_
 
 libvnc_la_LDFLAGS = -module -avoid-version
 
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(GLX_LIB)
 
 EXTRA_DIST = Xvnc.man
 
diff --git a/hw/vnc/xvnc.cc b/hw/vnc/xvnc.cc
index 3b848b2..4ad4466 100644
--- a/hw/vnc/xvnc.cc
+++ b/hw/vnc/xvnc.cc
@@ -87,6 +87,17 @@ extern "C" {
 #include "version-config.h"
 #include "site.h"
 #endif
+
+#if XORG >= 113
+#ifdef GLXEXT
+/* C++ really is the worst */
+#define private _private
+#include "glxserver.h"
+#undef private
+#include "glx_extinit.h"
+#endif
+#endif
+
 #undef class
 #undef public
 }
@@ -1562,6 +1573,16 @@ static void vfbClientStateChange(CallbackListPtr*, 
pointer, pointer) {
   dispatchException &= ~DE_RESET;
 }
 
+#if XORG >= 113
+#ifdef GLXEXT
+static ExtensionModule vnc_glx_ext = {
+GlxExtensionInit,
+"GLX",
+&noGlxExtension
+};
+#endif
+#endif
+
 void
 InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 {
@@ -1571,6 +1592,12 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 int i;
 int NumFormats = 0;
 
+#if XORG >= 113
+#ifdef GLXEXT
+LoadExtension(&vnc_glx_ext, TRUE);
+#endif
+#endif
+
 /* initialize pixmap formats */
 
 /* must have a pixmap depth to match every screen depth */
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-03-20 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-03-20 10:05:27

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc", Maintainer is "sndir...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-03-14 15:36:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-03-20 10:05:29.0 +0100
@@ -1,0 +2,6 @@
+Mon Mar 18 18:32:43 UTC 2013 - mkoeg...@auto.tuwien.ac.at
+
+- Enable encryption support
+- Enable pam support
+
+---



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.r4Ik5p/_old  2013-03-20 10:05:31.0 +0100
+++ /var/tmp/diff_new_pack.r4Ik5p/_new  2013-03-20 10:05:31.0 +0100
@@ -35,10 +35,12 @@
 BuildRequires:  font-util
 BuildRequires:  gcc-c++
 BuildRequires:  libXfont-devel
+BuildRequires:  libgnutls-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
 BuildRequires:  nasm
+BuildRequires:  pam-devel
 BuildRequires:  xorg-x11-server-sdk
 %else
 Requires:   x11vnc

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xorg-x11-Xvnc for openSUSE:Factory

2013-03-14 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-03-14 15:03:33

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc", Maintainer is "sndir...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes  
2013-01-17 13:18:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-03-14 15:08:52.0 +0100
@@ -1,0 +2,8 @@
+Tue Mar 12 19:32:53 UTC 2013 - sch...@suse.de
+
+- u_aarch64-support.patch: Basic support for aarch64
+- Use RPM_OPT_FLAGS
+- tigervnc-1.2.80-snprintf-overflow.patch: fix use of snprintf
+- Fix file list
+
+---

New:

  tigervnc-1.2.80-snprintf-overflow.patch
  u_aarch64-support.patch



Other differences:
--
++ xorg-x11-Xvnc.spec ++
--- /var/tmp/diff_new_pack.1zRWTx/_old  2013-03-14 15:08:54.0 +0100
+++ /var/tmp/diff_new_pack.1zRWTx/_new  2013-03-14 15:08:54.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-Xvnc
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,33 +15,43 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %define tigervnc 1
 
 Name:   xorg-x11-Xvnc
 %if %tigervnc
 Version:7.6_1.0.1
+Release:0
 %else
 Version:7.6_0.1
+Release:0
 %endif
-Release:2.1
 %if %tigervnc
-License:GPL-2.0
-%else
-#License:MIT License (or similar)
-%endif
-%if %tigervnc
-BuildRequires:  xorg-x11-server-sdk Mesa-devel libopenssl-devel gcc-c++ 
autoconf automake cmake libtool libjpeg-devel nasm fltk-devel font-util 
libXfont-devel
+BuildRequires:  Mesa-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  cmake
+BuildRequires:  fltk-devel
+BuildRequires:  font-util
+BuildRequires:  gcc-c++
+BuildRequires:  libXfont-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libopenssl-devel
+BuildRequires:  libtool
+BuildRequires:  nasm
+BuildRequires:  xorg-x11-server-sdk
 %else
 Requires:   x11vnc
 %endif
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-Group:  System/X11/Servers/XF86_4
 %if %tigervnc
 Summary:TigerVNC implementation of Xvnc
+License:GPL-2.0
+Group:  System/X11/Servers/XF86_4
 %else
 Summary:Xvnc wrapper script which makes use of Xvfb/x11vnc
+Group:  System/X11/Servers/XF86_4
+#License:MIT License (or similar)
 %endif
 %if %tigervnc
 Source1:tigervnc-1.2.80-20120905svn4996.tar.bz2
@@ -49,6 +59,8 @@
 Patch:  xorg-server-xdmcp.patch
 Patch1: tigervnc-1.2.80-fix-int-to-pointer.patch
 Patch2: N_tigervnc_keyboard-layout-handling.patch
+Patch3: u_aarch64-support.patch
+Patch4: tigervnc-1.2.80-snprintf-overflow.patch
 %else
 Source0:Xvnc.pl
 %endif
@@ -68,13 +80,18 @@
 patch -p1 < ../xserver113.patch
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 cd ../..
+%patch4 -p1
 %endif
 
 %build
 %if %tigervnc
 pushd ../..
-cmake . -DCMAKE_BUILD_TYPE=Debug
+cmake . -DCMAKE_BUILD_TYPE=Debug \
+   -DCMAKE_VERBOSE_MAKEFILE=on \
+   -DCMAKE_C_FLAGS="$RPM_OPT_FLAGS" \
+   -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS"
 make %{?jobs:-j %jobs}
 
 popd
@@ -94,12 +111,15 @@
--disable-devel-docs \
--with-fontrootdir=/usr/share/fonts \
--disable-selective-werror
-make %{?jobs:-j %jobs}
+make %{?jobs:-j %jobs} V=1
 %endif
 
 %install
 %if %tigervnc
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1*
+rm -rf $RPM_BUILD_ROOT/usr/%{_lib}/xorg
+rm -rf $RPM_BUILD_ROOT/var/lib/xkb
 %else
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 install -m 755 $RPM_SOURCE_DIR/Xvnc.pl  $RPM_BUILD_ROOT/usr/bin/Xvnc
@@ -120,13 +140,6 @@
 /usr/bin/Xvnc
 %if %tigervnc
 %{_mandir}/man1/Xvnc.1*
-%exclude %{_mandir}/man1/Xserver.1*
-%exclude /usr/%{_lib}/xorg/protocol.txt
-%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
-%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.so
-%exclude /var/lib/xkb/compiled/README.compiled
-%exclude /usr/lib/debug/*
-%exclude /usr/lib/debug/.*
 %endif
 
 %changelog

++ tigervnc-1.2.80-snprintf-overflow.patch ++
Index: tigervnc-1.2.80-20120905svn4996/vncviewer/parameters.cxx
===
--- tigervnc-1.2.80-20120905svn4996.orig/vncviewer/pa

commit xorg-x11-Xvnc for openSUSE:Factory

2013-01-17 Thread h_root 
Hello community,

here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory 
checked in at 2013-01-17 11:06:21

Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old)
 and  /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New)


Package is "xorg-x11-Xvnc", Maintainer is "sndir...@suse.com"

Changes:

New Changes file:

--- /dev/null   2013-01-09 19:40:42.352580873 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 
2013-01-17 13:18:08.0 +0100
@@ -0,0 +1,73 @@
+---
+Thu Jan 10 10:49:09 UTC 2013 - sndir...@suse.com
+
+- this seperate xorg-x11-Xvnc source package (tigervnc) now
+  replaces the previous xf4vnc in xorg-x11-server source package
+  (disabled there now)
+
+---
+Fri Dec  7 15:48:16 UTC 2012 - m...@novell.com
+
+- N_tigervnc_keyboard-layout-handling.patch
+  * Use keyboard handling from tightvnc. 
+
+---
+Wed Dec  5 17:32:29 UTC 2012 - m...@novell.com
+
+- Update TigerVNC to 1.2.80 and xserver to 1.13.0. 
+
+---
+Wed Feb  9 15:07:34 UTC 2011 - sndir...@novell.com
+
+- added jpeg-devel to BuildRequires 
+
+---
+Wed Feb  9 14:00:16 UTC 2011 - sndir...@novell.com
+
+- use system jpeg for building
+- fixed xkb path
+- added more reasonable options for Xvfb building
+
+---
+Wed Feb  9 08:57:06 UTC 2011 - sndir...@novell.com
+
+- added Reinhard's xdmcp fix (bnc #625593) 
+
+---
+Wed Feb  9 08:50:10 UTC 2011 - sndir...@novell.com
+
+- TigerVNC build
+  * fix fontpatch
+  * cleanup 
+
+---
+Wed Feb  9 04:41:24 UTC 2011 - sndir...@novell.com
+
+- build Xvnc of TigerVNC project when %tigervnc is set; make this
+  the default for now
+
+---
+Tue Feb  8 17:00:32 UTC 2011 - sndir...@novell.com
+
+- latest version of Perl script
+
+---
+Thu Feb  3 17:41:02 UTC 2011 - sndir...@novell.com
+
+- renamed package from xorg-x11-Xvnc-ng to xorg-x11-Xvnc
+
+---
+Thu Feb  3 17:26:04 UTC 2011 - sndir...@novell.com
+
+- rewritten wrapper script in Perl 
+
+---
+Wed Jan 26 10:07:10 UTC 2011 - sndir...@novell.com
+
+- added services file for SuSEfirewall2 
+
+---
+Wed Jan 26 00:43:01 UTC 2011 - sndir...@novell.com
+
+- created package 
+

New:

  N_tigervnc_keyboard-layout-handling.patch
  Xvnc.pl
  tigervnc-1.2.80-20120905svn4996.tar.bz2
  tigervnc-1.2.80-fix-int-to-pointer.patch
  xorg-server-1.13.0.tar.bz2
  xorg-server-xdmcp.patch
  xorg-x11-Xvnc.changes
  xorg-x11-Xvnc.spec



Other differences:
--
++ xorg-x11-Xvnc.spec ++
#
# spec file for package xorg-x11-Xvnc
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

%define tigervnc 1

Name:   xorg-x11-Xvnc
%if %tigervnc
Version:7.6_1.0.1
%else
Version:7.6_0.1
%endif
Release:2.1
%if %tigervnc
License:GPL-2.0
%else
#License:MIT License (or similar)
%endif
%if %tigervnc
BuildRequires:  xorg-x11-server-sdk Mesa-devel libopenssl-devel gcc-c++ 
autoconf automake cmake libtool libjpeg-devel nasm fltk-devel font-util 
libXfont-devel
%else
Requires:   x11vnc
%endif
BuildRoot:  %{_tmppath}/%{name}-%{version}-build
Group:  System/X11/Servers/XF86_4
%if %tigervnc
Summary:TigerVNC implementation of Xvnc
%else
Summary:Xvnc wrapper script which makes use of Xvfb/x11vnc
%endif
%if %tigervnc
Source1:tigervnc-1.2.80-20120905svn4996.tar