Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory
checked in at 2014-02-15 08:07:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2014-01-13
10:56:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2014-02-15
08:07:28.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Feb 13 14:29:47 UTC 2014 - m...@suse.com
+
+- Readd vncpasswd.arg for compatibility with installation system
+ and potentially another users. (bnc#855246)
+
+-------------------------------------------------------------------
+Fri Feb 7 14:52:02 UTC 2014 - m...@suse.com
+
+- Drop tigervnc-sf3492503.diff, tigervnc-sf3495623.diff and
+ tigervnc-sf3495623.patch.old (not used and not needed).
+- Update tigervnc-sf3492352.diff and tigervnc-sf3495623.patch.
+
+-------------------------------------------------------------------
Old:
----
tigervnc-sf3492503.patch
tigervnc-sf3493012.patch
xorg-bug38185.patch
New:
----
vncpasswd.arg
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.jer3p8/_old 2014-02-15 08:07:29.000000000 +0100
+++ /var/tmp/diff_new_pack.jer3p8/_new 2014-02-15 08:07:29.000000000 +0100
@@ -91,11 +91,14 @@
Source6: vnc-httpd.firewall
Source7: vnc_inetd_httpd
Source8: vnc.reg
+Source9: vncpasswd.arg
# Tiger vnc patches
Patch1: u_tigervnc-1.3.0-fix-use-after-free.patch
Patch2: tigervnc-newfbsize.patch
Patch3: tigervnc-clean-pressed-key-on-exit.patch
+Patch4: tigervnc-sf3492352.diff
+Patch5: tigervnc-sf3495623.patch
# Xserver patches
Patch10: tigervnc-1.2.80-fix-int-to-pointer.patch
@@ -130,6 +133,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
pushd unix/xserver
patch -p1 < ../xserver113.patch
@@ -193,6 +198,7 @@
install -D -m 644 %{SOURCE6}
$RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd
install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd
install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
+install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg
%find_lang '%{name}'
@@ -210,6 +216,7 @@
%{_bindir}/Xvnc
%{_bindir}/vncconfig
%{_bindir}/vncpasswd
+%{_bindir}/vncpasswd.arg
%{_bindir}/vncserver
%{_bindir}/x0vncserver
%{_bindir}/vnc_inetd_httpd
++++++ tigervnc-sf3495623.patch ++++++
--- /var/tmp/diff_new_pack.jer3p8/_old 2014-02-15 08:07:29.000000000 +0100
+++ /var/tmp/diff_new_pack.jer3p8/_new 2014-02-15 08:07:29.000000000 +0100
@@ -1,242 +1,23 @@
-Tylko w o/common/network: Makefile
-diff -aur o/common/network/Socket.h n/common/network/Socket.h
---- o/common/network/Socket.h 2011-08-09 23:16:40.000000000 +0200
-+++ n/common/network/Socket.h 2012-03-01 15:36:05.274711896 +0100
-@@ -22,9 +22,9 @@
- #define __NETWORK_SOCKET_H__
-
- #include <limits.h>
--#include <rdr/FdInStream.h>
--#include <rdr/FdOutStream.h>
--#include <rdr/Exception.h>
-+#include "../rdr/FdInStream.h"
-+#include "../rdr/FdOutStream.h"
-+#include "../rdr/Exception.h"
-
- namespace network {
-
-diff -aur o/common/network/TcpSocket.cxx n/common/network/TcpSocket.cxx
---- o/common/network/TcpSocket.cxx 2011-08-09 23:16:40.000000000 +0200
-+++ n/common/network/TcpSocket.cxx 2012-03-01 15:47:39.684622379 +0100
-@@ -20,6 +20,9 @@
- #include <config.h>
- #endif
-
-+#include <memory>
-+#include <limits>
-+
- #ifdef WIN32
- //#include <io.h>
- #include <winsock2.h>
-@@ -41,10 +44,10 @@
- #endif
-
- #include <stdlib.h>
--#include <network/TcpSocket.h>
--#include <os/net.h>
--#include <rfb/util.h>
--#include <rfb/LogWriter.h>
-+#include "../network/TcpSocket.h"
-+#include "../os/net.h"
-+#include "../rfb/util.h"
-+#include "../rfb/LogWriter.h"
-
- #ifndef INADDR_NONE
- #define INADDR_NONE ((unsigned long)-1)
-@@ -53,6 +56,71 @@
- #define INADDR_LOOPBACK ((unsigned long)0x7F000001)
- #endif
-
-+template < class P_T >
-+class temporary_buffer:protected::std::pair < P_T *,::std::ptrdiff_t >
-+{
-+public:typedef P_T
-+ item_type;
-+public:typedef class
-+ temporary_buffer <
-+ item_type >
-+ itself, &
-+ ref;
-+ typedef itself const &
-+ cref;
-+public:typedef
-+ class::std::pair <
-+ item_type *,::std::ptrdiff_t >
-+ inherited;
-+public:typedef typename
-+ inherited::second_type
-+ size_type;
-+public:
-+temporary_buffer (::std::ptrdiff_t const &p_s = 01)
-+:inherited (::std::get_temporary_buffer < item_type > (p_s))
-+ {
-+ }
-+private:temporary_buffer (cref);
-+ ref
-+ operator = (cref);
-+public:~temporary_buffer ()
-+ {
-+ ::std::return_temporary_buffer (inherited::first);
-+ }
-+public:size_type const &
-+ size () const
-+ {
-+ return
-+ inherited::second;
-+ }
-+public:item_type * const &
-+ buffer () const
-+ {
-+ return
-+ inherited::first;
-+ }
-+public:ref
-+ clear ()
-+ {
-+ inherited::second = size_type ();
-+ return *this;
-+ }
-+protected:inherited & base ()
-+ {
-+ return *this;
-+ }
-+protected:inherited const &
-+ base () const
-+ {
-+ return *
-+ this;
-+ }
-+public:void
-+ swap (ref that)
-+ {
-+ ::std::swap (base (), that.base ());
-+}};
-+
- using namespace network;
- using namespace rdr;
-
-@@ -433,8 +501,36 @@
+diff -ur tigervnc-1.3.0.orig/common/network/TcpSocket.cxx
tigervnc-1.3.0/common/network/TcpSocket.cxx
+--- tigervnc-1.3.0.orig/common/network/TcpSocket.cxx 2014-02-07
16:35:24.644388330 +0200
++++ tigervnc-1.3.0/common/network/TcpSocket.cxx 2014-02-07
16:39:50.608078320 +0200
+@@ -31,6 +31,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <limits.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+ #include <netdb.h>
+@@ -450,7 +451,10 @@
}
void TcpListener::getMyAddresses(std::list<char*>* result) {
- const hostent* addrs = gethostbyname(0);
-- if (addrs == 0)
-+ hostent a_he, *addrs; typedef ::temporary_buffer < char > tbuf;
-+ tbuf a_hb ((BUFSIZ));
-+ {
-+ tbuf a_hn ((BUFSIZ)); int a_herr;
-+ typedef::std::numeric_limits < tbuf::size_type > tlp;
-+ /* TASK: get host name */
-+ while (a_hn.size ())
-+ if (::gethostname (a_hn.buffer (), a_hn.size ()))
-+ if (a_hn.size () <= tlp::max () >> 01)
-+ if (ENAMETOOLONG == errno)
-+ {
-+ tbuf a_h1 (a_hn.size () << 01);
-+ if (a_h1.size () > a_hn.size ()) a_hn.swap (a_h1);
-+ else throw rdr::SystemException("gethostname", errorNumber);
-+ } else throw rdr::SystemException("gethostname", errorNumber);
-+ else throw rdr::SystemException("gethostname", errorNumber);
-+ else break;
-+ /* TASK: get host address */
-+ while
-+ (::gethostbyname_r (a_hn. buffer (), &a_he, a_hb. buffer (), a_hb.
size (), &addrs, &a_herr))
-+ if (ERANGE == errno)
-+ if (a_hb .size () < tlp ::max () >> 01)
-+ {
-+ tbuf a_h1 (a_hb. size () << 01);
-+ if (a_h1. size () > a_hb .size ()) a_hb. swap (a_h1);
-+ else break;
-+ } else break;
-+ else throw rdr::SystemException("gethostbyname", errorNumber);
-+ }
-+ if (addrs != &a_he)
++ char hostname[HOST_NAME_MAX];
++ if (gethostname(hostname, HOST_NAME_MAX) < 0)
++ throw rdr::SystemException("gethostname", errorNumber);
++ const hostent* addrs = gethostbyname(hostname);
+ if (addrs == 0)
throw rdr::SystemException("gethostbyname", errorNumber);
if (addrs->h_addrtype != AF_INET)
- throw rdr::Exception("getMyAddresses: bad family");
-diff -aur o/common/network/TcpSocket.h n/common/network/TcpSocket.h
---- o/common/network/TcpSocket.h 2011-08-09 23:16:40.000000000 +0200
-+++ n/common/network/TcpSocket.h 2012-03-01 15:35:15.950711772 +0100
-@@ -28,7 +28,7 @@
- #ifndef __NETWORK_TCP_SOCKET_H__
- #define __NETWORK_TCP_SOCKET_H__
-
--#include <network/Socket.h>
-+#include "../network/Socket.h"
-
- #include <list>
-
-diff -aur o/common/rdr/FdInStream.h n/common/rdr/FdInStream.h
---- o/common/rdr/FdInStream.h 2011-08-09 23:16:40.000000000 +0200
-+++ n/common/rdr/FdInStream.h 2012-03-01 15:37:56.128712175 +0100
-@@ -23,7 +23,7 @@
- #ifndef __RDR_FDINSTREAM_H__
- #define __RDR_FDINSTREAM_H__
-
--#include <rdr/InStream.h>
-+#include "../rdr/InStream.h"
-
- namespace rdr {
-
-diff -aur o/common/rdr/FdOutStream.h n/common/rdr/FdOutStream.h
---- o/common/rdr/FdOutStream.h 2011-08-09 23:16:40.000000000 +0200
-+++ n/common/rdr/FdOutStream.h 2012-03-01 15:39:48.662712452 +0100
-@@ -23,7 +23,7 @@
- #ifndef __RDR_FDOUTSTREAM_H__
- #define __RDR_FDOUTSTREAM_H__
-
--#include <rdr/OutStream.h>
-+#include "../rdr/OutStream.h"
-
- namespace rdr {
-
-diff -aur o/common/rdr/InStream.h n/common/rdr/InStream.h
---- o/common/rdr/InStream.h 2011-08-09 23:16:40.000000000 +0200
-+++ n/common/rdr/InStream.h 2012-03-01 15:38:39.737712279 +0100
-@@ -24,7 +24,7 @@
- #ifndef __RDR_INSTREAM_H__
- #define __RDR_INSTREAM_H__
-
--#include <rdr/types.h>
-+#include "../rdr/types.h"
- #include <string.h> // for memcpy
-
- namespace rdr {
-diff -aur o/common/rdr/OutStream.h n/common/rdr/OutStream.h
---- o/common/rdr/OutStream.h 2011-08-09 23:16:40.000000000 +0200
-+++ n/common/rdr/OutStream.h 2012-03-01 15:40:25.833712551 +0100
-@@ -24,7 +24,7 @@
- #ifndef __RDR_OUTSTREAM_H__
- #define __RDR_OUTSTREAM_H__
-
--#include <rdr/types.h>
-+#include "../rdr/types.h"
- #include <string.h> // for memcpy
-
- namespace rdr {
-diff -aur o/common/rfb/Configuration.h n/common/rfb/Configuration.h
---- o/common/rfb/Configuration.h 2011-08-09 23:16:44.000000000 +0200
-+++ n/common/rfb/Configuration.h 2012-03-01 15:43:33.825713012 +0100
-@@ -43,7 +43,7 @@
- #ifndef __RFB_CONFIGURATION_H__
- #define __RFB_CONFIGURATION_H__
-
--#include <rfb/util.h>
-+#include "../rfb/util.h"
-
- namespace rfb {
- class VoidParameter;
-diff -aur o/common/rfb/LogWriter.h n/common/rfb/LogWriter.h
---- o/common/rfb/LogWriter.h 2011-08-09 23:16:44.000000000 +0200
-+++ n/common/rfb/LogWriter.h 2012-03-01 15:42:44.843712885 +0100
-@@ -22,8 +22,8 @@
- #define __RFB_LOG_WRITER_H__
-
- #include <stdarg.h>
--#include <rfb/Logger.h>
--#include <rfb/Configuration.h>
-+#include "../rfb/Logger.h"
-+#include "../rfb/Configuration.h"
-
- // Each log writer instance has a unique textual name,
- // and is attached to a particular Log instance and
++++++ vncpasswd.arg ++++++
#!/bin/sh
# Compatibility replacement for vncpasswd.arg.
if [ $# -ne 2 ]; then
echo "Usage: $0 file password"
exit 1
fi
echo "$2" | vncpasswd -f > "$1"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
