On 2010/03/25 21:32, Jasper Lievisse Adriaanse wrote:
> hi,
>
> as you may've noticed, i've been spending some time in the past year,
> and especially last weeks to fix the ports that are still using gtk+1.
> if they couldn't be fixed and had an alternative, they were zapped.
>
> apart from the big hurdle called 'xmms' there are only a few ports left
> that use it. i've been trying to update audio/lopster to the most recent
> cvs snapshot (which uses gtk2) but to no avail so far.
>
> other than those, these ports are still on my list to convert or whack.
>
..
> net/putty,-gui (there is a gtk2 port available)
..
their snapshots have gtk2 support; this port diff gets it building
and it mostly runs ok, but I noticed some strange pauses in plink when
I started sending large amounts of text (e.g. ls -lR /) then
interrupting with ^C. I don't have time to look further into that
at the moment, so I'll send what I have for now to at least try
and avoid duplicated work.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/putty/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 10 Aug 2009 06:33:43 -0000 1.2
+++ Makefile 25 Mar 2010 22:43:31 -0000
@@ -3,14 +3,17 @@
COMMENT-main= SSH and telnet client
COMMENT-gui= PuTTY GUI clients
-DISTNAME= putty-0.60
-PKGNAME-main= ${DISTNAME}
-PKGNAME-gui= ${DISTNAME:S/putty/putty-gui/}p0
+DISTNAME= putty-0.60-2010-03-24
+#PKGNAME-gui= ${DISTNAME:S/putty/putty-gui/}p0
+PKGNAME-main= putty-0.60.20100324
+PKGNAME-gui= putty-gui-0.60.20100324
CATEGORIES= net security
HOMEPAGE= http://www.chiark.greenend.org.uk/~sgtatham/putty/
-MASTER_SITES= http://the.earth.li/~sgtatham/putty/latest/ \
- ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
+#MASTER_SITES= http://the.earth.li/~sgtatham/putty/latest/ \
+# ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
+# mirrored from http://tartarus.org/~simon/putty-snapshots/
+MASTER_SITES= http://spacehopper.org/mirrors/
MAINTAINER= Damien Miller <d...@openbsd.org>
@@ -26,9 +29,13 @@ WRKBUILD= ${WRKSRC}/unix
MULTI_PACKAGES= -main -gui
WANTLIB= c
-WANTLIB-gui= X11 Xext Xi c glib gmodule iconv intl m \
- pthread-stubs xcb
-LIB_DEPENDS-gui= gtk.>=1,gdk.>=1::x11/gtk+
+WANTLIB-gui= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
+ fontconfig freetype gio-2.0 glib-2.0 glitz \
+ gmodule-2.0 gobject-2.0 iconv intl m pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pixman-1 png \
+ pthread-stubs xcb z
+LIB_DEPENDS-gui= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
pre-configure:
cd ${WRKSRC} && ./mkfiles.pl
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/putty/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 4 Sep 2007 09:14:00 -0000 1.1.1.1
+++ distinfo 25 Mar 2010 22:43:31 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (putty-0.60-2010-03-24.tar.gz) = /UA8hyoUB/R8U2+DXtOFuA==
+RMD160 (putty-0.60-2010-03-24.tar.gz) = vNucWPmIi+1Y5gHbJJzlKuMTzO8=
+SHA1 (putty-0.60-2010-03-24.tar.gz) = jJs6M60V0uBygLqUis8CfNQn9x8=
+SHA256 (putty-0.60-2010-03-24.tar.gz) =
9+Vd/KQk21r8hJWfE5pMHn3wSW1r6kGzRYhq4psASL4=
+SIZE (putty-0.60-2010-03-24.tar.gz) = 1834192
Index: patches/patch-unix_uxnoise_c
===================================================================
RCS file: /cvs/ports/net/putty/patches/patch-unix_uxnoise_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-unix_uxnoise_c
--- patches/patch-unix_uxnoise_c 4 Sep 2007 09:14:00 -0000 1.1.1.1
+++ patches/patch-unix_uxnoise_c 25 Mar 2010 22:43:31 -0000
@@ -1,15 +1,7 @@
$OpenBSD: patch-unix_uxnoise_c,v 1.1.1.1 2007/09/04 09:14:00 djm Exp $
---- unix/uxnoise.c.orig Wed Nov 17 02:27:00 2004
-+++ unix/uxnoise.c Tue Sep 4 17:47:44 2007
-@@ -4,6 +4,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/time.h>
-@@ -18,7 +19,7 @@ static int read_dev_urandom(char *buf, int len)
+--- unix/uxnoise.c.orig Wed Sep 16 23:28:20 2009
++++ unix/uxnoise.c Thu Mar 25 22:12:47 2010
+@@ -21,7 +21,7 @@ static int read_dev_urandom(char *buf, int len)
int fd;
int ngot, ret;
@@ -18,7 +10,7 @@ $OpenBSD: patch-unix_uxnoise_c,v 1.1.1.1
if (fd < 0)
return 0;
-@@ -39,28 +40,16 @@ static int read_dev_urandom(char *buf, int len)
+@@ -44,43 +44,20 @@ static int read_dev_urandom(char *buf, int len)
* This function is called once, at PuTTY startup. It will do some
* slightly silly things such as fetching an entire process listing
* and scanning /tmp, load the saved random seed from disk, and
@@ -31,27 +23,44 @@ $OpenBSD: patch-unix_uxnoise_c,v 1.1.1.1
- 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)))
+- }
+-
+- fp = popen("ps -axu 2>/dev/null", "r");
+- 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));
++ if (read_dev_urandom(buf, sizeof(buf))) {
+ func(buf, sizeof(buf));
++ } else {
++ fprintf(stderr, "read_dev_urandom: Unable to access entropy source\n");
+ exit(1);
+ }
-- fp = popen("ps -axu 2>/dev/null", "r");
-- while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0)
-- func(buf, ret);
-- pclose(fp);
--
- 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 +91,13 @@ void noise_get_light(void (*func) (void *, int))
*/
void noise_regular(void)
{
@@ -78,7 +87,7 @@ $OpenBSD: patch-unix_uxnoise_c,v 1.1.1.1
getrusage(RUSAGE_SELF, &rusage);
random_add_noise(&rusage, sizeof(rusage));
}
-@@ -121,6 +102,9 @@ void noise_regular(void)
+@@ -141,6 +110,9 @@ void noise_regular(void)
void noise_ultralight(unsigned long data)
{
struct timeval tv;
Index: pkg/PLIST-gui
===================================================================
RCS file: /cvs/ports/net/putty/pkg/PLIST-gui,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-gui
--- pkg/PLIST-gui 4 Sep 2007 09:14:00 -0000 1.1.1.1
+++ pkg/PLIST-gui 25 Mar 2010 22:43:31 -0000
@@ -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
+...@bin bin/pterm
+...@bin bin/putty
+...@bin bin/puttytel
@man man/man1/pterm.1
@man man/man1/putty.1
@man man/man1/puttytel.1
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/putty/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 4 Sep 2007 09:14:00 -0000 1.1.1.1
+++ pkg/PLIST-main 25 Mar 2010 22:43:31 -0000
@@ -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
+...@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
