summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2007-06-26 17:33:04 +0000
committerRaúl Porcel <armin76@gentoo.org>2007-06-26 17:33:04 +0000
commit51390123b7c5e71d92ca1cb8b8ba9d605c7c0658 (patch)
treef8e3081da28e64914e2be7ec9059ec7c2bf4e452
parentMarked ppc stable for bug #182823. (diff)
downloadhistorical-51390123b7c5e71d92ca1cb8b8ba9d605c7c0658.tar.gz
historical-51390123b7c5e71d92ca1cb8b8ba9d605c7c0658.tar.bz2
historical-51390123b7c5e71d92ca1cb8b8ba9d605c7c0658.zip
drop old, yay
Package-Manager: portage-2.1.3_rc5
-rw-r--r--net-misc/tightvnc/ChangeLog11
-rw-r--r--net-misc/tightvnc/Manifest66
-rw-r--r--net-misc/tightvnc/files/digest-tightvnc-1.2.9-r43
-rw-r--r--net-misc/tightvnc/files/digest-tightvnc-1.3.8-r13
-rw-r--r--net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch169
-rw-r--r--net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch52
-rw-r--r--net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch20
-rw-r--r--net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch37
-rw-r--r--net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch22
-rw-r--r--net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch150
-rw-r--r--net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch30
-rw-r--r--net-misc/tightvnc/files/x86.patch48
-rw-r--r--net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild115
-rw-r--r--net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild112
14 files changed, 14 insertions, 824 deletions
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 6c954a4bd0c3..f59465c0246f 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-misc/tightvnc
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.111 2007/06/26 17:01:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.112 2007/06/26 17:33:04 armin76 Exp $
+
+ 26 Jun 2007; Raúl Porcel <armin76@gentoo.org>
+ -files/tightvnc-1.2.9-amd64.patch, -files/tightvnc-1.2.9-gcc34.patch,
+ -files/tightvnc-1.2.9-gentoo.security.patch,
+ -files/tightvnc-1.2.9-imake-tmpdir.patch,
+ -files/tightvnc-1.2.9-pathfixes.patch, -files/tightvnc-1.3.8-amd64.patch,
+ -files/tightvnc-ppcsparc-server.patch, -files/x86.patch,
+ -tightvnc-1.2.9-r4.ebuild, -tightvnc-1.3.8-r1.ebuild:
+ drop old, yay
26 Jun 2007; Joseph Jezak <josejx@gentoo.org> tightvnc-1.3.9.ebuild:
Marked ppc stable for bug #182789.
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index ecf04e4f1827..bc86a623f163 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 1.3.9-fbsd.patch 291 RMD160 da893f9cb5788b061438d9064f36de88a6005369 SHA1 df8b07bb6317e5dd535140077c4bb966412f98d6 SHA256 b048f63da9e37cbb7730d3e178f73c7e84ae5c10b22902533e5713096373c414
MD5 f7b6e41db9b8db17fa71678517494d29 files/1.3.9-fbsd.patch 291
RMD160 da893f9cb5788b061438d9064f36de88a6005369 files/1.3.9-fbsd.patch 291
@@ -17,30 +14,6 @@ AUX server-CVE-2007-1351-1352.patch 1556 RMD160 7e801c3afc71c81ce7225e3781087100
MD5 3fecce8a0d2526997335381c1cbbce54 files/server-CVE-2007-1351-1352.patch 1556
RMD160 7e801c3afc71c81ce7225e37810871004f718a8a files/server-CVE-2007-1351-1352.patch 1556
SHA256 9bf98f6dfcf375edb7602ceb25df1d2fad902ae2f8aa24e516ef4b27b5246a84 files/server-CVE-2007-1351-1352.patch 1556
-AUX tightvnc-1.2.9-amd64.patch 5874 RMD160 1f946ae361db97afcfaf9303197cbe5fe2bc137b SHA1 9c35000336f1fdbd7a5089a0683bf2f72be1d659 SHA256 d0e8e0dd1b56f1dac28bc10a20f2af194027c2b3db06eded30efa472b50c1ddf
-MD5 7f0dcab7d01dfc820fabe9a79872085c files/tightvnc-1.2.9-amd64.patch 5874
-RMD160 1f946ae361db97afcfaf9303197cbe5fe2bc137b files/tightvnc-1.2.9-amd64.patch 5874
-SHA256 d0e8e0dd1b56f1dac28bc10a20f2af194027c2b3db06eded30efa472b50c1ddf files/tightvnc-1.2.9-amd64.patch 5874
-AUX tightvnc-1.2.9-gcc34.patch 1540 RMD160 e5a305684eae3c6be90769c9263259903b2c841b SHA1 61f91c89686ba161f3c11685598b63779d31ed42 SHA256 fa766be66960bb1b399c36350afac98dcc81bba65f757b82ca86efe335e6d540
-MD5 70b94ceb3134edc412d70768b55661aa files/tightvnc-1.2.9-gcc34.patch 1540
-RMD160 e5a305684eae3c6be90769c9263259903b2c841b files/tightvnc-1.2.9-gcc34.patch 1540
-SHA256 fa766be66960bb1b399c36350afac98dcc81bba65f757b82ca86efe335e6d540 files/tightvnc-1.2.9-gcc34.patch 1540
-AUX tightvnc-1.2.9-gentoo.security.patch 771 RMD160 929662e5b89870fa138438c145cda5936ed6e1a3 SHA1 46f6ba1931b43d7ff521809a642b65f5edc7db11 SHA256 1848e80e27dc2feae8d404fda99d5d609ecb0bc9b1262c6da40f6a2f6ab166ac
-MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
-RMD160 929662e5b89870fa138438c145cda5936ed6e1a3 files/tightvnc-1.2.9-gentoo.security.patch 771
-SHA256 1848e80e27dc2feae8d404fda99d5d609ecb0bc9b1262c6da40f6a2f6ab166ac files/tightvnc-1.2.9-gentoo.security.patch 771
-AUX tightvnc-1.2.9-imake-tmpdir.patch 956 RMD160 efa2723e879f96a2176685252854905207516120 SHA1 5a79393b313205db152a825f245dc2d67d14098a SHA256 01c00a5ef8eed18633ed3b800ea23dc08602bdaa2c737e60ea13803243731aef
-MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
-RMD160 efa2723e879f96a2176685252854905207516120 files/tightvnc-1.2.9-imake-tmpdir.patch 956
-SHA256 01c00a5ef8eed18633ed3b800ea23dc08602bdaa2c737e60ea13803243731aef files/tightvnc-1.2.9-imake-tmpdir.patch 956
-AUX tightvnc-1.2.9-pathfixes.patch 826 RMD160 bd3f436c816d78892ffa8fe32acdbc8b89acb00b SHA1 d67d53afff4182cb9226975df92adf1bb6647ff5 SHA256 717af3ec4fe50b81e37b2efec539d64e5b703d1d63dadd93d819206708b30266
-MD5 89eadc2f34995c86c1618b12f95cc246 files/tightvnc-1.2.9-pathfixes.patch 826
-RMD160 bd3f436c816d78892ffa8fe32acdbc8b89acb00b files/tightvnc-1.2.9-pathfixes.patch 826
-SHA256 717af3ec4fe50b81e37b2efec539d64e5b703d1d63dadd93d819206708b30266 files/tightvnc-1.2.9-pathfixes.patch 826
-AUX tightvnc-1.3.8-amd64.patch 5278 RMD160 555b78e36df77b721699652cc085c037a6d47111 SHA1 125e4c6a7334935bb9e9cf46291b1f1abade98b1 SHA256 e29ad675941ef90a2ef13095e950a63fd67134c9b6ed1cf44a7aa83342c645a9
-MD5 dc6cc8160bc641c7f0907473e1400f6c files/tightvnc-1.3.8-amd64.patch 5278
-RMD160 555b78e36df77b721699652cc085c037a6d47111 files/tightvnc-1.3.8-amd64.patch 5278
-SHA256 e29ad675941ef90a2ef13095e950a63fd67134c9b6ed1cf44a7aa83342c645a9 files/tightvnc-1.3.8-amd64.patch 5278
AUX tightvnc-1.3.8-darwin.patch 827 RMD160 f1bb43e02807ad8424dabbc284a3a8b8437101f7 SHA1 14a5038444dab48e78d6e677cc1720b54cd918bb SHA256 88308226944e5f15ec217ef25d75d25ce2a97cc00e8eb49f7f5597c85e29859e
MD5 123eaef930daa068bd0b5366ca89f33c files/tightvnc-1.3.8-darwin.patch 827
RMD160 f1bb43e02807ad8424dabbc284a3a8b8437101f7 files/tightvnc-1.3.8-darwin.patch 827
@@ -57,10 +30,6 @@ AUX tightvnc-1.3.8-pathfixes.patch 871 RMD160 aef060a40ba1c79bc8478ddd494283fdb9
MD5 248193a5095c87c7b10c1683a7eabb2f files/tightvnc-1.3.8-pathfixes.patch 871
RMD160 aef060a40ba1c79bc8478ddd494283fdb97358ad files/tightvnc-1.3.8-pathfixes.patch 871
SHA256 10c2e9d604235443e953a8c13b986d0c212d2cdad6858a54db819a6aa87eabf5 files/tightvnc-1.3.8-pathfixes.patch 871
-AUX tightvnc-ppcsparc-server.patch 785 RMD160 7544ad7b3339ad3da2bc5da7a2f43bfe52c2d9b0 SHA1 229a81b0229d53645fde40faf62e28468da7efb0 SHA256 2b095cb4446b77fbf3d1dcb6e40d7cc9658dfd0ec46f4b217b4029dc6d776eeb
-MD5 edad6a34c89561a1a11e68781bc9fcfd files/tightvnc-ppcsparc-server.patch 785
-RMD160 7544ad7b3339ad3da2bc5da7a2f43bfe52c2d9b0 files/tightvnc-ppcsparc-server.patch 785
-SHA256 2b095cb4446b77fbf3d1dcb6e40d7cc9658dfd0ec46f4b217b4029dc6d776eeb files/tightvnc-ppcsparc-server.patch 785
AUX tightvnc.confd 341 RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d SHA1 4b7f5f708cb92f5fc82508141422003ab05c1452 SHA256 3463105ab7f4aec95b9a72bcfcb9808b3acdcad0c1e5b608f1408faa79f3d4a0
MD5 7319b537e42c0e12033ac679063161cc files/tightvnc.confd 341
RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d files/tightvnc.confd 341
@@ -73,46 +42,19 @@ AUX vncviewer.png 495 RMD160 0378b8e33783ea6599e304de8279e0e4a9478ae7 SHA1 c835d
MD5 13fdea0a38fc64d5c1f529dbadcfb8d8 files/vncviewer.png 495
RMD160 0378b8e33783ea6599e304de8279e0e4a9478ae7 files/vncviewer.png 495
SHA256 dfe4eaf3f68a4905b3ab90e7cae528449c7d13a4f712f97d8855058ed9cc3fc4 files/vncviewer.png 495
-AUX x86.patch 1918 RMD160 b4385c70cc235edd89f84baef88681d33c994465 SHA1 91e75e9de377528d8daa226a59a52db71b84fea3 SHA256 59c26911b19fe68e97bb02f981470004d195304d450dbd82e5dfc137c7d89c4c
-MD5 38dd625a226506510c13b9b25c9c14c2 files/x86.patch 1918
-RMD160 b4385c70cc235edd89f84baef88681d33c994465 files/x86.patch 1918
-SHA256 59c26911b19fe68e97bb02f981470004d195304d450dbd82e5dfc137c7d89c4c files/x86.patch 1918
-DIST tightvnc-1.2.9_unixsrc.tar.bz2 1738256 RMD160 57c4d24bbc008b7188ae4bb177fbb409bc1d26d3 SHA1 62b55237676bbdc7f08771e6ff72c0f70264f4ee SHA256 c1ba77f832d6c81349f05219802c48b3435cfb6db88f496c9bb08b52b8405548
-DIST tightvnc-1.3.8_unixsrc.tar.bz2 1766473 RMD160 98013a7074c488d1cfc85ea2d7a9665a05ee2431 SHA1 1c733cb8525c6259a9cb6b35ca5a82ba02eb725c SHA256 cd76e1c5c6843fec2a7a5c493158cdb3642eb1ef4caecee7a89bfd2078881178
DIST tightvnc-1.3.9_unixsrc.tar.bz2 1792459 RMD160 79d858466b7fab740b4d66d6b0963533f48a5163 SHA1 a9529a262a060517402fb9845ef63a0d18c3141f SHA256 99aaca636535f9127f3a435ee71aef6821f821e6319bc6e9b2c775fefd34325a
-EBUILD tightvnc-1.2.9-r4.ebuild 3066 RMD160 cf45871fe4e2ceb71d9e04de4c5463e3c7dc1cf2 SHA1 c10e873ac6e76a0a2a81eaa623166ee331d551eb SHA256 f84e2b18f6dc315ef0f5645332a5ce5046818e36fbb9be9a97ef23a63565c7f1
-MD5 6856fe57a2c3cf4403bbcf2f12b98739 tightvnc-1.2.9-r4.ebuild 3066
-RMD160 cf45871fe4e2ceb71d9e04de4c5463e3c7dc1cf2 tightvnc-1.2.9-r4.ebuild 3066
-SHA256 f84e2b18f6dc315ef0f5645332a5ce5046818e36fbb9be9a97ef23a63565c7f1 tightvnc-1.2.9-r4.ebuild 3066
-EBUILD tightvnc-1.3.8-r1.ebuild 2941 RMD160 77344ee16b94ceb8b54555ee1c5fe0e7b7505a09 SHA1 d0a0be4ccc172af7f035f962c33f286d137a8996 SHA256 3b6e4faf13db417713ecb8b7094b4c8f10b4fd2eadc334b99912c50399b6d174
-MD5 5743f518789d94bcbba1a2d09c7b71d6 tightvnc-1.3.8-r1.ebuild 2941
-RMD160 77344ee16b94ceb8b54555ee1c5fe0e7b7505a09 tightvnc-1.3.8-r1.ebuild 2941
-SHA256 3b6e4faf13db417713ecb8b7094b4c8f10b4fd2eadc334b99912c50399b6d174 tightvnc-1.3.8-r1.ebuild 2941
EBUILD tightvnc-1.3.9.ebuild 2930 RMD160 df3db0bc6eb31093bc685367933fef19f2b92ddd SHA1 faa233040bb07406452d10ca2dedcbb940ccd305 SHA256 766c0564e60295868dae77554adfcfb597cb1b471b1b884d86dc10322db279e8
MD5 81453d4556e45a29152b1666d202d22c tightvnc-1.3.9.ebuild 2930
RMD160 df3db0bc6eb31093bc685367933fef19f2b92ddd tightvnc-1.3.9.ebuild 2930
SHA256 766c0564e60295868dae77554adfcfb597cb1b471b1b884d86dc10322db279e8 tightvnc-1.3.9.ebuild 2930
-MISC ChangeLog 16457 RMD160 d297c1a2c05a5be922bd62e305982a7ec335b75e SHA1 26090dbb39d867c09b9e9829993e3d518e137a6a SHA256 02e1a82a1427de40cf433e4d8cebc3c715e9f6a9c9509b49dd8c5b671356f69e
-MD5 d8cff91365e8ff4a6e0312b6be38379c ChangeLog 16457
-RMD160 d297c1a2c05a5be922bd62e305982a7ec335b75e ChangeLog 16457
-SHA256 02e1a82a1427de40cf433e4d8cebc3c715e9f6a9c9509b49dd8c5b671356f69e ChangeLog 16457
+MISC ChangeLog 16878 RMD160 2cbd6979d47713f32ab18af3ac6e9cfadaeafa7a SHA1 ef5f9e7116776a36299505a4d78a9ac6510a359c SHA256 e643602d4f51e37decece74c362ed4a6682185007ffb8922bf021a0d446541b4
+MD5 5dafe31d58b095c132d0f34e924ac0ab ChangeLog 16878
+RMD160 2cbd6979d47713f32ab18af3ac6e9cfadaeafa7a ChangeLog 16878
+SHA256 e643602d4f51e37decece74c362ed4a6682185007ffb8922bf021a0d446541b4 ChangeLog 16878
MISC metadata.xml 223 RMD160 f88bcdebf752bcc3933b4159df5d8f9f7d487ca1 SHA1 4a17e70b26b3bba2ec6eddb403ff890bb8bcf13f SHA256 98c023870e5fbbcc4f050a192947b7b6bbd239041c9f921b3fbf64b03523019f
MD5 038a74c1f0dc742c6df70730348c240a metadata.xml 223
RMD160 f88bcdebf752bcc3933b4159df5d8f9f7d487ca1 metadata.xml 223
SHA256 98c023870e5fbbcc4f050a192947b7b6bbd239041c9f921b3fbf64b03523019f metadata.xml 223
-MD5 31a483eed14190f8cd911b0d05521431 files/digest-tightvnc-1.2.9-r4 274
-RMD160 c998a7ff40fb44c186f7089d877a68b8e33a4a06 files/digest-tightvnc-1.2.9-r4 274
-SHA256 c7b13ad35c4b2e2bde6a2fcb01b6ad276384a265613a35ee739c2a3f0c2e3ea3 files/digest-tightvnc-1.2.9-r4 274
-MD5 bfe15238bfcba463b0abf4e830dbc177 files/digest-tightvnc-1.3.8-r1 274
-RMD160 da00418fe1031595ec6a5943151b71ac60c5e8cf files/digest-tightvnc-1.3.8-r1 274
-SHA256 b5684a8c3ea14d9490e9fe673bb74100da2bd98b86c58dc2332857f4f2885193 files/digest-tightvnc-1.3.8-r1 274
MD5 5c68812c929186970f79fe92adcde9e8 files/digest-tightvnc-1.3.9 274
RMD160 266b50365e4b47f9373e5ec80d670856b63f6312 files/digest-tightvnc-1.3.9 274
SHA256 ca6f81269355d5314b09e2131e0a84fb8d2e8eab16a71eddb23778112e371895 files/digest-tightvnc-1.3.9 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGgUaDcsIHjyDViGQRAoclAJ4obXoV28QtZtGF5KE2cdvS16vxIwCguwCo
-uJUlsEbZdjDWsnNxlTw3scY=
-=kEe/
------END PGP SIGNATURE-----
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r4 b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r4
deleted file mode 100644
index d72709d4f9b6..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f804b26c098625e3a2675a0aa7709e31 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
-RMD160 57c4d24bbc008b7188ae4bb177fbb409bc1d26d3 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
-SHA256 c1ba77f832d6c81349f05219802c48b3435cfb6db88f496c9bb08b52b8405548 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3.8-r1 b/net-misc/tightvnc/files/digest-tightvnc-1.3.8-r1
deleted file mode 100644
index bc139c537f55..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.3.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9b9b0465834289d1b7899982c0096440 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
-RMD160 98013a7074c488d1cfc85ea2d7a9665a05ee2431 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
-SHA256 cd76e1c5c6843fec2a7a5c493158cdb3642eb1ef4caecee7a89bfd2078881178 tightvnc-1.3.8_unixsrc.tar.bz2 1766473
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch
deleted file mode 100644
index c1473bfe1416..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff -rc vnc_unixsrc.org/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
-*** vnc_unixsrc.org/Xvnc/config/cf/linux.cf Tue Jan 31 11:22:43 2006
---- vnc_unixsrc/Xvnc/config/cf/linux.cf Tue Jan 31 22:37:34 2006
-***************
-*** 295,301 ****
- #define OptimizedCDebugFlags -O2
- #define LinuxMachineDefines -D__x86_64__
- #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-! #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* x86_64PCArchitecture */
-
- #ifdef ArmArchitecture
---- 295,301 ----
- #define OptimizedCDebugFlags -O2
- #define LinuxMachineDefines -D__x86_64__
- #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-! #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
- #endif /* x86_64PCArchitecture */
-
- #ifdef ArmArchitecture
-diff -rc vnc_unixsrc.org/Xvnc/include/Xmd.h vnc_unixsrc/Xvnc/include/Xmd.h
-*** vnc_unixsrc.org/Xvnc/include/Xmd.h Sun Jun 11 07:00:52 2000
---- vnc_unixsrc/Xvnc/include/Xmd.h Tue Jan 31 15:15:02 2006
-***************
-*** 59,65 ****
- #ifdef CRAY
- #define WORD64 /* 64-bit architecture */
- #endif
-! #if defined(__alpha) || defined(__alpha__)
- #define LONG64 /* 32/64-bit architecture */
- #endif
- #ifdef __sgi
---- 59,65 ----
- #ifdef CRAY
- #define WORD64 /* 64-bit architecture */
- #endif
-! #if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
- #define LONG64 /* 32/64-bit architecture */
- #endif
- #ifdef __sgi
-diff -rc vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c
-*** vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c Sun Jun 11 07:00:52 2000
---- vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c Tue Jan 31 15:15:02 2006
-***************
-*** 79,85 ****
- byte,
- glyph,
- scan;
-! int sizes[GLYPHPADOPTIONS];
- {
- int widthBits,
- widthBytes,
---- 79,85 ----
- byte,
- glyph,
- scan;
-! CARD32 sizes[GLYPHPADOPTIONS];
- {
- int widthBits,
- widthBytes,
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c Sun Jun 11 07:00:51 2000
---- vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c Tue Jan 31 15:15:02 2006
-***************
-*** 404,409 ****
---- 404,410 ----
- */
- void
- NoopDDA(
-+ #undef NeedVarargsPrototypes
- #if NeedVarargsPrototypes
- void* f, ...
- #endif
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c Tue Apr 8 17:18:33 2003
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c Tue Jan 31 15:15:02 2006
-***************
-*** 39,44 ****
---- 39,45 ----
- #endif
- #if USE_LIBWRAP
- #include <tcpd.h>
-+ #include <arpa/inet.h>
- #endif
-
- #include "rfb.h"
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c Fri Feb 27 06:22:47 2004
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c Tue Jan 31 15:15:02 2006
-***************
-*** 80,85 ****
---- 80,86 ----
- #include <sys/param.h>
- #include "dix.h"
- #include "rfb.h"
-+ #include <time.h>
-
- #ifdef CORBA
- #include <vncserverctrl.h>
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h Fri Feb 27 06:22:47 2004
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h Tue Jan 31 15:15:02 2006
-***************
-*** 30,35 ****
---- 30,36 ----
- #include <rfbproto.h>
- #include <vncauth.h>
- #include <zlib.h>
-+ #include <stdarg.h>
-
- /* It's a good idea to keep these values a bit greater than required. */
- #define MAX_ENCODINGS 10
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c Sun Oct 27 06:36:02 2002
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c Tue Jan 31 15:15:02 2006
-***************
-*** 42,47 ****
---- 42,48 ----
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+ #include <arpa/inet.h>
- #include <netinet/tcp.h>
- #include <netdb.h>
- #include <fcntl.h>
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h Sun Jun 11 07:00:52 2000
---- vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h Tue Jan 31 15:15:02 2006
-***************
-*** 479,484 ****
---- 479,485 ----
- );
-
- extern void NoopDDA(
-+ #undef NeedVarargsPrototypes
- #if NeedVarargsPrototypes
- void *,
- ...
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h Wed Feb 19 10:39:54 2003
---- vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h Tue Jan 31 17:05:16 2006
-***************
-*** 374,379 ****
---- 374,398 ----
- #define NO_ONE_RECT
- #endif
-
-+ /* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha.
-+ */
-+ #ifdef __x86_64__
-+ # define BITMAP_SCANLINE_UNIT 64
-+ # define BITMAP_SCANLINE_PAD 64
-+ # define LOG2_BITMAP_PAD 6
-+ # define LOG2_BYTES_PER_SCANLINE_PAD 3
-+
-+ /* Add for handling protocol XPutImage and XGetImage; see comment in
-+ * Alpha section.
-+ */
-+ #define INTERNAL_VS_EXTERNAL_PADDING
-+ #define BITMAP_SCANLINE_UNIT_PROTO 32
-+
-+ #define BITMAP_SCANLINE_PAD_PROTO 32
-+ #define LOG2_BITMAP_PAD_PROTO 5
-+ #define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2
-+ #endif
-+
- #endif /* SVR4 / BSD / i386 */
-
- #if defined (linux) && defined (__mc68000__)
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch
deleted file mode 100644
index 50e577a71753..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- vnc_unixsrc/Xvnc/lib/Xau/AuRead.c.old 2004-09-17 20:34:15.226303649 -0700
-+++ vnc_unixsrc/Xvnc/lib/Xau/AuRead.c 2004-09-17 20:34:31.743582524 -0700
-@@ -49,7 +49,7 @@
- FILE *file;
- {
- unsigned short len;
-- char *data, *malloc ();
-+ char *data;
-
- if (read_short (&len, file) == 0)
- return 0;
-@@ -76,7 +76,6 @@
- {
- Xauth local;
- Xauth *ret;
-- char *malloc ();
-
- if (read_short (&local.family, auth_file) == 0)
- return 0;
---- vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c.old 2004-09-17 20:37:50.192903801 -0700
-+++ vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c 2004-09-17 20:37:58.067083299 -0700
-@@ -61,8 +61,6 @@
- FILE *auth_file;
- Xauth *auth;
- {
-- char *malloc ();
--
- if (write_short (auth->family, auth_file) == 0)
- return 0;
- if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
---- vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c.old 2004-09-17 20:35:33.598137184 -0700
-+++ vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c 2004-09-17 20:35:40.435424729 -0700
-@@ -31,8 +31,6 @@
-
- /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
-
--extern char *malloc (), *realloc ();
--
- unsigned long *
- Xalloc (amount)
- unsigned amount;
---- vnc_unixsrc/Xvnc/include/Xpoll.h.old 2004-09-19 18:10:11.646953351 -0700
-+++ vnc_unixsrc/Xvnc/include/Xpoll.h 2004-09-19 18:31:06.019245838 -0700
-@@ -65,6 +65,8 @@
- #define NBBY 8 /* number of bits in a byte */
- #endif
-
-+#define fds_bits __fds_bits
-+
- #ifndef NFDBITS
- #define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */
- #endif
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch
deleted file mode 100644
index ab65aec892f9..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /tmp/vncserver 2003-02-21 17:29:45.000000000 +0000
-+++ vncserver 2003-02-21 17:30:10.000000000 +0000
-@@ -153,15 +153,8 @@
- $desktopLog = "$vncUserDir/$host:$displayNumber.log";
- unlink($desktopLog);
-
--# Make an X server cookie - use as the seed the sum of the current time, our
--# PID and part of the encrypted form of the password. Ideally we'd use
--# /dev/urandom, but that's only available on Linux.
--
--srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
--$cookie = "";
--for (1..16) {
-- $cookie .= sprintf("%02x", int(rand(256)));
--}
-+# Make an X server cookie - use mcookie
-+$cookie = `/usr/bin/mcookie`;
-
- system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
- system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie");
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch
deleted file mode 100644
index 9d5ccc58ad76..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- vnc_unixsrc/Xvnc/config/imake/imake.c.orig 2000-06-11 14:00:51.000000000 +0200
-+++ vnc_unixsrc/Xvnc/config/imake/imake.c 2003-09-01 22:59:25.000000000 +0200
-@@ -913,12 +913,25 @@
- static void get_libc_version(inFile)
- FILE* inFile;
- {
-- char *aout = tmpnam (NULL);
-+ char aout[PATH_MAX];
- FILE *fp;
- const char *format = "%s -o %s -x c -";
- char *cc;
- int len;
- char *command;
-+ char *tmpdir;
-+ int tmpfd;
-+
-+ if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (PATH_MAX-13))
-+ strcpy(aout, tmpdir);
-+ else
-+ strcpy(aout, "/tmp");
-+ strcat(aout, "/imakeXXXXXX");
-+
-+ if((tmpfd = mkstemp(aout)) == -1) {
-+ perror("mkstemp");
-+ abort();
-+ }
-
- cc = getenv ("CC");
- if (cc == NULL)
-@@ -930,6 +943,7 @@
- if (snprintf (command , len, format, cc, aout) == len)
- abort ();
-
-+ close(tmpfd);
- fp = popen (command, "w");
- if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0
- || pclose (fp) != 0)
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch
deleted file mode 100644
index b9818aeeaf2f..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- vncserver.ok 2007-02-03 19:41:44.000000000 +0100
-+++ vncserver 2007-02-03 19:43:48.000000000 +0100
-@@ -36,15 +36,15 @@
- $geometry = "1024x768";
- $depth = 24;
- $desktopName = "X";
--$vncClasses = "/usr/local/vnc/classes";
-+$vncClasses = "/usr/share/tightvnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+$fontPath = "unix/:-1";
-
- # Here is another example of setting the font path:
--# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/Type1/";
-
- # X colors database path is optional, uncomment and edit to use:
--# $colorPath = "/usr/lib/X11/rgb";
-+$colorPath = "/usr/share/X11/rgb";
-
- # 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
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch
deleted file mode 100644
index 9b7153465e7f..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- vnc_unixsrc.org/Xvnc/config/cf/Imake.cf 2003-02-06 19:11:28.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/Imake.cf 2006-09-14 21:37:48.000000000 +0200
-@@ -801,6 +801,10 @@
- # ifdef PpcArchitecture
- # define PowerPCArchitecture
- # endif
-+# ifdef __x86_64__
-+# define x86_64Architecture
-+# undef __x86_64__
-+# endif
- #endif /* linux */
-
- #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
---- vnc_unixsrc.org/Xvnc/config/cf/linux.cf 2002-03-20 11:49:23.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2006-09-14 21:37:48.000000000 +0200
-@@ -43,7 +43,7 @@
- #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
- defined(SparcArchitecture) || defined(ArmArchitecure) || \
- defined(i386Architecture) || defined(s390Architecture) || \
-- defined(s390xArchitecture)
-+ defined(s390xArchitecture) || defined(x86_64Architecture)
- #define DefaultLinuxCLibMajorVersion 6
- #else
- #define DefaultLinuxCLibMajorVersion 5
-@@ -290,6 +290,14 @@
- #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* PowerPCArchitecture */
-
-+#ifdef x86_64Architecture
-+#define DefaultCCOptions -fsigned-char
-+#define OptimizedCDebugFlags -O2
-+#define LinuxMachineDefines -D__x86_64__
-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-+#endif /* x86_64PCArchitecture */
-+
- #ifdef ArmArchitecture
- #define DefaultCCOptions -fsigned-char
- #define OptimizedCDebugFlags -O2
---- vnc_unixsrc.org/Xvnc/include/Xmd.h 2000-06-11 14:00:52.000000000 +0200
-+++ vnc_unixsrc/Xvnc/include/Xmd.h 2006-09-14 21:29:47.000000000 +0200
-@@ -59,7 +59,7 @@
- #ifdef CRAY
- #define WORD64 /* 64-bit architecture */
- #endif
--#if defined(__alpha) || defined(__alpha__)
-+#if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
- #define LONG64 /* 32/64-bit architecture */
- #endif
- #ifdef __sgi
---- vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c 2000-06-11 14:00:52.000000000 +0200
-+++ vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c 2006-09-14 21:29:47.000000000 +0200
-@@ -79,7 +79,7 @@
- byte,
- glyph,
- scan;
-- int sizes[GLYPHPADOPTIONS];
-+ CARD32 sizes[GLYPHPADOPTIONS];
- {
- int widthBits,
- widthBytes,
---- vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c 2000-06-11 14:00:51.000000000 +0200
-+++ vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c 2006-09-14 21:29:47.000000000 +0200
-@@ -404,6 +404,7 @@
- */
- void
- NoopDDA(
-+#undef NeedVarargsPrototypes
- #if NeedVarargsPrototypes
- void* f, ...
- #endif
---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c 2003-04-09 00:18:33.000000000 +0200
-+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c 2006-09-14 21:29:47.000000000 +0200
-@@ -39,6 +39,7 @@
- #endif
- #if USE_LIBWRAP
- #include <tcpd.h>
-+#include <arpa/inet.h>
- #endif
-
- #include "rfb.h"
---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c 2006-08-15 09:05:07.000000000 +0200
-+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c 2006-09-14 21:29:47.000000000 +0200
-@@ -80,6 +80,7 @@
- #include <sys/param.h>
- #include "dix.h"
- #include "rfb.h"
-+#include <time.h>
-
- #ifdef CORBA
- #include <vncserverctrl.h>
---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h 2004-02-27 13:22:47.000000000 +0100
-+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h 2006-09-14 21:29:47.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <rfbproto.h>
- #include <vncauth.h>
- #include <zlib.h>
-+#include <stdarg.h>
-
- /* It's a good idea to keep these values a bit greater than required. */
- #define MAX_ENCODINGS 10
---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c 2002-10-27 13:36:02.000000000 +0100
-+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c 2006-09-14 21:29:47.000000000 +0200
-@@ -42,6 +42,7 @@
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <netinet/tcp.h>
- #include <netdb.h>
- #include <fcntl.h>
---- vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h 2000-06-11 14:00:52.000000000 +0200
-+++ vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h 2006-09-14 21:29:47.000000000 +0200
-@@ -479,6 +479,7 @@
- );
-
- extern void NoopDDA(
-+#undef NeedVarargsPrototypes
- #if NeedVarargsPrototypes
- void *,
- ...
---- vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h 2003-02-19 17:39:54.000000000 +0100
-+++ vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h 2006-09-14 21:29:47.000000000 +0200
-@@ -374,6 +374,25 @@
- #define NO_ONE_RECT
- #endif
-
-+/* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha.
-+ */
-+#ifdef __x86_64__
-+# define BITMAP_SCANLINE_UNIT 64
-+# define BITMAP_SCANLINE_PAD 64
-+# define LOG2_BITMAP_PAD 6
-+# define LOG2_BYTES_PER_SCANLINE_PAD 3
-+
-+/* Add for handling protocol XPutImage and XGetImage; see comment in
-+ * Alpha section.
-+ */
-+#define INTERNAL_VS_EXTERNAL_PADDING
-+#define BITMAP_SCANLINE_UNIT_PROTO 32
-+
-+#define BITMAP_SCANLINE_PAD_PROTO 32
-+#define LOG2_BITMAP_PAD_PROTO 5
-+#define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2
-+#endif
-+
- #endif /* SVR4 / BSD / i386 */
-
- #if defined (linux) && defined (__mc68000__)
-
diff --git a/net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch b/net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch
deleted file mode 100644
index b2124b07e0ff..000000000000
--- a/net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- vnc-3.3.3r2.orig/Xvnc/programs/Xserver/include/servermd.h Mon Jul 28 10:17:34 1997
-+++ vnc-3.3.3r2/Xvnc/programs/Xserver/include/servermd.h Tue Dec 12 13:40:57 2000
-@@ -380,6 +380,27 @@
- #define GETLEFTBITS_ALIGNMENT 1
-
- #endif /* linux/m68k */
-+
-+#if defined (linux) && defined (PPC)
-+
-+#define IMAGE_BYTE_ORDER MSBFirst
-+#define BITMAP_BIT_ORDER MSBFirst
-+#define GLYPHPADBYTES 4
-+#define GETLEFTBITS_ALIGNMENT 1
-+
-+#define LARGE_INSTRUCTION_CACHE
-+#define FAST_CONSTANT_OFFSET_MODE
-+
-+#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
-+
-+#endif /* linux/__sparc__ */
-
- #ifdef sgi
-
diff --git a/net-misc/tightvnc/files/x86.patch b/net-misc/tightvnc/files/x86.patch
deleted file mode 100644
index 64ed196a30ef..000000000000
--- a/net-misc/tightvnc/files/x86.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- vnc_unixsrc/Xvnc/config/cf/Imake.cf.x86_64 2003-03-04 15:33:20.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/Imake.cf 2003-03-04 15:35:06.000000000 +0100
-@@ -579,6 +579,10 @@
- # define PowerPCArchitecture
- # undef __powerpc__
- # endif
-+# ifdef __x86_64__
-+# define x86_64Architecture
-+# undef __x86_64__
-+# endif
- #endif /* linux */
-
- #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
---- vnc_unixsrc/Xvnc/config/cf/linux.cf 2002-03-20 11:49:23.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2006-11-01 00:46:39.000000000 +0100
-@@ -43,7 +43,8 @@
- #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
- defined(SparcArchitecture) || defined(ArmArchitecure) || \
- defined(i386Architecture) || defined(s390Architecture) || \
-- defined(s390xArchitecture)
-+ defined(s390xArchitecture) || defined(x86_64Architecture) || \
-+ defined(HPArchitecture)
- #define DefaultLinuxCLibMajorVersion 6
- #else
- #define DefaultLinuxCLibMajorVersion 5
-@@ -290,6 +291,22 @@
- #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* PowerPCArchitecture */
-
-+#ifdef x86_64Architecture
-+#define DefaultCCOptions -fsigned-char
-+#define OptimizedCDebugFlags -O2
-+#define LinuxMachineDefines -D__x86_64__
-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+#endif /* x86_64PCArchitecture */
-+
-+#ifdef HPArchitecture
-+#define DefaultCCOptions
-+#define OptimizedCDebugFlags -O2
-+#define LinuxMachineDefines -D__hppa__
-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+#endif /* HPArchitecture */
-+
- #ifdef ArmArchitecture
- #define DefaultCCOptions -fsigned-char
- #define OptimizedCDebugFlags -O2
diff --git a/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild
deleted file mode 100644
index c46a1c825f30..000000000000
--- a/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r4.ebuild,v 1.8 2007/04/16 23:17:00 kloeri Exp $
-
-inherit eutils toolchain-funcs
-
-IUSE="java tcpd server"
-
-S="${WORKDIR}/vnc_unixsrc"
-DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
-SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
-HOMEPAGE="http://www.tightvnc.com/"
-
-KEYWORDS="alpha amd64 ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt
- x11-proto/xextproto
- x11-proto/xproto
- server? (
- x11-proto/inputproto
- x11-proto/kbproto
- x11-proto/printproto
- )
- >=x11-misc/imake-1
- x11-misc/gccmakedep
- ~media-libs/jpeg-6b
- tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
- !net-misc/vnc"
-
-RDEPEND="${DEPEND}
- server? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- x11-apps/rgb
- x11-apps/xauth
- x11-apps/xsetroot
- )
- java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
-
-src_unpack() {
-
- if ! use server;
- then
- echo
- einfo "The 'server' USE flag will build tightvnc's server."
- einfo "If '-server' is chosen only the client is built to save space."
- einfo "Stop the build now if you need to add 'server' to USE flags.\n"
- ebeep
- epause 5
- fi
-
- unpack ${A} && cd ${S}
- epatch "${FILESDIR}/${P}-gentoo.security.patch"
- epatch "${FILESDIR}/${P}-imake-tmpdir.patch"
- [[ "$(gcc-version)" == "3.4" ]] || [[ "$(gcc-major-version)" == "4" ]] && epatch ${FILESDIR}/${P}-gcc34.patch
- epatch "${FILESDIR}/x86.patch"
- epatch "${FILESDIR}/${P}-amd64.patch"
- epatch "${FILESDIR}/${PN}-ppcsparc-server.patch"
- epatch "${FILESDIR}/${P}-pathfixes.patch" # fixes bug 78385 and 146099
- epatch "${FILESDIR}"/server-CVE-2007-1003.patch
- epatch "${FILESDIR}"/server-CVE-2007-1351-1352.patch
-}
-
-src_compile() {
- xmkmf -a || die "xmkmf failed"
-
- make CDEBUGFLAGS="${CFLAGS}" World || die
-
- if use server; then
- cd Xvnc && ./configure || die "Configure failed."
- if use tcpd; then
- local myextra="-lwrap"
- use userland_Darwin || myextra="${myextra} -lnss_nis"
- make EXTRA_LIBRARIES="${myextra}" \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
- else
- make CDEBUGFLAGS="${CFLAGS}" || die
- fi
- fi
-
-}
-
-src_install() {
- # the web based interface and the java viewer need the java class files
- if use java; then
- insinto /usr/share/tightvnc/classes
- doins classes/*
- fi
-
- dodir /usr/share/man/man1 /usr/bin
- ./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
-
- if use server; then
- newconfd "${FILESDIR}"/tightvnc.confd vnc
- newinitd "${FILESDIR}"/tightvnc.initd vnc
- else
- rm -f ${D}/usr/bin/vncserver
- rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}*
- fi
-
- doicon ${FILESDIR}/vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer.png Network
-
-
- dodoc ChangeLog README WhatsNew
- use java && dodoc ${FILESDIR}/README.JavaViewer
- newdoc vncviewer/README README.vncviewer
-}
diff --git a/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild b/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild
deleted file mode 100644
index f19e4bfd59b6..000000000000
--- a/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.8-r1.ebuild,v 1.5 2007/06/24 13:01:35 grobian Exp $
-
-inherit eutils toolchain-funcs
-
-IUSE="java tcpd server"
-
-S="${WORKDIR}/vnc_unixsrc"
-DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
-SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
-HOMEPAGE="http://www.tightvnc.com/"
-
-KEYWORDS="~alpha ~amd64 hppa ~mips ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt
- x11-proto/xextproto
- x11-proto/xproto
- server? (
- x11-proto/inputproto
- x11-proto/kbproto
- x11-proto/printproto
- )
- >=x11-misc/imake-1
- x11-misc/gccmakedep
- ~media-libs/jpeg-6b
- tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
- !net-misc/vnc"
-
-RDEPEND="${DEPEND}
- server? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc
- x11-apps/rgb
- x11-apps/xauth
- x11-apps/xsetroot
- )
- java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
-
-src_unpack() {
-
- if ! use server;
- then
- echo
- einfo "The 'server' USE flag will build tightvnc's server."
- einfo "If '-server' is chosen only the client is built to save space."
- einfo "Stop the build now if you need to add 'server' to USE flags.\n"
- ebeep
- epause 5
- fi
-
- unpack ${A} && cd ${S}
- epatch "${FILESDIR}/${P}-pathfixes.patch" # fixes bug 78385 and 146099
- epatch "${FILESDIR}/${P}-imake-tmpdir.patch" # fixes bug 23483
- epatch "${FILESDIR}/${P}-darwin.patch" # fixes bug 89908
- use amd64 && epatch "${FILESDIR}/${P}-amd64.patch" # fixes bug 82583
- use mips && epatch "${FILESDIR}/${P}-mips.patch"
- epatch "${FILESDIR}"/server-CVE-2007-1003.patch
- epatch "${FILESDIR}"/server-CVE-2007-1351-1352.patch
-
-}
-
-src_compile() {
- xmkmf -a || die "xmkmf failed"
-
- make CDEBUGFLAGS="${CFLAGS}" World || die
-
- if use server; then
- cd Xvnc && ./configure || die "Configure failed."
- if use tcpd; then
- local myextra="-lwrap"
- make EXTRA_LIBRARIES="${myextra}" \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
- else
- make CDEBUGFLAGS="${CFLAGS}" || die
- fi
- fi
-
-}
-
-src_install() {
- # the web based interface and the java viewer need the java class files
- if use java; then
- insinto /usr/share/tightvnc/classes
- doins classes/*
- fi
-
- dodir /usr/share/man/man1 /usr/bin
- ./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
-
- if use server; then
- newconfd "${FILESDIR}"/tightvnc.confd vnc
- newinitd "${FILESDIR}"/tightvnc.initd vnc
- else
- rm -f ${D}/usr/bin/vncserver
- rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}*
- fi
-
- doicon ${FILESDIR}/vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer.png Network
-
- dodoc ChangeLog README WhatsNew
- use java && dodoc ${FILESDIR}/README.JavaViewer
- newdoc vncviewer/README README.vncviewer
-}