1 |
voyageur 11/12/29 23:30:13 |
2 |
|
3 |
Added: proftpd-1.3.4a-ubug-3682.patch |
4 |
proftpd-1.3.4a-ubug-3728.patch |
5 |
Log: |
6 |
Fixes USE=nls and build failure(sparc) on Gentoo/FreeBSD. Thanks to Dmitri Bogomolov and Naohiro Aota (bug #354295) and Tibor Vago (bug #393189) |
7 |
|
8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: proftpd-1.3.4a-ubug-3682.patch |
17 |
=================================================================== |
18 |
--- configure |
19 |
+++ configure |
20 |
@@ -15457,7 +15457,7 @@ |
21 |
fi |
22 |
|
23 |
|
24 |
- { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5 |
25 |
+ { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5 |
26 |
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; } |
27 |
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then |
28 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
29 |
@@ -15533,6 +15533,82 @@ |
30 |
ENABLE_NLS="1" |
31 |
|
32 |
else |
33 |
+ { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5 |
34 |
+echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; } |
35 |
+if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then |
36 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
37 |
+else |
38 |
+ ac_check_lib_save_LIBS=$LIBS |
39 |
+LIBS="-liconv $LIBS" |
40 |
+cat >conftest.$ac_ext <<_ACEOF |
41 |
+/* confdefs.h. */ |
42 |
+_ACEOF |
43 |
+cat confdefs.h >>conftest.$ac_ext |
44 |
+cat >>conftest.$ac_ext <<_ACEOF |
45 |
+/* end confdefs.h. */ |
46 |
+ |
47 |
+/* Override any GCC internal prototype to avoid an error. |
48 |
+ Use char because int might match the return type of a GCC |
49 |
+ builtin and then its argument prototype would still apply. */ |
50 |
+#ifdef __cplusplus |
51 |
+extern "C" |
52 |
+#endif |
53 |
+char libiconv_open (); |
54 |
+int |
55 |
+main () |
56 |
+{ |
57 |
+return libiconv_open (); |
58 |
+ ; |
59 |
+ return 0; |
60 |
+} |
61 |
+_ACEOF |
62 |
+rm -f conftest.$ac_objext conftest$ac_exeext |
63 |
+if { (ac_try="$ac_link" |
64 |
+case "(($ac_try" in |
65 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
66 |
+ *) ac_try_echo=$ac_try;; |
67 |
+esac |
68 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
69 |
+ (eval "$ac_link") 2>conftest.er1 |
70 |
+ ac_status=$? |
71 |
+ grep -v '^ *+' conftest.er1 >conftest.err |
72 |
+ rm -f conftest.er1 |
73 |
+ cat conftest.err >&5 |
74 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
75 |
+ (exit $ac_status); } && { |
76 |
+ test -z "$ac_c_werror_flag" || |
77 |
+ test ! -s conftest.err |
78 |
+ } && test -s conftest$ac_exeext && |
79 |
+ $as_test_x conftest$ac_exeext; then |
80 |
+ ac_cv_lib_iconv_libiconv_open=yes |
81 |
+else |
82 |
+ echo "$as_me: failed program was:" >&5 |
83 |
+sed 's/^/| /' conftest.$ac_ext >&5 |
84 |
+ |
85 |
+ ac_cv_lib_iconv_libiconv_open=no |
86 |
+fi |
87 |
+ |
88 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
89 |
+ conftest$ac_exeext conftest.$ac_ext |
90 |
+LIBS=$ac_check_lib_save_LIBS |
91 |
+fi |
92 |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5 |
93 |
+echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; } |
94 |
+if test $ac_cv_lib_iconv_libiconv_open = yes; then |
95 |
+ LIBS="$LIBS -liconv" |
96 |
+ |
97 |
+cat >>confdefs.h <<\_ACEOF |
98 |
+#define HAVE_LIBICONV 1 |
99 |
+_ACEOF |
100 |
+ |
101 |
+ |
102 |
+cat >>confdefs.h <<\_ACEOF |
103 |
+#define PR_USE_NLS 1 |
104 |
+_ACEOF |
105 |
+ |
106 |
+ ENABLE_NLS="1" |
107 |
+ |
108 |
+else |
109 |
{ echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5 |
110 |
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6; } |
111 |
if test "${ac_cv_lib_c_iconv_open+set}" = set; then |
112 |
@@ -15600,7 +15676,7 @@ |
113 |
#define PR_USE_NLS 1 |
114 |
_ACEOF |
115 |
|
116 |
- ENABLE_NLS="1" |
117 |
+ ENABLE_NLS="1" |
118 |
|
119 |
else |
120 |
{ { echo "$as_me:$LINENO: error: libiconv support, required for NLS, not present -- aborting" >&5 |
121 |
@@ -15609,6 +15685,9 @@ |
122 |
|
123 |
fi |
124 |
|
125 |
+ |
126 |
+fi |
127 |
+ |
128 |
|
129 |
fi |
130 |
|
131 |
--- configure.in |
132 |
+++ configure.in |
133 |
@@ -715,18 +715,26 @@ |
134 |
) |
135 |
|
136 |
dnl Similarly, the libiconv library is only needed on some non-GNU |
137 |
- dnl systems. |
138 |
+ dnl systems. Note that some systems redefine the iconv_open function |
139 |
+ dnl to something else (Bug#3682), e.g. libiconv_open. |
140 |
AC_CHECK_LIB(iconv, iconv_open, |
141 |
[LIBS="$LIBS -liconv" |
142 |
AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.]) |
143 |
AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) |
144 |
ENABLE_NLS="1" |
145 |
], |
146 |
- [AC_CHECK_LIB(c, iconv_open, |
147 |
- [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) |
148 |
+ [AC_CHECK_LIB(iconv, libiconv_open, |
149 |
+ [LIBS="$LIBS -liconv" |
150 |
+ AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.]) |
151 |
+ AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) |
152 |
ENABLE_NLS="1" |
153 |
], |
154 |
- [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])] |
155 |
+ [AC_CHECK_LIB(c, iconv_open, |
156 |
+ [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) |
157 |
+ ENABLE_NLS="1" |
158 |
+ ], |
159 |
+ [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])] |
160 |
+ ]) |
161 |
]) |
162 |
) |
163 |
fi |
164 |
|
165 |
|
166 |
|
167 |
1.1 net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch |
168 |
|
169 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch?rev=1.1&view=markup |
170 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch?rev=1.1&content-type=text/plain |
171 |
|
172 |
Index: proftpd-1.3.4a-ubug-3728.patch |
173 |
=================================================================== |
174 |
--- src/wtmp.c |
175 |
+++ src/wtmp.c |
176 |
@@ -42,7 +42,7 @@ |
177 |
!(defined(LINUX) || defined(__hpux) || defined (_AIX)) |
178 |
/* This "auxilliary" utmp doesn't exist under linux. */ |
179 |
|
180 |
-#if defined(__sparcv9) && !defined(__NetBSD__) |
181 |
+#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__) |
182 |
struct futmpx utx; |
183 |
time_t t; |