[gentoo-commits] repo/gentoo:master commit in: app-admin/fam/files/, app-admin/fam/

[gentoo-commits] repo/gentoo:master commit in: app-admin/fam/files/, app-admin/fam/

[Mike Frysinger]

commit:     93aa4938c198262facb58c264846571b3894c32e
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 05:06:27 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 05:08:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93aa4938

app-admin/fam: make out of tree builds work to avoid pointless source tree copies

 app-admin/fam/fam-2.7.0-r7.ebuild               |  4 ++--
 app-admin/fam/files/fam-2.7.0-out-of-tree.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index 166061b..179ada6 100644
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -28,14 +28,14 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
 	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
 
+	epatch "${FILESDIR}"/${P}-out-of-tree.patch
 	epatch "${FILESDIR}"/${P}-sysmacros.patch #580702
 
 	eautoreconf
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	econf $(use_enable static-libs static)
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
 
 	# These are thrown away later
 	if ! multilib_is_native_abi ; then

diff --git a/app-admin/fam/files/fam-2.7.0-out-of-tree.patch b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
new file mode 100644
index 00000000..51fdadf
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
@@ -0,0 +1,13 @@
+fix out of tree builds
+
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,7 +7,7 @@
+ 	Client.h \
+ 	fam.c++
+ 
+-libfam_la_LDFLAGS = -export-symbols fam.sym
++libfam_la_LDFLAGS = -export-symbols $(srcdir)/fam.sym
+ libfam_la_LIBADD = -lstdc++
+ 
+ EXTRA_DIST = fam.sym

[gentoo-commits] repo/gentoo:master commit in: app-admin/fam/files/, app-admin/fam/

[Mike Frysinger]

commit:     d44615da815563b029843855df7ed220a85e17c4
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 05:03:34 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 05:08:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44615da

app-admin/fam: fix build w/newer glibc #580702

 app-admin/fam/fam-2.7.0-r7.ebuild             |  2 ++
 app-admin/fam/files/fam-2.7.0-sysmacros.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index f85d60d..166061b 100644
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -28,6 +28,8 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
 	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
 
+	epatch "${FILESDIR}"/${P}-sysmacros.patch #580702
+
 	eautoreconf
 	multilib_copy_sources
 }

diff --git a/app-admin/fam/files/fam-2.7.0-sysmacros.patch b/app-admin/fam/files/fam-2.7.0-sysmacros.patch
new file mode 100644
index 00000000..ac42dca
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-sysmacros.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/580702
+
+fix build with newer glibc where sys/sysmacros.h isn't implicitly included
+by sys/types.h
+
+--- a/src/DNotify.c++
++++ b/src/DNotify.c++
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <libgen.h>

[gentoo-commits] repo/gentoo:master commit in: app-admin/fam/files/, app-admin/fam/

[Jeroen Roovers]

commit:     24f2e8a765da778cabf83f56e00ec7c4b15aaab9
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 13:06:24 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 13:06:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f2e8a7

app-admin/fam: Bump Debian patchset. Use net-libs/libtirpc (bug #631386).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/fam/Manifest                             |  1 +
 app-admin/fam/fam-2.7.0_p17_p2.ebuild              | 70 ++++++++++++++++++++++
 .../fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch     | 11 ++++
 app-admin/fam/files/fam-2.7.0-patch-header.patch   | 66 ++++++++++++++++++++
 4 files changed, 148 insertions(+)

diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index a2557228cd6..914b1bab745 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -1,2 +1,3 @@
 DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2
+DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
 DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209

diff --git a/app-admin/fam/fam-2.7.0_p17_p2.ebuild b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
new file mode 100644
index 00000000000..2872f6a3d33
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic ltprune multilib-minimal
+
+FAM_PV="${PV/_p*/}"
+DEBIAN_PATCH="${PV#*_p}"
+DEBIAN_PATCH="${DEBIAN_PATCH/_p/.}"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="
+	ftp://oss.sgi.com/projects/fam/download/stable/${PN}-${FAM_PV}.tar.gz
+	mirror://debian/pool/main/f/${PN}/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff.gz
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	!app-admin/gamin
+	net-libs/libtirpc
+	net-nds/rpcbind
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+S=${WORKDIR}/${PN}-${FAM_PV}
+
+src_prepare() {
+	eapply "${WORKDIR}"/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff
+	edos2unix debian/patches/10_debianbug375967.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-patch-header.patch
+
+	eapply debian/patches/*patch
+
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-out-of-tree.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-sysmacros.patch #580702
+
+	eapply_user
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $(${PKG_CONFIG} --cflags libtirpc)
+	append-libs $(${PKG_CONFIG} --libs libtirpc)
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+
+	# These are thrown away later
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/src conf man//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+
+	sed -i "${D}"/etc/fam.conf \
+		-e "s:local_only = false:local_only = true:g" \
+		|| die "sed fam.conf"
+
+	doinitd "${FILESDIR}/famd"
+}

diff --git a/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch b/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch
new file mode 100644
index 00000000000..5799fb3eff1
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ dnl AC_CONFIG_SRCDIR([acconfig.h])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_LANG(C++)
+ 
+ # Variables used by the FAM source.

diff --git a/app-admin/fam/files/fam-2.7.0-patch-header.patch b/app-admin/fam/files/fam-2.7.0-patch-header.patch
new file mode 100644
index 00000000000..808f4324db4
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-patch-header.patch
@@ -0,0 +1,66 @@
+--- a/debian/patches/15-partial_send.patch
++++ b/debian/patches/15-partial_send.patch
+@@ -1,6 +1,6 @@
+ diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.c++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++
+---- fam-2.7.0/fam-2.7.0/src/NetConnection.c++	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++	2007-07-30 12:57:19.812380334 -0400
++--- a/src/NetConnection.c++	2003-01-18 09:18:12.000000000 -0500
+++++ b/src/NetConnection.c++	2007-07-30 12:57:19.812380334 -0400
+ @@ -213,6 +213,7 @@
+  
+      msgList_t * msg = new msgList_t;
+@@ -31,8 +31,8 @@
+              {
+                  /* Since the client library can close it's fd before
+ diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.h fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h
+---- fam-2.7.0/fam-2.7.0/src/NetConnection.h	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h	2007-07-30 12:53:46.746803625 -0400
++--- a/src/NetConnection.h	2003-01-18 09:18:12.000000000 -0500
+++++ b/src/NetConnection.h	2007-07-30 12:53:46.746803625 -0400
+ @@ -80,6 +80,7 @@
+      typedef struct msgList_s {
+          char msg[MAXMSGSIZE+5];  //  + 4 for 32-bit length, + 1 for overflow
+--- a/debian/patches/16-port_number.patch
++++ b/debian/patches/16-port_number.patch
+@@ -1,6 +1,6 @@
+ diff -Naur fam-2.7.0/fam-2.7.0/man/famd.8 fam-2.7.0-mod/fam-2.7.0/man/famd.8
+---- fam-2.7.0/fam-2.7.0/man/famd.8	2003-01-19 19:58:11.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/man/famd.8	2007-07-30 12:23:15.292527117 -0400
++--- a/man/famd.8	2003-01-19 19:58:11.000000000 -0500
+++++ b/man/famd.8	2007-07-30 12:23:15.292527117 -0400
+ @@ -51,6 +51,9 @@
+  Register with the portmapper using the specifed RPC program
+  and version numbers.
+@@ -12,8 +12,8 @@
+  Poll a remove NFS server every \fIperiod\fR seconds
+  to obtain file updates if the remove server is not running \fBfamd\fR.
+ diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.c++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++
+---- fam-2.7.0/fam-2.7.0/src/Listener.c++	2003-01-19 19:37:29.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++	2007-07-26 16:32:03.863758810 -0400
++--- a/src/Listener.c++	2003-01-19 19:37:29.000000000 -0500
+++++ b/src/Listener.c++	2007-07-26 16:32:03.863758810 -0400
+ @@ -60,13 +60,14 @@
+  
+  static void cleanup_negotiation(void *closure);
+@@ -57,8 +57,8 @@
+  	if (listen(sock, 1) < 0)
+  	{
+ diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.h fam-2.7.0-mod/fam-2.7.0/src/Listener.h
+---- fam-2.7.0/fam-2.7.0/src/Listener.h	2003-01-18 09:18:12.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.h	2007-07-26 16:32:50.682255289 -0400
++--- a/src/Listener.h	2003-01-18 09:18:12.000000000 -0500
+++++ b/src/Listener.h	2007-07-26 16:32:50.682255289 -0400
+ @@ -51,7 +51,9 @@
+  
+      Listener(bool started_by_inetd,
+@@ -79,8 +79,8 @@
+      //  Private Instance Methods
+  
+ diff -Naur fam-2.7.0/fam-2.7.0/src/main.c++ fam-2.7.0-mod/fam-2.7.0/src/main.c++
+---- fam-2.7.0/fam-2.7.0/src/main.c++	2003-01-19 01:15:51.000000000 -0500
+-+++ fam-2.7.0-mod/fam-2.7.0/src/main.c++	2007-05-08 16:42:35.618954322 -0400
++--- a/src/main.c++	2003-01-19 01:15:51.000000000 -0500
+++++ b/src/main.c++	2007-05-08 16:42:35.618954322 -0400
+ @@ -89,6 +89,7 @@
+      fprintf(stderr, "\t-d\t\tdebug\n");
+      fprintf(stderr, "\t-v\t\tverbose\n");