rpm-4.0.2.patch.regen 7.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228
  1. ##
  2. ## rpm-4.0.2.patch.regen -- Annotated patch file
  3. ## Copyright (c) 2000-2001 Cable & Wireless Deutschland GmbH
  4. ## Copyright (c) 2000-2001 Ralf S. Engelschall <rse.com>
  5. ##
  6. ## This file assembles changes to existing RPM source files between
  7. ## the original RedHat RPM and the OpenPKG RPM variant. It can be
  8. ## automatically applied to a vanilla RedHat RPM source tree with the
  9. ## 'patch' tool to upgrade those files. Each patch snippet is annotated
  10. ## with a short description.
  11. ##
  12. ## Created on: 23-Sep-2001
  13. ##
  14. +---------------------------------------------------------------------------
  15. | Regenerated configure script from GNU autoconf run after
  16. | the patches for configure.in were applied.
  17. +---------------------------------------------------------------------------
  18. Index: configure
  19. --- configure 2001/02/26 21:52:29 1.1.1.16
  20. +++ configure 2001/07/05 11:44:33 1.13
  21. @@ -1879,7 +1879,7 @@
  22. fi
  23. -for ac_prog in gawk mawk nawk awk
  24. +for ac_prog in mawk gawk nawk awk
  25. do
  26. # Extract the first word of "$ac_prog", so it can be a program name with args.
  27. set dummy $ac_prog; ac_word=$2
  28. @@ -9055,13 +9055,63 @@
  29. else
  30. echo "$ac_t""no" 1>&6
  31. + echo $ac_n "checking for getmntinfo""... $ac_c" 1>&6
  32. +echo "configure:9060: checking for getmntinfo" >&5
  33. +if eval "test \"`echo '$''{'ac_cv_func_getmntinfo'+set}'`\" = set"; then
  34. + echo $ac_n "(cached) $ac_c" 1>&6
  35. +else
  36. + cat > conftest.$ac_ext <<EOF
  37. +#line 9065 "configure"
  38. +#include "confdefs.h"
  39. +/* System header to define __stub macros and hopefully few prototypes,
  40. + which can conflict with char getmntinfo(); below. */
  41. +#include <assert.h>
  42. +/* Override any gcc2 internal prototype to avoid an error. */
  43. +/* We use char because int might match the return type of a gcc2
  44. + builtin and then its argument prototype would still apply. */
  45. +char getmntinfo();
  46. +
  47. +int main() {
  48. +
  49. +/* The GNU C library defines this for functions which it implements
  50. + to always fail with ENOSYS. Some functions are actually named
  51. + something starting with __ and the normal name is an alias. */
  52. +#if defined (__stub_getmntinfo) || defined (__stub___getmntinfo)
  53. +choke me
  54. +#else
  55. +getmntinfo();
  56. +#endif
  57. +
  58. +; return 0; }
  59. +EOF
  60. +if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  61. + rm -rf conftest*
  62. + eval "ac_cv_func_getmntinfo=yes"
  63. +else
  64. + echo "configure: failed program was:" >&5
  65. + cat conftest.$ac_ext >&5
  66. + rm -rf conftest*
  67. + eval "ac_cv_func_getmntinfo=no"
  68. +fi
  69. +rm -f conftest*
  70. +fi
  71. +
  72. +if eval "test \"`echo '$ac_cv_func_'getmntinfo`\" = yes"; then
  73. + echo "$ac_t""yes" 1>&6
  74. + cat >> confdefs.h <<\EOF
  75. +#define HAVE_GETMNTINFO 1
  76. +EOF
  77. +
  78. +else
  79. + echo "$ac_t""no" 1>&6
  80. +
  81. echo $ac_n "checking for mntctl""... $ac_c" 1>&6
  82. -echo "configure:9060: checking for mntctl" >&5
  83. +echo "configure:9110: checking for mntctl" >&5
  84. if eval "test \"`echo '$''{'ac_cv_func_mntctl'+set}'`\" = set"; then
  85. echo $ac_n "(cached) $ac_c" 1>&6
  86. else
  87. cat > conftest.$ac_ext <<EOF
  88. -#line 9065 "configure"
  89. +#line 9115 "configure"
  90. #include "confdefs.h"
  91. /* System header to define __stub macros and hopefully few prototypes,
  92. which can conflict with char mntctl(); below. */
  93. @@ -9084,7 +9134,7 @@
  94. ; return 0; }
  95. EOF
  96. -if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  97. +if { (eval echo configure:9138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  98. rm -rf conftest*
  99. eval "ac_cv_func_mntctl=yes"
  100. else
  101. @@ -9106,12 +9156,12 @@
  102. echo "$ac_t""no" 1>&6
  103. echo $ac_n "checking for getmntinfo_r""... $ac_c" 1>&6
  104. -echo "configure:9110: checking for getmntinfo_r" >&5
  105. +echo "configure:9160: checking for getmntinfo_r" >&5
  106. if eval "test \"`echo '$''{'ac_cv_func_getmntinfo_r'+set}'`\" = set"; then
  107. echo $ac_n "(cached) $ac_c" 1>&6
  108. else
  109. cat > conftest.$ac_ext <<EOF
  110. -#line 9115 "configure"
  111. +#line 9165 "configure"
  112. #include "confdefs.h"
  113. /* System header to define __stub macros and hopefully few prototypes,
  114. which can conflict with char getmntinfo_r(); below. */
  115. @@ -9134,7 +9184,7 @@
  116. ; return 0; }
  117. EOF
  118. -if { (eval echo configure:9138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  119. +if { (eval echo configure:9188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  120. rm -rf conftest*
  121. eval "ac_cv_func_getmntinfo_r=yes"
  122. else
  123. @@ -9156,7 +9206,7 @@
  124. echo "$ac_t""no" 1>&6
  125. echo $ac_n "checking for getmntinfo_r in -lc_r""... $ac_c" 1>&6
  126. -echo "configure:9160: checking for getmntinfo_r in -lc_r" >&5
  127. +echo "configure:9210: checking for getmntinfo_r in -lc_r" >&5
  128. ac_lib_var=`echo c_r'_'getmntinfo_r | sed 'y%./+-%__p_%'`
  129. if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  130. echo $ac_n "(cached) $ac_c" 1>&6
  131. @@ -9164,7 +9214,7 @@
  132. ac_save_LIBS="$LIBS"
  133. LIBS="-lc_r $LIBS"
  134. cat > conftest.$ac_ext <<EOF
  135. -#line 9168 "configure"
  136. +#line 9218 "configure"
  137. #include "confdefs.h"
  138. /* Override any gcc2 internal prototype to avoid an error. */
  139. /* We use char because int might match the return type of a gcc2
  140. @@ -9175,7 +9225,7 @@
  141. getmntinfo_r()
  142. ; return 0; }
  143. EOF
  144. -if { (eval echo configure:9179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  145. +if { (eval echo configure:9229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  146. rm -rf conftest*
  147. eval "ac_cv_lib_$ac_lib_var=yes"
  148. else
  149. @@ -9211,14 +9261,16 @@
  150. fi
  151. +fi
  152. +
  153. echo $ac_n "checking for lchown""... $ac_c" 1>&6
  154. -echo "configure:9217: checking for lchown" >&5
  155. +echo "configure:9269: checking for lchown" >&5
  156. if eval "test \"`echo '$''{'ac_cv_func_lchown'+set}'`\" = set"; then
  157. echo $ac_n "(cached) $ac_c" 1>&6
  158. else
  159. cat > conftest.$ac_ext <<EOF
  160. -#line 9222 "configure"
  161. +#line 9274 "configure"
  162. #include "confdefs.h"
  163. /* System header to define __stub macros and hopefully few prototypes,
  164. which can conflict with char lchown(); below. */
  165. @@ -9241,7 +9293,7 @@
  166. ; return 0; }
  167. EOF
  168. -if { (eval echo configure:9245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  169. +if { (eval echo configure:9297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  170. rm -rf conftest*
  171. eval "ac_cv_func_lchown=yes"
  172. else
  173. @@ -9266,7 +9318,7 @@
  174. __CHOWN_RHF="%{__chown} -Rf"
  175. __CHGRP_RHF="%{__chgrp} -Rf"
  176. echo $ac_n "checking whether chown() follows symlinks""... $ac_c" 1>&6
  177. -echo "configure:9270: checking whether chown() follows symlinks" >&5
  178. +echo "configure:9322: checking whether chown() follows symlinks" >&5
  179. # Check whether --enable-broken-chown or --disable-broken-chown was given.
  180. if test "${enable_broken_chown+set}" = set; then
  181. enableval="$enable_broken_chown"
  182. @@ -9294,7 +9346,7 @@
  183. ${__RM} -f foo bar
  184. else
  185. echo $ac_n "checking (cannot check by non-root user)""... $ac_c" 1>&6
  186. -echo "configure:9298: checking (cannot check by non-root user)" >&5
  187. +echo "configure:9350: checking (cannot check by non-root user)" >&5
  188. result=no
  189. fi
  190. fi
  191. @@ -9312,13 +9364,13 @@
  192. echo $ac_n "checking root's primary group""... $ac_c" 1>&6
  193. -echo "configure:9316: checking root's primary group" >&5
  194. +echo "configure:9368: checking root's primary group" >&5
  195. if test "$cross_compiling" = yes; then
  196. ROOT_GROUP="root"
  197. else
  198. cat > conftest.$ac_ext <<EOF
  199. -#line 9322 "configure"
  200. +#line 9374 "configure"
  201. #include "confdefs.h"
  202. #include <stdio.h>
  203. #include <sys/types.h>
  204. @@ -9347,7 +9399,7 @@
  205. exit(1);
  206. }
  207. EOF
  208. -if { (eval echo configure:9351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  209. +if { (eval echo configure:9403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  210. then
  211. ROOT_GROUP=`cat conftest_rootg`
  212. else