pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc - Update net/vncviewer4 to 4.1.2 (release notes just s...
details: https://anonhg.NetBSD.org/pkgsrc/rev/100e3f56f8f9
branches: trunk
changeset: 516535:100e3f56f8f9
user: abs <abs%pkgsrc.org@localhost>
date: Sat Jul 22 19:21:11 2006 +0000
description:
- Update net/vncviewer4 to 4.1.2 (release notes just state "FIXED: Security
vulnerability.", and move to net/vncviewer, replacing vncviewer-3.x
- Remove vncpasswd from net/vnc and add to net/vncviewer
- Bump PKGREVISION for net/vnc
diffstat:
doc/CHANGES-2006 | 5 +++-
net/Makefile | 3 +-
net/vnc/Makefile | 5 +--
net/vnc/PLIST | 3 +-
net/vncviewer/Makefile | 41 ++++++++++++++++++--------------
net/vncviewer/PLIST | 7 +++--
net/vncviewer/distinfo | 14 ++++-------
net/vncviewer/patches/patch-aa | 29 +++++++----------------
net/vncviewer/patches/patch-ab | 50 -----------------------------------------
net/vncviewer4/DESCR | 7 -----
net/vncviewer4/Makefile | 33 ---------------------------
net/vncviewer4/PLIST | 3 --
net/vncviewer4/distinfo | 6 ----
net/vncviewer4/patches/patch-aa | 12 ---------
14 files changed, 49 insertions(+), 169 deletions(-)
diffs (truncated from 327 to 300 lines):
diff -r b2c4199e31f6 -r 100e3f56f8f9 doc/CHANGES-2006
--- a/doc/CHANGES-2006 Sat Jul 22 19:03:47 2006 +0000
+++ b/doc/CHANGES-2006 Sat Jul 22 19:21:11 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2006,v 1.793 2006/07/22 19:03:14 jmmv Exp $
+$NetBSD: CHANGES-2006,v 1.794 2006/07/22 19:24:10 abs Exp $
Changes to the packages collection and infrastructure in 2006:
@@ -3488,3 +3488,6 @@
Updated mail/wl to 2.14.0nb2 [rpaulo 2006-07-22]
Updated devel/monotone to 0.28 [jmmv 2006-07-22]
Updated devel/monotone-server to 0.28 [jmmv 2006-07-22]
+ Removed net/vncviewer [abs 2006-07-22]
+ Renamed net/vncviewer4 to net/vncviewer [abs 2006-07-22]
+ Updated net/vncviewer to 4.1.2 [abs 2006-07-22]
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/Makefile
--- a/net/Makefile Sat Jul 22 19:03:47 2006 +0000
+++ b/net/Makefile Sat Jul 22 19:21:11 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.629 2006/07/22 08:12:56 tron Exp $
+# $NetBSD: Makefile,v 1.630 2006/07/22 19:21:11 abs Exp $
#
COMMENT= Networking tools
@@ -457,7 +457,6 @@
SUBDIR+= vino
SUBDIR+= vnc
SUBDIR+= vncviewer
-SUBDIR+= vncviewer4
SUBDIR+= vpnc
SUBDIR+= vsftpd
SUBDIR+= vtun
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vnc/Makefile
--- a/net/vnc/Makefile Sat Jul 22 19:03:47 2006 +0000
+++ b/net/vnc/Makefile Sat Jul 22 19:21:11 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/07/22 19:21:11 abs Exp $
DISTNAME= vnc-3.3.3r2
PKGNAME= vnc-3.3.3.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net x11
MASTER_SITES= ftp://ftp.uk.research.att.com/pub/vnc/dist/
DISTFILES= vnc-3.3.3r2_unixsrc.tgz \
@@ -41,7 +41,6 @@
${CHMOD} 2555 ${PREFIX}/bin/Xvnc
.endif
${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
- ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
-e 's|/usr/bin/perl|${PERL5}|g' \
< ${WRKSRC}/vncserver \
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vnc/PLIST
--- a/net/vnc/PLIST Sat Jul 22 19:03:47 2006 +0000
+++ b/net/vnc/PLIST Sat Jul 22 19:21:11 2006 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/22 19:21:11 abs Exp $
bin/Xvnc
bin/vncconnect
-bin/vncpasswd
bin/vncserver
share/doc/vnc/Xvnc.gif
share/doc/vnc/ach.jpg
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer/Makefile
--- a/net/vncviewer/Makefile Sat Jul 22 19:03:47 2006 +0000
+++ b/net/vncviewer/Makefile Sat Jul 22 19:21:11 2006 +0000
@@ -1,31 +1,36 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/22 19:21:11 abs Exp $
-DISTNAME= vnc-3.3.3r2_unixsrc
-PKGNAME= vncviewer-3.3.3.2
-PKGREVISION= 3
+DISTNAME= vnc-4_1_2-unixsrc
+PKGNAME= vncviewer-4.1.2
CATEGORIES= net x11
-MASTER_SITES= http://www.uk.research.att.com/archive/vnc/dist/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= http://www.realvnc.com/dist/
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= vnc-3.3.3r2-v6-20010421.diff.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= abs%NetBSD.org@localhost
-HOMEPAGE= http://www.uk.research.att.com/vnc/
+MAINTAINER= riz%NetBSD.org@localhost
+HOMEPAGE= http://www.realvnc.com/
COMMENT= Viewer for remote X and Win32 VNC servers
-WRKSRC= ${WRKDIR}/vnc_unixsrc
+WRKSRC= ${WRKDIR}/${DISTNAME}/unix
CRYPTO= yes
NO_INSTALL_MANPAGES= yes
-USE_IMAKE= yes
-BUILD_DEFS+= USE_INET6
+USE_LANGUAGES= c c++
+USE_X11BASE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-installed-zlib
-INSTALLATION_DIRS= bin
+# The distfile listed above is bogus, there is no direct link to download the
+# file, so a special command must be used. I lifted this from FreeBSD Ports.
+DISTURL=http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&acceptLicense=1&filever=4.1.2&filetype=tar_gz&haveDetails=1
+pre-fetch:
+ ${TEST} -f ${DISTDIR}/${DISTNAME}.tar.gz || \
+ (cd ${DISTDIR} && ${FETCH_CMD} -o ${DISTNAME}.tar.gz ${DISTURL:Q})
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer
- ${INSTALL_DATA} ${WRKSRC}/vncviewer/README ${PREFIX}/share/doc/vncviewer
+ ${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man \
+ ${PREFIX}/man/man1/vncviewer.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
+ ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
+ ${PREFIX}/man/man1/vncpasswd.1
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer/PLIST
--- a/net/vncviewer/PLIST Sat Jul 22 19:03:47 2006 +0000
+++ b/net/vncviewer/PLIST Sat Jul 22 19:21:11 2006 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/22 19:21:11 abs Exp $
+bin/vncpasswd
bin/vncviewer
-share/doc/vncviewer/README
-@dirrm share/doc/vncviewer
+man/man1/vncpasswd.1
+man/man1/vncviewer.1
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer/distinfo
--- a/net/vncviewer/distinfo Sat Jul 22 19:03:47 2006 +0000
+++ b/net/vncviewer/distinfo Sat Jul 22 19:21:11 2006 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/07/13 13:47:57 hubertf Exp $
+$NetBSD: distinfo,v 1.9 2006/07/22 19:21:11 abs Exp $
-SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
-RMD160 (vnc-3.3.3r2_unixsrc.tgz) = 3c70c386065d8b0254b1a0627455fb7bc03846ae
-Size (vnc-3.3.3r2_unixsrc.tgz) = 2072772 bytes
-SHA1 (vnc-3.3.3r2-v6-20010421.diff.gz) = d2af7e0fb0074200f490f6463fb250901368875e
-RMD160 (vnc-3.3.3r2-v6-20010421.diff.gz) = dea9aff6124bfdbe099fd1207e20d22cab1c0d6b
-Size (vnc-3.3.3r2-v6-20010421.diff.gz) = 6510 bytes
-SHA1 (patch-aa) = ec85472922c648648c89c7f1bb0ce406214289c8
-SHA1 (patch-ab) = b387f2ee2e78ced366e312f90bb9bad809f9e3ba
+SHA1 (vnc-4_1_2-unixsrc.tar.gz) = 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7
+RMD160 (vnc-4_1_2-unixsrc.tar.gz) = 2a2d615825e6ac74aca5f0c29d025e576b725dc3
+Size (vnc-4_1_2-unixsrc.tar.gz) = 537713 bytes
+SHA1 (patch-aa) = 2b598d63502b8abc6aaa4cb1bde736e15b455f1a
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer/patches/patch-aa
--- a/net/vncviewer/patches/patch-aa Sat Jul 22 19:03:47 2006 +0000
+++ b/net/vncviewer/patches/patch-aa Sat Jul 22 19:21:11 2006 +0000
@@ -1,23 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2005/07/13 13:47:57 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2006/07/22 19:21:11 abs Exp $
---- vncviewer/Imakefile.orig 2005-07-13 15:26:57.329207000 +0200
-+++ vncviewer/Imakefile
-@@ -8,9 +8,7 @@ CDEBUGFLAGS = -O2
- XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but
- XCOMM seems to cause problems on Digital Unix.
-
--#if defined(i386Architecture) && defined(LinuxArchitecture)
- DEFINES = -DMITSHM
--#endif
+--- tx/TXDialog.h.orig 2006-03-23 16:39:31.000000000 +0000
++++ tx/TXDialog.h
+@@ -30,6 +30,7 @@
- INCLUDES = -I../include -I.
- VNCAUTH_LIB = ../libvncauth/libvncauth.a
-@@ -36,4 +34,8 @@ SRCS = \
-
- OBJS = $(SRCS:.c=.o)
+ #include "TXWindow.h"
+ #include <errno.h>
++#include <unistd.h>
-+#if !defined(SunArchitecture)
-+ComplexProgramTargetNoMan(vncviewer)
-+#else
- ComplexProgramTarget(vncviewer)
-+#endif
+ class TXDialog : public TXWindow, public TXDeleteWindowCallback {
+ public:
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer/patches/patch-ab
--- a/net/vncviewer/patches/patch-ab Sat Jul 22 19:03:47 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/23 21:12:37 bouyer Exp $
-
---- vncviewer/sockets.c.orig Wed Oct 23 20:17:57 2002
-+++ vncviewer/sockets.c Wed Oct 23 20:23:48 2002
-@@ -210,7 +210,11 @@
- return -1;
- }
-
-+#ifdef SVR4
-+ if (connect(sock, sa, sizeof(struct sockaddr_in)) < 0) {
-+#else
- if (connect(sock, sa, sa->sa_len) < 0) {
-+#endif
- fprintf(stderr,programName);
- perror(": ConnectToTcpAddr: connect");
- close(sock);
-@@ -369,26 +373,27 @@
- #else
- /* just for IPv4 */
- struct hostent *hp;
-- struct sockaddr_in *sin;
-+ struct sockaddr_in *sin = (struct sockaddr_in *)sa;
- struct in_addr *addr = &sin->sin_addr;
-
-- sin = (struct sockaddr_in *)sa;
- sin->sin_family = AF_INET;
-+#ifndef SVR4
- sin->sin_len = sizeof(struct sockaddr_in);
-+#endif
- sin->sin_port = 0;
-
- if (strcmp(str,"") == 0) {
-- *addr = 0; /* local */
-+ memset(addr, 0, sizeof(struct sockaddr_in)); /* local */
- return True;
- }
-
-- if ((addr.s_addr = inet_addr(str)) == -1) {
-+ if ((addr->s_addr = inet_addr(str)) == -1) {
- if (!(hp = gethostbyname(str)))
- return False;
-- memcpy(&addr, hp->h_addr, sizeof(struct in_addr));
-+ memcpy(addr, hp->h_addr, sizeof(struct in_addr));
- }
-
-- return False;
-+ return True;
- #endif
- }
-
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer4/DESCR
--- a/net/vncviewer4/DESCR Sat Jul 22 19:03:47 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-"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 contains the viewer for remote X and Win32 VNC servers
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer4/Makefile
--- a/net/vncviewer4/Makefile Sat Jul 22 19:03:47 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/05/12 09:45:12 joerg Exp $
-
-DISTNAME= vnc-4_1_1-unixsrc
-PKGNAME= vncviewer-4.1.1
-CATEGORIES= net x11
-MASTER_SITES= http://www.realvnc.com/dist/
-
-MAINTAINER= riz%NetBSD.org@localhost
-HOMEPAGE= http://www.realvnc.com/
-COMMENT= Viewer for remote X and Win32 VNC servers
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/unix
-CRYPTO= yes
-NO_INSTALL_MANPAGES= yes
-USE_LANGUAGES= c c++
-USE_X11BASE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-installed-zlib
-
-# The distfile listed above is bogus, there is no direct link to download the
-# file, so a special command must be used. I lifted this from FreeBSD Ports.
-DISTURL=http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&acceptLicense=1&filever=4.1.1&filetype=tar_gz&haveDetails=1
-pre-fetch:
- ${TEST} -f ${DISTDIR}/${DISTNAME}.tar.gz || \
- (cd ${DISTDIR} && ${FETCH_CMD} -o ${DISTNAME}.tar.gz ${DISTURL:Q})
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
- ${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man \
- ${PREFIX}/man/man1/vncviewer.1
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r b2c4199e31f6 -r 100e3f56f8f9 net/vncviewer4/PLIST
--- a/net/vncviewer4/PLIST Sat Jul 22 19:03:47 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/14 21:10:07 drochner Exp $
-bin/vncviewer
Home |
Main Index |
Thread Index |
Old Index