Cyril Brulebois <k...@debian.org> (03/07/2009):
> I'm going to upload to DELAYED/15 (so that the patch doesn't stay in
> the BTS forever) once I've received the bug number, but feel free to
> do another MU in the meanwhile (at least nfs-utils has a dep-wait on
> it, although I'd bet it also needs some Linux-specific stuff). :)
I just did so. Maybe the build log would be nicer if there wasn't
DH_VERBOSE=1 in debian/rules, too? :)
Mraw,
KiBi.
diff -u librpcsecgss-0.18/debian/changelog librpcsecgss-0.18/debian/changelog
--- librpcsecgss-0.18/debian/changelog
+++ librpcsecgss-0.18/debian/changelog
@@ -1,3 +1,12 @@
+librpcsecgss (0.18-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS on GNU/kFreeBSD by using getpid() (rather than arc4random())
+ not only if __linux__ is defined, but also if __GLIBC__ is defined, in
+ both src/clnt_{tcp,udp}.c (Closes: #535587).
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 03 Jul 2009 15:21:03 +0200
+
librpcsecgss (0.18-2) unstable; urgency=low
* DH compatibility level is 7
only in patch2:
unchanged:
--- librpcsecgss-0.18.orig/src/clnt_udp.c
+++ librpcsecgss-0.18/src/clnt_udp.c
@@ -154,7 +154,7 @@
cu->cu_total.tv_usec = -1;
cu->cu_sendsz = sendsz;
cu->cu_recvsz = recvsz;
-#ifdef __linux__
+#if defined (__linux__) || defined(__GLIBC__)
call_msg.rm_xid = getpid() ^ now.tv_sec ^ now.tv_usec;
#else
call_msg.rm_xid = arc4random();
only in patch2:
unchanged:
--- librpcsecgss-0.18.orig/src/clnt_tcp.c
+++ librpcsecgss-0.18/src/clnt_tcp.c
@@ -226,7 +226,7 @@
* Initialize call message
*/
(void)gettimeofday(&now, (struct timezone *)0);
-#ifdef __linux__
+#if defined (__linux__) || defined(__GLIBC__)
call_msg.rm_xid = getpid() ^ now.tv_sec ^ now.tv_usec;
#else
call_msg.rm_xid = arc4random();
