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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes 2013-01-17 13:18:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 2013-03-14 15:08:52.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 12 19:32:53 UTC 2013 - [email protected] + +- 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.000000000 +0100 +++ /var/tmp/diff_new_pack.1zRWTx/_new 2013-03-14 15:08:54.000000000 +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/parameters.cxx +++ tigervnc-1.2.80-20120905svn4996/vncviewer/parameters.cxx @@ -490,7 +490,7 @@ void saveViewerParameters(const char *fi const size_t buffersize = 256; char filepath[PATH_MAX]; - char write_error[buffersize*2]; + char write_error[PATH_MAX]; char encodingBuffer[buffersize]; // Write to the registry or a predefined file if no filename was specified. @@ -516,7 +516,7 @@ void saveViewerParameters(const char *fi /* Write parameters to file */ FILE* f = fopen(filepath, "w+"); if (!f) { - snprintf(write_error, sizeof(filepath), "Failed to write configuration file, " + snprintf(write_error, sizeof(write_error), "Failed to write configuration file, " "can't open %s", filepath); throw Exception(write_error); } ++++++ u_aarch64-support.patch ++++++ Subject: Basic support for aarch64 Author: Andreas Schwab <[email protected]> Index: xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c =================================================================== --- xorg-server-1.13.2.orig/hw/xfree86/os-support/linux/lnx_video.c +++ xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c @@ -58,7 +58,8 @@ static Bool ExtendedEnabled = FALSE; !defined(__sparc__) && \ !defined(__mips__) && \ !defined(__nds32__) && \ - !defined(__arm__) + !defined(__arm__) && \ + !defined(__aarch64__) /* * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare @@ -511,7 +512,7 @@ xf86EnableIO(void) #endif } close(fd); -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) +#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) if (ioperm(0, 1024, 1) || iopl(3)) { if (errno == ENODEV) ErrorF("xf86EnableIOPorts: no I/O ports found\n"); @@ -540,7 +541,7 @@ xf86DisableIO(void) #if defined(__powerpc__) munmap(ioBase, 0x20000); ioBase = NULL; -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) +#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__) iopl(0); ioperm(0, 1024, 0); #endif Index: xorg-server-1.13.2/include/servermd.h =================================================================== --- xorg-server-1.13.2.orig/include/servermd.h +++ xorg-server-1.13.2/include/servermd.h @@ -286,6 +286,20 @@ SOFTWARE. #define GLYPHPADBYTES 4 #endif /* linux/s390 */ +#ifdef __aarch64__ + +#ifdef __AARCH64EL__ +#define IMAGE_BYTE_ORDER LSBFirst +#define BITMAP_BIT_ORDER LSBFirst +#endif +#ifdef __AARCH64EB__ +#define IMAGE_BYTE_ORDER MSBFirst +#define BITMAP_BIT_ORDER MSBFirst +#endif +#define GLYPHPADBYTES 4 + +#endif /* __aarch64__ */ + /* size of buffer to use with GetImage, measured in bytes. There's obviously * a trade-off between the amount of heap used and the number of times the * ddx routine has to be called. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
