Re: UPDATE: rdesktop 1.6.0
On Sat, Jun 21, 2008 at 11:03:49AM +0200, Steven Mestdagh wrote: Giovanni Bechis [2008-06-18, 12:53:39]: It works well @i386, PLIST updated and PKGNAME removed. seems to work on amd64 too. however, it picks up libsamplerate if it's installed. others reported that it does not make a difference, so maybe the configure script needs some tweaking to avoid picking it up. and don't forget lib-depends-check. Cheers Giovanni hi, here's an updated diff, which won't pickup libsamplerate if it's installed. ok after the unlock? cheers, jasper works on amd64 here
Re: UPDATE: rdesktop 1.6.0
On Sat, Jun 21, 2008 at 11:03:49AM +0200, Steven Mestdagh wrote: Giovanni Bechis [2008-06-18, 12:53:39]: It works well @i386, PLIST updated and PKGNAME removed. seems to work on amd64 too. however, it picks up libsamplerate if it's installed. others reported that it does not make a difference, so maybe the configure script needs some tweaking to avoid picking it up. and don't forget lib-depends-check. Cheers Giovanni hi, here's an updated diff, which won't pickup libsamplerate if it's installed. ok after the unlock? cheers, jasper - update rdesktop to 1.6.0 * includes SECURITY FIXES for several over-/underflows: CVE-2008-1801 CVE-2008-1802 CVE-2008-1803 - specify license marker - prevent picking up libsamplerate if present - regen PLIST Index: Makefile === RCS file: /cvs/ports/x11/rdesktop/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- Makefile15 Sep 2007 20:04:24 - 1.25 +++ Makefile5 Aug 2008 12:07:43 - @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.25 2007/09/15 20:04:24 merdely Exp $ COMMENT= open source client for Windows Terminal Server -DISTNAME= rdesktop-1.5.0 -PKGNAME= ${DISTNAME}p1 +DISTNAME= rdesktop-1.6.0 CATEGORIES=x11 net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/} @@ -10,7 +9,7 @@ MAINTAINER=Chris Kuethe [EMAIL PROTECTED] -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP=Yes PERMIT_DISTFILES_CDROM=Yes Index: distinfo === RCS file: /cvs/ports/x11/rdesktop/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo5 Apr 2007 17:36:24 - 1.13 +++ distinfo5 Aug 2008 12:07:43 - @@ -1,5 +1,5 @@ -MD5 (rdesktop-1.5.0.tar.gz) = QzVG9g/A8gHpkwe6GINp7Q== -RMD160 (rdesktop-1.5.0.tar.gz) = NQ4IFm0LdiC07ZxllK3a5+xT0Vo= -SHA1 (rdesktop-1.5.0.tar.gz) = 4whr+GUZHu1BYxgTEl9ILiecfz0= -SHA256 (rdesktop-1.5.0.tar.gz) = Xq0Xw9KcsQKK7KSF7nqMZWlMGwKhtwFMPakgsmWkOKo= -SIZE (rdesktop-1.5.0.tar.gz) = 245137 +MD5 (rdesktop-1.6.0.tar.gz) = xvy+1/CtfmCsX8stMk2LFg== +RMD160 (rdesktop-1.6.0.tar.gz) = z2BM0bwHB7SF3rZT76PkfiH6vEw= +SHA1 (rdesktop-1.6.0.tar.gz) = uL/QPUZA0oWgruWz+xmaR8tCJfI= +SHA256 (rdesktop-1.6.0.tar.gz) = NQJuqo4UyovQujcwkm8UIi+EUvKsZiYju/GQnYsGCXk= +SIZE (rdesktop-1.6.0.tar.gz) = 284728 Index: patches/patch-configure === RCS file: patches/patch-configure diff -N patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-configure 5 Aug 2008 12:07:43 - @@ -0,0 +1,23 @@ +$OpenBSD$ + +Don't pickup libsamplerate if that's installed. + +--- configure.orig Sat Apr 5 07:43:32 2008 configure Tue Aug 5 14:02:00 2008 +@@ -7290,6 +7290,7 @@ echo ${ECHO_T}yes 6; } + HAVE_ALSA=1 + fi + ++if false; then + pkg_failed=no + { echo $as_me:$LINENO: checking for LIBSAMPLERATE 5 + echo $ECHO_N checking for LIBSAMPLERATE... $ECHO_C 6; } +@@ -7371,6 +7372,8 @@ _ACEOF + fi + LIBSAMPLERATE_LIBS=$LIBSAMPLERATE_LIBS -lm + fi ++fi ++ + fi + + if test $sound != no; then Index: patches/patch-rdpsnd_sun_c === RCS file: patches/patch-rdpsnd_sun_c diff -N patches/patch-rdpsnd_sun_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-rdpsnd_sun_c 5 Aug 2008 12:07:43 - @@ -0,0 +1,40 @@ +$OpenBSD$ + +2 changes are here: +- Change all uint_t to unsigned int. On Linux a uint_t is just a typedef + to unsigned int. We don't have a uint_t. + +- In sun_open rdesktop will also check that a device is in full duplex + mode before opening the device successfully. I didn't add code to check + if a device is in full duplex mode, I just removed the check. + +--- rdpsnd_sun.c.orig Sat May 10 23:14:38 2008 rdpsnd_sun.c Tue Jun 17 16:08:59 2008 +@@ -54,7 +54,7 @@ static uint32 snd_rate; + static short samplewidth; + static char *dsp_dev; + +-static uint_t written_samples; ++static unsigned int written_samples; + + void sun_play(void); + void sun_record(void); +@@ -147,8 +147,7 @@ sun_open(int mode) + { + AUDIO_INITINFO(info); + +- if ((ioctl(dsp_fd, AUDIO_GETINFO, info) == -1) +- || !(info.hw_features AUDIO_HWFEATURE_DUPLEX)) ++ if (ioctl(dsp_fd, AUDIO_GETINFO, info) == -1) + { + close(dsp_fd); + dsp_fd = -1; +@@ -440,7 +439,7 @@ sun_play(void) + if (out-p == out-end) + { + audio_info_t info; +- uint_t delay_samples; ++ unsigned int delay_samples; + unsigned long delay_us; + + if (ioctl(dsp_fd, AUDIO_GETINFO, info) != -1) Index: patches/patch-xwin_c === RCS file:
Re: UPDATE: rdesktop 1.6.0
On Tuesday 05 August 2008 08:08:30 Jasper Lievisse Adriaanse wrote: - specify license marker It should be GPLv2+. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: rdesktop 1.6.0
Giovanni Bechis [2008-06-18, 12:53:39]: It works well @i386, PLIST updated and PKGNAME removed. seems to work on amd64 too. however, it picks up libsamplerate if it's installed. others reported that it does not make a difference, so maybe the configure script needs some tweaking to avoid picking it up. and don't forget lib-depends-check. Cheers Giovanni Index: Makefile === RCS file: /cvs/ports/x11/rdesktop/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile 15 Sep 2007 20:04:24 - 1.25 +++ Makefile 18 Jun 2008 10:46:36 - @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.25 2007/09/15 20:04:24 merdely Exp $ COMMENT= open source client for Windows Terminal Server -DISTNAME=rdesktop-1.5.0 -PKGNAME= ${DISTNAME}p1 +DISTNAME=rdesktop-1.6.0 CATEGORIES= x11 net MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=rdesktop/} Index: distinfo === RCS file: /cvs/ports/x11/rdesktop/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 5 Apr 2007 17:36:24 - 1.13 +++ distinfo 18 Jun 2008 10:46:36 - @@ -1,5 +1,5 @@ -MD5 (rdesktop-1.5.0.tar.gz) = QzVG9g/A8gHpkwe6GINp7Q== -RMD160 (rdesktop-1.5.0.tar.gz) = NQ4IFm0LdiC07ZxllK3a5+xT0Vo= -SHA1 (rdesktop-1.5.0.tar.gz) = 4whr+GUZHu1BYxgTEl9ILiecfz0= -SHA256 (rdesktop-1.5.0.tar.gz) = Xq0Xw9KcsQKK7KSF7nqMZWlMGwKhtwFMPakgsmWkOKo= -SIZE (rdesktop-1.5.0.tar.gz) = 245137 +MD5 (rdesktop-1.6.0.tar.gz) = xvy+1/CtfmCsX8stMk2LFg== +RMD160 (rdesktop-1.6.0.tar.gz) = z2BM0bwHB7SF3rZT76PkfiH6vEw= +SHA1 (rdesktop-1.6.0.tar.gz) = uL/QPUZA0oWgruWz+xmaR8tCJfI= +SHA256 (rdesktop-1.6.0.tar.gz) = NQJuqo4UyovQujcwkm8UIi+EUvKsZiYju/GQnYsGCXk= +SIZE (rdesktop-1.6.0.tar.gz) = 284728 Index: patches/patch-rdpsnd_sun_c === RCS file: patches/patch-rdpsnd_sun_c diff -N patches/patch-rdpsnd_sun_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-rdpsnd_sun_c18 Jun 2008 10:46:36 - @@ -0,0 +1,40 @@ +$OpenBSD$ + +2 changes are here: +- Change all uint_t to unsigned int. On Linux a uint_t is just a typedef + to unsigned int. We don't have a uint_t. + +- In sun_open rdesktop will also check that a device is in full duplex + mode before opening the device successfully. I didn't add code to check + if a device is in full duplex mode, I just removed the check. + +--- rdpsnd_sun.c.origSat May 10 23:14:38 2008 rdpsnd_sun.c Tue Jun 17 16:08:59 2008 +@@ -54,7 +54,7 @@ static uint32 snd_rate; + static short samplewidth; + static char *dsp_dev; + +-static uint_t written_samples; ++static unsigned int written_samples; + + void sun_play(void); + void sun_record(void); +@@ -147,8 +147,7 @@ sun_open(int mode) + { + AUDIO_INITINFO(info); + +-if ((ioctl(dsp_fd, AUDIO_GETINFO, info) == -1) +-|| !(info.hw_features AUDIO_HWFEATURE_DUPLEX)) ++if (ioctl(dsp_fd, AUDIO_GETINFO, info) == -1) + { + close(dsp_fd); + dsp_fd = -1; +@@ -440,7 +439,7 @@ sun_play(void) + if (out-p == out-end) + { + audio_info_t info; +-uint_t delay_samples; ++unsigned int delay_samples; + unsigned long delay_us; + + if (ioctl(dsp_fd, AUDIO_GETINFO, info) != -1) Index: patches/patch-xwin_c === RCS file: patches/patch-xwin_c diff -N patches/patch-xwin_c --- patches/patch-xwin_c 17 May 2007 17:31:33 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-xwin_c,v 1.4 2007/05/17 17:31:33 ckuethe Exp $ xwin.c.orig Wed Apr 25 12:03:29 2007 -+++ xwin.c Wed Apr 25 12:04:54 2007 -@@ -3221,6 +3221,10 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx - image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, - (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8); - -+if (image == NULL) -+image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, -+ (char *) data, cx, cy, BitmapPad(g_display), 0); -+ - if (g_ownbackstore) - { - XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, cy); Index: pkg/PLIST === RCS file: /cvs/ports/x11/rdesktop/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 25 Mar 2007 19:38:39 - 1.6 +++ pkg/PLIST 18 Jun 2008 10:46:36 - @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.6 2007/03/25 19:38:39 aanriot Exp $ -bin/rdesktop [EMAIL PROTECTED] bin/rdesktop @man man/man1/rdesktop.1 share/rdesktop/
Re: UPDATE: rdesktop 1.6.0
Matthew Clarke wrote: You might want to add libsamplerate (audio/libsamplerate) to the port's dependencies, as that library will be found and used if it is installed. I could't tell that the presence of libsamplerate made any difference to the few sounds that I've heard during testing so far, though. I tried with a couple of Windows 2003 Server and sound did not work at all (with or without libao enabled). Cheers Giovanni
Re: UPDATE: rdesktop 1.6.0
Wed, Jun 18, 2008 at 12:53:39PM +0200, Giovanni Bechis may have written: It works well @i386, PLIST updated and PKGNAME removed. Cheers Giovanni [ snip patch ] Works well on i386 here. - connect to XP Pro on laptop at 1024x768 - connect to XP Pro on other laptop at 1680x1050 - connect to XP Pro in qemu on local system at 1680x1050 You might want to add libsamplerate (audio/libsamplerate) to the port's dependencies, as that library will be found and used if it is installed. I could't tell that the presence of libsamplerate made any difference to the few sounds that I've heard during testing so far, though. -- Debugging is twice as hard as writing the code in the first place. Therefore, if you write the code as cleverly as possible, you are, by definition, not smart enough to debug it. -- Kernighan -- quoted by Quentyn Taylor
Re: UPDATE: rdesktop 1.6.0
Will Maier [Tue, Jun 17, 2008 at 08:15:09PM -0500] wrote: Index: patches/patch-rdpsnd_sun_c === RCS file: patches/patch-rdpsnd_sun_c diff -N patches/patch-rdpsnd_sun_c --- /dev/null1 Jan 1970 00:00:00 - +++ patches/patch-rdpsnd_sun_c 17 Jun 2008 23:57:36 - @@ -0,0 +1,40 @@ +$OpenBSD$ + +2 changes are here: +- Change all uint_t to unsigned int. On Linux a uint_t is just a typedef + to unsigned int. We don't have a uint_t. + +- In sun_open rdesktop will also check that a device is in full duplex + mode before opening the device successfully. I didn't add code to check + if a device is in full duplex mode, I just removed the check. We don't usually include comments in the patch files. Well, I'd love if more people would add comments to their patches. I think it's a good thing. Regards, Bernd
Re: UPDATE: rdesktop 1.6.0
It works well @i386, PLIST updated and PKGNAME removed. Cheers Giovanni Index: Makefile === RCS file: /cvs/ports/x11/rdesktop/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile15 Sep 2007 20:04:24 - 1.25 +++ Makefile18 Jun 2008 10:46:36 - @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.25 2007/09/15 20:04:24 merdely Exp $ COMMENT= open source client for Windows Terminal Server -DISTNAME= rdesktop-1.5.0 -PKGNAME= ${DISTNAME}p1 +DISTNAME= rdesktop-1.6.0 CATEGORIES=x11 net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/} Index: distinfo === RCS file: /cvs/ports/x11/rdesktop/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo5 Apr 2007 17:36:24 - 1.13 +++ distinfo18 Jun 2008 10:46:36 - @@ -1,5 +1,5 @@ -MD5 (rdesktop-1.5.0.tar.gz) = QzVG9g/A8gHpkwe6GINp7Q== -RMD160 (rdesktop-1.5.0.tar.gz) = NQ4IFm0LdiC07ZxllK3a5+xT0Vo= -SHA1 (rdesktop-1.5.0.tar.gz) = 4whr+GUZHu1BYxgTEl9ILiecfz0= -SHA256 (rdesktop-1.5.0.tar.gz) = Xq0Xw9KcsQKK7KSF7nqMZWlMGwKhtwFMPakgsmWkOKo= -SIZE (rdesktop-1.5.0.tar.gz) = 245137 +MD5 (rdesktop-1.6.0.tar.gz) = xvy+1/CtfmCsX8stMk2LFg== +RMD160 (rdesktop-1.6.0.tar.gz) = z2BM0bwHB7SF3rZT76PkfiH6vEw= +SHA1 (rdesktop-1.6.0.tar.gz) = uL/QPUZA0oWgruWz+xmaR8tCJfI= +SHA256 (rdesktop-1.6.0.tar.gz) = NQJuqo4UyovQujcwkm8UIi+EUvKsZiYju/GQnYsGCXk= +SIZE (rdesktop-1.6.0.tar.gz) = 284728 Index: patches/patch-rdpsnd_sun_c === RCS file: patches/patch-rdpsnd_sun_c diff -N patches/patch-rdpsnd_sun_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-rdpsnd_sun_c 18 Jun 2008 10:46:36 - @@ -0,0 +1,40 @@ +$OpenBSD$ + +2 changes are here: +- Change all uint_t to unsigned int. On Linux a uint_t is just a typedef + to unsigned int. We don't have a uint_t. + +- In sun_open rdesktop will also check that a device is in full duplex + mode before opening the device successfully. I didn't add code to check + if a device is in full duplex mode, I just removed the check. + +--- rdpsnd_sun.c.orig Sat May 10 23:14:38 2008 rdpsnd_sun.c Tue Jun 17 16:08:59 2008 +@@ -54,7 +54,7 @@ static uint32 snd_rate; + static short samplewidth; + static char *dsp_dev; + +-static uint_t written_samples; ++static unsigned int written_samples; + + void sun_play(void); + void sun_record(void); +@@ -147,8 +147,7 @@ sun_open(int mode) + { + AUDIO_INITINFO(info); + +- if ((ioctl(dsp_fd, AUDIO_GETINFO, info) == -1) +- || !(info.hw_features AUDIO_HWFEATURE_DUPLEX)) ++ if (ioctl(dsp_fd, AUDIO_GETINFO, info) == -1) + { + close(dsp_fd); + dsp_fd = -1; +@@ -440,7 +439,7 @@ sun_play(void) + if (out-p == out-end) + { + audio_info_t info; +- uint_t delay_samples; ++ unsigned int delay_samples; + unsigned long delay_us; + + if (ioctl(dsp_fd, AUDIO_GETINFO, info) != -1) Index: patches/patch-xwin_c === RCS file: patches/patch-xwin_c diff -N patches/patch-xwin_c --- patches/patch-xwin_c17 May 2007 17:31:33 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-xwin_c,v 1.4 2007/05/17 17:31:33 ckuethe Exp $ xwin.c.origWed Apr 25 12:03:29 2007 -+++ xwin.c Wed Apr 25 12:04:54 2007 -@@ -3221,6 +3221,10 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx - image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, -(char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8); - -+ if (image == NULL) -+ image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, -+ (char *) data, cx, cy, BitmapPad(g_display), 0); -+ - if (g_ownbackstore) - { - XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, cy); Index: pkg/PLIST === RCS file: /cvs/ports/x11/rdesktop/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 25 Mar 2007 19:38:39 - 1.6 +++ pkg/PLIST 18 Jun 2008 10:46:36 - @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.6 2007/03/25 19:38:39 aanriot Exp $ -bin/rdesktop [EMAIL PROTECTED] bin/rdesktop @man man/man1/rdesktop.1 share/rdesktop/ share/rdesktop/keymaps/
Comments in patches (was: UPDATE: rdesktop 1.6.0)
On Tue, Jun 17, 2008 at 08:15:09PM -0500, Will Maier wrote: We don't usually include comments in the patch files. To second Bernd's response: If the purpose of a patch is obvious, there's no reason to add a comment. But sometimes it isn't obvious, or you're patching stuff you want to send to (and explain to) upstream later. For an example of missing comments, please look at the ghostscript patches. I didn't add comments to them, and I regret it. Ciao, Kili -- Immer wenn ich in den letzten Tagen maile, kommen irgendwelche Insekten an, die sich das ganze Jahr nicht haben blicken lassen. -- Ansgar Stein
Re: Comments in patches (was: UPDATE: rdesktop 1.6.0)
On Wed, 18 Jun 2008, Matthias Kilian wrote: If the purpose of a patch is obvious, there's no reason to add a comment. But sometimes it isn't obvious, or you're patching stuff you want to send to (and explain to) upstream later. For an example of missing comments, please look at the ghostscript patches. I didn't add comments to them, and I regret it. It's never too late... -- Antoine
Re: UPDATE: rdesktop 1.6.0
Hi Devin- On Mon, Jun 16, 2008 at 10:45:23AM -0700, Devin Smith wrote: Some questions I had: 1. I wasn't sure if PKGNAME should have the p0 appended or should it just be ${DISTNAME}. The pN suffix is the port patchlevel; if you're bumping the upstream version, you don't need it. Since PKGNAME=DISTNAME by default, you can just omit the PKGNAME= entirely. 2. When adding / deleting files to create a cvs diff should I be using the cvsdo utility (http://viper.haque.net/~timeless/redbean/)? It seemed easier to use then editing the CVS/Entries file manually. In most cases, you should be able to simply 'cvs {add,remove}' the relevant files. [...] Index: patches/patch-rdpsnd_sun_c === RCS file: patches/patch-rdpsnd_sun_c diff -N patches/patch-rdpsnd_sun_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-rdpsnd_sun_c17 Jun 2008 23:57:36 - @@ -0,0 +1,40 @@ +$OpenBSD$ + +2 changes are here: +- Change all uint_t to unsigned int. On Linux a uint_t is just a typedef + to unsigned int. We don't have a uint_t. + +- In sun_open rdesktop will also check that a device is in full duplex + mode before opening the device successfully. I didn't add code to check + if a device is in full duplex mode, I just removed the check. We don't usually include comments in the patch files. -- o--{ Will Maier }--o | web:...http://www.lfod.us/ | [EMAIL PROTECTED] | *-[ BSD: Live Free or Die ]*
Re: UPDATE: rdesktop 1.6.0
On Mon, Jun 16, 2008 at 10:45 AM, Devin Smith [EMAIL PROTECTED] wrote: 1. I wasn't sure if PKGNAME should have the p0 appended or should it just be ${DISTNAME}. PKGNAME can be unset, thereby reverting to DISTNAME. This is a new version of the port, with no local patchlevel. 2. When adding / deleting files to create a cvs diff should I be using the cvsdo utility (http://viper.haque.net/~timeless/redbean/)? It seemed easier to use then editing the CVS/Entries file manually. cvs add or cvs rm CK -- GDB has a 'break' feature; why doesn't it have 'fix' too?