diff --git a/.libvncserver.metadata b/.libvncserver.metadata new file mode 100644 index 0000000..4b809ce --- /dev/null +++ b/.libvncserver.metadata @@ -0,0 +1 @@ +2004c6ae493baeff3da40b61e0a0f73c83182dad SOURCES/LibVNCServer-0.9.9.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/LibVNCServer-0.9.9-no_x11vnc.patch b/SOURCES/LibVNCServer-0.9.9-no_x11vnc.patch new file mode 100644 index 0000000..db2ec9d --- /dev/null +++ b/SOURCES/LibVNCServer-0.9.9-no_x11vnc.patch @@ -0,0 +1,26 @@ +diff -up LibVNCServer-0.9.9/configure.ac.system_minilzo LibVNCServer-0.9.9/configure.ac +--- LibVNCServer-0.9.9/configure.ac.system_minilzo 2012-05-04 11:27:08.000000000 -0500 ++++ LibVNCServer-0.9.9/configure.ac 2012-05-07 08:22:19.473583597 -0500 +@@ -992,7 +992,7 @@ if test "$build_x11vnc" = "yes"; then + # + # configure.ac:690: required file `x11vnc/Makefile.in' not found + # +- AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile]) ++ #AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile]) + + if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then + # need to move local tarball rfb headers aside: +diff -up LibVNCServer-0.9.9/Makefile.am.system_minilzo LibVNCServer-0.9.9/Makefile.am +--- LibVNCServer-0.9.9/Makefile.am.system_minilzo 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/Makefile.am 2012-05-07 08:22:19.475583573 -0500 +@@ -1,6 +1,6 @@ +-if WITH_X11VNC +-X11VNC=x11vnc +-endif ++#if WITH_X11VNC ++#X11VNC=x11vnc ++#endif + + SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test $(X11VNC) + DIST_SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test + diff --git a/SOURCES/LibVNCServer-0.9.9-pkgconfig.patch b/SOURCES/LibVNCServer-0.9.9-pkgconfig.patch new file mode 100644 index 0000000..a0425e6 --- /dev/null +++ b/SOURCES/LibVNCServer-0.9.9-pkgconfig.patch @@ -0,0 +1,26 @@ +diff -up LibVNCServer-0.9.9/libvncclient.pc.in.pkgconfig LibVNCServer-0.9.9/libvncclient.pc.in +--- LibVNCServer-0.9.9/libvncclient.pc.in.pkgconfig 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncclient.pc.in 2013-02-14 10:45:18.902001014 -0600 +@@ -7,6 +7,8 @@ Name: LibVNCClient + Description: A library for easy implementation of a VNC client. + Version: @VERSION@ + Requires: +-Libs: -L${libdir} -lvncclient @LIBS@ @WSOCKLIB@ ++Requires.private: zlib ++Libs: -L${libdir} -lvncclient ++Libs.private: @LIBS@ @WSOCKLIB@ + Cflags: -I${includedir} + +diff -up LibVNCServer-0.9.9/libvncserver.pc.in.pkgconfig LibVNCServer-0.9.9/libvncserver.pc.in +--- LibVNCServer-0.9.9/libvncserver.pc.in.pkgconfig 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncserver.pc.in 2013-02-14 10:44:49.727365748 -0600 +@@ -7,6 +7,8 @@ Name: LibVNCServer + Description: A library for easy implementation of a VNC server. + Version: @VERSION@ + Requires: +-Libs: -L${libdir} -lvncserver @LIBS@ @WSOCKLIB@ ++Requires.private: zlib ++Libs: -L${libdir} -lvncserver ++Libs.private: @LIBS@ @WSOCKLIB@ + Cflags: -I${includedir} + diff --git a/SOURCES/LibVNCServer-0.9.9-system_minilzo.patch b/SOURCES/LibVNCServer-0.9.9-system_minilzo.patch new file mode 100644 index 0000000..f6d7db9 --- /dev/null +++ b/SOURCES/LibVNCServer-0.9.9-system_minilzo.patch @@ -0,0 +1,67 @@ +diff -up LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo LibVNCServer-0.9.9/libvncclient/Makefile.am +--- LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncclient/Makefile.am 2012-05-07 08:22:19.474583585 -0500 +@@ -13,10 +13,10 @@ endif + endif + + +-libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c ../common/minilzo.c $(TLSSRCS) +-libvncclient_la_LIBADD=$(TLSLIBS) ++libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c $(TLSSRCS) ++libvncclient_la_LIBADD=$(TLSLIBS) -lminilzo + +-noinst_HEADERS=../common/lzodefs.h ../common/lzoconf.h ../common/minilzo.h tls.h ++noinst_HEADERS=tls.h + + rfbproto.o: rfbproto.c corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c + +diff -up LibVNCServer-0.9.9/libvncclient/rfbproto.c.system_minilzo LibVNCServer-0.9.9/libvncclient/rfbproto.c +--- LibVNCServer-0.9.9/libvncclient/rfbproto.c.system_minilzo 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncclient/rfbproto.c 2012-05-07 08:22:19.474583585 -0500 +@@ -59,7 +59,7 @@ + #include + #endif + +-#include "minilzo.h" ++#include + #include "tls.h" + + /* +diff -up LibVNCServer-0.9.9/libvncserver/Makefile.am.system_minilzo LibVNCServer-0.9.9/libvncserver/Makefile.am +--- LibVNCServer-0.9.9/libvncserver/Makefile.am.system_minilzo 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncserver/Makefile.am 2012-05-07 08:31:01.342059345 -0500 +@@ -37,7 +37,7 @@ include_HEADERS=../rfb/rfb.h ../rfb/rfbc + + noinst_HEADERS=../common/d3des.h ../rfb/default8x16.h zrleoutstream.h \ + zrlepalettehelper.h zrletypes.h private.h scale.h rfbssl.h rfbcrypto.h \ +- ../common/minilzo.h ../common/lzoconf.h ../common/lzodefs.h ../common/md5.h ../common/sha1.h \ ++ ../common/md5.h ../common/sha1.h \ + $(TIGHTVNCFILETRANSFERHDRS) + + EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \ +@@ -54,11 +54,11 @@ endif + LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c $(WEBSOCKETSSRCS) \ + stats.c corre.c hextile.c rre.c translate.c cutpaste.c \ + httpd.c cursor.c font.c \ +- draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ../common/minilzo.c ultra.c scale.c \ ++ draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ultra.c scale.c \ + $(ZLIBSRCS) $(TIGHTSRCS) $(TIGHTVNCFILETRANSFERSRCS) + + libvncserver_la_SOURCES=$(LIB_SRCS) +-libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS) ++libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS) -lminilzo + + lib_LTLIBRARIES=libvncserver.la + +diff -up LibVNCServer-0.9.9/libvncserver/ultra.c.system_minilzo LibVNCServer-0.9.9/libvncserver/ultra.c +--- LibVNCServer-0.9.9/libvncserver/ultra.c.system_minilzo 2012-05-04 09:19:00.000000000 -0500 ++++ LibVNCServer-0.9.9/libvncserver/ultra.c 2012-05-07 08:22:19.475583573 -0500 +@@ -8,7 +8,7 @@ + */ + + #include +-#include "minilzo.h" ++#include + + /* + * cl->beforeEncBuf contains pixel data in the client's format. diff --git a/SOURCES/libvncserver-0.9.1-multilib.patch b/SOURCES/libvncserver-0.9.1-multilib.patch new file mode 100644 index 0000000..d54a470 --- /dev/null +++ b/SOURCES/libvncserver-0.9.1-multilib.patch @@ -0,0 +1,20 @@ +diff -up LibVNCServer-0.9.1/libvncserver-config.in.multilib LibVNCServer-0.9.1/libvncserver-config.in +--- LibVNCServer-0.9.1/libvncserver-config.in.multilib 2007-05-26 21:28:25.000000000 -0500 ++++ LibVNCServer-0.9.1/libvncserver-config.in 2008-01-22 14:51:08.000000000 -0600 +@@ -4,7 +4,6 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + exec_prefix_set=no + includedir=@includedir@ +-libdir=@libdir@ + + # if this script is in the same directory as libvncserver-config.in, assume not installed + if [ -f "`dirname "$0"`/libvncserver-config.in" ]; then +@@ -63,7 +62,7 @@ while test $# -gt 0; do + libs="$libs -R$dir" + fi + done +- echo "$libs" -lvncserver -lvncclient @LIBS@ @WSOCKLIB@ ++ echo "$libs" -lvncserver -lvncclient + ;; + --link) + echo @CC@ diff --git a/SPECS/libvncserver.spec b/SPECS/libvncserver.spec new file mode 100644 index 0000000..f7a5c02 --- /dev/null +++ b/SPECS/libvncserver.spec @@ -0,0 +1,210 @@ + +%if 0%{?fedora} || 0%{?rhel} > 5 +%define system_minilzo 1 +%endif + +Summary: Library to make writing a vnc server easy +Name: libvncserver +Version: 0.9.9 +Release: 7.2%{?dist} +# NOTE: --with-tightvnc-filetransfer => GPLv2 +License: GPLv2+ +Group: System Environment/Libraries +URL: http://libvncserver.sourceforge.net/ +Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# workaround there being no x11vnc/ dir in tarball +Patch0: LibVNCServer-0.9.9-no_x11vnc.patch +Patch1: LibVNCServer-0.9.9-system_minilzo.patch +Patch2: libvncserver-0.9.1-multilib.patch +# pkgconfig love (upstreamable) +Patch3: LibVNCServer-0.9.9-pkgconfig.patch + +# upstream name +Obsoletes: LibVNCServer < 0.9.1 +Provides: LibVNCServer = %{version}-%{release} + +BuildRequires: automake autoconf +BuildRequires: libgcrypt-devel +BuildRequires: libjpeg-devel +%{?system_minilzo:BuildRequires: lzo-minilzo lzo-devel} +BuildRequires: pkgconfig(gnutls) +# for %%check +BuildRequires: xorg-x11-server-Xvfb +BuildRequires: xorg-x11-xauth +BuildRequires: zlib-devel + +%description +LibVNCServer makes writing a VNC server (or more correctly, a program +exporting a framebuffer via the Remote Frame Buffer protocol) easy. + +It hides the programmer from the tedious task of managing clients and +compression schemata. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +# libvncserver-config deps +Requires: coreutils +# upstream name +#Obsoletes: LibVNCServer-devel < %{version}-%{release} +Provides: LibVNCServer-devel = %{version}-%{release} +%description devel +%{summary}. + + +%prep +%setup -q -n LibVNCServer-%{version} + +%patch0 -p1 -b .no_x11vnc +%if 0%{?system_minilzo} +%patch1 -p1 -b .system_minilzo +#nuke bundled minilzo +rm -f common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c +%endif +%patch2 -p1 -b .multilib +%patch3 -p1 -b .pkgconfig + +# fix encoding +for file in AUTHORS ChangeLog ; do +mv ${file} ${file}.OLD && \ +iconv -f ISO_8859-1 -t UTF8 ${file}.OLD > ${file} && \ +touch --reference ${file}.OLD $file +done + +# needed by patch 1 (and to nuke rpath's) +autoreconf + + +%build +%configure \ + --disable-static \ + --without-tightvnc-filetransfer \ + --with-gcrypt \ + --without-png + +# hack to omit unused-direct-shlib-dependencies +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool + +make V=1 %{?_smp_mflags} + + +%install +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} + +# unpackaged files +rm -fv %{buildroot}%{_bindir}/linuxvnc +rm -fv %{buildroot}%{_libdir}/lib*.a +rm -fv %{buildroot}%{_libdir}/lib*.la + + +%check +unset DISPLAY +# Run a fake X session +# rawhide/koji seems to have some some unreproducible errors atm -- rex +# there's also selinux :( https://bugzilla.redhat.com/843603 +xvfb-run -a make -C test test ||: + + +%clean +rm -rf %{buildroot} + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{_libdir}/libvncclient.so.0* +%{_libdir}/libvncserver.so.0* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/libvncserver-config +%{_includedir}/rfb/ +%{_libdir}/libvncclient.so +%{_libdir}/libvncserver.so +%{_libdir}/pkgconfig/libvncclient.pc +%{_libdir}/pkgconfig/libvncserver.pc + + +%changelog +* Tue Jul 23 2013 Petr Pisar - 0.9.9-7.2 +- Specify dependencies on libpng and libgcrypt (bug #852660) + +* Mon Apr 08 2013 Daniel Mach - 0.9.9-7.1 +- Rebuild for gnutls + +* Thu Feb 14 2013 Rex Dieter 0.9.9-7 +- pkgconfig love (#854111) + +* Thu Feb 14 2013 Fedora Release Engineering - 0.9.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jan 18 2013 Adam Tkac - 0.9.9-5 +- rebuild due to "jpeg8-ABI" feature drop + +* Fri Dec 21 2012 Adam Tkac - 0.9.9-4 +- rebuild against new libjpeg + +* Thu Jul 26 2012 Rex Dieter 0.9.9-3 +- libvncserver fails to build in mock with selinux enabled (#843603) + +* Thu Jul 19 2012 Fedora Release Engineering - 0.9.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon May 07 2012 Rex Dieter 0.9.9-1 +- 0.9.9 + +* Wed Apr 18 2012 Petr Pisar 0.9.8.2-4 +- Enable system lzo library on rhel >= 6 (#813764) + +* Fri Jan 13 2012 Fedora Release Engineering - 0.9.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Dec 31 2011 Christoph Wickert - 0.9.8.2-2 +- On F15, %%check needs xorg-x11-xauth, too + +* Tue Dec 13 2011 Rex Dieter 0.9.8.2-1 +- 0.9.8.2 (#694975) +- new %%check section (yay for xvfb-run) + +* Tue Feb 08 2011 Fedora Release Engineering - 0.9.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Feb 18 2010 Stepan Kasal - 0.9.7-4 +- repack the tarball, there are .jar files without any source +- do not BR findutils, they are guaranteed in Fedora mock +- fix obsolete, so that it covers only packages created before this + spec was added to Fedora + +* Sat Jul 25 2009 Fedora Release Engineering - 0.9.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat May 23 2009 Rex Dieter - 0.9.7-3 +- Socket is not closed when disconnecting from server (#501895) + +* Mon May 04 2009 Rex Dieter - 0.9.7-2 +- fix detection of LINUX platform/define + +* Mon May 04 2009 Rex Dieter - 0.9.7-1 +- LibVNCServer-0.9.7 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Apr 10 2008 Manuel Wolfshant 0.9.1-3 +- do not use bundled copy of minilzo (#439979) + +* Sun Jan 27 2008 Rex Dieter 0.9.1-2 +- hack libtool to omit unused shlib dependencies +- fix AUTHORS encoding +- fix src perms + +* Mon Jan 21 2008 Rex Dieter 0.9.1-1 +- 0.9.1