Re: potential qemu crash fix, please test
On Tue, Jan 25, 2011 at 09:40:22AM -0600, Dale Rahn wrote:
> THIS IS WRONG.
And the wrong code is still in the qemu-old port.
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu-old/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile19 Jan 2011 16:22:31 - 1.12
+++ Makefile28 Jan 2011 01:35:42 -
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc
COMMENT= multi system emulator
DISTNAME= qemu-0.9.1
-REVISION= 17
+REVISION= 18
CATEGORIES=emulators
HOMEPAGE= http://www.nongnu.org/qemu/
Index: patches/patch-vl_c
===
RCS file: /home/cvs/ports/emulators/qemu-old/patches/patch-vl_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-vl_c
--- patches/patch-vl_c 27 May 2010 17:33:43 - 1.1.1.1
+++ patches/patch-vl_c 28 Jan 2011 01:35:16 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-vl_c,v 1.1.1.1 2010/05/27 17:33:43 fgsch Exp $
vl.c.orig Sun Jan 6 13:38:42 2008
-+++ vl.c Tue Jun 17 19:48:00 2008
+--- vl.c.orig Sun Jan 6 14:38:42 2008
vl.c Thu Jan 27 20:35:07 2011
@@ -61,7 +61,8 @@
#include
#ifdef _BSD
@@ -123,16 +123,27 @@ $OpenBSD: patch-vl_c,v 1.1.1.1 2010/05/2
if (ifname1 != NULL)
pstrcpy(ifname, sizeof(ifname), ifname1);
-@@ -4320,7 +4396,7 @@ static int net_socket_mcast_create(struct sockaddr_in
+@@ -4279,6 +4355,7 @@ static int net_socket_mcast_create(struct sockaddr_in
+ struct ip_mreq imr;
+ int fd;
+ int val, ret;
++u_char loop;
+ if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
+ fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) does
not contain a multicast address\n",
+ inet_ntoa(mcastaddr->sin_addr),
+@@ -4318,9 +4395,9 @@ static int net_socket_mcast_create(struct sockaddr_in
+ }
+
/* Force mcast msgs to loopback (eg. several QEMUs in same host */
- val = 1;
+-val = 1;
++loop = 1;
ret=setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
- (const char *)&val, sizeof(val));
-+ (const char *)&val, sizeof(char));
++ (const char *)&loop, sizeof(loop));
if (ret < 0) {
perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
goto fail;
-@@ -4609,7 +4685,8 @@ static const char *get_word(char *buf, int buf_size, c
+@@ -4609,7 +4686,8 @@ static const char *get_word(char *buf, int buf_size, c
return p;
}
@@ -142,7 +153,7 @@ $OpenBSD: patch-vl_c,v 1.1.1.1 2010/05/2
const char *tag, const char *str)
{
const char *p;
-@@ -4748,6 +4825,9 @@ static int net_client_init(const char *str)
+@@ -4748,6 +4826,9 @@ static int net_client_init(const char *str)
char ifname[64];
char setup_script[1024], down_script[1024];
int fd;
@@ -152,7 +163,7 @@ $OpenBSD: patch-vl_c,v 1.1.1.1 2010/05/2
vlan->nb_host_devs++;
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
fd = strtol(buf, NULL, 0);
-@@ -4755,16 +4835,16 @@ static int net_client_init(const char *str)
+@@ -4755,16 +4836,16 @@ static int net_client_init(const char *str)
if (net_tap_fd_init(vlan, fd))
ret = 0;
} else {
@@ -173,7 +184,7 @@ $OpenBSD: patch-vl_c,v 1.1.1.1 2010/05/2
}
} else
#endif
-@@ -8130,19 +8210,23 @@ int main(int argc, char **argv)
+@@ -8130,19 +8211,23 @@ int main(int argc, char **argv)
gdbstub_port = DEFAULT_GDBSTUB_PORT;
#endif
snapshot = 0;
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: hfsplus broken on powerpc
On Thu, Jan 27, 2011 at 3:58 PM, Federico G. Schwindt wrote: > On Thu, Jan 27, 2011 at 11:12:43AM -0800, patrick keshishian wrote: >> On Thu, Jan 27, 2011 at 1:37 AM, Federico G. Schwindt >> wrote: >> > On Wed, Jan 26, 2011 at 05:13:44PM -0800, patrick keshishian wrote: >> >> On Wed, Jan 26, 2011 at 4:45 PM, Federico G. Schwindt >> >> wrote: >> >> > On Wed, Jan 26, 2011 at 03:15:11PM -0800, patrick keshishian wrote: >> >> >> http://marc.info/?l=openbsd-ports&m=129372769129646&w=2 >> >> >> >> >> >> I never got any replies of "yes", "maybe", "you are out of your >> >> >> freaking mind", etc. >> >> > >> >> > ?what about something like this: >> >> > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=300289? >> >> > ?looks simpler imho. >> >> >> >> The libhfsp/src/swab.h source on debian link seems different than what >> >> I see in hfsplus_1.0.4.src.tar.bz2 (just downloaded). >> >> >> >> MD5 (hfsplus_1.0.4.src.tar.bz2) = 18fa1efb5432469357ffa6bfa7c08fcd >> >> size: 185461 >> >> >> >> >> >> Either way, I don't think the dabian patch is correct; at least not >> >> entirely. They propose: >> >> >> >> -#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++) >> >> +#define bswabU16_inc(ptr) ptr = (UInt16*)ptr + 1 >> >> >> >> which will change the following (from btree.c): >> >> >> >> ? ? node->num_rec ? = bswabU16_inc(p); >> >> ? ? node->reserved ?= bswabU16_inc(p); >> >> >> >> to: >> >> ? ? node->num_rec ? = p = (UInt16*)p + 1; >> >> ? ? node->reserved ?= p = (UInt16*)p +1; >> >> >> >> I seriously doubt this is the intent of the original code. >> > >> > ?ok, assuming they wanted "*p; *p++" i believe you can do: >> >> No. The intent is: >> >> some_integer_type = *(some_integer_type*)p; >> p = (some_interger_type*)p + sizeof(some_integer_type); > > sorry, that's what i meant (as opposed to p = p + 1) and the code below > should do that. Nope. What your macro does is "*p; (*p)++". --patrick > f.- > >> > #define bswabU16_inc(ptr) ?((*((UInt16*)(ptr)))++) >> > >> > ?and will give you the right result. >> > >> > ?f.- >> > >
Re: Can't fetch some distfiles on -current (today)
On Thu, Jan 27, 2011 at 18:10, Stuart Henderson wrote: > On 2011/01/27 23:32, Ulrich Kahl wrote: >> Hi! >> >> If I try to fetch the distfiles from textproc/intltool and > > https://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz > works for me. Are you using any non-standard FETCH_CMD? > > If any of those try to access SourceForge, there's been a big outage, and just got SVN up a few hours ago, and the latest I heard was that CVS was still down.
Re: Can't fetch some distfiles on -current (today)
On 2011/01/27 23:32, Ulrich Kahl wrote: > Hi! > > If I try to fetch the distfiles from textproc/intltool and https://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz works for me. Are you using any non-standard FETCH_CMD?
Re: hfsplus broken on powerpc
On Thu, Jan 27, 2011 at 11:12:43AM -0800, patrick keshishian wrote: > On Thu, Jan 27, 2011 at 1:37 AM, Federico G. Schwindt > wrote: > > On Wed, Jan 26, 2011 at 05:13:44PM -0800, patrick keshishian wrote: > >> On Wed, Jan 26, 2011 at 4:45 PM, Federico G. Schwindt > >> wrote: > >> > On Wed, Jan 26, 2011 at 03:15:11PM -0800, patrick keshishian wrote: > >> >> http://marc.info/?l=openbsd-ports&m=129372769129646&w=2 > >> >> > >> >> I never got any replies of "yes", "maybe", "you are out of your > >> >> freaking mind", etc. > >> > > >> > ?what about something like this: > >> > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=300289? > >> > ?looks simpler imho. > >> > >> The libhfsp/src/swab.h source on debian link seems different than what > >> I see in hfsplus_1.0.4.src.tar.bz2 (just downloaded). > >> > >> MD5 (hfsplus_1.0.4.src.tar.bz2) = 18fa1efb5432469357ffa6bfa7c08fcd > >> size: 185461 > >> > >> > >> Either way, I don't think the dabian patch is correct; at least not > >> entirely. They propose: > >> > >> -#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++) > >> +#define bswabU16_inc(ptr) ptr = (UInt16*)ptr + 1 > >> > >> which will change the following (from btree.c): > >> > >> ? ? node->num_rec ? = bswabU16_inc(p); > >> ? ? node->reserved ?= bswabU16_inc(p); > >> > >> to: > >> ? ? node->num_rec ? = p = (UInt16*)p + 1; > >> ? ? node->reserved ?= p = (UInt16*)p +1; > >> > >> I seriously doubt this is the intent of the original code. > > > > ?ok, assuming they wanted "*p; *p++" i believe you can do: > > No. The intent is: > > some_integer_type = *(some_integer_type*)p; > p = (some_interger_type*)p + sizeof(some_integer_type); sorry, that's what i meant (as opposed to p = p + 1) and the code below should do that. f.- > > #define bswabU16_inc(ptr) ?((*((UInt16*)(ptr)))++) > > > > ?and will give you the right result. > > > > ?f.- > >
Re: Can't fetch some distfiles on -current (today)
On Thu, Jan 27, 2011 at 11:32:25PM +0100, Ulrich Kahl wrote: > Hi! > > If I try to fetch the distfiles from textproc/intltool and > x11/xfce4/libxfce4menu, I get errors (forbidden or 404). x11/xfce4/libxfce4menu is unlinked from the build, and discontinued upstream (well replaced by garcon as of xfce 4.8). Should be cvs rm'ed. Check x11/xfce4/Makefile is up to date. Landry
Can't fetch some distfiles on -current (today)
Hi! If I try to fetch the distfiles from textproc/intltool and x11/xfce4/libxfce4menu, I get errors (forbidden or 404). In the first case, changing the HOMEPAGE to http:// helped, in the second case, it seems so, that the subdirectory is in a complete different location on the server. I don't know if other ports have the same problem, or if I have an absolute broken ports tree, so if someone can check it, it would be great. Ulrich
O Χορός του Έρωτα - Για τη γιορτή των Ερωτευμένων
( http://www.antigoni-jewellery.gr/index.php?option=com_virtuemart&page=shop.browse&manufacturer_id=9&Itemid=53&lang=el ) Αντιγόνη Καπουτζή - σχεδιασμός, δημιουργία κοσμημάτων Official site ( http://www.antigoni.com ) | Portal ( http://www.antigoni-friends.gr ) | E-shop ( http://www.antigoni-jewellery.gr ) Μην απαντάτε σε αυτό το μήνυμα. Πατήστε εδώ για αυτόματη διαγραφή ( http://antigoni-friends.gr/index.php?option=com_acymailing&ctrl=user&task=unsub&mailid=22&subid=176831&key=3b3e8848236937c48b70c14117d78a10 )
Re: hfsplus broken on powerpc
On Thu, Jan 27, 2011 at 1:37 AM, Federico G. Schwindt wrote: > On Wed, Jan 26, 2011 at 05:13:44PM -0800, patrick keshishian wrote: >> On Wed, Jan 26, 2011 at 4:45 PM, Federico G. Schwindt >> wrote: >> > On Wed, Jan 26, 2011 at 03:15:11PM -0800, patrick keshishian wrote: >> >> http://marc.info/?l=openbsd-ports&m=129372769129646&w=2 >> >> >> >> I never got any replies of "yes", "maybe", "you are out of your >> >> freaking mind", etc. >> > >> > ?what about something like this: >> > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=300289? >> > ?looks simpler imho. >> >> The libhfsp/src/swab.h source on debian link seems different than what >> I see in hfsplus_1.0.4.src.tar.bz2 (just downloaded). >> >> MD5 (hfsplus_1.0.4.src.tar.bz2) = 18fa1efb5432469357ffa6bfa7c08fcd >> size: 185461 >> >> >> Either way, I don't think the dabian patch is correct; at least not >> entirely. They propose: >> >> -#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++) >> +#define bswabU16_inc(ptr) ptr = (UInt16*)ptr + 1 >> >> which will change the following (from btree.c): >> >> node->num_rec = bswabU16_inc(p); >> node->reserved = bswabU16_inc(p); >> >> to: >> node->num_rec = p = (UInt16*)p + 1; >> node->reserved = p = (UInt16*)p +1; >> >> I seriously doubt this is the intent of the original code. > > ok, assuming they wanted "*p; *p++" i believe you can do: No. The intent is: some_integer_type = *(some_integer_type*)p; p = (some_interger_type*)p + sizeof(some_integer_type); --patrick > > #define bswabU16_inc(ptr) ((*((UInt16*)(ptr)))++) > > and will give you the right result. > > f.- >
Re: hfsplus broken on powerpc
On Wed, Jan 26, 2011 at 05:13:44PM -0800, patrick keshishian wrote: > On Wed, Jan 26, 2011 at 4:45 PM, Federico G. Schwindt > wrote: > > On Wed, Jan 26, 2011 at 03:15:11PM -0800, patrick keshishian wrote: > >> http://marc.info/?l=openbsd-ports&m=129372769129646&w=2 > >> > >> I never got any replies of "yes", "maybe", "you are out of your > >> freaking mind", etc. > > > > ?what about something like this: > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=300289? > > ?looks simpler imho. > > The libhfsp/src/swab.h source on debian link seems different than what > I see in hfsplus_1.0.4.src.tar.bz2 (just downloaded). > > MD5 (hfsplus_1.0.4.src.tar.bz2) = 18fa1efb5432469357ffa6bfa7c08fcd > size: 185461 > > > Either way, I don't think the dabian patch is correct; at least not > entirely. They propose: > > -#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++) > +#define bswabU16_inc(ptr) ptr = (UInt16*)ptr + 1 > > which will change the following (from btree.c): > > node->num_rec = bswabU16_inc(p); > node->reserved = bswabU16_inc(p); > > to: > node->num_rec = p = (UInt16*)p + 1; > node->reserved = p = (UInt16*)p +1; > > I seriously doubt this is the intent of the original code. ok, assuming they wanted "*p; *p++" i believe you can do: #define bswabU16_inc(ptr) ((*((UInt16*)(ptr)))++) and will give you the right result. f.-
