Fixup FreeBSD support, bug #99158.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 129 insertions, 9 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 588f38f50c4d..45e4f9460163 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gamin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.23 2005/07/16 08:09:15 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.24 2005/07/16 08:16:46 azarah Exp $
+
+  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/gamin-0.1.2-freebsd.patch, gamin-0.1.2.ebuild:
+  Fixup FreeBSD support, bug #99158.
 
 *gamin-0.1.2 (16 Jul 2005)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 80286f3273dc..d2d2ff29c62d 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -3,11 +3,11 @@ Hash: SHA1
 
 MD5 59d28e6a7eced2cd85355b76c6ae02b4 gamin-0.0.26.ebuild 1186
 MD5 2695c38fbf4b4e11fe5d9c4d6f080ffc gamin-0.0.18.ebuild 889
-MD5 ec1d03fa33afb40ea89868ed4812c9e6 gamin-0.1.2.ebuild 1717
+MD5 ad7f830d0eab5cd55d254f5265c6c197 gamin-0.1.2.ebuild 1809
 MD5 e14b51caa6ba40b1982f36284c19f75b gamin-0.0.19.ebuild 833
 MD5 d56aae268087693c5b5fe3fc58cdae4c gamin-0.0.25.ebuild 1185
 MD5 0cdad230fe4f3ab61550ef8079ddeb1f gamin-0.0.26-r6.ebuild 1258
-MD5 80a34990f58bb83cc15824af04e3ccd0 ChangeLog 4532
+MD5 ceffbe12d1f8db8d7a1c2e86387566b2 ChangeLog 4678
 MD5 03f3bc849895689c9635a6a7e8c11d0b gamin-0.1.1.ebuild 1345
 MD5 1a12b6356c49807d6a034d775c96575f gamin-0.0.20.ebuild 828
 MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
@@ -19,6 +19,7 @@ MD5 caf15e7329c9675dff66e7f65b424e79 files/digest-gamin-0.0.26-r6 64
 MD5 c576a2ec43ce151b5bc78b77e0f58c9a files/digest-gamin-0.0.15 64
 MD5 caf15e7329c9675dff66e7f65b424e79 files/digest-gamin-0.0.26 64
 MD5 b183176dcfe9a0ad1609767f11cafc12 files/digest-gamin-0.0.18 64
+MD5 34c4d5ec0d78793575451f664d9de425 files/gamin-0.1.2-freebsd.patch 4312
 MD5 04ae13b77ce72f4c93d0460b1bbcfd57 files/digest-gamin-0.0.20 64
 MD5 35d7d4d3208d674f62e4f2d7ef7d383f files/digest-gamin-0.0.19 64
 MD5 2ab0167c306465e140ebfe2d8151fced files/digest-gamin-0.1.2 63
@@ -27,7 +28,7 @@ MD5 315c32e4751bc7d3bcfd88e03841a168 files/gamin-0.0.26-inotify_use_fd.patch 275
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC2MFB1ZcsMnZjRyIRAgl6AKC0DW3mKmbORkVxionyfakdTgxK8QCfYywj
-K9C5kcSW1Z4EmmXtEM5ieDQ=
-=J0/Q
+iD8DBQFC2MMF1ZcsMnZjRyIRAoElAJ9+RTO7WC3dvJlBoljOgu1c2fn1gQCcD4NW
+oR/Em1q4uIUP/uL9RtXdffo=
+=FoPI
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gamin/files/gamin-0.1.2-freebsd.patch b/app-admin/gamin/files/gamin-0.1.2-freebsd.patch
new file mode 100644
index 000000000000..39ad8c485847
--- /dev/null
+++ b/app-admin/gamin/files/gamin-0.1.2-freebsd.patch
@@ -0,0 +1,113 @@
+diff -ur gamin-0.1.2/libgamin/gam_api.c gamin-0.1.2-fbsd/libgamin/gam_api.c
+--- gamin-0.1.2/libgamin/gam_api.c	2005-06-15 12:53:25.000000000 +0200
++++ gamin-0.1.2-fbsd/libgamin/gam_api.c	2005-07-16 00:15:37.317345328 +0200
+@@ -421,7 +421,7 @@
+ {
+     char data[2] = { 0, 0 };
+     int written;
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
+     struct {
+ 	    struct cmsghdr hdr;
+ 	    struct cmsgcred cred;
+@@ -445,7 +445,7 @@
+ #endif
+ 
+ retry:
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
+     written = sendmsg(fd, &msg, 0);
+ #else
+     written = write(fd, &data[0], 1);
+@@ -655,7 +655,7 @@
+ 
+     s_uid = getuid();
+ 
+-#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
++#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
+     /* Set the socket to receive credentials on the next message */
+     {
+         int on = 1;
+Only in gamin-0.1.2-fbsd/libgamin: gam_api.c.orig
+diff -ur gamin-0.1.2/libgamin/gam_data.c gamin-0.1.2-fbsd/libgamin/gam_data.c
+--- gamin-0.1.2/libgamin/gam_data.c	2005-05-18 16:45:04.000000000 +0200
++++ gamin-0.1.2-fbsd/libgamin/gam_data.c	2005-07-16 00:15:37.321344720 +0200
+@@ -471,7 +471,7 @@
+     }
+     if (is_threaded > 0) {
+ 	pthread_mutexattr_init(&attr);
+-	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
++	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ 	pthread_mutex_init(&ret->lock, &attr);
+ 	pthread_mutexattr_destroy(&attr);
+     }
+diff -ur gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_channel.c
+--- gamin-0.1.2/server/gam_channel.c	2005-06-15 13:02:34.000000000 +0200
++++ gamin-0.1.2-fbsd/server/gam_channel.c	2005-07-16 00:15:37.326343960 +0200
+@@ -29,7 +29,7 @@
+ {
+     char data[2] = { 0, 0 };
+     int written;
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
+     struct {
+ 	    struct cmsghdr hdr;
+ 	    struct cmsgcred cred;
+@@ -53,7 +53,7 @@
+ #endif
+ 
+ retry:
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
+     written = sendmsg(fd, &msg, 0);
+ #else
+     written = write(fd, &data[0], 1);
+@@ -100,7 +100,7 @@
+ 
+     s_uid = getuid();
+ 
+-#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
++#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
+     /* Set the socket to receive credentials on the next message */
+     {
+         int on = 1;
+diff -ur gamin-0.1.2/server/gam_connection.c gamin-0.1.2-fbsd/server/gam_connection.c
+--- gamin-0.1.2/server/gam_connection.c	2005-06-14 14:31:19.000000000 +0200
++++ gamin-0.1.2-fbsd/server/gam_connection.c	2005-07-16 00:15:37.332343048 +0200
+@@ -30,10 +30,7 @@
+     GMainLoop *loop;            /* the Glib loop used */
+     GIOChannel *source;         /* the Glib I/O Channel used */
+     int request_len;            /* how many bytes of request are valid */
+-    union {
+-	GAMPacket request;      /* the next request being read */
+-	void *request_data;     /* the next request as a char *  */
+-    };
++    GAMPacket request;          /* the next request being read */
+     GamListener *listener;      /* the listener associated with the connection */
+ };
+ 
+@@ -245,7 +242,7 @@
+     g_assert(data);
+     g_assert(size);
+ 
+-    *data = (char *) &conn->request_data + conn->request_len;
++    *data = (char *) &conn->request + conn->request_len;
+     *size = sizeof(GAMPacket) - conn->request_len;
+ 
+     return (0);
+diff -ur gamin-0.1.2/tests/testing.c gamin-0.1.2-fbsd/tests/testing.c
+--- gamin-0.1.2/tests/testing.c	2005-06-13 10:59:29.000000000 +0200
++++ gamin-0.1.2-fbsd/tests/testing.c	2005-07-16 00:15:37.337342288 +0200
+@@ -436,9 +436,9 @@
+             return (-1);
+         }
+         /*
+-         * wait at most 3 secs before declaring failure
++         * wait at most 7 secs before declaring failure
+          */
+-        while ((delay < 30) && (testState.nb_events < nb_events + count)) {
++        while ((delay < 70) && (testState.nb_events < nb_events + count)) {
+             debugLoop(100);
+ 
+ /*	    printf("+"); fflush(stdout); */
+Only in gamin-0.1.2-fbsd/tests: testing.c.orig
diff --git a/app-admin/gamin/gamin-0.1.2.ebuild b/app-admin/gamin/gamin-0.1.2.ebuild
index e0bb7d16c2be..6a99d31fdd66 100644
--- a/app-admin/gamin/gamin-0.1.2.ebuild
+++ b/app-admin/gamin/gamin-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.2.ebuild,v 1.1 2005/07/16 08:09:15 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.2.ebuild,v 1.2 2005/07/16 08:16:46 azarah Exp $
 
 inherit eutils libtool
 
@@ -24,12 +24,14 @@ PROVIDE="virtual/fam"
 
 src_unpack() {
 	unpack ${A}
-	
+
 	cd ${S}
+	# Fixup FreeBSD support, bug #99158
+	epatch ${FILESDIR}/${P}-freebsd.patch
 	# Add support for legacy inotify interface
 	epatch ${FILESDIR}/${P}-inotify-legacy-backend.patch
 
-	# Needed by above patch
+	# Needed by above 'legacy inotify' patch
 	aclocal || die "aclocal failed"
 	autoheader || die "autoheader failed"
 	libtoolize --automake -c -f || die "libtoolize failed"