Update to PuTTY 0.62.
ok djm@
This commit is contained in:
brad
parent
0f5ba4f288
commit
73958da403
@ -1,13 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2012/12/12 16:38:33 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2013/01/13 10:12:52 brad Exp $
|
||||
|
||||
COMMENT-main= SSH and telnet client
|
||||
COMMENT-gui= PuTTY GUI clients
|
||||
|
||||
DISTNAME= putty-0.60
|
||||
DISTNAME= putty-0.62
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
REVISION-main= 2
|
||||
PKGNAME-gui= ${DISTNAME:S/putty/putty-gui/}
|
||||
REVISION-gui= 4
|
||||
CATEGORIES= net security
|
||||
|
||||
HOMEPAGE= http://www.chiark.greenend.org.uk/~sgtatham/putty/
|
||||
@ -23,25 +21,33 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
CONFIGURE_STYLE= autoconf automake
|
||||
AUTOCONF_VERSION= 2.61
|
||||
CONFIGURE_ENV= CPPFLAGS="-I.././" \
|
||||
LDFLAGS="-L${X11BASE}/lib"
|
||||
AUTOCONF_VERSION= 2.67
|
||||
AUTOMAKE_VERSION= 1.11
|
||||
WRKSRC= ${WRKDIST}/unix
|
||||
USE_GROFF = Yes
|
||||
|
||||
MULTI_PACKAGES= -main -gui
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
WANTLIB-main= c
|
||||
WANTLIB-gui= X11 Xext Xi c glib gmodule m ${MODGETTEXT_WANTLIB} \
|
||||
pthread-stubs xcb gtk>=1 gdk>=1
|
||||
WANTLIB-main= X11 c
|
||||
WANTLIB-gui= GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
|
||||
Xinerama Xrandr Xrender atk-1.0 c cairo expat \
|
||||
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
|
||||
glib-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 \
|
||||
pangocairo-1.0 pangoft2-1.0 pixman-1 png \
|
||||
pthread-stubs xcb xcb-render xcb-shm z \
|
||||
${MODGETTEXT_WANTLIB}
|
||||
|
||||
LIB_DEPENDS-main= # empty
|
||||
LIB_DEPENDS-gui= x11/gtk+
|
||||
LIB_DEPENDS-gui= x11/gtk+2
|
||||
|
||||
AUTO_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
|
||||
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
post-patch:
|
||||
@echo "Running aclocal-${AUTOMAKE_VERSION} in ${WRKSRC}"
|
||||
@cd ${WRKSRC} && ${SETENV} ${AUTO_ENV} aclocal
|
||||
@ -49,6 +55,4 @@ post-patch:
|
||||
pre-configure:
|
||||
cd ${WRKDIST} && ./mkfiles.pl
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
MD5 (putty-0.60.tar.gz) = B+Zf2YsW0RWuOKGAv7JC4g==
|
||||
RMD160 (putty-0.60.tar.gz) = nFbuTS0F9bEHnGXxml2dBrWWq6M=
|
||||
SHA1 (putty-0.60.tar.gz) = jZn48Qd7erJfAUEmtdgSoa1Vzjc=
|
||||
SHA256 (putty-0.60.tar.gz) = sruq+TJJl+hc8V1E7UHo6JU5yCFdzqydbXJyo328KEk=
|
||||
SIZE (putty-0.60.tar.gz) = 1743711
|
||||
SHA256 (putty-0.62.tar.gz) = jRh+hu4YyDmJXSY2B7YXiHeFZONyDo2FxTBaBPnaBXM=
|
||||
SIZE (putty-0.62.tar.gz) = 1783106
|
||||
|
||||
@ -1,9 +1,18 @@
|
||||
$OpenBSD: patch-unix_configure_ac,v 1.1 2012/12/12 16:38:33 naddy Exp $
|
||||
--- unix/configure.ac.orig Tue Dec 11 23:47:28 2012
|
||||
+++ unix/configure.ac Tue Dec 11 23:47:48 2012
|
||||
@@ -23,7 +23,7 @@ AC_SUBST([all_targets])
|
||||
$OpenBSD: patch-unix_configure_ac,v 1.2 2013/01/13 10:12:52 brad Exp $
|
||||
--- unix/configure.ac.orig Sat May 22 10:07:25 2010
|
||||
+++ unix/configure.ac Thu Dec 27 01:53:50 2012
|
||||
@@ -11,7 +11,7 @@ AC_CONFIG_HEADERS([uxconfig.h:uxconfig.in])
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_CC
|
||||
if test "X$GCC" = Xyes; then
|
||||
- PUTTYCFLAGS="-Wall -Werror"
|
||||
+ PUTTYCFLAGS="-Wall"
|
||||
else
|
||||
PUTTYCFLAGS=""
|
||||
fi
|
||||
@@ -65,7 +65,7 @@ AS_IF([test "x$with_gssapi" != xno],
|
||||
|
||||
AC_SEARCH_LIBS([socket], [xnet])
|
||||
AC_CHECK_LIB(X11, XOpenDisplay)
|
||||
|
||||
-AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
|
||||
+AC_CHECK_FUNCS([getaddrinfo posix_openpt ptsname setresuid strsignal updwtmpx])
|
||||
|
||||
@ -1,42 +1,49 @@
|
||||
$OpenBSD: patch-unix_uxnoise_c,v 1.2 2012/03/08 12:13:01 ajacoutot Exp $
|
||||
--- unix/uxnoise.c.orig Tue Nov 16 10:27:00 2004
|
||||
+++ unix/uxnoise.c Tue Mar 6 08:56:51 2012
|
||||
@@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
@@ -44,23 +45,11 @@ static int read_dev_urandom(char *buf, int len)
|
||||
$OpenBSD: patch-unix_uxnoise_c,v 1.3 2013/01/13 10:12:52 brad Exp $
|
||||
--- unix/uxnoise.c.orig Wed Sep 16 18:28:20 2009
|
||||
+++ unix/uxnoise.c Thu Dec 27 01:32:29 2012
|
||||
@@ -49,38 +49,11 @@ static int read_dev_urandom(char *buf, int len)
|
||||
|
||||
void noise_get_heavy(void (*func) (void *, int))
|
||||
{
|
||||
- char buf[512];
|
||||
- FILE *fp;
|
||||
- int ret;
|
||||
- int got_dev_urandom = 0;
|
||||
+ char buf[32];
|
||||
|
||||
- if (read_dev_urandom(buf, 32))
|
||||
- if (read_dev_urandom(buf, 32)) {
|
||||
- got_dev_urandom = 1;
|
||||
- func(buf, 32);
|
||||
- }
|
||||
+ if (read_dev_urandom(buf, sizeof(buf)))
|
||||
+ func(buf, sizeof(buf));
|
||||
|
||||
- fp = popen("ps -axu 2>/dev/null", "r");
|
||||
- while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0)
|
||||
- func(buf, ret);
|
||||
- pclose(fp);
|
||||
- if (fp) {
|
||||
- while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0)
|
||||
- func(buf, ret);
|
||||
- pclose(fp);
|
||||
- } else if (!got_dev_urandom) {
|
||||
- fprintf(stderr, "popen: %s\n"
|
||||
- "Unable to access fallback entropy source\n", strerror(errno));
|
||||
- exit(1);
|
||||
- }
|
||||
-
|
||||
- fp = popen("ls -al /tmp 2>/dev/null", "r");
|
||||
- while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0)
|
||||
- func(buf, ret);
|
||||
- pclose(fp);
|
||||
- if (fp) {
|
||||
- while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0)
|
||||
- func(buf, ret);
|
||||
- pclose(fp);
|
||||
- } else if (!got_dev_urandom) {
|
||||
- fprintf(stderr, "popen: %s\n"
|
||||
- "Unable to access fallback entropy source\n", strerror(errno));
|
||||
- exit(1);
|
||||
- }
|
||||
-
|
||||
read_random_seed(func);
|
||||
random_save_seed();
|
||||
}
|
||||
@@ -94,21 +83,13 @@ void noise_get_light(void (*func) (void *, int))
|
||||
@@ -114,21 +87,13 @@ void noise_get_light(void (*func) (void *, int))
|
||||
*/
|
||||
void noise_regular(void)
|
||||
{
|
||||
@ -63,7 +70,7 @@ $OpenBSD: patch-unix_uxnoise_c,v 1.2 2012/03/08 12:13:01 ajacoutot Exp $
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
random_add_noise(&rusage, sizeof(rusage));
|
||||
}
|
||||
@@ -121,6 +102,9 @@ void noise_regular(void)
|
||||
@@ -141,6 +106,9 @@ void noise_regular(void)
|
||||
void noise_ultralight(unsigned long data)
|
||||
{
|
||||
struct timeval tv;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-unix_uxpty_c,v 1.1 2012/12/12 16:38:33 naddy Exp $
|
||||
--- unix/uxpty.c.orig Tue Dec 11 23:41:14 2012
|
||||
+++ unix/uxpty.c Tue Dec 11 23:43:15 2012
|
||||
@@ -333,12 +333,21 @@ static void pty_open_master(Pty pty)
|
||||
$OpenBSD: patch-unix_uxpty_c,v 1.2 2013/01/13 10:12:52 brad Exp $
|
||||
--- unix/uxpty.c.orig Wed Mar 2 14:12:42 2011
|
||||
+++ unix/uxpty.c Thu Dec 27 01:30:33 2012
|
||||
@@ -335,12 +335,21 @@ static void pty_open_master(Pty pty)
|
||||
chown(pty->name, getuid(), gp ? gp->gr_gid : -1);
|
||||
chmod(pty->name, 0600);
|
||||
#else
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@comment $OpenBSD: PLIST-gui,v 1.1.1.1 2007/09/04 09:14:00 djm Exp $
|
||||
bin/pterm
|
||||
bin/putty
|
||||
bin/puttytel
|
||||
@comment $OpenBSD: PLIST-gui,v 1.2 2013/01/13 10:12:52 brad Exp $
|
||||
@bin bin/pterm
|
||||
@bin bin/putty
|
||||
@bin bin/puttytel
|
||||
@man man/man1/pterm.1
|
||||
@man man/man1/putty.1
|
||||
@man man/man1/puttytel.1
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/09/04 09:14:00 djm Exp $
|
||||
bin/plink
|
||||
bin/pscp
|
||||
bin/psftp
|
||||
bin/puttygen
|
||||
@comment $OpenBSD: PLIST-main,v 1.2 2013/01/13 10:12:52 brad Exp $
|
||||
@bin bin/plink
|
||||
@bin bin/pscp
|
||||
@bin bin/psftp
|
||||
@bin bin/puttygen
|
||||
@man man/man1/plink.1
|
||||
@man man/man1/pscp.1
|
||||
@man man/man1/psftp.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user