debian/0000755000000000000000000000000012312056455007171 5ustar debian/tightvncserver.doc-base0000644000000000000000000000054411372204733013647 0ustar Document: tightvncserver Title: VNC Frequently Asked Questions Author: Edward Betts, Ola Lundqvist Abstract:Information about using and troubleshooting VNC Section: Network/Communication Format: Text Files: /usr/share/doc/tightvncserver/faq.txt.gz Format: HTML Index: /usr/share/doc/tightvncserver/faq.html Files: /usr/share/doc/tightvncserver/faq.html debian/watch0000644000000000000000000000012211372054553010217 0ustar version=3 http://www.tightvnc.com/download.php .*tightvnc-([\d.]+)_unixsrc.tar.gz debian/tightvncserver.examples0000644000000000000000000000002011371614454014001 0ustar debian/vnc.conf debian/faq.html0000644000000000000000000010572511371614454010643 0ustar VNC Frequently Asked Questions (FAQ)

Virtual Network Computing


Note

This version was edited by Edward Betts and Ola Lundqvist for the Debian Operating System. The original version is available at the VNC Home Page (extern).


VNC Frequently Asked Questions (FAQ)

This isn't intended to be an introduction to VNC - have a look at the Getting Started page first.

This list is being updated regularly, so, particularly as you are reading a mirrored copy, it's worth checking the original from time to time. The archives of the mailing list are also available, and they can be a good source of help - try searching them here.

Historical Note: With the release of 3.3.2 we have moved some of the old questions into the Old FAQ page because they should not apply to recent versions. As with most software, it's worth checking to make sure you've got the lastest version.

VNC Frequently Asked Questions

Getting Started

Where can I get VNC?
The latest versions of VNC and this documentation are always available from the AT&T Laboratories Cambridge web site at http://www.uk.research.att.com/vnc. In addition, various add-ons, extras, and ports to other platforms can be found on the contribs page.
I thought this was something to do with ORL? What's the Olivetti/Oracle link here?
In January 1999, AT&T acquired ORL, the Olivetti Research Laboratory founded 12 years earlier, and recently jointly funded by Oracle, to create AT&T Laboratories Cambridge.
I started the X server using vncserver, but it dies with a message "Could not open default font 'fixed'. "
The 'fixed' font is needed for the server to start - if it can't find it, you need to specify the correct font path for your machine in the 'vncserver' script. If you're not sure what the path should be, type 'xset q' from within a normal X session. One of the things reported is the font path used by your current X server, which is generally the right thing to use for Xvnc. On some platforms you may need to use a colon as a separator in the font path instead of a comma. If you're on a recent version of Linux but still using VNC version 3.3.1, you may have compressed fonts which VNC doesn't understand. Either upgrade or see the Old FAQ.
The VNC server can also get upset if you have directories on your font path which don't actually exist on your system. Make sure you remove those. Also note that older versions of the Xvnc server, by default, act as if they had a resolution of 100dpi. Some RedHat installations, for example, only install 75dpi fonts, so you may need to install the missing font RPMs from your distribution or use the -dpi option to Xvnc, or update to the latest version.
I get errors like "failed to bind listener" and "Failed to establish all listening sockets" in the log file.
This is probably due to the permissions on /tmp/.X11-unix. You may well see this if you update to Solaris 2.7 or Redhat 6.0, for example. See the section below entitled "Why can I only run vncserver/Xvnc as root?".
Vncserver seems to be dying quietly without putting any messages in the log file.
Check that the Xvnc process really has died. If so, then check that your VNC font path (set by uncommenting lines in the vncserver script) only includes directories which actually exist. The XFree86 code in older versions of Xvnc seems to have a problem which causes the server to die quietly if non-existent directories are searched. Upgrading to 3.3.3 or later should reduce these problems.
I connected to my Unix VNC server and I just see a grey desktop with a cursor.
After the vncserver script has started the Xvnc server, it then runs your ~/.vnc/xstartup script. By default this will try to start the twm window manager, but if twm isn't on your path, or if you prefer something else, you can edit xstartup. The log file may also give you clues about what is happening.
The log file is showing an error message from xrdb / Xlib.
By default, the first thing your xstartup script does is to run xrdb to load your resources. So if the Xvnc server has not started for any reason, the xrdb is often the first thing to notice it and print an error. (Though if you're getting a 'command not found' message, then xrdb is probably not on your path - you need to find where it is on your system and add it.)
If you get something like 'connection refused' or 'Can't connect: errno = 111', the Xvnc server probably isn't there. So you should check whether the Xvnc process is actually running, and whether there is anything earlier in the log file indicating why it might have died. By far the most common reason for the server not starting is that it can't find the 'fixed' font (see above). Other possibilities are that the server has quietly crashed, or that it is taking a very long time to start up. The vncserver script has a 3-second delay before running xstartup, but in extreme cases this may not be enough. Lastly, the DISPLAY variable used by vncserver is based on the results given by the 'uname - n' command. If your applications cannot resolve this to the right IP address, perhaps because of funny settings in /etc/hosts, then they won't be able to connect.
If you get a 'Client is not authorized to connect to Server' or similar message, there's something wrong with the X authority setup - perhaps xauth is not on your path? You could try using xhost to bypass this temporarily, but we wouldn't recomend this as a long-term solution. There should be some indication in the log file if xauth has failed.
The Java client doesn't work in my browser.
Several Java implementations have bugs which upset the VNC applet. Try pressing Reload. We've seen this problem on Netscape Navigator 3 and Internet Explorer 5. Note, too, that the Java applet often won't work if you are accessing the server via a web proxy. Make a direct connection if you can.
My viewer failed to connect to my server!
VNC relies on a correctly-configured and operational TCP/IP network, so please make 100% sure that your TCP/IP setup is right before you start asking questions on the mailing list. Here are some things you should check before assuming it's a VNC problem; consult your local expert if you don't know how to check them:

Running the programs

My X VNC server is working, but I don't see my normal environment. How can I change the Window manager etc?
The window manager is started by the ~/.vnc/xstartup script. We use twm, as this is available on almost all Unix platforms. Edit the script if you'd rather replace it with something else. On many platforms you can, as an alternative, just make xstartup a link to whatever script normally starts your X environment.

If you want to be more sophisticated, you can specify the -name option to vncserver, and then take different actions in the xstartup script based on the name given. For example:
case "$VNCDESKTOP" in
kde)
        startkde &
        ;;
*)
        xterm -geometry 40x10+40+40 -ls -title "$VNCDESKTOP Desktop" &
        twm &
        ;;
esac
Why can I only run vncserver/Xvnc as root?
The most likely reason for this is that Xvnc can't create the unix domain socket (the path for this unix domain socket is usually /tmp/.X11-unix/Xn). Try making sure that users can write to this directory by making it world-writable, i.e.

chmod 01777 /tmp/.X11-unix

An alternative is to set the Xvnc binary to have the same permissions as your normal X server, but this may be more of a security risk.
Can I remote the normal X display of my workstation (display :0) in the same way as the Windows server does?
It would be possible to add VNC support to a standard X server, so that it operated this way, but we have no plans to do so. It shouldn't be too difficult, if you have the full source code for your X server. Xvnc is basically XFree86 with the hardware-dependent bits taken out and VNC put in their place, so it doesn't have drivers for any graphics cards. You could have a look at the Xvnc source code to see which bits have been added to the standard XFree86, and make the equivalent changes on your X server.

We tend to run all our X sessions as VNC sessions and only use the local X server to run the viewer. It's very fast when on the same machine as the server! If you feel that it's overkill to run two X servers on the same machine, you might consider Ganesh Varadarajan's svgalib-based viewer, available from the contribs page.
What X Visual does Xvnc use?
By default, vncserver will start Xvnc with the same depth as the current X display, if there is one, or 8 bits deep if there isn't. We've tried to steer clear of colour maps as much as possible and normally use "true colour", even when there are only 8 bits per pixel.
Unfortunately some X applications don't cope too well with an 8 bit TrueColor visual. You can make Xvnc use the more normal PseudoColor visual by giving a "-cc 3" option to vncserver.
Can I cut and paste between the viewer and the server?
VNC supports copying and pasting of ASCII text in both directions, provided the viewer and server allow it. When the clipboard changes on the machine running the viewer, the changes are copied to the server and vice versa. Some notable exceptions:
The code to do copying from the X server to the viewer didn't make it in the original version 3.3.2. It's back in 3.3.2R2 and later, so upgrade if you haven't already!
There's a memory leak in Xvnc!
This is fixed in versions 3.3.2r3 and later. If you're using an older distribution you can find a patch for it here.


Why doesn't Ctrl-Alt-Del work? Why can't I unlock my NT workstation remotely? Why can't I stop the screensaver remotely?
Make sure you are running a recent version of VNC, and that you are running it as a service. From some platforms you will not be able to type Ctrl-Alt-Del directly, because it will be caught by the local machine. The Windows viewer, for example, has an option on its menu to send a Ctrl-Alt-Del to the remote host. In some situations, you will find that something like Ctrl-Alt-Backspace or Ctrl-Alt- may work instead. Screensavers sometimes use a different resolution and so can disconnect you when they stop or start - see the next question.
When I connect using VNC and then log into my Windows machine, I get disconnected and have to reconnect!
Sometimes logging in will involve a change in screen resolution, if the user's display settings are different from the defaults. If this happens, the server will disconnect you and you will need to reconnect to get the new screen size. Just occasionally on NT, the mode seems to change resolution temporarily as you log in, and if WinVNC happens to see this you can also be disconnected, even if the final resolution changes.

If the user has set a different display number in their personal WinVNC properties dialog you will also be disconnected.
The dead keys don't work on my keyboard
It's quite a challenge working out how to do international keyboard support across different platforms. We'll sort out dead keys, but if you'd like to work out how to do them, we'd be grateful.
The keyboard doesn't work / keys do strange things!
There is one common problem which can cause this. If a modifier key, such as Shift, Ctrl or Alt, is pressed, and the viewer window then loses focus or dies, the 'key release' message never gets to the viewer and hence never gets to the remote server. The remote machine will then think that M is Ctrl-M etc. We have done various things to reduce the chance of this happening; the viewers release various modifiers automatically when they lose focus, for example, but it can still occur and can be confusing when it does. The solution is easy: simply press and release the modifier key which is stuck. If you don't know which it is, then try them one at a time.

General Questions

How do I make VNC go faster?

We find VNC to be perfectly acceptable as our normal method of accessing Unix desktops on a daily basis. This is over a 10 Mbit/s ethernet on reasonably modern machines, using the X or Win32 viewer. Because Windows gives us fewer hints about what it's doing, and because we don't have the source code for Windows in the same way that we do for X, the WinVNC server has to work harder to find out what's changed, and so a really fast machine should make a big speed difference. For more information about how the Windows server works, see the WinVNC documentation. But if you've been disappointed by the speed of the Windows server, don't give up. We're improving it gradually, but it'll be a while before it's as fast as on Unix.

There are several things that can slow any VNC session down, however, and you may like to consider these if you find it too slow:

  • Unusually 'busy' desktops. The VNC protocol is very efficient at rendering areas of a single colour, such as you generally find on window title bars, scrollbars, backgrounds of pages etc. But if, for example, you have pretty 24-bit photographs of your girlfriend as your screen background, or dithered title-bars on your windows, you may pay a price for the aesthetics. A colourful or patterned desktop background will probably slow down VNC more than any other single factor. We have some suggestions on speeding up the twm window manager, some of which will also apply to other environments.
  • Hi-colour desktops. Don't use 24-bit colour if you can use 16 or 8 equally well. Remember, on Unix you can run multiple servers, so I have a big 16-bit desktop for normal work and a small 8-bit one for when I log in from home. The server can send out a wide range of pixel formats, and some viewers will allow you to request a specific format for that session. On the Windows viewer, for example, if you click Options... when making the connection, you can request only 8-bit pixels from the server - useful if the network gets slow. If you are using a modem, I recommend changing the shortcut in the Start menu to include the /8bit option - this will then be the default. Similarly, if you regularly connect to a remote WinVNC server, consider whether you could run happily at lower resolution. A 1280x1024 screen has more then 4 times as many pixels as a 640x480 one, and if all you are doing is checking a printer queue you probably don't need them all! Note, though, that on WinVNC, 16-bit colour is usually the best to use. See below.
  • Elderly graphics cards or drivers may make quite a difference; this is a graphics-intensive application! On Windows the graphics system on the server will affect the speed as well as the one on the viewer.
  • Some applications are not very economical about redrawing their display. Early versions of Unix Netscape, for example, tended to draw everything twice when scrolling, which did nothing to help the smoothness under VNC. X11Amp flashes its display very fast when in 'pause' mode.
  • Some Java Virtual Machines are particularly fast at reading from the network and particularly slow at drawing to the screen, or vice versa. With the Java viewer it is worth experimenting with the encodings available from the Options menu, as we sometimes find big differences in speed.
  • If you are connecting to WinVNC, don't change the default settings in the Properties box unless you need to.
  • All the standard clients can do local rectangle copying, and this generally means that dragging a full window on X is much faster than dragging its outline. If your window manager allows this, it may speed things up. Roman Mitnitski also reports that when he increased the mouse dragging threshold (-t option of the server) the performance was improved.
  • Generally, with WinVNC, use 16-bit colour (65536 colours) on the server if you can. 16-bit is almost always the best depth to use, because:
    1. 256-colour screens have to be palette-converted before they can be transmitted to truecolour clients. Only if the client is 256-colour palette- based will you see any performance increase. Even if the client is 256 colour truecolour, it'll have to convert via a 32-bit truecolour palette!
    2. 24-bit screens have to be specially munged via 32-bit since VNC's internal colour-handling routines don't work with 24-bit directly.
    3. 24 and 32-bit screens have to have each pixel looked up in three tables to get the converted value.
    4. Graphics cards claiming to do 24-bit often actually do 32-bit with munging - this in many cases makes 24-bit slower just for general use than 32-bit!
    5. Finally, 16-bit involves no palette processing and a single lookup in a cached src_format to dest_format table to convert the pixels.
On slow links, you may also want to use some software to compress the data between the two ends. SSH is good for this. See the section on security below.
Will VNC work through a firewall?
It depends on your firewall, and whether you want to access a server inside your firewall from elsewhere, or a server outside your firewall from inside.
Generally firewalls are designed to prevent incoming connections except to certain well-known machines and ports. If you can configure these to include your VNC server, then you will be able to access it from anywhere in the world. There is a good argument to be made for the fact that VNC is less of a security risk than X, so if your site doesn't allow X in or out it may still allow VNC.
Many modern firewalls will allow outgoing connections initiated from inside, so you can often access servers on outside machines. It is straightforward, for example, to recompile the viewer source to include SOCKS support, or to make other special arrangements. See the contribs page.
It's a pity that Java within a browser doesn't automatically use SOCKS if the browser is configured to use it. There's probably Java SOCKS support out there somewhere...
If your internet access is through a router which does Network Address Translation, you may be able to configure the router to redirect particular incoming ports to particular machines. So you could run WinVNC with a display number of 0 on machine snoopy, and with display 1 on machine woodstock, then set your router to send port 5900 to snoopy and 5901 to woodstock. See below for information on the other port numbers used by VNC.
Which TCP/IP ports does VNC use?
A VNC server listens on two ports. The exact port numbers depend on the VNC display number, because a single machine may run multiple servers. The most important one is 59xx, where xx is the display number. The VNC protocol itself runs over this port. So for most PC servers, the port will be 5900, because they use display 0 by default.
In addition, VNC servers normally have a small and very restricted web server built in, which allows you to connect a browser to them and use the Java viewer. This runs on port 58xx. Note that this is the HTTP port used for downloading pages and applets, but once the applet is running it uses 59xx for VNC just like any other viewer.
The servers can be changed to listen on other ports if, for any reason, these are not suitable for you. See the server's documentation for more details. Most of the viewers, if given a display number larger than 99, will interpret it as a direct port number and will not add 5900. See also the next question.
If you are running a viewer in 'listening' mode, where it accepts connections initiated by the server, it will listen for incoming VNC on port 5500.
Can I run VNC over a port normally used for a standard service? (eg. port 21, or port 80)
In rare circumstances, people may want to do this, perhaps because they have a firewall which only allows connections to certain ports. This can be done, at least for the Windows and Unix servers (see their documentation), but the following points need to be borne in mind:
  • On some systems (eg. most forms of Unix), ordinary users are not allowed to run servers on ports below 1024.
  • You obviously can't run a VNC server on a port that's already being used for other things.
  • Many VNC servers use two ports: one for the VNC server, and one for the HTTP server that provides the Java applet (see previous question). If you plan to use the Java viewer, you may want to change both. Not all servers will allow this at present.
  • You need to tell the viewer the right display number. Normally, display numbers come between 0 and 99. If you specify any number smaller than 99, the viewers add 5900 to get the port number. If you specify a larger number, the viewers take it as a port number directly. So how do you use port numbers lower than 99? You have to specify a negative display number! For example, to connect to a server running on port 80 on machine 'snoopy':

    vncviewer snoopy:-5820

    because -5820 + 5900 = 80. This may not work with all viewers, but Unix and Windows seem to be fine.
How secure is VNC?
Access to your VNC desktop generally allows access to your whole environment, so security is obviously important. VNC uses a challenge-response password scheme to make the initial connection: the server sends a random series of bytes, which are encrypted using the password typed in, and then returned to the server, which checks them against the 'right' answer. After that the data is unencrypted and could, in theory, be watched by other malicious users, though it's a bit harder to snoop a VNC session than, say, a telnet, rlogin, or X session. Since VNC runs over a simple single TCP/IP socket, it is easy to add support for SSL or some other encryption scheme if this is important to you, or to tunnel it through something like SSH.

SSH allows you to redirect remote TCP/IP ports so that all traffic is strongly encrypted, and this can be combined with VNC. SSH can also compress the encrypted data - this can be very useful if using VNC over slow links. See the 'Using SSH with VNC' page.

While we're on the subject of security, you should also be aware that only the first 8 characters of VNC passwords are significant. This is because the 'getpass' call used in the Unix server to read a password has this restriction, and the other platforms have been made compatible with this.
Ray Jones <rjones@pobox.com> has built a version of VNC which uses SSLeay public key encryption, and Wolfram Gloger <wmglo@dent.med.uni-muenchen.de> has built Xvnc with the TCP Wrapper library, allowing you more control over which hosts are allowed to connect. See the contribs page for details.
Are you going to make it more secure?
We do hope eventually to add better security to VNC, but there's also a good argument for not doing so. If security is a concern, it can be better to use a single system such as SSH or FreeS/WAN to encrypt all your traffic, rather than relying on the individual packages to do the right thing. Then, if you decide in a year's time that one system is too easily crackable, you can replace it yourself and all of your communications will benefit. It may also be easier to fit in with corporate security systems this way.
Could you do file transfer (e.g. by drag & drop) between the two ends?

It's certainly possible, but we aren't going to do it. File transfer seems simple, but is actually rather complicated to do in a cross- platform way. Some examples: How do you map filenames between platforms with wildly different naming conventions? How do you cope with running out of disk space? What about permissions? How do you do it on platforms which don't have a concept of drag and drop? Can you interrupt the transfer if it's taking too long? Can you restart it if it gets interrupted?

Since there are a very large number of perfectly good systems out there for transferring files over IP, we aren't planning to incorporate it in VNC. It would probably more than double the size of the code, and would introduce all sorts of issues that we, quite frankly, aren't interested in! So use the standard file transfer built into Windows, or use FTP, or netcat, or the web, or rcp, or ssh, or...

Are you planning support for AIX, EPOC,HP-UX, SGI, Win 3.1, or my favourite platform ?
We have provided VNC on all the platforms we use here, and it's difficult to provide binaries for anything we don't have, and it takes a while to get up to speed on new platforms. Information about third-party ports of VNC to a large number of other platforms can be found on the 'contribs' page, so check there first. Remember that a viewer is available for any platform which runs Java, though the speed may vary quite a bit. But for many platforms it should not be difficult to compile at least the viewer. If anyone tailors the sources for a particular platform we will happily either incorporate the changes in the main source distributions or make the patches available from our site.
Would things work better if you compressed the stream?

VNC incorporates really quite efficient compression in the sense that we generally send a tiny fraction of the raw data, probably something like 1/20 on average. The details are in the protocol spec if anyone's interested. On a couple of test screen dumps we found that the Hextile encoding was more efficient than GIF! I don't know whether this is true in general.

But we haven't done more general encoding after that; we've tended to the view that (a) it might introduce too much latency and (b) most modems compress pretty well anyway. We are planning some zlib-compression experiments in the near future to see how this affects things. Because different bits of the screen can be sent using different encodings, the server could, in theory, detect that one bit would be most efficiently sent as JPEG, while another would be better hextiled.

The question is always how much work it's worth doing at the server to find this out. To some degree you can control this already, because the viewers allow you to specify your preferred encoding. Under X, if your viewer and server are on the same machine the viewer will use the raw encoding by default, otherwise it will use hextile. You may find that by selecting different encodings on the command line you get better performance.

See also the suggestions above about using ssh, which also provides compression.

Have you thought about caching bits of the screen at the viewer end?
Yes, that could also be good. You could have an off-screen cache in the viewer and the server could copy things from there to the screen. Management of this would add a certain amount of complexity, though.
Since there is already a CopyRect primitive in VNC, an alternative approach would be to copy updates from another part of the screen if they already exist there, rather than resending them. Again, to make the server find out efficiently when this is worth doing would be an interesting challenge, and volunteers for the project are welcome!
Can I use VNC over a modem without using TCP/IP?
Not at present. VNC could run over other transports such as RS232, firewire, USB, modems, IrDA etc, in fact, anything which gives a reliable 2-way connection. At present we just use TCP/IP, because it's convenient, ubiquitous, and easy to route. This means that you can use VNC over anything which supports TCP/IP, so using it over a modem is just the same as any other network, once you have Dial-Up Networking set up. If you need to communicate directly between two machines without going via the internet/intranet, then set up a remote access server on one and dial in from the other.
Does VNC have any Y2K (Year 2000) bugs?
The WinVNC server and Windows viewer have been tested on a PC with its date running through the 2000 boundary without any problems, so unless the underlying OS or BIOS has difficulties, VNC on a PC should be fine. The VNC part of the X-based Unix VNC server only uses dates when writing the log files; the logfile entries are timestamped with a two-digit year, but the format is easy to change if required and the entries are not intended to be machine-readable. The developers of the XFree86 server on which Xvnc is based state that there are no Y2K problems (see http://www.xfree86.org/FAQ/). We therefore issue the standard disclaimer: we believe the VNC code, in its entirety, to be free from Year 2000 problems, subject to the other components of the systems on which it is running.
Any other tips?
Several people have indicated that they have to use Windows occasionally but prefer to use Unix most of the time, and so want to access a PC under the desk from the Unix box.

Here's a suggestion: all other things being equal, I recommend using the Windows box to view the Unix machine rather than the other way around. This is chiefly because Windows generally works better as a client than as a server, and also because PC graphics cards are often better than those in Unix workstations. Remember, you can create a VNC session of any size and pixel depth you like.

If you're very anti-Windows you can make your VNC desktop the same size as the local screen and set the taskbar to 'Auto hide' and just pretend you're on an X terminal, but pop up the Start menu when you have to use PowerPoint.... The Windows viewer also now has a proper 'full-screen mode', so you don't even need to bother with auto-hide.

You misspelled 'organization' on the download page!
No we didn't. We spell it like that in the UK. Actually, we spell it both ways, but the 's' spelling is more common, despite what the OED says! Now, as for 'misspelt'...

Compiling the source

I'm having trouble compiling VNC on my platform...
Have you checked the contribs page? Several people have provided hints on how to build VNC on other platforms. If yours is not listed there, you might at least get some clues..

For comments, feedback, etc, please see the 'Keeping in touch' page.
Copyright 1999 - AT&T Laboratories Cambridge

debian/rules0000755000000000000000000001417711764074337010274 0ustar #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS += -g endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif export CC = gcc configure: config-stamp config-stamp: dh_testdir # Add here commands to configure the package. CC=$(CC) xmkmf (cd Xvnc; CC=$(CC) xmkmf) (cd Xvnc; ./configure) #./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ # --prefix=/usr \ # --mandir=\$${prefix}/share/man \ # --infodir=\$${prefix}/share/info \ # --localstatedir=/var \ # --with-installed-zlib \ # --with-x touch config-stamp build-arch: config-stamp build-arch-stamp build-arch-stamp: dh_testdir # Add here command to compile/build the package. # Build first things. $(MAKE) World # Build Xvnc (cd Xvnc; $(MAKE) World) lynx -dump debian/faq.html | sed 's,file://.*/,,' > debian/faq.txt lynx -dump debian/start.html | sed 's,file://.*/,,' > debian/start.txt touch build-arch-stamp build-indep: config-stamp build-indep-stamp build-indep-stamp: dh_testdir # Add here command to compile/build the arch indep package. # It's ok not to do anything here, if you don't need to build # anything for this package. #/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1 touch build-indep-stamp build: build-arch build-indep clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp config-stamp rm -f debian/faq.txt debian/start.txt xmkmf (cd Xvnc; xmkmf) # Add here commands to clean up after the build process. -rm -f config.log config.status config.cache [ -f Makefile ] || $(MAKE) distclean [ -f Makefile ] || $(MAKE) clean -(cd Xvnc; $(MAKE) clean) -(cd Xvnc/programs/Xserver; $(MAKE) clean) -find . -type f -a -name "*.o" | xargs rm -f {} -find . -type f -a -name "*.a" | xargs rm -f {} rm -f vncpasswd/vncpasswd vncconnect/vncconnect vncviewer/vncviewer rm -f vncpasswd/Makefile vncviewer/Makefile vncviewer/vncviewer._man rm -f vncconnect/Makefile libvncauth/Makefile #-rm Xvnc/programs/Xserver/*fb*/*.{c,h} #-rm Xvnc/programs/Xserver/Xvnc #-find . -type f -a -name Makefile -a ! -path '*Xvnc/Makefile' \ # -exec rm -f '{}' ';' -rmdir Xvnc/exports # Extra clean targets find Xvnc -name "Makefile" | grep -v Xvnc/Makefile | xargs rm -f -rm -f \ Xvnc/config/cf/platform.def dh_clean Xvnc/xmakefile \ Xvnc/config/cf/host.def \ Xvnc/config/imake/Makefile.proto \ Makefile \ Xvnc/Makefile install: DH_OPTIONS= install: build dh_testdir dh_testroot dh_prep dh_installdirs # Add here commands to install the package into debian/vnc. #$(MAKE) install prefix=$(CURDIR)/debian/vnc/usr # mkdir -p $(CURDIR)/debian/tmp # ./vncinstall $(CURDIR)/debian/tmp/ # tightvncpasswd install -o root -g root -m 755 vncpasswd/vncpasswd \ $(CURDIR)/debian/tightvncserver/usr/bin/tightvncpasswd install -o root -g root -m 644 vncpasswd/vncpasswd.man \ $(CURDIR)/debian/tightvncserver/usr/share/man/man1/tightvncpasswd.1 # tightvncserver install -o root -g root -m 755 Xvnc/programs/Xserver/Xvnc \ $(CURDIR)/debian/tightvncserver/usr/bin/Xtightvnc install -o root -g root -m 755 vncserver \ $(CURDIR)/debian/tightvncserver/usr/bin/tightvncserver install -o root -g root -m 755 vncconnect/vncconnect \ $(CURDIR)/debian/tightvncserver/usr/bin/tightvncconnect install -o root -g root -m 644 vncserver.man \ $(CURDIR)/debian/tightvncserver/usr/share/man/man1/tightvncserver.1 install -o root -g root -m 644 vncconnect/vncconnect.man \ $(CURDIR)/debian/tightvncserver/usr/share/man/man1/tightvncconnect.1 install -o root -g root -m 644 Xvnc/programs/Xserver/Xvnc.man \ $(CURDIR)/debian/tightvncserver/usr/share/man/man1/Xtightvnc.1 # libvncauth0 # install -o root -g root -m 644 rfb/libvncauth.so.0.0 \ # $(CURDIR)/debian/libvncauth0/usr/lib # libvncauth-dev # Now moved to rfb dir. #install -o root -g root -m 644 include/* \ # $(CURDIR)/debian/libvncauth-dev/usr/include # install -o root -g root -m 644 rfb/libvncauth.a \ # $(CURDIR)/debian/libvncauth-dev/usr/lib # xtightvncviewer install -o root -g root -m 755 vncviewer/vncviewer \ $(CURDIR)/debian/xtightvncviewer/usr/bin/xtightvncviewer install -o root -g root -m 644 vncviewer/Vncviewer \ $(CURDIR)/debian/xtightvncviewer/etc/X11/app-defaults/Vncviewer install -o root -g root -m 644 vncviewer/vncviewer.man \ $(CURDIR)/debian/xtightvncviewer/usr/share/man/man1/xtightvncviewer.1 # dh_movefiles # Build architecture-independent files here. # Pass -i to all debhelper commands in this target to reduce clutter. binary-indep: build install binary-indep-keep: dh_testdir -i dh_testroot -i # dh_installdebconf -i dh_installdocs -i dh_installexamples -i dh_installmenu -i # dh_installlogrotate -i # dh_installemacsen -i # dh_installpam -i # dh_installmime -i # dh_installinit -i dh_installcron -i # dh_installman -i dh_installinfo -i # dh_undocumented -i dh_installchangelogs -i dh_link -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_perl -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. binary-arch: build install dh_testdir -a dh_testroot -a # dh_installdebconf -a dh_installdocs -a dh_installexamples -a dh_installmenu -a # dh_installlogrotate -a # dh_installemacsen -a # dh_installpam -a # dh_installmime -a # dh_installinit -a dh_installcron -a # dh_installman -a dh_installinfo -a # dh_undocumented -a dh_installchangelogs -a # Remove empty directories rmdir $(CURDIR)/debian/tightvncserver/usr/share/man/man5 \ $(CURDIR)/debian/tightvncserver/usr/share/vncserver dh_strip -a dh_link -a dh_compress -a dh_fixperms -a dh_makeshlibs -a dh_installdeb -a dh_perl -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install debian/tightvncserver.postinst0000755000000000000000000000144711372047321014061 0ustar #!/bin/sh set -e if [ "$1" = "configure" ]; then MAN=/usr/share/man/man1 BIN=/usr/bin update-alternatives --install \ $BIN/vncserver vncserver $BIN/tightvncserver 70 \ --slave \ $MAN/vncserver.1.gz vncserver.1.gz $MAN/tightvncserver.1.gz \ --slave \ $BIN/vncconnect vncconnect $BIN/tightvncconnect \ --slave \ $MAN/vncconnect.1.gz vncconnect.1.gz $MAN/tightvncconnect.1.gz update-alternatives --install \ $BIN/Xvnc Xvnc $BIN/Xtightvnc 70 \ --slave \ $MAN/Xvnc Xvnc.1.gz $MAN/Xtightvnc.1.gz update-alternatives --install \ $BIN/vncpasswd vncpasswd $BIN/tightvncpasswd 70 \ --slave \ $MAN/vncpasswd.1.gz vncpasswd.1.gz $MAN/tightvncpasswd.1.gz fi #DEBHELPER# exit 0 debian/xtightvncviewer.prerm0000755000000000000000000000023511372047277013512 0ustar #!/bin/sh set -e if [ "$1" = "remove" ] ; then BIN=/usr/bin update-alternatives --remove \ vncviewer $BIN/xtightvncviewer fi #DEBHELPER# exit 0 debian/xtightvncviewer.dirs0000644000000000000000000000006011371614454013313 0ustar usr/bin usr/share/man/man1 etc/X11/app-defaults debian/vnc.conf0000644000000000000000000001101611371614454010630 0ustar # /etc/vnc.conf written by Marcus Brinkmann. This file is in the Public Domain. # # This is the configuration file for the vncserver package. # It is perl syntax, but only variable assignment is allowed. # A semicolon will be added if missing. # Every value has suitable defaults, so you probably don't need any file. # # This file will be sourced by `vncserver' and `vncpasswd'. # After this file, $(HOME)/.vncrc will be sourced, so values can be # overwritten on a per-user basis. If you want to reactivate the default # value there, you have to specify an empty value. For example, $fontPath # will set to the default value after # # $fontPath = "/foo"; # $fontPath = ""; # # If you are missing something, please let me know. # Marcus.Brinkmann@ruhr-uni-bochum.de # System configuration # -------------------- # # This section contains entries that should be true for all users. # $vncClasses should be the path to the java classes of server. # $vncClasses = "/usr/share/vncserver"; # $XFConfigPath can be set to the global XF86Config file. This will be # parsed to gain default values for $fontPath and $colorPath. # If you want to disable this feature, point it to an # invalid file, "/foo" for example. # $XFConfigPath = "/etc/X11/XF86Config"; # $fontPath should be a comma seperated list of fonts to be added to the font # path. If not specified, and $XFConfigPath is valid, vncserver # will read the $fontPath from there. If both are not set, the # default will apply. # Example: $fontPath = "tcp/localhost:7100"; # would make vnc to use xfs. # Example: $fontPath = ""; # $fontPath .= "/usr/X11R6/lib/X11/fonts/misc/,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/Type1/,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/Speedo/,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/75dpi/,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/100dpi/,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/freefont/,"; # $fontPath .= "/usr/X11R6/lib/X11/fonts/sharefont/"; # I don't know what the default is, though. # $colorPath should be the RGB file to be used by X. This can also be taken from # XF86Config file if specified by $XFConfigPath # $colorPath = "/usr/X11R6/lib/X11/rgb"; # User configuration # ------------------ # # This section contains entries that may change from user to user. # $vncUserDir contains the filename for the log files directory of Xvnc # (the server) and the viewers that are connected to it. # $vncUserDir = "$ENV{HOME}/.vnc"; # $vncPasswdFile contains the filename of the password file for Xvnc. # $vncPasswdFile = $vncUserDir . "/passwd"; # $vncStartup points to a script that will be started at the very beginning. # $vncStartup = "/etc/X11/Xsession"; # $xauthorityFile should be the path to the authority file that should be used # by your vnc X server. # $xauthorityFile = "$ENV{HOME}/.Xauthority"; # $defaultDesktopName should be set to the default name of the desktop. # This can be changed at the command line with -name. # $defaultDesktopName = "X"; # $geometry sets framebuffer width & height. Default will be calculated if # server is started from within a running X servers. Can be changed at # the commandline (-geometry). A fixed default will be used if # vncserver is not invoked in a running X session. # Example: $geometry ="640x480"; # $depth sets the framebuffer color depth. Must be between 8 and 32. # $pixelformat sets the default pixelformat. # The default will be calculated if none of both is specified # and when vncserver is called from within a running X servers. # Can be changed at the command line with option -depth. # A fixed default value will be used if vncserver is not # invoked in a running X session. # Example: $depth = "16"; # $pixelformat = "rgb565"; # $getDefaultFrom sets the display from which you can query the default of # the above three options, if you don't want to start vncserver # from within a running X server. It will be added to the call # of xdpyinfo. # It is useful to get the default from the X server you will # run xvncviewer in. # Example: $getDefaultFrom = "-display localhost:0" # $rfbwait sets the maximum time in msec to wait for vnc client viewer. # $rfbwait = "120000"; debian/README.inetd0000644000000000000000000000311511371614454011156 0ustar This is what works for me. In /etc/services I have vnc-640x480x8 5950/tcp vnc-800x600x8 5951/tcp vnc-800x600x16 5952/tcp vnc-1024x768x16 5953/tcp These correspond to the various resultions for VNC windows. In /etc/inetd.conf I have vnc-640x480x8 stream tcp nowait nobody.tty /usr/bin/Xvnc Xvnc -inetd -query localhost -once -geometry 640x480 -depth 8 vnc-800x600x8 stream tcp nowait nobody.tty /usr/bin/Xvnc Xvnc -inetd -query localhost -once -geometry 800x600 -depth 8 vnc-800x600x16 stream tcp nowait nobody.tty /usr/bin/Xvnc Xvnc -inetd -query localhost -once -geometry 800x600 -depth 16 vnc-1024x768x16 stream tcp nowait nobody.tty /usr/bin/Xvnc Xvnc -inetd -query localhost -once -geometry 1024x768 -depth 16 These arrange for VNC to be started at the appropriate resolutions. The -query localhost tells the X server which Xvnc starts to send an XDMCP query to localhost to get a display manager. I use KDM on my system, and so I had to alter/etc/kde2/kdm/kdmrc to change Enable=false to Enable=true I also changed /etc/kde2/kdm/kdmrc/Xaccess to allow connections. Also need to reload inetd (update-inetd may handle this in a package) and restart kdm You can then use a VNC connection to display 50 (i.e. systemname:50 in the vnc viewer) to get a 640x480x8 session. For GDM you need to change Enable=false to Enable=true in /etc/gdm/gdm.conf (but I have not tested this to see if anything else is needed) Using VNC this way has been useful for me - I hope it may be useful for someone else also. John Lines debian/start.html0000644000000000000000000002011311371614454011214 0ustar Getting Started with VNC

Virtual Network Computing


Note

This version was edited by Edward Betts for the Debian Operating System. The original version is available at the VNC Home Page (extern).


Getting Started with VNC

VNC consists of two types of component.  A server, which generates a display, and a viewer, which actually draws the display on your screen.   There are two important features of VNC: So, to get started with VNC you need to run a server, and then connect to it with a viewer. Get the packages for the platforms you use from the download page, if you haven't already, and install them. The current VNC software requires a TCP/IP connection between the server and the viewer, though there is no reason why the software couldn't be modified to use, for example, RS232 or Firewire.  We have internal versions that use other network transport layers. But for now you'll need to know the name or the IP address of the server machine.

Most people will be running either a Unix server or a Windows server, though similar principles will apply to other platforms.


Running a Unix server

A VNC server appears, to the Unix applications which appear on it,  to be a standard X display just like the one you sit in front of; but it doesn't have a physical screen attached.  The applications don't know this.  They just carry on running whether or not a viewer is connected, in the same way as they would regardless of whether you were actually looking at your physical screen.

You can start a new VNC server by typing:

vncserver
on a Unix machine.  (If you're sitting at a PC you may need to telnet to the Unix machine to get a command shell into which you can type this.)  The vncserver program is a Perl script which you may need to edit to set up the directories appropriate for your local installation.

If you haven't run a VNC server before you will be prompted for a password, which you will need to use when connecting to this server. All your servers will use the same password, and you can change it at a later date using 

vncpasswd
With a normal X system, the main X display of a workstation called 'snoopy' is usually snoopy:0. You can also run as many VNC servers on a Unix machine as you like, and they will appear as snoopy:1, snoopy:2 etc, as if they were just additional displays.  You can cause applications to use them by setting the DISPLAY environment variable to the VNC server you want, or by starting the application with the -display option. For example:
xterm -display snoopy:2 &
Normally vncserver will choose the first available display number and tell you what it is, but you can specify a display number if you always wish to use the same one:
vncserver :2
Nothing will appear immediately as a result of starting a server. To see anything you need to connect a viewer to the server. See below.  The server will generate a log in your ~/.vnc directory. If you have problems at this stage, see the full documentation and the FAQ .

Killing a Unix server

You can kill a Unix VNC server using, for example:
vncserver -kill :2

Running a Windows server

Install the Windows server, WinVNC, by running the Setup program included in the distribution.  This will create a VNC group in your Start Menu.

Install the default registry settings using the option in the VNC group.

Run the WinVNC server. If this is the first time you've used WinVNC on this machine you'll be prompted to set a password, which you'll need when you connect to the machine from a remote location. Normally you'll want to leave the other options on their default settings.  (Note that the default display number is 0 on a PC.  You'll need to specify this to the viewer when you connect.)  Click OK and the server should be running.  It will install a small icon on the system tray, and by right-clicking on this you can control most aspects of the server.  (Full instructions for installing and running the WinVNC server can be found under the main documentation.)

You can now go to another machine and connect a viewer to the server. (see below)


Running a viewer

When you run the viewer, you need to specify the name of the server and the number of the desktop. If, for example, you have started a server as display 2 on a machine called 'snoopy', you can start a viewer for it by typing:
vncviewer snoopy:2
With the Windows viewer, you can run it from the command line, but you will more typically run it from the VNC group on the Start Menu. In this case, you will be prompted for the host name and display number.

Enter it and click OK, and you will be prompted for your password, after which you should see the remote display.  (If you are connecting to a Windows or Mac server, the display number will be 0, unless you have explicitly changed it).

If the machine running the server does not have a proper DNS entry, you probably won't be able to use the name and will have to replace snoopy:2 with something like 192.168.1.2:2 .  You can get round this on most platforms by creating a 'hosts' file which maps names onto IP addresses.  Consult your local guru for help with this.


Using a web browser as a viewer

The VNC servers also contain a small web server. If you connect to this with a web browser, you can download the Java version of the viewer, and use this to view the server. You can then see your desktop from any Java-capable browser! (unless you are using a proxy to connect to the web). The server listens for HTTP connections on port 5800+display number.  So to view display 2 on machine 'snoopy', you would point your web browser at:
http://snoopy:5802/
The applet will prompt you for your password, and should then display the desktop.

That's it!  For more details see the documentation. The answers to lots of common questions can be found in the FAQ .

 

For comments, feedback, etc, please see the 'Keeping in touch' page.
Copyright 1999 - AT&T Laboratories Cambridge

debian/tightvncserver.prerm0000755000000000000000000000054611372201135013315 0ustar #!/bin/sh set -e if [ "$1" = "remove" ] ; then BIN=/usr/bin update-alternatives --remove \ vncserver $BIN/tightvncserver update-alternatives --remove \ Xvnc $BIN/Xtightvnc update-alternatives --remove \ vncpasswd $BIN/tightvncpasswd update-alternatives --remove \ vncpasswd $BIN/tightvncpasswd fi #DEBHELPER# exit 0 debian/tightvncserver.docs0000644000000000000000000000012611371614454013122 0ustar debian/README.inetd debian/start.html debian/start.txt debian/faq.txt debian/faq.html debian/xtightvncviewer.menu0000644000000000000000000000027011372730757013327 0ustar ?package(xtightvncviewer):needs="x11" \ section="Applications/Network/Communication" \ hints="VNC,remote-control"\ title="xtightvncviewer" \ command="/usr/bin/xtightvncviewer" debian/copyright0000644000000000000000000000571211372045776011142 0ustar This package was packaged for Debian by Ola Lundqvist on Thu, 05 Dec 2002 12:10:24 +0100 using the vnc package as a base. It was downloaded from: http://www.tightvnc.com/ COPYRIGHT: ========== TightVNC is Copyright (C) 2001-2003 Constantin Kaplinsky. All Rights Reserved. VNC is Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. Copyright (C) 1994-2000 Olivetti Research Ltd/AT&T Laboratories Cambridge. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License with your Debian GNU system, in /usr/share/common-licenses/GPL-2, or with the Debian GNU source package as the file LICENSE.TXT. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. ACKNOWLEDGEMENTS ================ This distribution contains public domain DES software by Richard Outerbridge. This is: Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge. (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992. This distribution contains software from the X Window System, Version 11, Release 6. This is: Copyright (C) 1994 X Consortium Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from the X Consor- tium. X Window System is a trademark of X Consortium, Inc. debian/tightvncserver.dirs0000644000000000000000000000010611371614454013131 0ustar etc usr/bin usr/share/man/man1 usr/share/man/man5 usr/share/vncserver debian/source/0000755000000000000000000000000011372054553010473 5ustar debian/source/format0000644000000000000000000000001411372054553011701 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012312056327010616 5ustar debian/patches/10-Xvnc--programs--Xserver--Xvnc.man.patch0000644000000000000000000000225511372056270020162 0ustar From 52ede66b873905a7862cbe1b3faafe32c54fd1c5 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Mon, 10 May 2010 21:34:01 +0300 Subject: [PATCH] Xvnc/programs/Xserver/Xvnc.man: Fix spelling Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- Xvnc/programs/Xserver/Xvnc.man | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Xvnc/programs/Xserver/Xvnc.man b/Xvnc/programs/Xserver/Xvnc.man index ce08077..2b4ead1 100644 --- a/Xvnc/programs/Xserver/Xvnc.man +++ b/Xvnc/programs/Xserver/Xvnc.man @@ -137,7 +137,7 @@ version of Xvnc by AT&T labs (TightVNC-specific). .SH BUGS There are many security problems in current Xvnc implementation. It's recommended to restrict network access to Xvnc servers from untrusted -network adresses. Probably, the best way to secure Xvnc server is to +network addresses. Probably, the best way to secure Xvnc server is to allow only loopback connections from the server machine (the \fI\-localhost\fR option) and to use SSH tunneling for remote access to the Xvnc server. For details on SSH tunneling, see -- 1.7.0 debian/patches/30-ftbfs-mips.patch0000644000000000000000000000544211372071735014143 0ustar From ff21e5fad63bd8598114e8807b32fa49e45e0a22 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Mon, 10 May 2010 23:59:39 +0300 Subject: [PATCH] Xvnc/config/cf/linux.cf: Mips changes Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- Xvnc/config/cf/linux.cf | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/Xvnc/config/cf/linux.cf b/Xvnc/config/cf/linux.cf index 1769a58..ec04b4d 100644 --- a/Xvnc/config/cf/linux.cf +++ b/Xvnc/config/cf/linux.cf @@ -43,7 +43,8 @@ XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.57.2.12 1998/03/01 01:57:10 #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \ defined(SparcArchitecture) || defined(ArmArchitecure) || \ defined(i386Architecture) || defined(s390Architecture) || \ - defined(s390xArchitecture) + defined(s390xArchitecture) || defined(MipsArchitecture) || \ + defined(MipselArchitecure) || defined(HPArchitecture) #define DefaultLinuxCLibMajorVersion 6 #else #define DefaultLinuxCLibMajorVersion 5 @@ -261,6 +262,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* x86_64Architecture */ +#ifdef ia64Architecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__ia64__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#endif /* x86_64Architecture */ + #ifdef AlphaArchitecture #define OptimizedCDebugFlags -O2 #define LinuxMachineDefines -D__alpha__ @@ -322,6 +330,27 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #endif #endif /* SparcArchitecture */ +#ifdef MipsArchitecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__mips__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif /* MipsArchitecture */ + +#ifdef MipselArchitecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__mips__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif /* MipselArchitecture */ + +#ifdef HPArchitecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__hppa__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif /* HPArchitecture */ + /*================================================================ BEGIN ORL VNC modification Always define _REENTRANT since we may use threaded libraries */ -- 1.7.0 debian/patches/aarch64.patch0000644000000000000000000000233112312056327013066 0ustar Description: Add aarch64 (arm64) support Author: Colin Watson Forwarded: no Last-Update: 2014-03-18 Index: b/Xvnc/config/cf/Imake.cf =================================================================== --- a/Xvnc/config/cf/Imake.cf +++ b/Xvnc/config/cf/Imake.cf @@ -700,6 +700,10 @@ # define s390Architecture # undef __s390__ # endif /* s390 */ +# ifdef __aarch64__ +# define AArch64Architecture +# undef __aarch64__ +# endif /* __arch64__ */ # ifdef __alpha # define AlphaArchitecture # undef __alpha Index: b/Xvnc/config/cf/linux.cf =================================================================== --- a/Xvnc/config/cf/linux.cf +++ b/Xvnc/config/cf/linux.cf @@ -305,6 +305,14 @@ #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* PowerPCArchitecture */ +#ifdef AArch64Architecture +#define DefaultCCOptions -fsigned-char +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__aarch64__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#endif /* AArch64Architecture */ + #ifdef ArmArchitecture #define DefaultCCOptions -fsigned-char #define OptimizedCDebugFlags -O2 debian/patches/20-vncviewer--vncviewer.man.patch0000644000000000000000000000215311372056004016721 0ustar From 867626319b1b6f1ea1e8af19a0b98460f2638491 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Mon, 10 May 2010 22:13:46 +0300 Subject: [PATCH] vncviewer/vncviewer.man: Fix hyphens Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- vncviewer/vncviewer.man | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man index c77efd9..b1e9938 100644 --- a/vncviewer/vncviewer.man +++ b/vncviewer/vncviewer.man @@ -342,7 +342,7 @@ When started with the \fB\-via\fR option, vncviewer reads the \fBVNC_VIA_CMD\fR environment variable, expands patterns beginning with the "%" character, and executes result as a command assuming that it would create TCP tunnel that should be used for VNC connection. If -not set, this environment variable defaults to "/usr/bin/ssh -f -L +not set, this environment variable defaults to "/usr/bin/ssh \-f \-L %L:%H:%R %G sleep 20". The following patterns are recognized in the \fBVNC_VIA_CMD\fR (note -- 1.7.0 debian/patches/series0000644000000000000000000000021012312055557012030 0ustar 10-Xvnc--programs--Xserver--Xvnc.man.patch 20-vncviewer--vncviewer.man.patch 30-ftbfs-mips.patch debian-changes-1.3.9-6.1 aarch64.patch debian/patches/debian-changes-1.3.9-6.10000644000000000000000000031104611373424372014353 0ustar Description: Upstream changes introduced in version 1.3.9-6.1 This patch has been created by dpkg-source during the package build. Here's the last changelog entry, hopefully it gives details on why those changes were made: . tightvnc (1.3.9-6.1) unstable; urgency=low . * Non-maintainer upload. - Update to packaging format "3.0 (quilt)". * debian/compat - Update to 7. * debian/control - (Build-Depends): Update xutils to xutils-dev (important; Closes: #575865). Update to debhelper 7.1. Remove obsolete x-dev. - (Depends): Add ${misc:Depends}. - (Homepage): New field. - (Standards-Version): Update to 3.8.4. - (tightvncserver::Depends): Replace obsolete xbase-clients with x11-utils and xauth. The needed binaries xdpyinfo and xauth are used in Perl program /usr/bin/tightvncserver. * debian/copyright - Point to GPL-2. * debian/patches - (10, 20): Add new patches. - (30): Convert original MIPS patch to apply to current sources. - (tightvnc-ftbfs-mips.patch): Removed. See 30. * debian/*.{postrm,prerm} - Add "set -e". - Fix Lintian maintainer-script-without-set-e. * debian/rules - (CC): Add. Export variable for xmkmf(1). - (DH_COMPAT): Delete; use debian/compat. - (install): Correct tightvncpasswd.1x to tightvncpasswd.1. - (binary-arch): Remove empty directories. * debian/source/format - New file. * debian/watch - New file. * debian/tightvncserver.doc-base - New file. * debian/xtightvncviewer.menu - (section): Update obsolete Apps/Net to Applications/Network/Communication. . The person named in the Author field signed this changelog entry. Author: Jari Aalto Bug-Debian: http://bugs.debian.org/575865 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Forwarded: Reviewed-By: Last-Update: --- tightvnc-1.3.9.orig/vncserver.man +++ tightvnc-1.3.9/vncserver.man @@ -3,7 +3,7 @@ .\" Man page for vncserver .\" .\" Copyright (C) 1998 Marcus.Brinkmann@ruhr-uni-bochum.de -.\" Copyright (C) 2000, opal@debian.org +.\" Copyright (C) 2000,2008 Ola Lundqvist .\" Copyright (C) 2000, 2001 Red Hat, Inc. .\" Copyright (C) 2001, 2002 Constantin Kaplinsky .\" @@ -18,9 +18,10 @@ vncserver \- a wrapper to launch an X se \fBvncserver\fR [:\fIdisplay\fR] [\-geometry \fIwidth\fRx\fIheight\fR] [\-depth \fIdepth\fR] [\-pixelformat rgb\fINNN\fR|bgr\fINNN\fR] [\-name \fIdesktop\-name\fR] -[\fIXvnc\-options\fR...] +[\| \-httpport\ int \|] [\| \-basehttpport\ int \|] [\| \-alwaysshared \|] +[\| \-nevershared \|] [\fIXvnc\-options\fR...] .TP -\fBvncserver\fR \-kill :\fIdisplay\fR +\fBvncserver\fR [\| \-clean \|] \-kill :\fIdisplay\fR .TP \fBvncserver\fR \-help .SH DESCRIPTION @@ -54,9 +55,27 @@ the viewer display. \fB\-name\fR \fIstring\fR This specifies the name of the desktop. .TP +\fB\-clean\fR +This option can be used in conjunction with +.TP \fB\-kill\fR \fB:\fR\fIdisplay\fR Stops the session running on the specified display. .TP +\fB\-nevershared\fR +Never allow shared desktops. +.TP +\fB\-alwaysshared\fR +Always allow shared desktops. +.TP +\fB\-basehttpport int\fR +The base http port to use for the java client applet (you have to install +the tightvnc-java package to make this work). The real port number will be +port = base + display num. +.TP +\fB\-httpport int\fR +The http port to use for the java client applet (you have to install +the tightvnc-java package to make this work). +.TP \fB\-help\fR Prints a short usage notice to stderr. .SH EXAMPLES --- /dev/null +++ tightvnc-1.3.9/Makefile @@ -0,0 +1,1262 @@ +# Makefile generated by imake - do not edit! +# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ + +# ---------------------------------------------------------------------- +# Makefile generated from "Imake.tmpl" and +# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ +# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $ +# +# +# +# +# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $ +# ---------------------------------------------------------------------- + +all:: + +.SUFFIXES: .i + +# $XdotOrg: xc/config/cf/Imake.cf,v 1.7 2005/03/02 11:20:29 gisburn Exp $ +# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ + +# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ + +# Keep cpp from replacing path elements containing i486/i586/i686 + +# ----------------------------------------------------------------------- +# site-specific configuration parameters that need to come before +# the platform-specific parameters - edit site.def to change + +# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ + +# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ + +# ---------------------------------------------------------------------- +# platform-specific configuration parameters - edit linux.cf to change + +# $XdotOrg: xc/config/cf/linux.cf,v 1.24 2005/03/06 01:05:00 branden Exp $ +# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ + +# operating system: Linux 2.6.32-trunk-686-bigmem i686 [ELF] (2.6.32) +# libc: (6.10.2) +# binutils: (220) + +# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ + +# $XdotOrg: xc/config/cf/xorg.cf,v 1.44 2005/01/27 03:50:46 ajax Exp $ + +# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ + +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) +RELEASE_VERSION = RELEASE-1 + +AFB_DEFS = -DUSE_AFB + +DRIVERSDKDIR = $(USRLIBDIR)/Server +DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules +DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include + + XF86SRC = $(SERVERSRC)/hw/xfree86 + XF86COMSRC = $(XF86SRC)/common + XF86PARSERSRC = $(XF86SRC)/parser + XF86OSSRC = $(XF86SRC)/os-support + XF86DRIVERSRC = $(XF86SRC)/drivers + DRIVERSRC = $(XF86DRIVERSRC) + + XFREE86DOCDIR = $(DOCDIR) + XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) + XFREE86HTMLDOCDIR = $(DOCHTMLDIR) +XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese + +# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ + + SELINUX_LDFLAGS = + + SELINUX_INCLUDES = -I/usr/include/selinux + + SELINUX_CFLAGS = -DHAVE_SELINUX + + SELINUX_LIBS = -lselinux + +# ---------------------------------------------------------------------- +# site-specific configuration parameters that go after +# the platform-specific parameters - edit site.def to change + +# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ + +# --------------------------------------------------------------------- +# Imake rules for building libraries, programs, scripts, and data files +# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.8 2005/02/01 22:27:00 ajax Exp $ +# +# +# +# +# rules: $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes Exp $ + +.PHONY: all interfaces install install.man install.lib install.sdk depend includes cleandir + + _NULLCMD_ = @ echo -n + +X_BYTE_ORDER = X_LITTLE_ENDIAN + +GLIDE2INCDIR = /usr/include/glide + +GLIDE3INCDIR = /usr/include/glide3 + +GLIDE3LIBNAME = glide3 + +TKLIBNAME = tk8.4 + +TKLIBDIR = /usr/lib + +TCLLIBNAME = tcl8.4 + +TCLIBDIR = /usr/lib + + PATHSEP = / + SHELL = /bin/sh -e + + TOP = . + CURRENT_DIR = . + + IMAKE = imake + DEPEND = gccmakedep + MKDIRHIER = mkdir -p + REVPATH = revpath + EXPORTLISTGEN = + RMAN = /usr/bin/rman + RMANBASENAME = rman + RMANOPTIONS = + CONFIGSRC = $(TOP)/config + IMAKESRC = $(CONFIGSRC)/imake + DEPENDSRC = $(CONFIGSRC)/util + + INCROOT = /usr/include + USRLIBDIR = /usr/lib + VARDIR = /var + VARLIBDIR = $(VARDIR)/lib + SYSTEMUSRLIBDIR = /usr/lib + SYSTEMUSRINCDIR = /usr/include + SHLIBDIR = /usr/lib + LINTLIBDIR = $(USRLIBDIR)/lint + MANPATH = /usr/share/man + MANSOURCEPATH = $(MANPATH)/man + MANDIR = $(MANSOURCEPATH)$(MANSECT) + SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) + LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)4 + FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) + GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) + MISCMANDIR = $(MANSOURCEPATH)7 + ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) + ICONDIR = "/usr/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + DRIVERMANDIR = $(MANSOURCEPATH)4 + LOGDIRECTORY = $(VARDIR)/log + + VARRUNDIR = $(VARDIR)/run + + VARDBDIR = $(VARDIR)/lib + + AR = ar clq + +# Nice try but useless: make will inherit BOOTSTRAPCFLAGS +# from top Makefile + BOOTSTRAPCFLAGS = + + CC = gcc -m32 + AS = gcc -m32 -c -x assembler + +.SUFFIXES: .cc + + CXX = c++ -m32 + + CXXFILT = c++filt + + CXXLIB = -lstdc++ + + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing +CXXDEPENDINCLUDES = + CXXEXTRA_DEFINES = +CXXEXTRA_INCLUDES = + CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(CXXPROJECT_DEFINES) + CXXOPTIONS = + CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) + CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) + + COMPRESS = compress + GZIPCMD = gzip + + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) + PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) + + INSTALL = install + INSTALLFLAGS = -c + + LD = gcc -m32 -nostdlib + + LEX = flex -l + M4 = m4 + M4FLAGS = + LEXLIB = -lfl + YACC = bison -y + CCYACC = bison -y + + LINT = lint + + LINTLIBFLAG = -C + LINTOPTS = -axz + LN = ln -s + MAKE = make + MV = mv -f + CP = cp + + RANLIB = ranlib + + RANLIBINSTFLAGS = + + RM = rm -f + PERL = perl + PERLOPTS = + PERLENVSETUP = env LC_ALL=C + + MANSECT = 1 + SYSCALLMANSECT = 2 + LIBMANSECT = 3 + DRIVERMANSECT = 4 + FILEMANSECT = 5 + GAMEMANSECT = 6 + MISCMANSECT = 7 + ADMMANSECT = 8 + MANSRCSECT = s + MANNEWSECT = n + PROJECTMANSUFFIX = x + MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) + SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) + LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = 4x + FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) + GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = 7x + ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + ADMINMANSUFFIX = 8 + MANSRCSUFFIX = man + MANNEWSUFFIX = _man + MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__adminmansuffix__=$(ADMINMANSUFFIX) -D__projectroot__=$(PROJECTROOT) -D__xconfigfile__=$(XCONFIGFILE) -D__xconfigdir__=$(XCONFIGDIR) -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) -D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) $(XORGMANDEFS) $(VENDORMANDEFS) + + COMPRESSMANCMD = gzip -n + + TROFF = groff -Tps + NROFF = nroff + + MSMACROS = -ms + MANMACROS = -man + TBL = tbl + EQN = eqn + NEQN = neqn + COL = col + COLFLAGS = -b + + MODCC = gcc -m32 + + MODCPP = cpp + MODCFLAGS = $(CFLAGS) + MODAS = gcc -m32 -c -x assembler + MODASFLAGS = + + MODLD = gcc -m32 -nostdlib + + MODLDFLAGS = +MODLDCOMBINEFLAGS = -r + MODAR = ar clq + + MODRANLIB = ranlib + + DVIPS = dvips + LATEX = latex + + STD_INCLUDES = + STD_CPP_OPTIONS = -traditional + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) + STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) + EXTRA_LOAD_FLAGS = + EXTRA_LDOPTIONS = + EXTRA_LIBRARIES = + TAGS = ctags + + PARALLELMFLAGS = + + SHAREDCODEDEF = + SHLIBDEF = + + SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + + PICFLAGS = -fPIC + + CXXPICFLAGS = -fPIC + + PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO + + INSTPGMFLAGS = + + INSTBINFLAGS = -m 0755 + INSTUIDFLAGS = -m 4711 + INSTLIBFLAGS = -m 0644 + INSTINCFLAGS = -m 0444 + INSTMANFLAGS = -m 0444 + INSTDATFLAGS = -m 0444 + INSTKMEMFLAGS = -m 4711 + + PROJECTROOT = /usr + + CDEBUGFLAGS = -g -O2 -fno-strict-aliasing + CCOPTIONS = + + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = $(INSTALLED_LIBS) + LDPOSTLIB = + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + + CCLINK = $(CC) + + CXXLINK = $(CXX) + + LDSTRIPFLAGS = -x + LDCOMBINEFLAGS = -r + DEPENDFLAGS = + DEPEND_DEFINES = + +# Not sure this belongs here + TKLIBDIR = /usr/lib + TKINCDIR = /usr/include + TKLIBNAME = tk8.4 + TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) + TCLLIBDIR = /usr/lib + TCLINCDIR = /usr/include + TCLLIBNAME = tcl8.4 + TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) + + MACROFILE = linux.cf + RM_CMD = $(RM) + + IMAKE_DEFINES = + IMAKE_WARNINGS = -Wundef + + IRULESRC = $(CONFIGDIR) + IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) + + ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) + +# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ + +# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ + +# ---------------------------------------------------------------------- +# X Window System Build Parameters and Rules +# $XdotOrg: xc/config/cf/X11.tmpl,v 1.52 2005/09/22 23:54:18 alanc Exp $ +# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ +# +# +# +# +# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ + +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 + +STICKY_DEFINES = -DHAS_STICKY_DIR_BIT + +FCHOWN_DEFINES = -DHAS_FCHOWN + +# ----------------------------------------------------------------------- +# X Window System make variables; these need to be coordinated with rules + + XTOP = $(TOP) + BINDIR = /usr/bin + BUILDINCROOT = $(TOP)/exports + BUILDINCDIR = $(BUILDINCROOT)/include + BUILDINCTOP = ../.. + BUILDLIBDIR = $(TOP)/exports/lib + BUILDLIBTOP = ../.. + BUILDBINDIR = $(TOP)/exports/bin + BUILDBINTOP = ../.. + BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDI18NDIR = $(BUILDLIBDIR)/locale + BUILDMODULETOP = $(BUILDLIBTOP)/.. + XBUILDINCROOT = $(XTOP)/exports + XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 + XBUILDINCTOP = ../../.. + XBUILDBINDIR = $(XBUILDINCROOT)/bin + INCDIR = $(INCROOT) + ADMDIR = /usr/adm + LIBDIR = /usr/lib/X11 + SHAREDIR = /usr/share/X11 + LIBEXECDIR = /usr/libexec + MODULEDIR = $(USRLIBDIR)/modules + TOP_X_INCLUDES = + XBINDIR = $(PROJECTROOT)/bin + + INSTSRCDIR = /usr/src + + ETCX11DIR = /etc/X11 + + CONFDIR = $(ETCX11DIR) + + DOCDIR = $(LIBDIR)/doc + DOCHTMLDIR = $(DOCDIR)/html + DOCPSDIR = $(DOCDIR)/PostScript + DOCPDFDIR = $(DOCDIR)/PDF + FONTDIR = /usr/share/fonts/X11 + ENCODINGSDIR = /usr/share/fonts/X11/encodings + XINITDIR = $(LIBDIR)/xinit + XDMDIR = $(LIBDIR)/xdm + XDMVARDIR = $(VARLIBDIR)/xdm + TWMDIR = $(LIBDIR)/twm + XSMDIR = $(LIBDIR)/xsm + NLSDIR = $(LIBDIR)/nls + XLOCALEDIR = $(LIBDIR)/locale + LBXPROXYDIR = $(LIBDIR)/lbxproxy + PROXYMANAGERDIR = $(LIBDIR)/proxymngr + XPRINTDIR = $(LIBDIR)/xserver + XAPPLOADDIR = /etc/X11/app-defaults + FONTCFLAGS = -t + + INSTAPPFLAGS = $(INSTDATFLAGS) + + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale + MKFONTDIR = $(XBINDIR)/mkfontdir + MKHTMLINDEX = $(XBINDIR)/mkhtmlindex + UCS2ANY = $(XBINDIR)/ucs2any + BDFTRUNCATE = $(XBINDIR)/bdftruncate + UCSMAPPREFIX = $(FONTDIR)/util/map- + XCURSORGEN = $(XBINDIR)/xcursorgen + + HTMLINDEXCMD = HtmlIndexCmd + + DOCUTILSRC = $(XTOP)/doc/util + CLIENTSRC = $(TOP)/clients + DEMOSRC = $(TOP)/demos + XDOCMACROS = $(DOCUTILSRC)/macros.t + XIDXMACROS = $(DOCUTILSRC)/indexmacros.t + PROGRAMSRC = $(TOP)/programs + LIBSRC = $(XTOP)/lib + FONTSRC = $(XTOP)/fonts + ENCODINGSSRC = $(FONTSRC)/encodings + INCLUDESRC = $(BUILDINCROOT)/include + XINCLUDESRC = $(INCLUDESRC)/X11 + SERVERSRC = $(XTOP)/programs/Xserver + CONTRIBSRC = $(XTOP)/../contrib + UNSUPPORTEDSRC = $(XTOP)/unsupported + DOCSRC = $(XTOP)/doc + RGBSRC = $(XTOP)/programs/rgb + BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf + MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir + FONTSERVERSRC = $(PROGRAMSRC)/xfs + FONTINCSRC = $(XTOP)/include/fonts + EXTINCSRC = $(XTOP)/include/extensions + FTSOURCEDIR = FreeTypeSrcDir + DRMSRCDIR = $(TOP)/extras/drm + MESASRCDIR = $(TOP)/extras/Mesa + OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample + PSWRAPSRC = $(XTOP)/config/pswrap + TRANSCOMMSRC = $(LIBSRC)/xtrans + TRANS_INCLUDES = -I$(TRANSCOMMSRC) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 +XTRANS_FAILDEFINES = -DFAIL_HARD + + VENDORMANNAME = X.Org + VENDORMANVERSION = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" + VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" + VENDORNAME = The X.Org Foundation + VENDORNAMESHORT = X.Org + + VENDORWEBSUPPORT = http://wiki.X.Org + +VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"' + + XKBDEFRULES = xorg + XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"' + + XCONFIGFILE = xorg.conf + XCONFIGDIR = $(LIBDIR) + XLOGFILE = Xorg + XSERVERNAME = Xorg + + XENVLIBDIR = $(USRLIBDIR) + CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) XLOCALEDIR=$(BUILDLIBDIR)/locale + +# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ + + XLIBSRC = $(LIBSRC)/X11 + +SOXLIBREV = 6.2 +DEPXONLYLIB = +XONLYLIB = -lX11 + +LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + + DEPXLIBONLY = $(DEPXONLYLIB) + XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) + + XEXTLIBSRC = $(LIBSRC)/Xext + +SOXEXTREV = 6.4 +DEPEXTENSIONLIB = +EXTENSIONLIB = -lXext + +LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln + +LINTEXTENSIONLIB = $(LINTEXTENSION) + DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) + XLIB = $(EXTENSIONLIB) $(XONLYLIB) + LINTXLIB = $(LINTXONLYLIB) + + XSSLIBSRC = $(LIBSRC)/Xss + +SOXSSREV = 1.0 +DEPXSSLIB = +XSSLIB = -lXss + +LINTXSS = $(LINTLIBDIR)/llib-lXss.ln + + XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc + +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = +XXF86MISCLIB = -lXxf86misc + +LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln + + XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm + +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = +XXF86VMLIB = -lXxf86vm + +LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln + + XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga + +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = +XXF86DGALIB = -lXxf86dga + +LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln + + XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush + +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = +XXF86RUSHLIB = -lXxf86rush + +LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln + + XVLIBSRC = $(LIBSRC)/Xv + +SOXVREV = 1.0 +DEPXVLIB = +XVLIB = -lXv + +LINTXV = $(LINTLIBDIR)/llib-lXv.ln + + XVMCLIBSRC = $(LIBSRC)/XvMC + +SOXVMCREV = 1.0 +DEPXVMCLIB = +XVMCLIB = -lXvMC + +LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln + + XINERAMALIBSRC = $(LIBSRC)/Xinerama + +SOXINERAMAREV = 1.0 +DEPXINERAMALIB = +XINERAMALIB = -lXinerama + +LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln + + XRESLIBSRC = $(LIBSRC)/XRes + +SOXRESREV = 1.0 +DEPXRESLIB = +XRESLIB = -lXRes + +LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln + + DMXLIBSRC = $(LIBSRC)/dmx + +SODMXREV = 1.0 +DEPDMXLIB = +DMXLIB = -ldmx + +LINTDMX = $(LINTLIBDIR)/llib-ldmx.ln + + DPSLIBSRC = $(LIBSRC)/dps + +DEPDPSLIB = $(USRLIBDIR)/libdps.a +DPSLIB = -ldps + +LINTDPS = $(LINTLIBDIR)/llib-ldps.ln + + DPSTKLIBSRC = $(LIBSRC)/dpstk + +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a +DPSTKLIB = -ldpstk + +LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln + + PSRESLIBSRC = $(LIBSRC)/psres + +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a +PSRESLIB = -lpsres + +LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln + + GLULIBSRC = $(LIBSRC)/GLU + +SOGLUREV = 1.3 +DEPGLULIB = +GLULIB = -lGLU + +LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln + + GLXLIBSRC = $(LIBSRC)/GL + +SOGLREV = 1.2 +DEPGLXLIB = +GLXLIB = -lGL + +LINTGLX = $(LINTLIBDIR)/llib-lGL.ln + + GLWIDGETSRC = $(LIBSRC)/GLw + +DEPGLWLIB = $(USRLIBDIR)/libGLw.a +GLWLIB = -lGLw + +LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln + +XRENDERDIR = /usr +XRENDERLIBDIR = /usr/lib +XRENDERINCDIR = /usr/include +XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender +DEPXRENDERLIB = + +XRENDERINCLUDES = -I$(XRENDERINCDIR) + + XRANDRLIBSRC = $(LIBSRC)/Xrandr + +SOXRANDRREV = 2.0 +DEPXRANDRLIB = +XRANDRLIB = -lXrandr + +LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln + + XFIXESLIBSRC = $(LIBSRC)/Xfixes + +SOXFIXESREV = 3.0 +DEPXFIXESLIB = +XFIXESLIB = -lXfixes + +LINTXFIXES = $(LINTLIBDIR)/llib-lXfixes.ln + + XDAMAGELIBSRC = $(LIBSRC)/Xdamage + +SOXDAMAGEREV = 1.0 +DEPXDAMAGELIB = +XDAMAGELIB = -lXdamage + +LINTXDAMAGE = $(LINTLIBDIR)/llib-lXdamage.ln + +XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite + +SOXCOMPOSITEREV = 1.0 +DEPXCOMPOSITELIB = +XCOMPOSITELIB = -lXcomposite + +LINTXCOMPOSITE = $(LINTLIBDIR)/llib-lXcomposite.ln + +XEVIELIBSRC = $(LIBSRC)/Xevie + +SOXEVIEREV = 1.0 +DEPXEVIELIB = +XEVIELIB = -lXevie + +LINTXEVIE = $(LINTLIBDIR)/llib-lXevie.ln + +XCURSORDIR = /usr +XCURSORLIBDIR = /usr/lib +XCURSORINCDIR = /usr/include +XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor + +XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES) + + APPLEWMLIBSRC = $(LIBSRC)/apple + +DEPAPPLEWMLIB = $(USRLIBDIR)/libAppleWM.a +APPLEWMLIB = -lAppleWM + +LINTAPPLEWM = $(LINTLIBDIR)/llib-lAppleWM.ln + + WINDOWSWMLIBSRC = $(LIBSRC)/windows + +DEPWINDOWSWMLIB = $(USRLIBDIR)/libWindowsWM.a +WINDOWSWMLIB = -lWindowsWM + +LINTWINDOWSWM = $(LINTLIBDIR)/llib-lWindowsWM.ln + + XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache + +DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a +XFONTCACHELIB = -lXfontcache + +LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln + + XAUTHSRC = $(LIBSRC)/Xau + +SOXAUTHREV = 6.0 +DEPXAUTHLIB = +XAUTHLIB = -lXau + +LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln + + XDMCPLIBSRC = $(LIBSRC)/Xdmcp + +SOXDMCPREV = 6.0 +DEPXDMCPLIB = +XDMCPLIB = -lXdmcp + +LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln + + XMUSRC = $(LIBSRC)/Xmu + +SOXMUREV = 6.2 +DEPXMULIB = +XMULIB = -lXmu + +LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln + + XMUUSRC = $(LIBSRC)/Xmuu + +SOXMUUREV = 1.0 +DEPXMUULIB = +XMUULIB = -lXmuu + +LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln + + OLDXLIBSRC = $(LIBSRC)/oldX + +DEPOLDXLIB = $(USRLIBDIR)/liboldX.a +OLDXLIB = -loldX + +LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln + + XPLIBSRC = $(LIBSRC)/Xp + +SOXPREV = 6.2 +DEPXPLIB = +XPLIB = -lXp + +LINTXP = $(LINTLIBDIR)/llib-lXp.ln + + TOOLKITSRC = $(LIBSRC)/Xt + +SOXTREV = 6.0 +DEPXTOOLONLYLIB = +XTOOLONLYLIB = -lXt + +LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln + + DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) + XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) + LINTXTOOLLIB = $(LINTXTOOLONLYLIB) + + XALIBSRC = $(LIBSRC)/Xa + +SOXAREV = 1.0 +DEPXALIB = +XALIB = -lXa + +LINTXA = $(LINTLIBDIR)/llib-lXa.ln + + AWIDGETSRC = $(LIBSRC)/Xaw + +SOXAWREV = 8.0 +DEPXAWLIB = +XAWLIB = -lXaw + +LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln + + AWIDGET7SRC = $(LIBSRC)/Xaw7 + +SOXAW7REV = 7.0 +DEPXAW7LIB = +XAW7LIB = -lXaw + +LINTXAW7 = $(LINTLIBDIR)/llib-lXaw.ln + + AWIDGET6SRC = $(LIBSRC)/Xaw6 + +SOXAW6REV = 6.1 +DEPXAW6LIB = +XAW6LIB = -lXaw + +LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln + + XILIBSRC = $(LIBSRC)/Xi + +SOXINPUTREV = 6.0 +DEPXILIB = +XILIB = -lXi + +LINTXI = $(LINTLIBDIR)/llib-lXi.ln + + XTESTLIBSRC = $(LIBSRC)/Xtst + +SOXTESTREV = 6.1 +DEPXTESTLIB = +XTESTLIB = -lXtst + +LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln + +DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a +XBSDLIB = -lXbsd + +LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln + + ICESRC = $(LIBSRC)/ICE + +SOICEREV = 6.4 +DEPICELIB = +ICELIB = -lICE + +LINTICE = $(LINTLIBDIR)/llib-lICE.ln + + SMSRC = $(LIBSRC)/SM + +SOSMREV = 6.0 +DEPSMLIB = +SMLIB = -lSM + +LINTSM = $(LINTLIBDIR)/llib-lSM.ln + + XKEYSRC = $(LIBSRC)/Xkey + +SOXKEYREV = 6.0 +DEPXKEYLIB = +XKEYLIB = -lXkey + +LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln + + FSLIBSRC = $(LIBSRC)/FS + +SOFSREV = 6.0 +DEPFSLIB = +FSLIB = -lFS + +LINTFS = $(LINTLIBDIR)/llib-lFS.ln + + FONTLIBSRC = $(LIBSRC)/font + +DEPFONTLIB = $(USRLIBDIR)/libXfont.a +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln +# +DEPXFONTLIB = $(USRLIBDIR)/libXfont.a +XFONTLIB = -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln + + FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs + +DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a +FONTSTUBLIB = -lfntstubs + +LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln + DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) + + FONTENCLIBSRC = $(LIBSRC)/fontenc + +DEPXFONTENCLIB = $(USRLIBDIR)/libfontenc.a +XFONTENCLIB = -lfontenc + +LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln + + XPMLIBSRC = $(LIBSRC)/Xpm + +SOXPMREV = 4.11 +DEPXPMLIB = +XPMLIB = -lXpm + +LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln + +FREETYPE2DIR = /usr +FREETYPE2LIBDIR = /usr/lib +FREETYPE2INCDIR = /usr/include + +FREETYPE2LIB = -lfreetype + +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + +FREETYPE2DEFINES = -DFREETYPE2 + + EXPATLIBSRC = $(LIBSRC)/expat + +SOEXPATREV = 0.4 +DEPEXPATLIB = +EXPATLIB = -lexpat + +LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln + +EXPATDIR = /usr +EXPATLIBDIR = /usr/lib +EXPATINCDIR = /usr/include + +EXPATINCLUDES = + +EXPATLIB = -lexpat + +EXPATDEFINES = -DEXPAT + +XFTDIR = /usr +XFTLIBDIR = /usr/lib +XFTINCDIR = /usr/include +XFTLIB = -L$(XFTLIBDIR) -lXft + +XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES) + +FONTCONFIGDIR = /usr +FONTCONFIGLIBDIR = /usr/lib +FONTCONFIGINCDIR = /usr/include +FONTCONFIGBINDIR = /usr/bin + +FONTCONFIGLIB = -lfontconfig + +FONTCONFIGINCLUDES = + +FCCACHE = $(FONTCONFIGBINDIR)/fc-cache + +FONTCONFIGDEFINES = -DFONTCONFIG + +LIBPNGINCDIR = /usr/include + +LIBPNGINC= + +LIBPNGDIR = /usr +LIBPNGLIBDIR = /usr/lib +LIBPNGINCDIR = /usr/include + +LIBPNGLIB = -lpng + + XKBFILELIBSRC = $(LIBSRC)/xkbfile + +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = +XKBFILELIB = -lxkbfile + +LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln + + XKBCOMPCMD = $(XBINDIR)/xkbcomp + + XKBUILIBSRC = $(LIBSRC)/xkbui + +SOXKBUIREV = 1.0 +DEPXKBUILIB = +XKBUILIB = -lxkbui + +LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln + +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + + XTRAPLIBSRC = $(LIBSRC)/XTrap + +SOXTRAPREV = 6.4 +DEPXTRAPLIB = +XTRAPLIB = -lXTrap + +LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln + + DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) + + DEPLIBS1 = $(DEPLIBS) + DEPLIBS2 = $(DEPLIBS) + DEPLIBS3 = $(DEPLIBS) + DEPLIBS4 = $(DEPLIBS) + DEPLIBS5 = $(DEPLIBS) + DEPLIBS6 = $(DEPLIBS) + DEPLIBS7 = $(DEPLIBS) + DEPLIBS8 = $(DEPLIBS) + DEPLIBS9 = $(DEPLIBS) + DEPLIBS10 = $(DEPLIBS) + + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? + +XMULIBONLY = -lXmu +XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + + CONFIGDIR = $(LIBDIR)/config + + USRLIBDIRPATH = $(USRLIBDIR) + LDPRELIBS = $(INSTALLED_LIBS) + LDPOSTLIBS = + TOP_INCLUDES = $(TOP_X_INCLUDES) + PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' + +CXXPROJECT_DEFINES = + +# ---------------------------------------------------------------------- +# start of Imakefile + +SUBDIRS = libvncauth vncviewer vncpasswd vncconnect + +World: + make Makefiles + make depend + make all + @echo "" + @echo Built $(SUBDIRS). + @echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"' + @echo "" + +libs: + @echo 'No libraries included.' + +all:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "making" all "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) all; \ + done + +depend:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "depending" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) depend; \ + done + +# ---------------------------------------------------------------------- +# common rules for all Makefiles - do not edit + +.c.i: + $(RM) $@ + $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ + +.SUFFIXES: .ii + +.cc.ii: + $(RM) $@ + $(CC) -E $(CFLAGS) $(_NOOP_) $*.cc > $@ + +.SUFFIXES: .s + +.c.s: + $(RM) $@ + $(CC) -S $(CFLAGS) $(_NOOP_) $*.c + +.cc.s: + $(RM) $@ + $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc + +emptyrule:: + +cleandir:: + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* + +Makefile:: + -@if [ -f Makefile ]; then set -x; \ + $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ + else exit 0; fi + $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) + +tags:: + $(TAGS) -w *.[ch] + $(TAGS) -xw *.[ch] > TAGS + +man_keywords:: + +html_index:: + +clean:: cleandir + +distclean:: cleandir + +# ---------------------------------------------------------------------- +# rules for building in SUBDIRS - do not edit + +install:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "installing" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) install; \ + done + +install.man:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) install.man; \ + done + +install.sdk:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "installing driver SDK" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR='$(DESTDIR)' install.sdk; \ + done + +clean:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) clean; \ + done + +tags:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "tagging" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) TAGS='$(TAGS)' tags; \ + done + +$(ONESUBDIR)/Makefile: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[n]*) executeit="no";; esac; done; \ + cd $(ONESUBDIR) && \ + if [ "$$executeit" != "no" ]; then \ + $(IMAKE_CMD) -DTOPDIR=$(IMAKETOP) -DCURDIR=$(ONECURDIR)$(ONESUBDIR); \ + fi; + +Makefiles:: + -@for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[n]*) executeit="no";; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + case "$(CURRENT_DIR)" in \ + .) curdir= ;; \ + *) curdir=$(CURRENT_DIR)/ ;; \ + esac; \ + echo "making Makefiles in $$curdir$$i..."; \ + itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ + curtmp="$(CURRENT_DIR)" \ + toptmp=""; \ + case "$$itmp" in \ + ../?*) \ + while echo "$$itmp" | grep '^\.\./' > /dev/null;\ + do \ + toptmp="/`basename $$curtmp`$$toptmp"; \ + curtmp="`dirname $$curtmp`"; \ + itmp="`echo $$itmp | sed 's;\.\./;;'`"; \ + done \ + ;; \ + esac; \ + case "$$itmp" in \ + */?*/?*/?*/?*) newtop=../../../../..;; \ + */?*/?*/?*) newtop=../../../..;; \ + */?*/?*) newtop=../../..;; \ + */?*) newtop=../..;; \ + *) newtop=..;; \ + esac; \ + newtop="$$newtop$$toptmp"; \ + case "$(TOP)" in \ + /?*) imaketop=$(TOP) \ + imakeprefix= ;; \ + .) imaketop=$$newtop \ + imakeprefix=$$newtop/ ;; \ + *) imaketop=$$newtop/$(TOP) \ + imakeprefix=$$newtop/ ;; \ + esac; \ + $(RM) $$i/Makefile.bak; \ + if [ -f $$i/Makefile ]; then \ + echo " $(MV) Makefile Makefile.bak"; \ + if [ "$$executeit" != "no" ]; then \ + $(MV) $$i/Makefile $$i/Makefile.bak; \ + fi; \ + fi; \ + $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ + if [ -d $$i ] ; then \ + cd $$i; \ + $(MAKE) $(MFLAGS) Makefiles; \ + cd $$newtop; \ + else \ + exit 1; \ + fi; \ + done + +includes:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo including "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) includes; \ + done + +distclean:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) distclean; \ + done + + PREPROCESSMANPAGES = true + +distclean:: + $(RM) Makefile Makefile.dep + +# ---------------------------------------------------------------------- +# dependencies generated by makedepend + --- /dev/null +++ tightvnc-1.3.9/1.3.10-sparc.patch?view=markup @@ -0,0 +1,553 @@ + + + + + + + + +[gentoo-x86] View of /net-misc/tightvnc/files/1.3.10-sparc.patch + + + + +
+ +
+ + + + + + +
+ + + +[gentoo-x86] +/ + + + +net-misc +/ + + + +tightvnc +/ + + + +files +/ + + + +1.3.10-sparc.patch + + + + + +Project Root: + + + +
+ +
+ +
+

GentooView of /net-misc/tightvnc/files/1.3.10-sparc.patch

+ +

+Parent Directory Parent Directory + +| Revision Log Revision Log + + +| View Revision Graph Revision Graph + +

+
+
+Revision: 1.1 - +(download) + +(annotate) + +
Wed Nov 4 19:12:33 2009 UTC (2 weeks, 1 day ago) by armin76 + +
Branch: MAIN + + +
CVS Tags: HEAD + + + + + + + + +
Add a patch to fix corruption on sparc
+(Portage version: 2.1.6.13/cvs/Linux ia64)
+
+ +
+
diff -ur vnc_unixsrc.orig/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
+--- vnc_unixsrc.orig/Xvnc/programs/Xserver/include/servermd.h	2009-11-04 18:44:50.000000000 +0000
++++ vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h	2009-11-04 18:47:48.000000000 +0000
+@@ -421,6 +421,20 @@
+ 
+ #endif /* Linux/PPC */
+ 
++#if defined (linux) && defined(__sparc__)
++
++#define IMAGE_BYTE_ORDER       MSBFirst
++#define BITMAP_BIT_ORDER       MSBFirst
++#define GLYPHPADBYTES          4
++#define GETLEFTBITS_ALIGNMENT  1
++
++#define AVOID_MEMORY_READ 
++#define LARGE_INSTRUCTION_CACHE
++#define FAST_CONSTANT_OFFSET_MODE
++#define SHARED_IDCACHE
++
++#endif /* Linux/sparc */
++
+ #if defined(__MACH__) && defined(__POWERPC__)
+ 
+ #define IMAGE_BYTE_ORDER       MSBFirst
+ +
+ + + + + +
+
www@gentoo.org

+Powered by ViewCVS 1.0_pre20050929 +
+

ViewCVS and CVS Help

+
+ + + --- tightvnc-1.3.9.orig/vncserver +++ tightvnc-1.3.9/vncserver @@ -1,5 +1,6 @@ #!/usr/bin/perl # +# Copyright (C) 2004-2006,2008-2009 Ola Lundqvist # Copyright (C) 2002-2003 Constantin Kaplinsky. All Rights Reserved. # Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. # @@ -23,6 +24,13 @@ # vncserver - wrapper script to start an X VNC server. # +# This file was heavily edited by +# Ola Lundqvist +# Marcus Brinkmann +# Clean option by Dirk Eddelbuettel + +# Please report all errors to Debian and not to ORL. + # # First make sure we're operating in a sane environment. # @@ -36,9 +44,11 @@ $geometry = "1024x768"; $depth = 24; $desktopName = "X"; -$vncClasses = "/usr/local/vnc/classes"; +if (-d "/usr/share/tightvnc-java") { + $vncClasses = "/usr/share/tightvnc-java"; +} $vncUserDir = "$ENV{HOME}/.vnc"; -$fontPath = "unix/:7100"; +#$fontPath = "unix/:7100"; $authType = "-rfbauth $vncUserDir/passwd"; # Here is another example of setting the font path: @@ -49,7 +59,7 @@ $authType = "-rfbauth $vncUserDir/passwd # You might wish to make your vnc directory under /tmp, to make sure # passwords are always kept on the local filesystem. To do that, just -# uncomment the line below. Note that in this case Xvnc's .Xauthority +# uncomment the line below. Note that in this case Xtightvnc's .Xauthority # file will be searched in the same $vncUserDir directory by default, # and $ENV{HOME}/.vncstartup will be executed instead of usual # $vncUserDir/xstartup. @@ -60,14 +70,50 @@ $defaultXStartup = ("#!/bin/sh\n\n". "xrdb \$HOME/.Xresources\n". "xsetroot -solid grey\n". - "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". - "twm &\n"); + "#x-terminal-emulator -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". + "#x-window-manager &\n". + "# Fix to make GNOME work\n". + "export XKL_XMODMAP_DISABLE=1\n". + "/etc/X11/Xsession\n"); $xauthorityFile = "$ENV{XAUTHORITY}"; +######## Adding configuration possibility ################ +$Config_file = "/etc/vnc.conf"; +&ReadConfigFile(); +$Config_file = "$ENV{HOME}/.vncrc"; +&ReadConfigFile(); + +if (!$XFConfigPath) { + foreach ("/etc/X11/xorg.conf", "/etc/X11/XF86Config-4", "/etc/X11/XF86Config" ){ + $XFConfigPath = $_; + last if ( -e $XFConfigPath ); + } +} +if (!$fontPath) { + &ReadXFConfigFont; +} +if (!$fontPath) { + $fontPath = "/usr/share/fonts/X11/misc/,". + "/usr/share/fonts/X11/Type1/,". + "/usr/share/fonts/X11/75dpi/,". + "/usr/share/fonts/X11/100dpi/" +} +if (!$colorPath) { + &ReadXFConfigColor; +} +if (!$colorPath) { + foreach ("/etc/X11/rgb", "/usr/share/X11/rgb", "/usr/X11R6/lib/X11/rgb"){ + $colorPath = $_; + last if ( -e "${colorPath}.txt" ); + } +} +########################################################## + $vncUserDirUnderTmp = ($vncUserDir =~ m|^/tmp/.+|) ? 1 : 0; $xstartup = ($vncUserDirUnderTmp) ? "$ENV{HOME}/.vncstartup" : "$vncUserDir/xstartup"; +$xstartup = $vncStartup if ($vncStartup); unless ($xauthorityFile) { if ($vncUserDirUnderTmp) { $xauthorityFile = "$vncUserDir/.Xauthority"; @@ -82,12 +128,23 @@ chop($host = `uname -n`); # Check command line options &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1, - "-help",0,"-h",0,"--help",0); + "-help",0,"-h",0,"--help",0, + "-clean",0, "-fp",1, + "-alwaysshared",0, "-nevershared",0, + "-httpport",1,"-basehttpport",1); &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'}); &Kill() if ($opt{'-kill'}); +$useClasses = 0; +if (defined $vncClasses) { + if(! -d $vncClasses) { + die "VNC class files can not be found at $vncClasses."; + } + $useClasses = 1; +} + # Uncomment this line if you want default geometry, depth and pixelformat # to match the current X display: # &GetXDisplayDefaults(); @@ -103,6 +160,25 @@ if ($opt{'-pixelformat'}) { $pixelformat = $opt{'-pixelformat'}; } +if ($opt{'-fp'}) { + @fontPathElements = split(/\s*,\s*/, "$opt{'-fp'}"); + + $fontPath = ''; + + foreach $i (0.."$#fontPathElements") { + $tempFontPath = $fontPathElements[$i]; + if ($tempFontPath !~ m!^[^/]*/[^/]*:\d+$!) { + $tempFontPath =~ s/:unscaled$//; + if (-r "$tempFontPath/fonts.dir") { + $fontPath .= "$fontPathElements[$i],"; + } + } else { + $fontPath .= "$fontPathElements[$i],"; + } + } + chop $fontPath; +} + &CheckGeometryAndDepth(); if ($opt{'-name'}) { @@ -116,14 +192,14 @@ unless (-e $vncUserDir) { die "$prog: Could not create $vncUserDir.\n"; } } -($z,$z,$mode) = lstat("$vncUserDir"); +($z,$z,$mode) = stat("$vncUserDir"); if (!-d _ || !-o _ || ($vncUserDirUnderTmp && ($mode & 0777) != 0700)) { die "$prog: Wrong type or access mode of $vncUserDir.\n"; } # Make sure the user has a password. -($z,$z,$mode) = lstat("$vncUserDir/passwd"); +($z,$z,$mode) = stat("$vncUserDir/passwd"); if (-e _ && (!-f _ || !-o _)) { die "$prog: Wrong type or ownership on $vncUserDir/passwd.\n"; } @@ -169,9 +245,21 @@ system("xauth -f $xauthorityFile add $ho # Now start the X VNC Server -$cmd = "Xvnc :$displayNumber"; +$cmd = "Xtightvnc :$displayNumber"; $cmd .= " -desktop " . "edString($desktopName); -$cmd .= " -httpd $vncClasses"; +if ($useClasses) { + $cmd .= " -httpd $vncClasses"; + print ("Found $vncClasses for http connections.\n"); + if ($opt{'-httpport'}) { + $cmd .= " -httpport $opt{'-httpport'}"; + print ("Listening to $opt{'-httpport'} for http connections.\n"); + } + elsif ($opt{'-basehttpport'}) { + my $v = $opt{'-basehttpport'} + $displayNumber; + print ("Listening to $v for http connections.\n"); + $cmd .= " -httpport $v"; + } +} $cmd .= " -auth $xauthorityFile"; $cmd .= " -geometry $geometry" if ($geometry); $cmd .= " -depth $depth" if ($depth); @@ -181,6 +269,8 @@ $cmd .= " $authType"; $cmd .= " -rfbport $vncPort"; $cmd .= " -fp $fontPath" if ($fontPath); $cmd .= " -co $colorPath" if ($colorPath); +$cmd .= " -alwaysshared" if ($opt{'-alwaysshared'}); +$cmd .= " -nevershared" if ($opt{'-nevershared'}); foreach $arg (@ARGV) { $cmd .= " " . "edString($arg); @@ -192,18 +282,18 @@ $cmd .= " >> " . "edString($desktopL $pidFile = "$vncUserDir/$host:$displayNumber.pid"; system("$cmd & echo \$! >$pidFile"); -# Give Xvnc a chance to start up +# Give Xtightvnc a chance to start up sleep(1); unless (kill 0, `cat $pidFile`) { - warn "Couldn't start Xvnc; trying default font path.\n"; + warn "Couldn't start Xtightvnc; trying default font path.\n"; warn "Please set correct fontPath in the $prog script.\n"; $cmd =~ s@-fp [^ ]+@@; system("$cmd & echo \$! >$pidFile"); sleep(1); } unless (kill 0, `cat $pidFile`) { - warn "Couldn't start Xvnc process.\n\n"; + warn "Couldn't start Xtightvnc process.\n\n"; open(LOG, "<$desktopLog"); while () { print; } close(LOG); @@ -241,6 +331,65 @@ system("$xstartup >> " . "edString($ exit; +############################ Debian functions ################################# +# I thank Manoj for the code below. +# +# ReadConfigFile reads in a config file and sets variables according to it. +# + +sub ReadConfigFile +{ + open(CONFIG, "$Config_file") || return; + my $lineno = 0; + while () { + chomp; + $lineno++; + s/\#.*//og; + next if /^\s*$/og; + $_ .= ";" unless /;\s*$/; + if (/^\s*([^=]+)\s*=\s*(\S.*)$/o) { + my $ret = eval "$1=$2"; + if ($@) { + print STDERR "Error parsing config file $Config_file!\n"; + print STDERR "$lineno:$_\n"; + } + } + } +} + +sub ReadXFConfigFont +{ + open(CONFIG, "$XFConfigPath") || return; + my $lineno = 0; + while () { + chomp; + $lineno++; + s/\#.*//og; + next if /^\s*$/og; + if (/^\s*FontPath\s*"(\S.*)"\s*$/o) { + $fontPath .= "," if $fontPath; + $fontPath .= $1; + } + } +} + +sub ReadXFConfigColor +{ + open(CONFIG, "$XFConfigPath") || return; + my $lineno = 0; + while ( && !$colorPath) { + chomp; + $lineno++; + s/\#.*//og; + next if /^\s*$/og; + if (/^\s*RgbPath\s*"(\S.*)"\s*$/o) { + $colorPath = $1; + } + } +} + + +########## End of debian functions ########### ############################################################################### # @@ -306,7 +455,8 @@ sub CheckDisplayNumber socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n"; eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))'; - unless (bind(S, pack('S n x12', $AF_INET, 6000 + $n))) { + #unless (bind(S, pack('S n x12', $AF_INET, 6000 + $n))) { + unless (bind(S, sockaddr_in(6000 + $n, &INADDR_ANY))) { close(S); return 0; } @@ -314,7 +464,8 @@ sub CheckDisplayNumber socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n"; eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))'; - unless (bind(S, pack('S n x12', $AF_INET, 5900 + $n))) { + #unless (bind(S, pack('S n x12', $AF_INET, 5900 + $n))) { + unless (bind(S, sockaddr_in(5900 + $n, &INADDR_ANY))) { close(S); return 0; } @@ -452,15 +603,19 @@ sub Usage "Usage: $prog [] [:]\n". " $prog -kill :\n". "\n". - " are Xvnc options, or:\n". + " are Xtightvnc options, or:\n". "\n". " -name \n". " -depth \n". " -geometry x\n". + " -httpport number\n". + " -basehttpport number\n". + " -alwaysshared\n". + " -nevershared\n". " -pixelformat rgb\n". " -pixelformat bgr\n". "\n". - "See vncserver and Xvnc manual pages for more information.\n"); + "See vncserver and Xtightvnc manual pages for more information.\n"); } @@ -484,14 +639,18 @@ sub Kill unless (-r $pidFile) { die "\nCan't find file $pidFile\n". - "You'll have to kill the Xvnc process manually\n\n"; + "You'll have to kill the Xtightvnc process manually\n\n"; } $SIG{'HUP'} = 'IGNORE'; chop($pid = `cat $pidFile`); - warn "Killing Xvnc process ID $pid\n"; + warn "Killing Xtightvnc process ID $pid\n"; system("kill $pid"); unlink $pidFile; + + ## If option -clean is given, also remove the logfile + unlink "$vncUserDir/$host$opt{'-kill'}.log" if ($opt{'-clean'}); + exit; } @@ -559,7 +718,7 @@ sub SanityCheck # cmd: - foreach $cmd ("uname","xauth","Xvnc","vncpasswd") { + foreach $cmd ("uname","xauth","Xtightvnc","vncpasswd") { for (split(/:/,$ENV{PATH})) { if (-x "$_/$cmd") { next cmd; --- tightvnc-1.3.9.orig/Xvnc/Makefile +++ tightvnc-1.3.9/Xvnc/Makefile @@ -1,193 +1,1336 @@ -# $XConsortium: Makefile /main/36 1996/11/13 14:42:50 lehors $ -# $XFree86: xc/Makefile,v 3.6.2.2 1998/02/07 00:44:32 dawes Exp $ +# Makefile generated by imake - do not edit! +# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ -# Luna users will need to either run make as "make MAKE=make" -# or add "MAKE = make" to this file. +# ---------------------------------------------------------------------- +# Makefile generated from "Imake.tmpl" and +# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ +# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $ +# +# +# +# +# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $ +# ---------------------------------------------------------------------- + +all:: + +.SUFFIXES: .i + +# $XdotOrg: xc/config/cf/Imake.cf,v 1.7 2005/03/02 11:20:29 gisburn Exp $ +# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ + +# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ + +# Keep cpp from replacing path elements containing i486/i586/i686 + +# ----------------------------------------------------------------------- +# site-specific configuration parameters that need to come before +# the platform-specific parameters - edit site.def to change + +# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ + +# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ + +# ---------------------------------------------------------------------- +# platform-specific configuration parameters - edit linux.cf to change + +# $XdotOrg: xc/config/cf/linux.cf,v 1.24 2005/03/06 01:05:00 branden Exp $ +# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ + +# operating system: Linux 2.6.32-trunk-686-bigmem i686 [ELF] (2.6.32) +# libc: (6.10.2) +# binutils: (220) + +# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ + +# $XdotOrg: xc/config/cf/xorg.cf,v 1.44 2005/01/27 03:50:46 ajax Exp $ + +# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ + +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) +RELEASE_VERSION = RELEASE-1 + +AFB_DEFS = -DUSE_AFB + +DRIVERSDKDIR = $(USRLIBDIR)/Server +DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules +DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include + + XF86SRC = $(SERVERSRC)/hw/xfree86 + XF86COMSRC = $(XF86SRC)/common + XF86PARSERSRC = $(XF86SRC)/parser + XF86OSSRC = $(XF86SRC)/os-support + XF86DRIVERSRC = $(XF86SRC)/drivers + DRIVERSRC = $(XF86DRIVERSRC) + + XFREE86DOCDIR = $(DOCDIR) + XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) + XFREE86HTMLDOCDIR = $(DOCHTMLDIR) +XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese + +# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ + + SELINUX_LDFLAGS = + + SELINUX_INCLUDES = -I/usr/include/selinux + + SELINUX_CFLAGS = -DHAVE_SELINUX + + SELINUX_LIBS = -lselinux + +# ---------------------------------------------------------------------- +# site-specific configuration parameters that go after +# the platform-specific parameters - edit site.def to change + +# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ + +# --------------------------------------------------------------------- +# Imake rules for building libraries, programs, scripts, and data files +# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.8 2005/02/01 22:27:00 ajax Exp $ +# +# +# +# +# rules: $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes Exp $ + +.PHONY: all interfaces install install.man install.lib install.sdk depend includes cleandir + + _NULLCMD_ = @ echo -n + +X_BYTE_ORDER = X_LITTLE_ENDIAN + +GLIDE2INCDIR = /usr/include/glide + +GLIDE3INCDIR = /usr/include/glide3 + +GLIDE3LIBNAME = glide3 + +TKLIBNAME = tk8.4 + +TKLIBDIR = /usr/lib + +TCLLIBNAME = tcl8.4 + +TCLIBDIR = /usr/lib + + PATHSEP = / + SHELL = /bin/sh -e + + TOP = . + CURRENT_DIR = . + + IMAKE = imake + DEPEND = gccmakedep + MKDIRHIER = mkdir -p + REVPATH = revpath + EXPORTLISTGEN = + RMAN = /usr/bin/rman + RMANBASENAME = rman + RMANOPTIONS = + CONFIGSRC = $(TOP)/config + IMAKESRC = $(CONFIGSRC)/imake + DEPENDSRC = $(CONFIGSRC)/util + + INCROOT = /usr/include + USRLIBDIR = /usr/lib + VARDIR = /var + VARLIBDIR = $(VARDIR)/lib + SYSTEMUSRLIBDIR = /usr/lib + SYSTEMUSRINCDIR = /usr/include + SHLIBDIR = /usr/lib + LINTLIBDIR = $(USRLIBDIR)/lint + MANPATH = /usr/share/man + MANSOURCEPATH = $(MANPATH)/man + MANDIR = $(MANSOURCEPATH)$(MANSECT) + SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT) + LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT) + DRIVERMANDIR = $(MANSOURCEPATH)4 + FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT) + GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT) + MISCMANDIR = $(MANSOURCEPATH)7 + ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT) + ICONDIR = "/usr/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + DRIVERMANDIR = $(MANSOURCEPATH)4 + LOGDIRECTORY = $(VARDIR)/log + + VARRUNDIR = $(VARDIR)/run + + VARDBDIR = $(VARDIR)/lib + + AR = ar clq + +# Nice try but useless: make will inherit BOOTSTRAPCFLAGS +# from top Makefile + BOOTSTRAPCFLAGS = + + CC = gcc -m32 + AS = gcc -m32 -c -x assembler + +.SUFFIXES: .cc + + CXX = c++ -m32 + + CXXFILT = c++filt + + CXXLIB = -lstdc++ + + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing +CXXDEPENDINCLUDES = + CXXEXTRA_DEFINES = +CXXEXTRA_INCLUDES = + CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(CXXPROJECT_DEFINES) + CXXOPTIONS = + CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) + CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) + + COMPRESS = compress + GZIPCMD = gzip + + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) + PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) + + INSTALL = install + INSTALLFLAGS = -c + + LD = gcc -m32 -nostdlib + + LEX = flex -l + M4 = m4 + M4FLAGS = + LEXLIB = -lfl + YACC = bison -y + CCYACC = bison -y + + LINT = lint + + LINTLIBFLAG = -C + LINTOPTS = -axz + LN = ln -s + MAKE = make + MV = mv -f + CP = cp + + RANLIB = ranlib + + RANLIBINSTFLAGS = + + RM = rm -f + PERL = perl + PERLOPTS = + PERLENVSETUP = env LC_ALL=C + + MANSECT = 1 + SYSCALLMANSECT = 2 + LIBMANSECT = 3 + DRIVERMANSECT = 4 + FILEMANSECT = 5 + GAMEMANSECT = 6 + MISCMANSECT = 7 + ADMMANSECT = 8 + MANSRCSECT = s + MANNEWSECT = n + PROJECTMANSUFFIX = x + MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX) + SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX) + LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX) + DRIVERMANSUFFIX = 4x + FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX) + GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX) + MISCMANSUFFIX = 7x + ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX) + ADMINMANSUFFIX = 8 + MANSRCSUFFIX = man + MANNEWSUFFIX = _man + MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__adminmansuffix__=$(ADMINMANSUFFIX) -D__projectroot__=$(PROJECTROOT) -D__xconfigfile__=$(XCONFIGFILE) -D__xconfigdir__=$(XCONFIGDIR) -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) -D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) $(XORGMANDEFS) $(VENDORMANDEFS) + + COMPRESSMANCMD = gzip -n + + TROFF = groff -Tps + NROFF = nroff + + MSMACROS = -ms + MANMACROS = -man + TBL = tbl + EQN = eqn + NEQN = neqn + COL = col + COLFLAGS = -b + + MODCC = gcc -m32 + + MODCPP = cpp + MODCFLAGS = $(CFLAGS) + MODAS = gcc -m32 -c -x assembler + MODASFLAGS = + + MODLD = gcc -m32 -nostdlib + + MODLDFLAGS = +MODLDCOMBINEFLAGS = -r + MODAR = ar clq + + MODRANLIB = ranlib + + DVIPS = dvips + LATEX = latex + + STD_INCLUDES = + STD_CPP_OPTIONS = -traditional + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) + STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) + EXTRA_LOAD_FLAGS = + EXTRA_LDOPTIONS = + EXTRA_LIBRARIES = + TAGS = ctags + + PARALLELMFLAGS = + + SHAREDCODEDEF = + SHLIBDEF = + + SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + + PICFLAGS = -fPIC + + CXXPICFLAGS = -fPIC + + PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO + + INSTPGMFLAGS = + + INSTBINFLAGS = -m 0755 + INSTUIDFLAGS = -m 4711 + INSTLIBFLAGS = -m 0644 + INSTINCFLAGS = -m 0444 + INSTMANFLAGS = -m 0444 + INSTDATFLAGS = -m 0444 + INSTKMEMFLAGS = -m 4711 + + PROJECTROOT = /usr + + CDEBUGFLAGS = -g -O2 -fno-strict-aliasing + CCOPTIONS = + + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = $(INSTALLED_LIBS) + LDPOSTLIB = + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + + CCLINK = $(CC) + + CXXLINK = $(CXX) + + LDSTRIPFLAGS = -x + LDCOMBINEFLAGS = -r + DEPENDFLAGS = + DEPEND_DEFINES = + +# Not sure this belongs here + TKLIBDIR = /usr/lib + TKINCDIR = /usr/include + TKLIBNAME = tk8.4 + TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) + TCLLIBDIR = /usr/lib + TCLINCDIR = /usr/include + TCLLIBNAME = tcl8.4 + TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) + + MACROFILE = linux.cf + RM_CMD = $(RM) + + IMAKE_DEFINES = + IMAKE_WARNINGS = -Wundef + + IRULESRC = $(CONFIGDIR) + IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) + + ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) + +# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ + +# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ + +# ---------------------------------------------------------------------- +# X Window System Build Parameters and Rules +# $XdotOrg: xc/config/cf/X11.tmpl,v 1.52 2005/09/22 23:54:18 alanc Exp $ +# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ +# +# +# +# +# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ + +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 + +STICKY_DEFINES = -DHAS_STICKY_DIR_BIT + +FCHOWN_DEFINES = -DHAS_FCHOWN + +# ----------------------------------------------------------------------- +# X Window System make variables; these need to be coordinated with rules + + XTOP = $(TOP) + BINDIR = /usr/bin + BUILDINCROOT = $(TOP)/exports + BUILDINCDIR = $(BUILDINCROOT)/include + BUILDINCTOP = ../.. + BUILDLIBDIR = $(TOP)/exports/lib + BUILDLIBTOP = ../.. + BUILDBINDIR = $(TOP)/exports/bin + BUILDBINTOP = ../.. + BUILDMODULEDIR = $(BUILDLIBDIR)/modules + BUILDI18NDIR = $(BUILDLIBDIR)/locale + BUILDMODULETOP = $(BUILDLIBTOP)/.. + XBUILDINCROOT = $(XTOP)/exports + XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 + XBUILDINCTOP = ../../.. + XBUILDBINDIR = $(XBUILDINCROOT)/bin + INCDIR = $(INCROOT) + ADMDIR = /usr/adm + LIBDIR = /usr/lib/X11 + SHAREDIR = /usr/share/X11 + LIBEXECDIR = /usr/libexec + MODULEDIR = $(USRLIBDIR)/modules + TOP_X_INCLUDES = + XBINDIR = $(PROJECTROOT)/bin + + INSTSRCDIR = /usr/src + + ETCX11DIR = /etc/X11 + + CONFDIR = $(ETCX11DIR) + + DOCDIR = $(LIBDIR)/doc + DOCHTMLDIR = $(DOCDIR)/html + DOCPSDIR = $(DOCDIR)/PostScript + DOCPDFDIR = $(DOCDIR)/PDF + FONTDIR = /usr/share/fonts/X11 + ENCODINGSDIR = /usr/share/fonts/X11/encodings + XINITDIR = $(LIBDIR)/xinit + XDMDIR = $(LIBDIR)/xdm + XDMVARDIR = $(VARLIBDIR)/xdm + TWMDIR = $(LIBDIR)/twm + XSMDIR = $(LIBDIR)/xsm + NLSDIR = $(LIBDIR)/nls + XLOCALEDIR = $(LIBDIR)/locale + LBXPROXYDIR = $(LIBDIR)/lbxproxy + PROXYMANAGERDIR = $(LIBDIR)/proxymngr + XPRINTDIR = $(LIBDIR)/xserver + XAPPLOADDIR = /etc/X11/app-defaults + FONTCFLAGS = -t + + INSTAPPFLAGS = $(INSTDATFLAGS) + + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale + MKFONTDIR = $(XBINDIR)/mkfontdir + MKHTMLINDEX = $(XBINDIR)/mkhtmlindex + UCS2ANY = $(XBINDIR)/ucs2any + BDFTRUNCATE = $(XBINDIR)/bdftruncate + UCSMAPPREFIX = $(FONTDIR)/util/map- + XCURSORGEN = $(XBINDIR)/xcursorgen + + HTMLINDEXCMD = HtmlIndexCmd + + DOCUTILSRC = $(XTOP)/doc/util + CLIENTSRC = $(TOP)/clients + DEMOSRC = $(TOP)/demos + XDOCMACROS = $(DOCUTILSRC)/macros.t + XIDXMACROS = $(DOCUTILSRC)/indexmacros.t + PROGRAMSRC = $(TOP)/programs + LIBSRC = $(XTOP)/lib + FONTSRC = $(XTOP)/fonts + ENCODINGSSRC = $(FONTSRC)/encodings + INCLUDESRC = $(BUILDINCROOT)/include + XINCLUDESRC = $(INCLUDESRC)/X11 + SERVERSRC = $(XTOP)/programs/Xserver + CONTRIBSRC = $(XTOP)/../contrib + UNSUPPORTEDSRC = $(XTOP)/unsupported + DOCSRC = $(XTOP)/doc + RGBSRC = $(XTOP)/programs/rgb + BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf + MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir + FONTSERVERSRC = $(PROGRAMSRC)/xfs + FONTINCSRC = $(XTOP)/include/fonts + EXTINCSRC = $(XTOP)/include/extensions + FTSOURCEDIR = FreeTypeSrcDir + DRMSRCDIR = $(TOP)/extras/drm + MESASRCDIR = $(TOP)/extras/Mesa + OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample + PSWRAPSRC = $(XTOP)/config/pswrap + TRANSCOMMSRC = $(LIBSRC)/xtrans + TRANS_INCLUDES = -I$(TRANSCOMMSRC) + CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 +XTRANS_FAILDEFINES = -DFAIL_HARD + + VENDORMANNAME = X.Org + VENDORMANVERSION = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" + VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" + VENDORNAME = The X.Org Foundation + VENDORNAMESHORT = X.Org + + VENDORWEBSUPPORT = http://wiki.X.Org + +VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"' + + XKBDEFRULES = xorg + XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"' + + XCONFIGFILE = xorg.conf + XCONFIGDIR = $(LIBDIR) + XLOGFILE = Xorg + XSERVERNAME = Xorg + + XENVLIBDIR = $(USRLIBDIR) + CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) XLOCALEDIR=$(BUILDLIBDIR)/locale + +# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ + + XLIBSRC = $(LIBSRC)/X11 + +SOXLIBREV = 6.2 +DEPXONLYLIB = +XONLYLIB = -lX11 + +LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + + DEPXLIBONLY = $(DEPXONLYLIB) + XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) + + XEXTLIBSRC = $(LIBSRC)/Xext + +SOXEXTREV = 6.4 +DEPEXTENSIONLIB = +EXTENSIONLIB = -lXext + +LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln + +LINTEXTENSIONLIB = $(LINTEXTENSION) + DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) + XLIB = $(EXTENSIONLIB) $(XONLYLIB) + LINTXLIB = $(LINTXONLYLIB) + + XSSLIBSRC = $(LIBSRC)/Xss + +SOXSSREV = 1.0 +DEPXSSLIB = +XSSLIB = -lXss + +LINTXSS = $(LINTLIBDIR)/llib-lXss.ln + + XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc + +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = +XXF86MISCLIB = -lXxf86misc + +LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln + + XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm + +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = +XXF86VMLIB = -lXxf86vm + +LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln + + XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga + +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = +XXF86DGALIB = -lXxf86dga + +LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln + + XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush + +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = +XXF86RUSHLIB = -lXxf86rush + +LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln + + XVLIBSRC = $(LIBSRC)/Xv + +SOXVREV = 1.0 +DEPXVLIB = +XVLIB = -lXv + +LINTXV = $(LINTLIBDIR)/llib-lXv.ln + + XVMCLIBSRC = $(LIBSRC)/XvMC + +SOXVMCREV = 1.0 +DEPXVMCLIB = +XVMCLIB = -lXvMC + +LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln + + XINERAMALIBSRC = $(LIBSRC)/Xinerama + +SOXINERAMAREV = 1.0 +DEPXINERAMALIB = +XINERAMALIB = -lXinerama + +LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln + + XRESLIBSRC = $(LIBSRC)/XRes + +SOXRESREV = 1.0 +DEPXRESLIB = +XRESLIB = -lXRes + +LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln + + DMXLIBSRC = $(LIBSRC)/dmx + +SODMXREV = 1.0 +DEPDMXLIB = +DMXLIB = -ldmx + +LINTDMX = $(LINTLIBDIR)/llib-ldmx.ln + + DPSLIBSRC = $(LIBSRC)/dps + +DEPDPSLIB = $(USRLIBDIR)/libdps.a +DPSLIB = -ldps + +LINTDPS = $(LINTLIBDIR)/llib-ldps.ln + + DPSTKLIBSRC = $(LIBSRC)/dpstk + +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a +DPSTKLIB = -ldpstk + +LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln + + PSRESLIBSRC = $(LIBSRC)/psres + +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a +PSRESLIB = -lpsres + +LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln + + GLULIBSRC = $(LIBSRC)/GLU + +SOGLUREV = 1.3 +DEPGLULIB = +GLULIB = -lGLU + +LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln + + GLXLIBSRC = $(LIBSRC)/GL + +SOGLREV = 1.2 +DEPGLXLIB = +GLXLIB = -lGL + +LINTGLX = $(LINTLIBDIR)/llib-lGL.ln + + GLWIDGETSRC = $(LIBSRC)/GLw + +DEPGLWLIB = $(USRLIBDIR)/libGLw.a +GLWLIB = -lGLw + +LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln + +XRENDERDIR = /usr +XRENDERLIBDIR = /usr/lib +XRENDERINCDIR = /usr/include +XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender +DEPXRENDERLIB = + +XRENDERINCLUDES = -I$(XRENDERINCDIR) + + XRANDRLIBSRC = $(LIBSRC)/Xrandr + +SOXRANDRREV = 2.0 +DEPXRANDRLIB = +XRANDRLIB = -lXrandr + +LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln + + XFIXESLIBSRC = $(LIBSRC)/Xfixes + +SOXFIXESREV = 3.0 +DEPXFIXESLIB = +XFIXESLIB = -lXfixes + +LINTXFIXES = $(LINTLIBDIR)/llib-lXfixes.ln + + XDAMAGELIBSRC = $(LIBSRC)/Xdamage + +SOXDAMAGEREV = 1.0 +DEPXDAMAGELIB = +XDAMAGELIB = -lXdamage + +LINTXDAMAGE = $(LINTLIBDIR)/llib-lXdamage.ln + +XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite + +SOXCOMPOSITEREV = 1.0 +DEPXCOMPOSITELIB = +XCOMPOSITELIB = -lXcomposite + +LINTXCOMPOSITE = $(LINTLIBDIR)/llib-lXcomposite.ln + +XEVIELIBSRC = $(LIBSRC)/Xevie + +SOXEVIEREV = 1.0 +DEPXEVIELIB = +XEVIELIB = -lXevie + +LINTXEVIE = $(LINTLIBDIR)/llib-lXevie.ln + +XCURSORDIR = /usr +XCURSORLIBDIR = /usr/lib +XCURSORINCDIR = /usr/include +XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor + +XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES) + + APPLEWMLIBSRC = $(LIBSRC)/apple + +DEPAPPLEWMLIB = $(USRLIBDIR)/libAppleWM.a +APPLEWMLIB = -lAppleWM + +LINTAPPLEWM = $(LINTLIBDIR)/llib-lAppleWM.ln + + WINDOWSWMLIBSRC = $(LIBSRC)/windows + +DEPWINDOWSWMLIB = $(USRLIBDIR)/libWindowsWM.a +WINDOWSWMLIB = -lWindowsWM + +LINTWINDOWSWM = $(LINTLIBDIR)/llib-lWindowsWM.ln + + XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache + +DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a +XFONTCACHELIB = -lXfontcache + +LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln + + XAUTHSRC = $(LIBSRC)/Xau + +SOXAUTHREV = 6.0 +DEPXAUTHLIB = +XAUTHLIB = -lXau + +LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln + + XDMCPLIBSRC = $(LIBSRC)/Xdmcp + +SOXDMCPREV = 6.0 +DEPXDMCPLIB = +XDMCPLIB = -lXdmcp + +LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln + + XMUSRC = $(LIBSRC)/Xmu + +SOXMUREV = 6.2 +DEPXMULIB = +XMULIB = -lXmu + +LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln + + XMUUSRC = $(LIBSRC)/Xmuu + +SOXMUUREV = 1.0 +DEPXMUULIB = +XMUULIB = -lXmuu + +LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln + + OLDXLIBSRC = $(LIBSRC)/oldX + +DEPOLDXLIB = $(USRLIBDIR)/liboldX.a +OLDXLIB = -loldX + +LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln + + XPLIBSRC = $(LIBSRC)/Xp + +SOXPREV = 6.2 +DEPXPLIB = +XPLIB = -lXp + +LINTXP = $(LINTLIBDIR)/llib-lXp.ln + + TOOLKITSRC = $(LIBSRC)/Xt + +SOXTREV = 6.0 +DEPXTOOLONLYLIB = +XTOOLONLYLIB = -lXt + +LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln + + DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) + XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) + LINTXTOOLLIB = $(LINTXTOOLONLYLIB) + + XALIBSRC = $(LIBSRC)/Xa + +SOXAREV = 1.0 +DEPXALIB = +XALIB = -lXa + +LINTXA = $(LINTLIBDIR)/llib-lXa.ln + + AWIDGETSRC = $(LIBSRC)/Xaw + +SOXAWREV = 8.0 +DEPXAWLIB = +XAWLIB = -lXaw + +LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln + + AWIDGET7SRC = $(LIBSRC)/Xaw7 + +SOXAW7REV = 7.0 +DEPXAW7LIB = +XAW7LIB = -lXaw + +LINTXAW7 = $(LINTLIBDIR)/llib-lXaw.ln + + AWIDGET6SRC = $(LIBSRC)/Xaw6 + +SOXAW6REV = 6.1 +DEPXAW6LIB = +XAW6LIB = -lXaw + +LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln + + XILIBSRC = $(LIBSRC)/Xi + +SOXINPUTREV = 6.0 +DEPXILIB = +XILIB = -lXi + +LINTXI = $(LINTLIBDIR)/llib-lXi.ln + + XTESTLIBSRC = $(LIBSRC)/Xtst + +SOXTESTREV = 6.1 +DEPXTESTLIB = +XTESTLIB = -lXtst + +LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln + +DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a +XBSDLIB = -lXbsd + +LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln + + ICESRC = $(LIBSRC)/ICE + +SOICEREV = 6.4 +DEPICELIB = +ICELIB = -lICE + +LINTICE = $(LINTLIBDIR)/llib-lICE.ln + + SMSRC = $(LIBSRC)/SM + +SOSMREV = 6.0 +DEPSMLIB = +SMLIB = -lSM + +LINTSM = $(LINTLIBDIR)/llib-lSM.ln + + XKEYSRC = $(LIBSRC)/Xkey + +SOXKEYREV = 6.0 +DEPXKEYLIB = +XKEYLIB = -lXkey + +LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln + + FSLIBSRC = $(LIBSRC)/FS + +SOFSREV = 6.0 +DEPFSLIB = +FSLIB = -lFS + +LINTFS = $(LINTLIBDIR)/llib-lFS.ln + + FONTLIBSRC = $(LIBSRC)/font + +DEPFONTLIB = $(USRLIBDIR)/libXfont.a +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln +# +DEPXFONTLIB = $(USRLIBDIR)/libXfont.a +XFONTLIB = -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln + + FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs + +DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a +FONTSTUBLIB = -lfntstubs + +LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln + DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) + + FONTENCLIBSRC = $(LIBSRC)/fontenc + +DEPXFONTENCLIB = $(USRLIBDIR)/libfontenc.a +XFONTENCLIB = -lfontenc + +LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln + + XPMLIBSRC = $(LIBSRC)/Xpm + +SOXPMREV = 4.11 +DEPXPMLIB = +XPMLIB = -lXpm + +LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln + +FREETYPE2DIR = /usr +FREETYPE2LIBDIR = /usr/lib +FREETYPE2INCDIR = /usr/include + +FREETYPE2LIB = -lfreetype + +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + +FREETYPE2DEFINES = -DFREETYPE2 + + EXPATLIBSRC = $(LIBSRC)/expat + +SOEXPATREV = 0.4 +DEPEXPATLIB = +EXPATLIB = -lexpat + +LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln + +EXPATDIR = /usr +EXPATLIBDIR = /usr/lib +EXPATINCDIR = /usr/include + +EXPATINCLUDES = + +EXPATLIB = -lexpat + +EXPATDEFINES = -DEXPAT + +XFTDIR = /usr +XFTLIBDIR = /usr/lib +XFTINCDIR = /usr/include +XFTLIB = -L$(XFTLIBDIR) -lXft + +XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES) + +FONTCONFIGDIR = /usr +FONTCONFIGLIBDIR = /usr/lib +FONTCONFIGINCDIR = /usr/include +FONTCONFIGBINDIR = /usr/bin + +FONTCONFIGLIB = -lfontconfig + +FONTCONFIGINCLUDES = + +FCCACHE = $(FONTCONFIGBINDIR)/fc-cache + +FONTCONFIGDEFINES = -DFONTCONFIG + +LIBPNGINCDIR = /usr/include + +LIBPNGINC= + +LIBPNGDIR = /usr +LIBPNGLIBDIR = /usr/lib +LIBPNGINCDIR = /usr/include + +LIBPNGLIB = -lpng + + XKBFILELIBSRC = $(LIBSRC)/xkbfile + +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = +XKBFILELIB = -lxkbfile + +LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln + + XKBCOMPCMD = $(XBINDIR)/xkbcomp + + XKBUILIBSRC = $(LIBSRC)/xkbui + +SOXKBUIREV = 1.0 +DEPXKBUILIB = +XKBUILIB = -lxkbui + +LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln + +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + + XTRAPLIBSRC = $(LIBSRC)/XTrap + +SOXTRAPREV = 6.4 +DEPXTRAPLIB = +XTRAPLIB = -lXTrap + +LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln + + DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) + + DEPLIBS1 = $(DEPLIBS) + DEPLIBS2 = $(DEPLIBS) + DEPLIBS3 = $(DEPLIBS) + DEPLIBS4 = $(DEPLIBS) + DEPLIBS5 = $(DEPLIBS) + DEPLIBS6 = $(DEPLIBS) + DEPLIBS7 = $(DEPLIBS) + DEPLIBS8 = $(DEPLIBS) + DEPLIBS9 = $(DEPLIBS) + DEPLIBS10 = $(DEPLIBS) + + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? + +XMULIBONLY = -lXmu +XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + + CONFIGDIR = $(LIBDIR)/config + + USRLIBDIRPATH = $(USRLIBDIR) + LDPRELIBS = $(INSTALLED_LIBS) + LDPOSTLIBS = + TOP_INCLUDES = $(TOP_X_INCLUDES) + PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' + +CXXPROJECT_DEFINES = + +# ---------------------------------------------------------------------- +# start of Imakefile + +# $XConsortium: Imakefile /main/137 1996/10/08 07:38:14 swick $ +# $XFree86: xc/Imakefile,v 3.11.2.2 1998/02/28 04:47:00 dawes Exp $ RELEASE = "Release 6.3" -SHELL = /bin/sh -RM = rm -f -MV = mv -WORLDOPTS = -k -WIN32WORLDOPTS = -i -TOP = . -CURRENT_DIR = . -CONFIGSRC = $(TOP)/config -IMAKESRC = $(CONFIGSRC)/imake -DEPENDSRC = $(CONFIGSRC)/makedepend -DEPENDTOP = ../.. -IMAKETOP = ../.. -IRULESRC = $(CONFIGSRC)/cf -IMAKE = $(IMAKESRC)/imake -IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES) -MAKE_OPTS = -f xmakefile -MAKE_CMD = $(MAKE) $(MAKE_OPTS) -FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" - -all: - @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial - @$(MAKE_CMD) $@ - -all-initial: - @echo Please use make World, or on NT use nmake World.Win32. - @echo Check the configuration parameters in the $(IRULESRC) directory, - @echo and pass BOOTSTRAPCFLAGS if necessary. - @echo Read the release notes carefully before proceeding. - @echo Do not name your log file make.log or it will be deleted. - -World: - @echo "" - @echo Building $(RELEASE) of the X Window System. - @echo "" - @case "x$(BOOTSTRAPCFLAGS)" in x) \ - echo I hope you checked the configuration parameters in $(IRULESRC) ; \ - echo to see if you need to pass BOOTSTRAPCFLAGS. ; \ - echo "" ; \ - ;; esac; - @date + + FONTSDIR = fonts + + DOCSDIR = doc + NLSSUBDIR = nls + + SUBDIRS = include config lib $(NLSSUBDIR) programs $(FONTSDIR) $(DOCSDIR) + + LNINSTALLDIRS = lib + +all:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "making" all "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" all; \ + done + +install.ln:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(LNINSTALLDIRS) ;\ + do \ + echo "linting" for install.ln and install.ln "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) LINTOPTS='$(LINTOPTS)' install.ln; \ + done + +external.ln:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(LNINSTALLDIRS) ;\ + do \ + echo "linting" for external.ln and lintlib "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) LINTOPTS='$(LINTOPTS)' lintlib; \ + done + +depend:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "depending" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) depend; \ + done + +VerifyOS:: @echo "" - @if [ ! -f $(IRULESRC)/host.def ]; then \ - if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \ - echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \ - else \ - if [ ! -f $(TOP)/fonts/Imakefile ]; then \ - echo "#define BuildFonts NO" > $(IRULESRC)/host.def; \ - else \ - echo "" > $(IRULESRC)/host.def; \ - fi \ - fi \ + @echo Building on Linux 2.6.32-trunk-686-bigmem i686 [ELF] "("2"."6"."32")." + @echo "" + + @echo libc version 6"."10"."2 + @echo "" + +includes:: + @if [ -d $(BUILDINCDIR) ]; then \ + set +x; \ + else \ + if [ -h $(BUILDINCDIR) ]; then \ + (set -x; rm -f $(BUILDINCDIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(BUILDINCDIR)); \ + fi + @if [ -d $(BUILDBINDIR) ]; then \ + set +x; \ + else \ + if [ -h $(BUILDBINDIR) ]; then \ + (set -x; rm -f $(BUILDBINDIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(BUILDBINDIR)); \ fi - cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean - $(MAKE) $(MFLAGS) Makefile.boot - $(MAKE_CMD) $(MFLAGS) VerifyOS - $(MAKE_CMD) $(MFLAGS) Makefiles - $(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS= - $(MAKE_CMD) $(MFLAGS) includes - $(MAKE_CMD) $(MFLAGS) depend - $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World + +# +# Watch out!!! Make sure you do make includes after removing X11.... +# +cleandir:: + $(RM) -r $(BUILDINCDIR) + $(RM) -r $(BUILDLIBDIR) + $(RM) -r $(BUILDBINDIR) + +World:: + $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(PARALLELOPTS) all + +Everything:: + @echo "" + @echo Rebuilding $(RELEASE) of the X Window System. + @echo "" + @date + @echo "" + cd $(IMAKESRC) && if [ -f Makefile ]; then $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; else $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi + + $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles + $(MAKE) $(MFLAGS) $(MAKE_OPTS) includes + $(MAKE) $(MFLAGS) $(MAKE_OPTS) depend + $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) @echo "" @date @echo "" - @echo Full build of $(RELEASE) of the X Window System complete. + @echo Rebuild of $(RELEASE) of the X Window System complete. @echo "" -.PRECIOUS: Makefile +# cleandir out link tree looking for stuff that should get checked in +dangerous_strip_clean:: + $(MAKE) -k cleandir + find . -type l -exec rm {} \; + find . \( \! \( -type d -o -name Makefile \) \) -print + +BOOTSTRAPSUBDIRS = imake makedepend + +# ---------------------------------------------------------------------- +# common rules for all Makefiles - do not edit + +.c.i: + $(RM) $@ + $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ + +.SUFFIXES: .ii + +.cc.ii: + $(RM) $@ + $(CC) -E $(CFLAGS) $(_NOOP_) $*.cc > $@ + +.SUFFIXES: .s + +.c.s: + $(RM) $@ + $(CC) -S $(CFLAGS) $(_NOOP_) $*.c + +.cc.s: + $(RM) $@ + $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc + +emptyrule:: + +cleandir:: + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* + +tags:: + $(TAGS) -w *.[ch] + $(TAGS) -xw *.[ch] > TAGS + +man_keywords:: + +html_index:: + +clean:: cleandir + +distclean:: cleandir + +# ---------------------------------------------------------------------- +# rules for building in SUBDIRS - do not edit + +install:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "installing" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) install; \ + done + +install.man:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR=$(DESTDIR) install.man; \ + done + +install.sdk:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "installing driver SDK" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) DESTDIR='$(DESTDIR)' install.sdk; \ + done + +clean:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" clean; \ + done + +tags:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "tagging" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) TAGS='$(TAGS)' tags; \ + done + +$(ONESUBDIR)/Makefile: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[n]*) executeit="no";; esac; done; \ + cd $(ONESUBDIR) && \ + if [ "$$executeit" != "no" ]; then \ + $(IMAKE_CMD) -DTOPDIR=$(IMAKETOP) -DCURDIR=$(ONECURDIR)$(ONESUBDIR); \ + fi; + +Makefiles:: + -@for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[n]*) executeit="no";; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + case "$(CURRENT_DIR)" in \ + .) curdir= ;; \ + *) curdir=$(CURRENT_DIR)/ ;; \ + esac; \ + echo "making Makefiles in $$curdir$$i..."; \ + itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ + curtmp="$(CURRENT_DIR)" \ + toptmp=""; \ + case "$$itmp" in \ + ../?*) \ + while echo "$$itmp" | grep '^\.\./' > /dev/null;\ + do \ + toptmp="/`basename $$curtmp`$$toptmp"; \ + curtmp="`dirname $$curtmp`"; \ + itmp="`echo $$itmp | sed 's;\.\./;;'`"; \ + done \ + ;; \ + esac; \ + case "$$itmp" in \ + */?*/?*/?*/?*) newtop=../../../../..;; \ + */?*/?*/?*) newtop=../../../..;; \ + */?*/?*) newtop=../../..;; \ + */?*) newtop=../..;; \ + *) newtop=..;; \ + esac; \ + newtop="$$newtop$$toptmp"; \ + case "$(TOP)" in \ + /?*) imaketop=$(TOP) \ + imakeprefix= ;; \ + .) imaketop=$$newtop \ + imakeprefix=$$newtop/ ;; \ + *) imaketop=$$newtop/$(TOP) \ + imakeprefix=$$newtop/ ;; \ + esac; \ + $(RM) $$i/Makefile.bak; \ + if [ -f $$i/Makefile ]; then \ + echo " $(MV) Makefile Makefile.bak"; \ + if [ "$$executeit" != "no" ]; then \ + $(MV) $$i/Makefile $$i/Makefile.bak; \ + fi; \ + fi; \ + $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ + if [ -d $$i ] ; then \ + cd $$i; \ + $(MAKE) $(MFLAGS) Makefiles; \ + cd $$newtop; \ + else \ + exit 1; \ + fi; \ + done + +includes:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo including "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) includes; \ + done + +distclean:: + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; --*) ;; *[ik]*) set +e;; esac; done; \ + for i in $(SUBDIRS) ;\ + do \ + echo "cleaning" "in $(CURRENT_DIR)/$$i..."; \ + $(MAKE) -C $$i $(MFLAGS) $(PARALLELMFLAGS) distclean; \ + done + + PREPROCESSMANPAGES = true + +install.man:: man_keywords + +# ---------------------------------------------------------------------- +# dependencies generated by makedepend -# This is just a sequence of bootstrapping steps we have to do. -# The steps are listed as separate targets so clearmake can wink in -# the Makefile.proto files. -Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap - -imake.proto: - cd $(IMAKESRC) && $(MAKE) $(FLAGS) - $(RM) $(DEPENDSRC)/Makefile.proto - -$(DEPENDSRC)/Makefile.proto: - $(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC) - -depend.bootstrap: - cd $(DEPENDSRC) && $(RM) -r Makefile Makefile.dep makedepend *.o bootstrap - cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap - -$(IMAKESRC)/Makefile.proto: - $(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) - -imake.bootstrap: - cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend - cd $(IMAKESRC) && $(MAKE) $(FLAGS) bootstrap - cd $(IMAKESRC) && $(MAKE) -f Makefile.proto all - -@if [ -f xmakefile ]; then set -x; \ - $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \ - else exit 0; fi - $(MAKE) $(MFLAGS) xmakefile - -Makefile:: - $(MAKE) $(MFLAGS) xmakefile - -xmakefile: Imakefile - $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - -World.Win32: - @echo : - @echo Building $(RELEASE) of the X Window System. - @echo : - @echo : - -@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def - cd $(IMAKESRC) - $(MAKE) -f Makefile.ini clean.Win32 - $(MAKE) -f Makefile.ini imake.exe - cd ..\.. - -if exist xmakefile.bak del xmakefile.bak - -if exist xmakefile ren xmakefile xmakefile.bak - $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - $(MAKE_CMD) $(MFLAGS) VerifyOS - $(MAKE_CMD) $(MFLAGS) Makefiles - $(MAKE_CMD) $(MFLAGS) clean - cd $(CONFIGSRC)\util - $(MAKE) mkdirhier.exe - cd ..\.. - $(MAKE_CMD) $(MFLAGS) includes - $(MAKE_CMD) $(MFLAGS) depend - $(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS) - @echo : - @echo : - @echo Full build of $(RELEASE) of the X Window System complete. - @echo : - -World.OS2: - @echo : - @echo Building $(RELEASE) of the X Window System on OS/2. - @echo : - @echo : - -@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def - \indir $(IMAKESRC) $(MAKE) SHELL= -f Makefile.ini clean.os2 - \indir $(IMAKESRC) $(MAKE) SHELL= CC=gcc -f Makefile.ini imake.os2 - -if exist Makefile.bak del Makefile.bak - -if exist Makefile ren Makefile Makefile.bak - $(subst /,\,$(IMAKE)) -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - $(MAKE) $(MFLAGS) VerifyOS - $(MAKE) $(MFLAGS) Makefiles - $(MAKE) $(MFLAGS) clean - $(MAKE) $(MFLAGS) includes - $(MAKE) $(MFLAGS) depend - $(MAKE) $(MFLAGS) - @echo : - @echo : - @echo Full build of $(RELEASE) of the X Window System complete. - @echo : - -# don't allow any default rules in this Makefile -.SUFFIXES: -# quiet "make" programs that display a message if suffix list empty -.SUFFIXES: .Dummy - -# a copy of every rule that might be invoked at top level - -clean: - $(MAKE_CMD) $@ -dangerous_strip_clean: - $(MAKE_CMD) $@ -depend: - $(MAKE_CMD) $@ -Everything: - $(MAKE_CMD) $@ -external.ln: - $(MAKE_CMD) $@ -includes: - $(MAKE_CMD) $@ -install.linkkit: - $(MAKE_CMD) $@ -install.ln: - $(MAKE_CMD) $@ -install.man: - $(MAKE_CMD) $@ -install: - $(MAKE_CMD) $@ -Makefiles: - $(MAKE_CMD) $@ -man_keywords: - $(MAKE_CMD) $@ -tags: - $(MAKE_CMD) $@ -VerifyOS: - $(MAKE_CMD) $@ --- tightvnc-1.3.9.orig/Xvnc/config/cf/X11.tmpl +++ tightvnc-1.3.9/Xvnc/config/cf/X11.tmpl @@ -666,10 +666,10 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v #define ConfigDir $(LIBDIR)/config #endif #ifndef FontDir -#define FontDir $(LIBDIR)/fonts +#define FontDir /usr/share/fonts/X11 #endif #ifndef AdmDir -#define AdmDir /usr/adm +#define AdmDir /var/log #endif #ifndef XinitDir #define XinitDir $(LIBDIR)/xinit @@ -714,7 +714,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v #define XPrintDir $(LIBDIR) #endif #ifndef ServerConfigDir -#define ServerConfigDir $(LIBDIR)/xserver +#define ServerConfigDir /etc/X11/xserver #endif #ifndef VarDirectory #define VarDirectory /var/X11 @@ -735,7 +735,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v #endif #endif #ifndef XAppLoadDir -#define XAppLoadDir $(LIBDIR)/app-defaults +#define XAppLoadDir /etc/app-defaults #endif #ifndef XtErrorPrefix #define XtErrorPrefix /* as empty string */ @@ -798,14 +798,14 @@ XCOMM X Window System make variables; th XBUILDBINDIR = XBuildBinDir INCDIR = $(INCROOT) /* header files */ ADMDIR = AdmDir /* server log files */ - LIBDIR = LibDir /* rgb, XErrorDB, etc. */ + LIBDIR = /usr/share/X11 /* rgb, XErrorDB, etc. */ TOP_X_INCLUDES = TopXInclude #ifdef VarDirectory VARDIR = VarDirectory #endif - FONTDIR = FontDir /* font directories */ + FONTDIR = /usr/share/fonts/X11 /* font directories */ XINITDIR = XinitDir /* xinit config files */ XDMDIR = XdmDir /* xdm config files */ XDMVARDIR = XdmVarDir /* xdm config files */ --- tightvnc-1.3.9.orig/Xvnc/config/cf/svr3.cf +++ tightvnc-1.3.9/Xvnc/config/cf/svr3.cf @@ -51,7 +51,7 @@ XCOMM $XFree86: xc/config/cf/svr3.cf,v 3 #endif #ifndef XmanSearchPath -#define XmanSearchPath /usr/man +#define XmanSearchPath /usr/share/man #endif /* --- tightvnc-1.3.9.orig/Xvnc/config/cf/Imake.cf +++ tightvnc-1.3.9/Xvnc/config/cf/Imake.cf @@ -600,7 +600,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define Win32Architecture #endif /* WIN32 */ -#ifdef linux +#if defined(linux) || defined(__GLIBC__) # define MacroIncludeFile # define MacroFile linux.cf # undef linux @@ -711,7 +711,7 @@ XCOMM Keep cpp from replacing path eleme # undef __alpha__ # endif /* __alpha__ */ # ifdef __arm__ -# define Arm32Architecture +# define ArmArchitecture # undef arm # undef __arm # undef __arm__ --- tightvnc-1.3.9.orig/Xvnc/config/cf/Imake.tmpl +++ tightvnc-1.3.9/Xvnc/config/cf/Imake.tmpl @@ -487,7 +487,7 @@ TCLIBDIR = TclLibDir #if SystemV4 #define SystemManDirectory /usr/share/man #else -#define SystemManDirectory /usr/man +#define SystemManDirectory /usr/share/man #endif #endif #ifndef ManDirectoryRoot --- tightvnc-1.3.9.orig/Xvnc/programs/Xserver/Xvnc.man +++ tightvnc-1.3.9/Xvnc/programs/Xserver/Xvnc.man @@ -141,7 +141,7 @@ network addresses. Probably, the best wa allow only loopback connections from the server machine (the \fI\-localhost\fR option) and to use SSH tunneling for remote access to the Xvnc server. For details on SSH tunneling, see - . + . .SH SEE ALSO \fBvncserver\fR(1), \fBvncviewer\fR(1), \fBvncpasswd\fR(1), \fBvncconnect\fR(1), \fBsshd\fR(1) --- tightvnc-1.3.9.orig/Xvnc/programs/Xserver/Xserver.man +++ tightvnc-1.3.9/Xvnc/programs/Xserver/Xserver.man @@ -649,7 +649,7 @@ Unix domain socket for display number \f /tmp/rcX\fBn\fP Kerberos 5 replay cache for display number \fBn\fP .TP 30 -/usr/adm/X\fBn\fPmsgs +/var/log/X\fBn\fPmsgs Error log file for display number \fBn\fP if run from \fIinit(8)\fP .TP 30 /lib/X11/xdm/xdm-errors --- tightvnc-1.3.9.orig/Xvnc/programs/Xserver/os/osinit.c +++ tightvnc-1.3.9/Xvnc/programs/Xserver/os/osinit.c @@ -71,7 +71,7 @@ SOFTWARE. #endif #ifndef ADMPATH -#define ADMPATH "/usr/adm/X%smsgs" +#define ADMPATH "/var/log/X%smsgs" #endif extern char *display; --- tightvnc-1.3.9.orig/Xvnc/programs/Xserver/include/servermd.h +++ tightvnc-1.3.9/Xvnc/programs/Xserver/include/servermd.h @@ -421,6 +421,20 @@ SOFTWARE. #endif /* Linux/PPC */ +#if defined (linux) && defined(__sparc__) + +#define IMAGE_BYTE_ORDER MSBFirst +#define BITMAP_BIT_ORDER MSBFirst +#define GLYPHPADBYTES 4 +#define GETLEFTBITS_ALIGNMENT 1 + +#define AVOID_MEMORY_READ +#define LARGE_INSTRUCTION_CACHE +#define FAST_CONSTANT_OFFSET_MODE +#define SHARED_IDCACHE + +#endif /* Linux/sparc */ + #if defined(__MACH__) && defined(__POWERPC__) #define IMAGE_BYTE_ORDER MSBFirst --- tightvnc-1.3.9.orig/Xvnc/programs/Xserver/dix/dixfonts.c +++ tightvnc-1.3.9/Xvnc/programs/Xserver/dix/dixfonts.c @@ -1759,10 +1759,11 @@ SetFontPathElements(npaths, paths, bad) if (err != Successful) { xfree(fpe->name); xfree(fpe); - err = BadValue; - goto bail; + err = Successful; } - fplist[valid_paths++] = fpe; + else { + fplist[valid_paths++] = fpe; + } } else { err = BadValue; goto bail; --- tightvnc-1.3.9.orig/Xvnc/programs/Xserver/cfb/Imakefile +++ tightvnc-1.3.9/Xvnc/programs/Xserver/cfb/Imakefile @@ -193,8 +193,11 @@ stipmipste.s: stipmips.s clean:: $(RM) stipmipste.s +stipmips.o: stipmips.s + $(CPP) AsmDefines stipmips.s | $(AS) -o $@ - + stipmipste.o: stipmipste.s - $(AS) -o $@ -DTETEXT stipmipste.s + $(CPP) AsmDefines -DTETEXT stipmipste.s | $(AS) -o $@ - #endif #ifdef SparcArchitecture debian/compat0000644000000000000000000000000211372054553010371 0ustar 7 debian/control0000644000000000000000000000542612312056365010603 0ustar Source: tightvnc Section: x11 Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Ola Lundqvist Standards-Version: 3.8.4 Build-Depends: debhelper (>> 7.1), lynx, zlib1g-dev, libjpeg-dev, libxaw7-dev (>> 4.1.0), perl-modules, xfonts-base, xutils-dev, libx11-dev, libxau-dev, libxext-dev, libxi-dev, libxkbfile-dev, libxmu-dev, libxt-dev, x11proto-core-dev Homepage: http://www.tightvnc.com Package: tightvncserver Architecture: any Provides: xserver, vnc-server Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, x11-common | xserver-common, x11-utils, xauth Recommends: xfonts-base, x11-xserver-utils Suggests: tightvnc-java Description: virtual network computing server software VNC stands for Virtual Network Computing. It is, in essence, a remote display system which allows you to view a computing `desktop' environment not only on the machine where it is running, but from anywhere on the Internet and from a wide variety of machine architectures. . This package provides a server to which X clients can connect and the server generates a display that can be viewed with a vncviewer. . The difference between the tightvncserver and the normal vncserver is the data encoding, optimized for low bandwidth connections. If the client do not support jpeg or zlib encoding it can use the default one. Later versions of vncserver (> 3.3.3r2) support a new automatic encoding that should be equally good as the tightvnc encoding. . Note: This server does not support or need a display. You need a vncviewer to see something. However, this viewer may also be on a computer running other operating systems in the local net. Package: xtightvncviewer Architecture: any Provides: vncviewer, vnc-viewer Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: xfonts-base Suggests: tightvncserver, ssh Description: virtual network computing client software for X VNC stands for Virtual Network Computing. It is, in essence, a remote display system which allows you to view a computing `desktop' environment not only on the machine where it is running, but from anywhere on the Internet and from a wide variety of machine architectures. . It is implemented in a client/server model. This package provides a client for X, with this you can connect to a vncserver somewhere in the network and display its content in a window. There are vncserver available for other operating systems. . The difference between the xtightvncviewer and the normal vncviewer is the data encoding, optimized for low bandwidth connections. If the client do not support jpeg or zlib encoding it can use the default one. Later versions of xvncviewer (> 3.3.3r2) support a new automatic encoding that should be equally good as the tightvnc encoding. debian/changelog0000644000000000000000000010262212312056455011046 0ustar tightvnc (1.3.9-6.4ubuntu1) trusty; urgency=medium * Add arm64 support. -- Colin Watson Tue, 18 Mar 2014 14:50:14 +0000 tightvnc (1.3.9-6.4) unstable; urgency=high * Non-maintainer upload. * debian/control: update Build-Depends: - libjpeg62-dev -> libjpeg-dev transition (Closes: #644967) * debian/rules: - do not add useless config.sub/config.guess - remove generated makefiles - Fix FTBFS due to broken dpkg. (Closes: #642768) - remove useless patch debian-changes-1.3.9-6.2 -- Bill Allombert Thu, 07 Jun 2012 00:01:17 +0200 tightvnc (1.3.9-6.3) unstable; urgency=low * Non-maintainer upload. * Add Makefile and Xvnc/Makefile to dh_clean parameters. (Closes: #663566) -- Mònica Ramírez Arceda Wed, 21 Mar 2012 10:55:32 +0100 tightvnc (1.3.9-6.2) unstable; urgency=low * Non-maintainer upload. * Add support Renesas SH (Closes: #582340). -- Nobuhiro Iwamatsu Fri, 11 Mar 2011 22:43:47 +0900 tightvnc (1.3.9-6.1) unstable; urgency=low * Non-maintainer upload. - Update to packaging format "3.0 (quilt)". * debian/compat - Update to 7. * debian/control - (Build-Depends): Update xutils to xutils-dev (important; Closes: #575865). Update to debhelper 7.1. Remove obsolete x-dev. - (Depends): Add ${misc:Depends}. - (Homepage): New field. - (Standards-Version): Update to 3.8.4. - (tightvncserver::Depends): Replace obsolete xbase-clients with x11-utils and xauth. The needed binaries xdpyinfo and xauth are used in Perl program /usr/bin/tightvncserver. * debian/copyright - Point to GPL-2. * debian/patches - (10, 20): Add new patches. - (30): Convert original MIPS patch to apply to current sources. - (tightvnc-ftbfs-mips.patch): Removed. See 30. * debian/*.{postrm,prerm} - Add "set -e". - Fix Lintian maintainer-script-without-set-e. * debian/rules - (CC): Add. Export variable for xmkmf(1). - (DH_COMPAT): Delete; use debian/compat. - (install): Correct tightvncpasswd.1x to tightvncpasswd.1. - (binary-arch): Remove empty directories. * debian/source/format - New file. * debian/watch - New file. * debian/tightvncserver.doc-base - New file. * debian/xtightvncviewer.menu - (section): Update obsolete Apps/Net to Applications/Network/Communication. -- Jari Aalto Thu, 13 May 2010 11:02:08 +0300 tightvnc (1.3.9-6) unstable; urgency=low * Applied patch for sparc that solves the problem that everything is mirrored on sparc. Thanks to Raúl Porcel for pointing out that this patch needs to be re-added. * Applied patch for GNU/kFreeBSD to fix socket handling problem. Closes: #500414. Thanks to "Diego Ongaro" for the patch. * Updated to use x11proto-dev instead of x-dev as build dependency. Closes: #515397. * Changed log directory from /usr/adm to /var/log. Closes: #500877. -- Ola Lundqvist Thu, 19 Nov 2009 21:46:00 +0100 tightvnc (1.3.9-5) unstable; urgency=low * Fix for the default xstartup to make gnome work. Closes: #476727. -- Ola Lundqvist Wed, 07 Oct 2009 18:39:34 +0200 tightvnc (1.3.9-4) unstable; urgency=low * Updated man path in build system. Xvnc/config/cf/svr3.cf Xvnc/config/cf/Imake.tmpl * Merged some code from 1.2.9 version in order to build properly on IA64. Closes: #483094. This changes some other minors things and also help build on Mipsel and hppa architecture. -- Ola Lundqvist Wed, 4 Jun 2008 08:17:28 +0200 tightvnc (1.3.9-3) unstable; urgency=low * Applied patch from Thiemo Seufer to make it build fine on mips and mipsel architecture, closes: #481444. -- Ola Lundqvist Sat, 17 May 2008 17:36:05 +0200 tightvnc (1.3.9-2) unstable; urgency=low * Now ships Vncviewer resources file, closes: #481274. Thanks to Ian Wienand for the patch. -- Ola Lundqvist Thu, 15 May 2008 20:55:20 +0200 tightvnc (1.3.9-1) unstable; urgency=low * New upstream release. Closes: #424077, #434240. This new release corrects a number of known problems: - tightvncconnect no longer make Xtightvnc crash (closes: #422361) - Control|Shift + Click is now sent properly (closes: #173701) - No input starvation (closes: #218401) - No errors when connecting from WinXP (closes: #281702) - Default path correction (closes: #365593) - The problematic DEBUG statement no longer exists (closes: #374273) - No longer use raw encoding for ssh tunnels (closes: #423091) * Updated vncserver script to allow .vnc directory as symlink. Closes: #411187. * Corrected link to broken homepage, closes: #345368. * Now uses /etc/X11/Xsession as default x init script, closes: #378573. * Applied patch from Paul Brook to make it build on arm architecture, closes: #464797. * Applied patch from Cyril Brulebois to make it build on GNU/kFreeBSD, closes: #415611. * Dropped pre-depends on dpkg. -- Ola Lundqvist Sun, 23 Mar 2008 00:36:15 +0100 tightvnc (1.2.9-22) unstable; urgency=low * Removed dependency on vnc-common. Vncpasswd is now part of the tightvncserver package. This means that there are no dependency on other vnc packages anymore. -- Ola Lundqvist Tue, 4 Mar 2008 08:21:14 +0100 tightvnc (1.2.9-21) unstable; urgency=low * Applied patch from Jari Aalto to make options be displayed in correct order in manpage, closes: #394833. -- Ola Lundqvist Sun, 19 Nov 2006 10:02:20 +0100 tightvnc (1.2.9-20) unstable; urgency=low * Removed patch to be able to set maxclients to 1000 instead of default 256. This means that #300858 need to be reopened. -- Ola Lundqvist Mon, 2 Oct 2006 21:40:25 +0200 tightvnc (1.2.9-19) unstable; urgency=low * Applied a possible correction for FTBFS for ia64 arch, closes: #381317. -- Ola Lundqvist Mon, 14 Aug 2006 21:47:55 +0200 tightvnc (1.2.9-18) unstable; urgency=low * Applied patch from LaMont Jones to support hppa arch building, closes: #382386. -- Ola Lundqvist Fri, 11 Aug 2006 17:25:35 +0200 tightvnc (1.2.9-17) unstable; urgency=low * Reverted back to old build method and changed config files instead. -- Ola Lundqvist Wed, 9 Aug 2006 22:29:34 +0200 tightvnc (1.2.9-16) unstable; urgency=low * Incorporated new build way from ubuntu, with modifications to suite Debian. This mean that it will adapt to how X behaves. Fix up DefaultFontPath (closes: #335849, #366881). * Removed debian/tightvncserver.wrapper as it is not used. * Updated to standards version 3.7.2. -- Ola Lundqvist Wed, 9 Aug 2006 07:17:28 +0200 tightvnc (1.2.9-15) unstable; urgency=low * Added missing documentation, closes: #366917. * Corrected documentation problem in README.inetd, closes: #319097. -- Ola Lundqvist Sun, 4 Jun 2006 22:56:54 +0200 tightvnc (1.2.9-14) unstable; urgency=low * Applied patch to make xtightvncserver compile and work on amd64. http://bugs.gentoo.org/attachment.cgi?id=78616. Closes: #281767. Thanks to Hugo Mills for pointing me to the fix. -- Ola Lundqvist Sun, 21 May 2006 21:39:31 +0200 tightvnc (1.2.9-13) unstable; urgency=low * Correction for rgb path and font paths. -- Ola Lundqvist Thu, 27 Apr 2006 07:06:59 +0200 tightvnc (1.2.9-12) unstable; urgency=low * RGB path correction. * Run Xtightvnc instead of Xvnc. -- Ola Lundqvist Fri, 21 Apr 2006 21:10:44 +0200 tightvnc (1.2.9-11) unstable; urgency=low * Applied patch from Peter Cordes that make it possible to use with xorg version 7.0, closes: #363448. -- Ola Lundqvist Wed, 19 Apr 2006 21:40:57 +0200 tightvnc (1.2.9-10) unstable; urgency=low * Changed dependency from xserver-common to x11-common, closes: #362516. -- Ola Lundqvist Mon, 17 Apr 2006 15:09:11 +0200 tightvnc (1.2.9-9) unstable; urgency=low * Applied patch from Markus Gutschke to fix a crash problem with - listen option in xvncviewer, closes: #337693. * Incorporated the NMU fixes, closes: #349107. * Applied patch from Thiemo Seufer for support of mips/mipsel to tightvnc, closes: #340336. * Updated standards version from 3.6.1 to 3.6.2. * Updated to debhelper 4 compatibility. * Updated FSF address in debian/copyright file. -- Ola Lundqvist Sat, 11 Mar 2006 17:11:45 +0100 tightvnc (1.2.9-8.1) unstable; urgency=low * Non-maintainer upload. * Replace build-dependency on xlibs-dev with an explicit build-dependency on each required package. (Closes: #346923) -- Steinar H. Gunderson Sat, 21 Jan 2006 02:15:13 +0100 tightvnc (1.2.9-8) unstable; urgency=low * Applied a simple patch to avoid crash in xtightvncviewer when switching local desktops, closes: #260439, #299221. * Applied a nice patch from Truxton Fulton to allow 1024 X clients, instead of just 128 that is the default, closes: #300858. * Fixed typo in manpage, closes: #327157. -- Ola Lundqvist Sun, 9 Oct 2005 21:31:44 +0200 tightvnc (1.2.9-7) unstable; urgency=low * Fixed typo in manpage for tightvncserver, closes: #327157. -- Ola Lundqvist Sun, 9 Oct 2005 21:24:52 +0200 tightvnc (1.2.9-6) unstable; urgency=low * Applying patch from Ian Wienand to make sure tightvnc build on IA64, closes: #185073. * Make sure that XF86Config-4 is the default instead of XF86Config if it exist, closes: #275135. -- Ola Lundqvist Sat, 5 Mar 2005 21:47:48 +0100 tightvnc (1.2.9-5) unstable; urgency=medium * Applied patch from Andreas Jochens so that it can compile with gcc 3.4, closes: #274045. -- Ola Lundqvist Sat, 2 Oct 2004 20:03:44 +0200 tightvnc (1.2.9-4) unstable; urgency=high * Debianized xstartup so it use x-window-manager and x-terminal- emulator instead of xterm and twm directly, closes: #272537. * Made vncserver honor $vncStartup, closes: #269049. -- Ola Lundqvist Mon, 20 Sep 2004 21:43:41 +0200 tightvnc (1.2.9-3) unstable; urgency=high * Ported options from old debian tightvnc-wrapper. * Made sure that it honor /etc/vnc.conf config file, closes: #267519. This is the cause of the severity. * Updated usage description. * Updated manual page to document the -query option, closes: #231445. * Updated manual page so it says tightvnc where it should do. * Updated standards version to 3.6.1. -- Ola Lundqvist Mon, 23 Aug 2004 09:18:35 +0200 tightvnc (1.2.9-2) unstable; urgency=low * Applied patch for amd64 support, closes: #254861. Thanks to Andreas Jochens for the patch. * Now use upstream vncwrapper instead of realvnc one, closes: #201176. Patched to to have good support for tightvnc-java. -- Ola Lundqvist Fri, 13 Aug 2004 10:24:32 +0200 tightvnc (1.2.9-1) unstable; urgency=low * New upstream version, closes: #207914, #180607. * Changed vncserver wrapper so that vncStartup honor ~/.vnc/xstartup. Thanks to Jan Xu , closes: #219354. -- Ola Lundqvist Fri, 9 Jul 2004 15:35:15 +0200 tightvnc (1.2.7-3) unstable; urgency=low * Fixed description so it is not so confusing. -- Ola Lundqvist Fri, 18 Jul 2003 16:31:26 +0200 tightvnc (1.2.7-2) unstable; urgency=low * Important security update regarding X cookies. -- Ola Lundqvist Mon, 27 Jan 2003 10:29:45 +0100 tightvnc (1.2.7-1) unstable; urgency=low * Calls correct program, closes: #174954. * New upstream version. * Corrected menu path, closes: #174429, #176072. * Fixed 100% cpu problem if font server restarted, closes: #176414. * Updated the description so people can tell why to use tightvnc instead of vnc, closes: #173194. * Added build dependency on imake, closes: #173087. -- Ola Lundqvist Mon, 13 Jan 2003 19:45:36 +0100 tightvnc (1.2.6-4) unstable; urgency=low * Added patch that fixed xvncviewer bug 14556 (same in tightvnc). * Added patch from Martin Koegler that fixes font path issues, closes: #173451. -- Ola Lundqvist Thu, 19 Dec 2002 08:48:54 +0100 tightvnc (1.2.6-3) unstable; urgency=low * Fix to make sure that the right server is started with vncserver is used as the alternative, closes: #172627. Thanks to Rob Andrews for the little fix. * Now uses a separate alternative for Xvnc. * Added Xvnc manpage. -- Ola Lundqvist Wed, 11 Dec 2002 15:19:36 +0100 tightvnc (1.2.6-2) unstable; urgency=low * Uses vnc.conf from vnc-common instead of tightvnc.conf. * Started to use alternatives. * Removed unnecessary dir in xtightvncviewer. * Now provides vnc-server and vnc-viewer just as vnc package does. -- Ola Lundqvist Mon, 9 Dec 2002 15:22:15 +0100 tightvnc (1.2.6-1) unstable; urgency=low * Created the tightvnc packages using the vnc package as a base. Closes: #143861, #164067, #168563. * Manpages from upstream. * Updated to latest standards version, 3.5.8 (no changes). * Moved from /usr/X11R6/ to /usr/ * Applied a subset of the patches that the debian package vnc has applied. -- Ola Lundqvist Mon, 09 Dec 2002 11:09:43 +0100 vnc (3.3.5-2) unstable; urgency=low * Patched vnc to make the vncauth library. It just had moved to some other place, closes: #168362. * Removed build dependency on xlib6g-dev, closes: #170163. * Fixed lintian error about shlibs information not generated correctly. -- Ola Lundqvist Fri, 22 Nov 2002 07:54:11 +0100 vnc (3.3.5-1) unstable; urgency=low * New upstream version, bugfix release. Fix for "can no longer login problem", closes: #167935, #168096, #168119. * 256 color display problem fixed upstream as mentioned in #168063. -- Ola Lundqvist Mon, 11 Nov 2002 12:15:35 +0100 vnc (3.3.4-1) unstable; urgency=low * New upstream version. This is major build changes. It does for example use automake/autoconf which hopefully will make some big changes to the buildability. The big change to this version is that the tightvnc patches is no longer used. The -via and -tunnel option is kept though. * Major patch-splitting/merging work have been done and is available in the debian/patches directory. All old patches (that have not been fixed upstream) is kept, and sent to upstream. So even if this is a major change (tightvnc->vnc) nobody should notice anything (I hope). * Added some build dependencies that Kirk Madsen noticed. -- Ola Lundqvist Mon, 28 Oct 2002 08:57:57 +0100 vnc (3.3.3r2-21) unstable; urgency=low * Applied sh build patch, closes: #157385. Thanks a lot to ISHIKAWA Mutsumi for providing the patch. * Fix DoS problem in http server, closes: #143857. Thanks to Tim Waugh for sending this patch to the vnc mailinglist. * Fixed allocation bug, closes: #152733. Thanks to Herbert Thielen for the patch. * Fixed minor warning bug, closes: #153012. Thanks to Herbert Thielen for the patch. * Call of rand instead of srand in vncserver wrapper, closes: #153877. Thanks to Matthew Astley for the info. * Fix passwd.real problem, closes: #152732. Thanks to Herbert Thielen for the patch. -- Ola Lundqvist Fri, 11 Oct 2002 07:29:34 +0200 vnc (3.3.3r2-20) unstable; urgency=high * Fixed s390 signed char problem, closes: #143425. * Fixes copyright file. -- Ola Lundqvist Thu, 18 Apr 2002 19:05:28 +0200 vnc (3.3.3r2-19) unstable; urgency=low * Fixed spelling issue, closes: #133371. * Added README.inetd, written by John Lines , closes: #139164. -- Ola Lundqvist Mon, 8 Apr 2002 20:58:52 +0200 vnc (3.3.3r2-18) unstable; urgency=low * Fixing wrapper problems, closes: #127043, #134554. -- Ola Lundqvist Sun, 7 Apr 2002 21:14:33 +0200 vnc (3.3.3r2-17) unstable; urgency=low * MU upload with the patch (last changelogentry) added, and with some more fixes from Jones to make it work fine, closes: #114343. * Now removes /etc/alternatives/xvncviewer if it exists and is a dangling symlink, closes: #127043. * Added a patch manually from Chris Tillman , had to fix it some because of the other patches, closes: #126974. * Added a security patch from Oryn , closes: #128096. * Fixed the xvncviewer man page, vncconnect is already in vncserver, closes: #128569. * Fixed vncconnect manpage, closes: #127555. * Updated TODO. * Added next tightvnc patch, no patch needed for java source because nothing have changed there. This is just minor bug fixes, closes: #126394. -- Ola Lundqvist Wed, 16 Jan 2002 14:03:43 +0100 vnc (3.3.3r2-16.1) unstable; urgency=low * NMU * Update Imake.cf, linux.cf, and makedepends (getline conflicted.) Closes: #114343 -- LaMont Jones Tue, 15 Jan 2002 22:57:20 -0700 vnc (3.3.3r2-16) unstable; urgency=low * More s390 fixes from Gerhard Tonn . * Now includes vncconnect, closes: #115157. * Now does not use wrapper for xvncviewer, closes: #125800. * Fixed spelling error in libvncauth-dev, closes: #125067. -- Ola Lundqvist Thu, 20 Dec 2001 15:51:37 +0100 vnc (3.3.3r2-15) unstable; urgency=low * Fixed build-dep problem, closes: #114343. * No more use of installxaw, closes: #120229. * Fixed author section of the manpage, closes: #122551. * Added patch for s390 from Gerhard Tonn , closes: #123806. * Applied patch to work under gdm from Nick Phillips , closes: #122561. * Updated description to include note about TightVNC, closes: #114275. * Really old bugs. No further reports. Probably fixed by now. closes: #75599, #67409, #57325. -- Ola Lundqvist Mon, 17 Dec 2001 19:21:48 +0100 vnc (3.3.3r2-14) unstable; urgency=low * Fixed build problem, closes: #108419. * Fixed another build problem, closes: #112953. * Fixed path problem, thanks ijones@cis.ohio-state.edu for the patch closes: #108333. * Fixed passwd creation problem, thanks to Isaac Jones and Ohio State Opensource Club, closes: #110460. * Documented the tightvnc options, closes: #105506. * Fixed typo in description, closes: #109372. * Applied the latest tightvnc patch, closes: #111886. -- Ola Lundqvist Mon, 01 Oct 2001 10:47:24 +0200 vnc (3.3.3r2-13) unstable; urgency=low * Added build dependency on libjpeg62-dev, closes: #104300. -- Ola Lundqvist Fri, 13 Jul 2001 23:05:12 +0200 vnc (3.3.3r2-12) unstable; urgency=low * Fixed the manpage for xvncviewer with a updated one from Terran Melconian , closes: #89469. * Fixed dependency, closes: #96552. * Applied a small patch from Isaac Jones that fixes error in the vncpasswd wrapper so that the config files are actually used, closes: #99911. * This should fix this woody bug too, closes: #100334. * Added tight encoding, from http://www.ce.cctpu.edu.ru/vnc/download.html, closes: #100172. -- Ola Lundqvist Fri, 2 Feb 2001 13:18:23 +0100 vnc (3.3.3r2-11) unstable; urgency=low * Added some more features to the server wrapper (thanks to Jorge L. deLyra), closes: Bug#81670. -- Ola Lundqvist Fri, 2 Feb 2001 13:18:23 +0100 vnc (3.3.3r2-10) unstable; urgency=low * Fixing typo in build dependency, closes: Bug#81297. * Fix deferupdate problem (fix by John, jodaman@cegt201.bradley.edu), closes: Bug#79792. -- Ola Lundqvist Fri, 5 Jan 2001 12:06:15 +0100 vnc (3.3.3r2-9) unstable; urgency=low * Fixing yet another build dependency, closes: Bug#80185. -- Ola Lundqvist Wed, 21 Dec 2000 11:08:21 +0100 vnc (3.3.3r2-8) unstable; urgency=low * Removed the java code from vncserver. It is not in a separate package and are compiled separatly. A step in the right direction to handle 79759. -- Ola Lundqvist Wed, 19 Dec 2000 21:15:48 +0100 vnc (3.3.3r2-7) unstable; urgency=low * Fixed so that the http port can be specified and added that to the documentation, closes: Bug#58350. -- Ola Lundqvist Wed, 13 Dec 2000 13:25:26 +0100 vnc (3.3.3r2-6) unstable; urgency=low * Applied patch from Rich Sahlender and fixed it so that it applied cleanly, closes: Bug#74369. -- Ola Lundqvist Wed, 13 Dec 2000 13:25:26 +0100 vnc (3.3.3r2-5) unstable; urgency=low * Recompiled to get rid of xpm4.7 dependency, closes: Bug#78794. -- Ola Lundqvist Tue, 5 Dec 2000 09:14:11 +0100 vnc (3.3.3r2-4) unstable; urgency=low * Corrected some installissues in the new vnc-common packages. - Added replaces, closes: Bug#77745, Bug#77811. - Fixed .dhelp problem, problem with doc-base file, closes: Bug#77759, Bug#77754. * Fixed commented reference to Xsession in config, closes: Bug#77721. * Misspelled changelog should be, closes: Bug#65700. -- Ola Lundqvist Thu, 23 Nov 2000 13:02:23 +0100 vnc (3.3.3r2-3) unstable; urgency=low * Recompiled without xlib6, closes: Bug#77501. Thank you for the information about libc5. * Fixed a man typo error in vncserver, closes: Bug#67920. * Fixed garbled display on PowerPC, thank you Kevin Puetz for the patch, closes: Bug#73022. * Probably fixed in later version, closes: Bug#57706. -- Ola Lundqvist Sun, 19 Nov 2000 17:36:37 +0100 vnc (3.3.3r2-2) unstable; urgency=low * Fixed typo error in vnc.conf, closes: Bug#63557. * Created a vnc-common package, closes: Bug#65700. -- Ola Lundqvist Sun, 19 Nov 2000 17:36:37 +0100 vnc (3.3.3r2-1) unstable; urgency=low * Fixed so that it honors XAUTHORITY env variable, thanx to Wolfram Gloger for the patch, closes: Bug#71440 * support XDM-AUTHORIZATION-1, thanx to Richard Kettlewell for the patch, closes: Bug#69822 * Fixed the wrapper issue, closes: Bug#61074 * Fixed link in faq to point to the right place, closes: Bug#61224 * Fixed pre-depends problem, closes: Bug#63066, Bug#63080 * Changed to a new upstream version, that fixes some issues. * Applied patch from Ian Jackson to cope with 24bpp X servers, closes: Bug#76564 * App defaults moved to /etc/X11/app-defaults, closes: Bug#76699 -- Ola Lundqvist Sat, 18 Nov 2000 20:40:48 +0100 vnc (3.3.3-10) frozen unstable; urgency=low * Thanks to Ben Collins for the NMU. * Can now build on m68k thanks to a patch by Roman Hodek Closes: Bug#61168 (important). -- Edward Betts Sun, 19 Mar 2000 13:23:52 +0000 vnc (3.3.3-9.1) frozen unstable; urgency=low * NMU * Applied patch to imake config files, allows building on sparc, arm, and probably fixes powerpc too, closes: #60529, #60532 -- Ben Collins Sat, 18 Mar 2000 08:14:28 -0700 vnc (3.3.3-9) frozen unstable; urgency=low * applied patch supplied by Jim Studt to allow building on ARM, closes: Bug#57838 * applied patch supplied by Bill Blunn to support the pixelformat option in the config file, closes: Bug#58338 -- Edward Betts Thu, 24 Feb 2000 02:24:36 +0000 vnc (3.3.3-8) frozen unstable; urgency=low * debian/control: Build-Depends: s/zlib1g-dev/zlibg1-dev/ closes: Bug#56174 * debian/xvncviewer.xaw: added /usr/X11R6/lib/Xaw95 closes: Bug#55199 -- Edward Betts Fri, 28 Jan 2000 17:42:41 +0000 vnc (3.3.3-7) unstable; urgency=low * Xvnc/config/cf/vnclibs.def: single line changed to fix important bug: #55277, filed by John Goerzen, `vnc: can't build from source'. * debian/rules: added -Nlibvncauth-dev to dh_installchangelogs fixes usr/share/doc/libvncauth0 -> usr/share/doc/libvncauth-dev symlink. -- Edward Betts Sun, 16 Jan 2000 09:23:39 +0000 vnc (3.3.3-6) unstable; urgency=low * debian/libvncauth-dev.links: changed /usr/share/doc/libvncauth-dev to a link to /usr/share/doc/libvncauth0 * debian/control: moved libvncauth0 from section x11 to libs and libvncauth-dev from x11 to devel * debian/control: updateded Standards-Version to 3.1.1 * debian/control: added Build-Depends. * Xvnc/config/cf/vnc: modified so that Xvnc links with libvncauth. -- Edward Betts Sun, 9 Jan 2000 07:58:23 +0000 vnc (3.3.3-5) unstable; urgency=low * Split svncviewer into seperate source package; both packages now have pristine source. * To handle source split, libvncauth is compiled as a shared library. * debian/TODO: wrote a long Todo list and removed items as they were completed, still some stuff left to do. * debian/*.debian: renamed to debian/*.wrapper, make things a bit clearer. * debian/*.dirs: removed the doc dirs, dh_installdocs creates them. * debian/control: remove svncviewer. * debian/control: add libvncauth0 and libvncauth-dev. * debian/copyright: mention that I now maintain the package. * debian/copyright: change ORL to AT&T. * debian/doc-base: added, for faq.html and start.html * debian/docs: add start.html and start.txt * debian/rules: simplifed build targets into one target. * debian/rules: dh_compress + dh_link handle man pages instead of gzip + ln. * debian/rules: install xvncviewer resources file. * debian/rules: modifed find command to not erase Xvnc/Makefile on clean. * debian/rules: remove the Xvnc/exports directory, and erase Xvnc/xmakefile, Xvnc/config/cf/host.def and Xvnc/config/imake/Makefile.proto on clean. * debian/rules: create faq.txt and start.txt from faq.html and start.html in the build target. * debian/vnc.conf: changed location of java classes. * debian/vncserver.wrapper: changed location of java classes. Fixes: #53506. * debian/vncviewer: example script to run xvncviewer or svncviewer based on $DISPLAY. If this is to go into /usr/bin it needs to have a man page and to be created in the postinst of xvncviewer and svncviewer. Fixes: #36594. * debian/xvncviewer.README.Debian: removed, because it was unneeded. * debian/xvncviewer.menu: added menu item for xvncviewer. Fixes: #52921. * libvncauth/Imakefile: extensive modification to build shared library. * vncpasswd/Imakefile: modified to build against libvncauth shared library. * vncviewer/Imakefile: modified to build against libvncauth shared library. -- Edward Betts Tue, 28 Dec 1999 10:30:08 +0000 vnc (3.3.3-4) unstable; urgency=low * debian/xvncviewer.xaw: make xvncviewer use xaw-wrappers, fixes bug #50354. * debian/control: vncserver needs the colour table file from xserver-common so depend on xserver-common, thanks go to Jim Studt for spotting this one, fixes bug #33911 and half of bug #33910. * debian/vncserver.debian: modification as suggested by previous maintainer in bug #33910, fixes the other half of #33910. * debian/vncserver.debian: added support for Xsession which is not executable, thanks to journey@jps.net for spotting this one and the implementation, fixes bug #51497. * debian/rules & debian/vncserver.dirs: moved stuff out of /usr/X11R6/lib/ to fix bug #33440, thanks go to Bernd Eckenfels for spotting this one. vncpasswd.real -> /usr/X11R6/bin/ (vncpasswd modified, and man link added) *.{class,jar} -> /usr/share/vncserver (does anybody use these?) -- Edward Betts Sun, 5 Dec 1999 17:18:06 +0000 vvnc (3.3.3-3) unstable; urgency=low * debian/rules: changed to debhelper * FHS. * Changed GPL location in copyright files * Include source, as previous upload was accidently made without a diff * There is no 3.3.3-2 because I messed up. -- Edward Betts Sat, 6 Nov 1999 01:27:42 +0000 vnc (3.3.3-1) unstable; urgency=low * New upstream release. * New maintainer. -- Edward Betts Sat, 30 Oct 1999 19:57:42 +0100 vnc (3.3.2r2-4) frozen unstable; urgency=low * debian/vncserver.debian: Do not remove too many font pathes, that means, check for :unscaled and font server. * debian/control: Depend on xbase-clients, not xbase. closes: #33028, #32821. The latter is an important bug and holding up the release of slink. * debian/copyright.vnc: Update addresse of web page. -- Marcus Brinkmann Sun, 7 Feb 1999 23:35:19 +0100 vnc (3.3.2r2-3) frozen unstable; urgency=low * Bugfixes only. The memory leak (see below) make it worth to include it in frozen. * control (vncserver): Added dependency on xbase because xauth is used in vncserver script (David Karlin) and fixed a small typo (lintian). * Xvnc/programs/Xserver/hw/vnc/rfbserver.c: Fixed memory leak (#27624). * Xvnc/config/cf/Imake.cf: Added Arm, Sparc, PowerPC architecture. Xvnc/config/cf/linux.cf: Likewise. (Tor Slettnes , #29831 for Alpha and Christian Meder , #30407 for Sparc, Daniel Jacobowitz , #29833). * Xvnc/programs/Xserver/cfb/stipsprc32.s: Additional Sparc changes (see above). Xvnc/programs/Xserver/cfb/stipsparc.s: Likewise. * debian/vncserver.debian: Remove invalid font pathes. (Bruce A. Mah , #21635) * debian/vncserver.debian: Add '--help' and '-h' as alias for '-help'. (#26872) -- Marcus Brinkmann Sun, 27 Dec 1998 05:16:11 +0100 vnc (3.3.2r2-2) unstable; urgency=low * svncviewer.postinst: Changed suid-register 4775 to 4755. Fixes: #27228. -- Marcus Brinkmann Tue, 29 Sep 1998 22:13:12 +0200 vnc (3.3.2r2-1) unstable; urgency=low * New upstream release. Fixes: #26673. * Fixed vncserver script one more time. Fixes: #25471, #26080, #26836. * Added '-clean' option to vncserver and vncserver(1x) (by Dirk Eddelbuettel). Fixes: #26871. * Added Replaces: and Conflicts: vnc-doc to vncserver and xvnviewer. Reason: vnc-doc is obsolete and should be removed from Debian (already reported as a bug against ftp.debian.org). The documentation is out of date and new documentation is included in the packages themselve. -- Marcus Brinkmann Thu, 24 Sep 1998 04:32:49 +0200 vnc (3.3.2-1) unstable; urgency=low * New upstream version, based on X11R6.3 source code: + Now native support for gzip'd fonts. + Fixed Keyboard handling (hopefully). * Added (slightly modified) FAQ from the web site. -- Marcus Brinkmann Fri, 12 Jun 1998 22:54:15 +0200 vnc (3.3.1-5) frozen unstable; urgency=low * Now the cool configuration files will actually be parsed. Sorry for this. Fixes: #21062. -- Marcus Brinkmann Mon, 13 Apr 1998 19:51:18 +0200 vnc (3.3.1-4) frozen unstable; urgency=low * This should be in frozen. It fixes many bugs and violations of policy. Indeed it is the first usable release of vnc. * Added patch by Mark Spencer to support gzip'd fonts. xfs cludge no longer necessary. * Removed rpath-link from upstream config file. * Changed vncserver to parse config files in /etc/vnc.conf and ~/.vncrc. * Changed vncpasswd to parse config files and get the default passwd file location from there. Also made it verbose if file could not be written. * Wrote six man pages. Please read them, I spent a lot of time on them. * Changed rule files to make three packages, one server and two clients. vncserver is now the X server. xvncviewer is now the client for X. svncviewer is now the client for svgalib. -- Marcus Brinkmann Sun, 15 Mar 1998 03:33:58 +0100 vnc (3.3.1-3) unstable; urgency=low * Move /usr/vnc to /usr/lib/vnc. * Suggest vnc-doc. * Clean up crud from experimental phase. -- Christoph Lameter Tue, 24 Feb 1998 16:05:10 -0800 vnc (3.3.1-2) unstable; urgency=low * Include description from slashdot on how to circumvent the font compression problem using xfs. Move to unstable. -- Christoph Lameter Tue, 24 Feb 1998 07:00:14 -0800 vnc (3.3.1-1) experimental; urgency=low * Broken font handling. Both the binary from the upstream site and the build sourcecode fail when setting the fontpath in the X server. Thus experimental. Poked around but found no clue. If someone else has time. HELP! -- Christoph Lameter Mon, 23 Feb 1998 15:00:26 -0800 debian/xtightvncviewer.postinst0000755000000000000000000000067411372047311014244 0ustar #!/bin/sh set -e if [ "$1" = "configure" ]; then MAN=/usr/share/man/man1 BIN=/usr/bin update-alternatives --install \ $BIN/vncviewer vncviewer $BIN/xtightvncviewer 70 \ --slave \ $MAN/vncviewer.1.gz vncviewer.1.gz $MAN/xtightvncviewer.1.gz \ --slave \ $MAN/xvncviewer.1.gz xvncviewer.1.gz $MAN/xtightvncviewer.1.gz \ --slave \ $BIN/xvncviewer xvncviewer $BIN/xtightvncviewer fi #DEBHELPER# exit 0