Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/fam/files: fam-2.7.0-gcc44.patch fam-2.7.0-limits.patch fam-2.7.0-gcc43.patch fam-2.7.0-gcc41.patch
Date: Mon, 24 Jan 2011 04:37:08
Message-Id: 20110124043659.12E0120057@flycatcher.gentoo.org
1 jer 11/01/24 04:36:58
2
3 Modified: fam-2.7.0-gcc44.patch fam-2.7.0-limits.patch
4 fam-2.7.0-gcc43.patch fam-2.7.0-gcc41.patch
5 Log:
6 Clean up patches.
7
8 (Portage version: 2.2.0_alpha19/cvs/Linux i686)
9
10 Revision Changes Path
11 1.2 app-admin/fam/files/fam-2.7.0-gcc44.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc44.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc44.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc44.patch?r1=1.1&r2=1.2
16
17 Index: fam-2.7.0-gcc44.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc44.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- fam-2.7.0-gcc44.patch 8 Jun 2009 03:27:44 -0000 1.1
24 +++ fam-2.7.0-gcc44.patch 24 Jan 2011 04:36:58 -0000 1.2
25 @@ -1,5 +1,5 @@
26 ---- fam-2.7.0-orig/src/NFSFileSystem.c++ 2009-06-03 19:20:51.000000000 +0300
27 -+++ fam-2.7.0/src/NFSFileSystem.c++ 2009-06-03 19:21:57.000000000 +0300
28 +--- a/src/NFSFileSystem.c++
29 ++++ b/src/NFSFileSystem.c++
30 @@ -97,7 +97,7 @@
31
32 attr_cache_timeout = ACREGMAX;
33
34
35
36 1.2 app-admin/fam/files/fam-2.7.0-limits.patch
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-limits.patch?rev=1.2&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-limits.patch?rev=1.2&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-limits.patch?r1=1.1&r2=1.2
41
42 Index: fam-2.7.0-limits.patch
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/app-admin/fam/files/fam-2.7.0-limits.patch,v
45 retrieving revision 1.1
46 retrieving revision 1.2
47 diff -u -r1.1 -r1.2
48 --- fam-2.7.0-limits.patch 29 May 2005 11:05:50 -0000 1.1
49 +++ fam-2.7.0-limits.patch 24 Jan 2011 04:36:58 -0000 1.2
50 @@ -1,5 +1,5 @@
51 ---- include/fam.h.orig 2005-05-06 17:42:40.772797499 +0100
52 -+++ include/fam.h 2005-05-06 17:36:55.081176093 +0100
53 +--- a/include/fam.h
54 ++++ b/include/fam.h
55 @@ -41,7 +41,7 @@
56 *****************************************************************************/
57
58
59
60
61 1.3 app-admin/fam/files/fam-2.7.0-gcc43.patch
62
63 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?rev=1.3&view=markup
64 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?rev=1.3&content-type=text/plain
65 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch?r1=1.2&r2=1.3
66
67 Index: fam-2.7.0-gcc43.patch
68 ===================================================================
69 RCS file: /var/cvsroot/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc43.patch,v
70 retrieving revision 1.2
71 retrieving revision 1.3
72 diff -u -r1.2 -r1.3
73 --- fam-2.7.0-gcc43.patch 4 Dec 2008 23:58:23 -0000 1.2
74 +++ fam-2.7.0-gcc43.patch 24 Jan 2011 04:36:58 -0000 1.3
75 @@ -1,6 +1,5 @@
76 -diff -Naur fam-2.7.0-orig/include/BTree.h fam-2.7.0/include/BTree.h
77 ---- fam-2.7.0-orig/include/BTree.h 2003-01-19 22:22:30.000000000 -0600
78 -+++ fam-2.7.0/include/BTree.h 2008-12-04 17:51:22.000000000 -0600
79 +--- a/include/BTree.h
80 ++++ b/include/BTree.h
81 @@ -24,6 +24,7 @@
82 #define BTree_included
83
84 @@ -9,9 +8,8 @@
85
86 // This is an in-core B-Tree implementation.
87 //
88 -diff -Naur fam-2.7.0-orig/lib/Client.c++ fam-2.7.0/lib/Client.c++
89 ---- fam-2.7.0-orig/lib/Client.c++ 2003-01-18 08:18:12.000000000 -0600
90 -+++ fam-2.7.0/lib/Client.c++ 2008-12-04 17:51:19.000000000 -0600
91 +--- a/lib/Client.c++
92 ++++ b/lib/Client.c++
93 @@ -34,7 +34,7 @@
94 #include <syslog.h>
95 #include <errno.h>
96 @@ -21,9 +19,8 @@
97
98 #include "fam.h"
99 #include "Client.h"
100 -diff -Naur fam-2.7.0-orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
101 ---- fam-2.7.0-orig/src/DNotify.c++ 2008-12-04 17:50:48.000000000 -0600
102 -+++ fam-2.7.0/src/DNotify.c++ 2008-12-04 17:51:19.000000000 -0600
103 +--- a/src/DNotify.c++
104 ++++ b/src/DNotify.c++
105 @@ -31,6 +31,7 @@
106 #include <sys/types.h>
107 #include <sys/stat.h>
108 @@ -32,9 +29,8 @@
109
110 #include "DNotify.h"
111
112 -diff -Naur fam-2.7.0-orig/src/IMon.c++ fam-2.7.0/src/IMon.c++
113 ---- fam-2.7.0-orig/src/IMon.c++ 2003-01-18 08:18:12.000000000 -0600
114 -+++ fam-2.7.0/src/IMon.c++ 2008-12-04 17:51:19.000000000 -0600
115 +--- a/src/IMon.c++
116 ++++ b/src/IMon.c++
117 @@ -40,7 +40,7 @@
118 #include "Interest.h"
119 #include "Log.h"
120 @@ -44,9 +40,8 @@
121
122 int IMon::imonfd = -2;
123 IMon::EventHandler IMon::ehandler = NULL;
124 -diff -Naur fam-2.7.0-orig/src/Interest.h fam-2.7.0/src/Interest.h
125 ---- fam-2.7.0-orig/src/Interest.h 2008-12-04 17:50:48.000000000 -0600
126 -+++ fam-2.7.0/src/Interest.h 2008-12-04 17:51:22.000000000 -0600
127 +--- a/src/Interest.h
128 ++++ b/src/Interest.h
129 @@ -29,6 +29,7 @@
130 #include <netinet/in.h> // for in_addr
131
132
133
134
135 1.2 app-admin/fam/files/fam-2.7.0-gcc41.patch
136
137 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc41.patch?rev=1.2&view=markup
138 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc41.patch?rev=1.2&content-type=text/plain
139 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc41.patch?r1=1.1&r2=1.2
140
141 Index: fam-2.7.0-gcc41.patch
142 ===================================================================
143 RCS file: /var/cvsroot/gentoo-x86/app-admin/fam/files/fam-2.7.0-gcc41.patch,v
144 retrieving revision 1.1
145 retrieving revision 1.2
146 diff -u -r1.1 -r1.2
147 --- fam-2.7.0-gcc41.patch 28 Nov 2005 18:35:27 -0000 1.1
148 +++ fam-2.7.0-gcc41.patch 24 Jan 2011 04:36:58 -0000 1.2
149 @@ -1,6 +1,5 @@
150 -diff -dpruN fam-2.7.0.orig/src/DNotify.h fam-2.7.0/src/DNotify.h
151 ---- fam-2.7.0.orig/src/DNotify.h 2005-11-16 08:49:13.000000000 +0100
152 -+++ fam-2.7.0/src/DNotify.h 2005-11-16 08:54:04.972188928 +0100
153 +--- a/src/DNotify.h
154 ++++ b/src/DNotify.h
155 @@ -59,8 +59,8 @@ private:
156 static int pipe_write_fd;
157 static int pipe_read_fd;