From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch | 11 ---- app-admin/fam/files/fam-2.7.0-out-of-tree.patch | 13 ----- app-admin/fam/files/fam-2.7.0-patch-header.patch | 66 ---------------------- app-admin/fam/files/fam-2.7.0-sysmacros.patch | 15 ----- app-admin/fam/files/famd | 26 --------- 5 files changed, 131 deletions(-) delete mode 100644 app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch delete mode 100644 app-admin/fam/files/fam-2.7.0-out-of-tree.patch delete mode 100644 app-admin/fam/files/fam-2.7.0-patch-header.patch delete mode 100644 app-admin/fam/files/fam-2.7.0-sysmacros.patch delete mode 100644 app-admin/fam/files/famd (limited to 'app-admin/fam/files') 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 deleted file mode 100644 index 5799fb3eff1b..000000000000 --- a/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-out-of-tree.patch b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch deleted file mode 100644 index 51fdadf38fe6..000000000000 --- a/app-admin/fam/files/fam-2.7.0-out-of-tree.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 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 deleted file mode 100644 index 808f4324db4a..000000000000 --- a/app-admin/fam/files/fam-2.7.0-patch-header.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- 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"); diff --git a/app-admin/fam/files/fam-2.7.0-sysmacros.patch b/app-admin/fam/files/fam-2.7.0-sysmacros.patch deleted file mode 100644 index ac42dca3bea6..000000000000 --- a/app-admin/fam/files/fam-2.7.0-sysmacros.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 - #include - #include -+#include - #include - #include - #include diff --git a/app-admin/fam/files/famd b/app-admin/fam/files/famd deleted file mode 100644 index da3d745b244a..000000000000 --- a/app-admin/fam/files/famd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - - need portmap - -} - -start() { - - ebegin "Starting famd" - start-stop-daemon --start --quiet --exec /usr/sbin/famd \ - -- -T 0 -c /etc/fam.conf - eend $? - -} - -stop() { - - ebegin "Stopping famd" - start-stop-daemon --stop --quiet --exec /usr/sbin/famd - eend $? - -} -- cgit v1.2.3