Gentoo Archives: gentoo-commits

From: "Michael Haubenwallner (haubi)" <haubi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/baselayout-prefix/files: baselayout-1.12.5-aix.patch
Date: Tue, 29 Mar 2011 15:34:32
Message-Id: 20110329153422.E020520057@flycatcher.gentoo.org
1 haubi 11/03/29 15:34:22
2
3 Modified: baselayout-1.12.5-aix.patch
4 Log:
5 recreate to work with older GNU patch (#361109)
6
7 (Portage version: 2.2.01.18125-prefix/cvs/AIX 00C0078A4C00)
8
9 Revision Changes Path
10 1.2 sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch?r1=1.1&r2=1.2
15
16 Index: baselayout-1.12.5-aix.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- baselayout-1.12.5-aix.patch 28 Mar 2011 14:05:51 -0000 1.1
23 +++ baselayout-1.12.5-aix.patch 29 Mar 2011 15:34:22 -0000 1.2
24 @@ -1,14 +1,17 @@
25 W00T, AIX does have /proc filesystem - even with slightly different layout.
26
27 ---- src/start-stop-daemon.c.orig 2011-03-28 13:55:36 +0200
28 -+++ src/start-stop-daemon.c 2011-03-28 14:50:47 +0200
29 -@@ -56,3 +56,5 @@
30 +--- src/start-stop-daemon.c
31 ++++ src/start-stop-daemon.c
32 +@@ -56,6 +56,8 @@
33 + # define OSNetBSD
34 + #elif defined(__APPLE__)
35 + # define OSDarwin
36 +#elif defined(_AIX)
37 +# define OSaix
38 #else
39 # error Unknown architecture - cannot build start-stop-daemon
40 #endif
41 -@@ -82,6 +104,10 @@
42 +@@ -85,6 +87,10 @@
43 #include <sys/pstat.h>
44 #endif
45
46 @@ -19,7 +22,7 @@
47 #include <errno.h>
48 #include <stdio.h>
49 #include <stdlib.h>
50 -@@ -171,7 +201,7 @@
51 +@@ -178,7 +184,7 @@
52 static void do_pidfile(const char *name);
53 static void do_stop(int signal_nr, int quietmode,
54 int *n_killed, int *n_notkilled, int retry_nr);
55 @@ -28,7 +31,7 @@
56 static int pid_is_exec(pid_t pid, const struct stat *esb);
57 #endif
58
59 -@@ -748,7 +778,7 @@
60 +@@ -755,7 +761,7 @@
61 static void
62 check(pid_t pid)
63 {
64 @@ -37,7 +40,7 @@
65 if (execname && !pid_is_exec(pid, &exec_stat))
66 return;
67 #elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
68 -@@ -784,7 +814,7 @@
69 +@@ -791,7 +797,7 @@
70 /* WTA: this needs to be an autoconf check for /proc/pid existance.
71 */
72
73 @@ -46,7 +49,7 @@
74 static void
75 do_procinit(void)
76 {
77 -@@ -1052,6 +1082,58 @@
78 +@@ -1059,6 +1065,58 @@
79 }
80 #endif /* OShpux */