tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

www/firefox issue in osfile__unix__back.jsm patch?



Hi,

The so-called "Firefox Sync" stuff stopped working for me after the update to
firefox-27.0. I could include loads of hairy firefox error logs if needed, but
I'm not sure it would be useful at all.

I could make this thing work again by fiddling with
patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm

More precisely, I reverted part of the changes that were made for the
import of ff-27. Here is my diff-of-diff:

--- patch-toolkit_components_osfile_modules_osfile__unix__back.jsm~     
2014-02-15 19:42:13.000000000 +0100
+++ patch-toolkit_components_osfile_modules_osfile__unix__back.jsm      
2014-02-19 23:30:37.000000000 +0100
@@ -13,7 +13,7 @@
  
 +       if (OS.Constants.Sys.Name == "NetBSD") {
 +       // NetBSD 5.0 uses *30, and netbsd-6 uses *50
-+       let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50";
++       let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "30";
 +       declareLazyFFI(SysFile,  "opendir", libc, "__opendir"+v, 
ctypes.default_abi,
 +                    /*return*/ Type.null_or_DIR_ptr,
 +                    /*path*/   Type.path);
@@ -31,7 +31,7 @@
                        /*dir*/   Type.DIR.in_ptr); // For MacOS X
 +       } else if (OS.Constants.Sys.Name == "NetBD") {
 +         // NetBSD 5.0 uses *30, and netbsd-6 uses *50
-+         let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50";
++         let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "30";
 +         declareLazyFFI(SysFile,  "readdir", libc, "__readdir"+v, 
ctypes.default_abi,
 +                      /*return*/Type.null_or_dirent_ptr,
 +                      /*dir*/   Type.DIR.in_ptr);


The fact is that I don't have any __opendir50 nor __readdir50 in my libc. This
is on i386 -current (NetBSD 6.99.31 (FICUS) #11: Sat Feb 15 14:26:18 CET 2014),
with COMPAT_50 and COMPAT_60 for that matter:

ficus[~] > nm /usr/lib/libc.so | grep __opendir
000988ca T __opendir2
001049d6 T __opendir230
00104a21 T __opendir30
ficus[~] > nm /usr/lib/libc.so | grep __readdir
0006f124 T ___readdir_unlocked30
00105770 T ___readdir_unlocked50
00105843 T __readdir30
001058b5 T __readdir_r30

I have no idea whether I do have something seriously wrong in my setup, or if
there something wrong with the pkgsrc patch? Any hint?

Anthony


Home | Main Index | Thread Index | Old Index