summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/shadow/files/shadow.automake-1.11.patch')
-rw-r--r--meta/recipes-extended/shadow/files/shadow.automake-1.11.patch106
1 files changed, 0 insertions, 106 deletions
diff --git a/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch b/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch
deleted file mode 100644
index a793f09a4e..0000000000
--- a/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1# patch is from openembedded:
2# commit 2db61370333f7a2fc1dbb86385734883387e0217
3# Author: Martin Jansa <Martin.Jansa@gmail.com>
4# Date: Fri Apr 2 07:34:46 2010 +0200
5#
6# shadow: fix do_install with automake-1.11
7#
8# Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9#
10# comment added by Kevin Tian <kevin.tian@intel.com>
11
12man_nopan is for !USE_PAM already included in man_MANS and automake-1.11 hates to install some file twice
13
14Upstream-Status: Pending
15
16Signed-off-by: Scott Garman <scott.a.garman@intel.com>
17
18diff -uNr shadow-4.1.4.2.orig/man/Makefile.am shadow-4.1.4.2/man/Makefile.am
19--- shadow-4.1.4.2.orig/man/Makefile.am 2009-03-14 15:40:10.000000000 +0100
20+++ shadow-4.1.4.2/man/Makefile.am 2010-04-02 07:31:17.000000000 +0200
21@@ -163,7 +163,6 @@
22 $(man_MANS) \
23 $(man_XMANS) \
24 $(addprefix login.defs.d/,$(login_defs_v)) \
25- $(man_nopam) \
26 id.1 \
27 id.1.xml \
28 sulogin.8 \
29diff -uNr shadow-4.1.4.2.orig/man/fr/Makefile.am shadow-4.1.4.2/man/fr/Makefile.am
30--- shadow-4.1.4.2.orig/man/fr/Makefile.am 2008-09-06 18:44:45.000000000 +0200
31+++ shadow-4.1.4.2/man/fr/Makefile.am 2010-04-02 07:42:11.000000000 +0200
32@@ -52,7 +52,6 @@
33
34 EXTRA_DIST = \
35 $(man_MANS) \
36- $(man_nopam) \
37 id.1
38
39 include ../generate_translations.mak
40diff -uNr shadow-4.1.4.2.orig/man/it/Makefile.am shadow-4.1.4.2/man/it/Makefile.am
41--- shadow-4.1.4.2.orig/man/it/Makefile.am 2008-09-06 18:44:45.000000000 +0200
42+++ shadow-4.1.4.2/man/it/Makefile.am 2010-04-02 07:42:20.000000000 +0200
43@@ -46,7 +46,6 @@
44
45 EXTRA_DIST = \
46 $(man_MANS) \
47- $(man_nopam) \
48 id.1 \
49 logoutd.8
50
51diff -uNr shadow-4.1.4.2.orig/man/ja/Makefile.am shadow-4.1.4.2/man/ja/Makefile.am
52--- shadow-4.1.4.2.orig/man/ja/Makefile.am 2007-12-31 17:48:28.000000000 +0100
53+++ shadow-4.1.4.2/man/ja/Makefile.am 2010-04-02 07:42:17.000000000 +0200
54@@ -49,7 +49,6 @@
55
56 EXTRA_DIST = \
57 $(man_MANS) \
58- $(man_nopam) \
59 id.1 \
60 shadow.3 \
61 sulogin.8
62diff -uNr shadow-4.1.4.2.orig/man/pl/Makefile.am shadow-4.1.4.2/man/pl/Makefile.am
63--- shadow-4.1.4.2.orig/man/pl/Makefile.am 2008-09-06 18:44:45.000000000 +0200
64+++ shadow-4.1.4.2/man/pl/Makefile.am 2010-04-02 07:42:07.000000000 +0200
65@@ -49,7 +49,6 @@
66
67 EXTRA_DIST = \
68 $(man_MANS) \
69- $(man_nopam) \
70 getspnam.3 \
71 id.1 \
72 shadow.3 \
73diff -uNr shadow-4.1.4.2.orig/man/ru/Makefile.am shadow-4.1.4.2/man/ru/Makefile.am
74--- shadow-4.1.4.2.orig/man/ru/Makefile.am 2010-04-02 07:39:00.000000000 +0200
75+++ shadow-4.1.4.2/man/ru/Makefile.am 2010-04-02 07:42:01.000000000 +0200
76@@ -54,7 +54,6 @@
77
78 EXTRA_DIST = \
79 $(man_MANS) \
80- $(man_nopam) \
81 id.1 \
82 sulogin.8
83
84diff -uNr shadow-4.1.4.2.orig/man/sv/Makefile.am shadow-4.1.4.2/man/sv/Makefile.am
85--- shadow-4.1.4.2.orig/man/sv/Makefile.am 2008-09-06 18:44:45.000000000 +0200
86+++ shadow-4.1.4.2/man/sv/Makefile.am 2010-04-02 07:42:24.000000000 +0200
87@@ -53,8 +53,7 @@
88 endif
89
90 EXTRA_DIST = \
91- $(man_MANS) \
92- $(man_nopam)
93+ $(man_MANS)
94
95 include ../generate_translations.mak
96
97--- shadow-4.1.4.2.orig/man/ru/Makefile.am 2010-04-02 07:54:09.000000000 +0200
98+++ shadow-4.1.4.2/man/ru/Makefile.am 2010-04-02 07:51:57.000000000 +0200
99@@ -1,7 +1,6 @@
100 mandir = @mandir@/ru
101
102 man_MANS = \
103- $(man_nopam) \
104 chage.1 \
105 chfn.1 \
106 chgpasswd.8 \