omnibus-software 22.11.239

Sign up to get free protection for your applications and to get access to all the features.
Files changed (241) hide show
  1. checksums.yaml +7 -0
  2. data/.expeditor/Version_inspector/README.md +21 -0
  3. data/.expeditor/Version_inspector/SW-Version-update.py +243 -0
  4. data/.expeditor/Version_inspector/manual_prod_list.json +29 -0
  5. data/.expeditor/Version_inspector/prod_default_version.json +103 -0
  6. data/.expeditor/Version_inspector/prod_list.json +194 -0
  7. data/.expeditor/Version_inspector/requirements.txt +4 -0
  8. data/.expeditor/Version_inspector/update_prod_default_version.sh +24 -0
  9. data/.expeditor/Version_inspector/update_prod_list.sh +35 -0
  10. data/.expeditor/config.yml +33 -0
  11. data/.expeditor/determine_version.sh +15 -0
  12. data/.expeditor/push_git_tag.sh +12 -0
  13. data/.expeditor/run_linux_tests.sh +16 -0
  14. data/.expeditor/verify.pipeline.yml +52 -0
  15. data/.github/CODEOWNERS +5 -0
  16. data/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md +29 -0
  17. data/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md +40 -0
  18. data/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md +17 -0
  19. data/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md +11 -0
  20. data/.github/dependabot.yml +9 -0
  21. data/.github/lock.yml +1 -0
  22. data/.gitignore +17 -0
  23. data/CODE_OF_CONDUCT.md +1 -0
  24. data/CONTRIBUTING.md +1 -0
  25. data/Dockerfile +21 -0
  26. data/Gemfile +10 -0
  27. data/LICENSE +201 -0
  28. data/README.md +99 -0
  29. data/Rakefile +56 -0
  30. data/VERSION +1 -0
  31. data/config/patches/bash/race-condition.patch +15 -0
  32. data/config/patches/bzip2/aix_makefile.patch +11 -0
  33. data/config/patches/bzip2/makefile_no_bins.patch +77 -0
  34. data/config/patches/bzip2/makefile_take_env_vars.patch +31 -0
  35. data/config/patches/bzip2/soname_install_dir.patch +11 -0
  36. data/config/patches/curl/curl-aix-disable-alpn.patch +22 -0
  37. data/config/patches/curl/curl-freebsd-hostcheck.patch +10 -0
  38. data/config/patches/erlang/epmd-require-explicitly-adding-loopback-address.patch +84 -0
  39. data/config/patches/erlang/updated-epmd-require-explicitly-adding-loopback-address.patch +75 -0
  40. data/config/patches/expat/configure_xlc_visibility.patch +58 -0
  41. data/config/patches/expat/configure_xlc_visibility_2.4.7.patch +59 -0
  42. data/config/patches/figlet/aix-figlet-cdefs.patch +48 -0
  43. data/config/patches/gdbm/v1.8.3-Makefile.in.patch +32 -0
  44. data/config/patches/git/aix-endian-fix.patch +20 -0
  45. data/config/patches/gtar/aix_extra_case.patch +13 -0
  46. data/config/patches/keepalived/keepalived-1.2.9_opscode_centos_5.patch +15 -0
  47. data/config/patches/libedit/freebsd-vi-fix.patch +24 -0
  48. data/config/patches/libedit/openbsd-weak-alias-fix.patch +48 -0
  49. data/config/patches/libedit/solaris.patch +36 -0
  50. data/config/patches/libffi/libffi-3.2.1-disable-multi-os-directory.patch +83 -0
  51. data/config/patches/libffi/libffi-3.3-arm64.patch +9608 -0
  52. data/config/patches/libxslt/libxslt-solaris-configure.patch +19 -0
  53. data/config/patches/libxslt/libxslt-windows-relocate.patch +12 -0
  54. data/config/patches/libyaml/windows-configure.patch +26 -0
  55. data/config/patches/libzmq/zeromq-4.0.11_mingw_inet_pton.patch +37 -0
  56. data/config/patches/libzmq/zeromq-aix-4.2.2-LARGE_FILES.patch +56 -0
  57. data/config/patches/libzmq/zeromq-aix-4.2.2-atomic-counter-fetch_and_add.patch +59 -0
  58. data/config/patches/logrotate/logrotate_basedir_override.patch +17 -0
  59. data/config/patches/m4/m4-1.4.18-glibc-change-work-around.patch +115 -0
  60. data/config/patches/make/deb-make-glob.patch +31 -0
  61. data/config/patches/ncurses/ncurses-5.9-gcc-5.patch +46 -0
  62. data/config/patches/ncurses/ncurses-5.9-solaris-xopen_source_extended-detection.patch +11 -0
  63. data/config/patches/ncurses/ncurses-clang.patch +43 -0
  64. data/config/patches/ncurses/patch-aa +23 -0
  65. data/config/patches/ncurses/patch-ab +44 -0
  66. data/config/patches/ncurses/patch-ac +40 -0
  67. data/config/patches/ncurses/patch-ad +13 -0
  68. data/config/patches/ncurses/patch-cxx_cursesf.h +22 -0
  69. data/config/patches/ncurses/patch-cxx_cursesm.h +22 -0
  70. data/config/patches/ncurses/patch-ncurses_tinfo_lib__baudrate.c +24 -0
  71. data/config/patches/openssl/openssl-1.0.1f-do-not-build-docs.patch +28 -0
  72. data/config/patches/openssl/openssl-1.0.1j-windows-relocate-dll.patch +20 -0
  73. data/config/patches/openssl/openssl-1.0.1q-fix-compiler-flags-table-for-msys.patch +20 -0
  74. data/config/patches/openssl/openssl-1.0.2x-darwin-arm64.patch +54 -0
  75. data/config/patches/openssl/openssl-1.1.0f-do-not-install-docs.patch +11 -0
  76. data/config/patches/openssl/openssl-3.0.1-do-not-install-docs.patch +22 -0
  77. data/config/patches/openssl-fips/openssl-fips-fix-compiler-flags-table-for-msys.patch +11 -0
  78. data/config/patches/perl/perl-5.18.1-remove_lnsl.patch +441 -0
  79. data/config/patches/perl/perl-5.22.1-remove_lnsl.patch +512 -0
  80. data/config/patches/perl/perl-5.30.0-remove_lnsl.patch +518 -0
  81. data/config/patches/perl/perl-5.32.1-remove_lnsl.patch +456 -0
  82. data/config/patches/perl/perl-5.34.0-remove_lnsl.patch +516 -0
  83. data/config/patches/pkg-config/openbsd-charset.patch +19 -0
  84. data/config/patches/popt/v1.16.ppc64le-configure.patch +18 -0
  85. data/config/patches/redis/password-from-environment.patch +19 -0
  86. data/config/patches/ruby/patch-configure +103 -0
  87. data/config/patches/ruby/remove_nano.patch +10 -0
  88. data/config/patches/ruby/ruby-2.6.7_c99.patch +12 -0
  89. data/config/patches/ruby/ruby-3.0.1-configure.patch +281 -0
  90. data/config/patches/ruby/ruby-3.0.2-configure.patch +251 -0
  91. data/config/patches/ruby/ruby-aix-atomic.patch +11 -0
  92. data/config/patches/ruby/ruby-aix-configure_26_and_later.patch +19 -0
  93. data/config/patches/ruby/ruby-aix-vm-core.patch +14 -0
  94. data/config/patches/ruby/ruby-fast-load_26.patch +16 -0
  95. data/config/patches/ruby/ruby-fast-load_31.patch +16 -0
  96. data/config/patches/ruby/ruby-faster-load_26.patch +11 -0
  97. data/config/patches/ruby/ruby-faster-load_27.patch +11 -0
  98. data/config/patches/ruby/ruby-mkmf.patch +29 -0
  99. data/config/patches/ruby/ruby-no-stack-protector-strong.patch +11 -0
  100. data/config/patches/ruby/ruby-no-stack-protector.patch +13 -0
  101. data/config/patches/ruby/ruby-win32_warning_removal.patch +12 -0
  102. data/config/patches/ruby/ruby_aix_openssl.patch +10 -0
  103. data/config/patches/ruby/ruby_aix_ssl_EAGAIN.patch +19 -0
  104. data/config/patches/ruby/rvm-cflags.patch +27 -0
  105. data/config/patches/stunnel/stunnel-on-windows.patch +42 -0
  106. data/config/patches/zlib/zlib-windows-relocate.patch +20 -0
  107. data/config/software/autoconf.rb +46 -0
  108. data/config/software/automake.rb +49 -0
  109. data/config/software/bash.rb +72 -0
  110. data/config/software/berkshelf-no-depselector.rb +46 -0
  111. data/config/software/berkshelf.rb +34 -0
  112. data/config/software/binutils.rb +47 -0
  113. data/config/software/bundler.rb +38 -0
  114. data/config/software/bzip2.rb +55 -0
  115. data/config/software/cacerts.rb +50 -0
  116. data/config/software/chef-gem.rb +35 -0
  117. data/config/software/chef.rb +112 -0
  118. data/config/software/cmake.rb +94 -0
  119. data/config/software/config_guess.rb +37 -0
  120. data/config/software/cpanminus.rb +49 -0
  121. data/config/software/curl.rb +103 -0
  122. data/config/software/delivery-cli.rb +89 -0
  123. data/config/software/dep-selector-libgecode.rb +48 -0
  124. data/config/software/elasticsearch.rb +61 -0
  125. data/config/software/elixir.rb +35 -0
  126. data/config/software/erlang.rb +134 -0
  127. data/config/software/expat.rb +63 -0
  128. data/config/software/fakeroot.rb +41 -0
  129. data/config/software/ffi-yajl.rb +46 -0
  130. data/config/software/figlet-fonts.rb +31 -0
  131. data/config/software/figlet.rb +44 -0
  132. data/config/software/gcc.rb +60 -0
  133. data/config/software/gdbm.rb +54 -0
  134. data/config/software/gecode.rb +62 -0
  135. data/config/software/gem-permissions.rb +43 -0
  136. data/config/software/git-windows.rb +96 -0
  137. data/config/software/git.rb +138 -0
  138. data/config/software/gmp.rb +48 -0
  139. data/config/software/go-uninstall.rb +33 -0
  140. data/config/software/go.rb +116 -0
  141. data/config/software/google-protobuf.rb +45 -0
  142. data/config/software/gtar.rb +62 -0
  143. data/config/software/help2man.rb +40 -0
  144. data/config/software/highline-gem.rb +37 -0
  145. data/config/software/ibm-jre.rb +59 -0
  146. data/config/software/inspec.rb +43 -0
  147. data/config/software/jre-from-jdk.rb +67 -0
  148. data/config/software/keepalived.rb +68 -0
  149. data/config/software/libarchive.rb +71 -0
  150. data/config/software/libedit.rb +73 -0
  151. data/config/software/libffi.rb +68 -0
  152. data/config/software/libgcc.rb +52 -0
  153. data/config/software/libiconv.rb +55 -0
  154. data/config/software/libintl-perl.rb +56 -0
  155. data/config/software/liblzma.rb +59 -0
  156. data/config/software/libossp-uuid.rb +45 -0
  157. data/config/software/libsodium.rb +40 -0
  158. data/config/software/libtool.rb +56 -0
  159. data/config/software/libuuid.rb +45 -0
  160. data/config/software/libxml2.rb +63 -0
  161. data/config/software/libxslt.rb +64 -0
  162. data/config/software/libyajl2-gem.rb +44 -0
  163. data/config/software/libyaml.rb +50 -0
  164. data/config/software/libzmq.rb +93 -0
  165. data/config/software/logrotate.rb +61 -0
  166. data/config/software/lua.rb +46 -0
  167. data/config/software/m4.rb +40 -0
  168. data/config/software/make.rb +43 -0
  169. data/config/software/makedepend.rb +44 -0
  170. data/config/software/mpc.rb +44 -0
  171. data/config/software/mpfr.rb +45 -0
  172. data/config/software/musl.rb +107 -0
  173. data/config/software/mysql2.rb +50 -0
  174. data/config/software/ncurses.rb +159 -0
  175. data/config/software/nginx.rb +55 -0
  176. data/config/software/nodejs-binary.rb +90 -0
  177. data/config/software/nodejs.rb +58 -0
  178. data/config/software/nokogiri.rb +92 -0
  179. data/config/software/omnibus-ctl.rb +42 -0
  180. data/config/software/openresty.rb +94 -0
  181. data/config/software/opensearch.rb +54 -0
  182. data/config/software/openssl-customization.rb +81 -0
  183. data/config/software/openssl-fips.rb +81 -0
  184. data/config/software/openssl.rb +185 -0
  185. data/config/software/patch.rb +46 -0
  186. data/config/software/patchelf.rb +66 -0
  187. data/config/software/pcre.rb +53 -0
  188. data/config/software/perl-extutils-embed.rb +37 -0
  189. data/config/software/perl-extutils-makemaker.rb +46 -0
  190. data/config/software/perl-thread-queue.rb +40 -0
  191. data/config/software/perl.rb +78 -0
  192. data/config/software/perl_pg_driver.rb +45 -0
  193. data/config/software/pg-gem.rb +36 -0
  194. data/config/software/pkg-config-lite.rb +46 -0
  195. data/config/software/pkg-config.rb +66 -0
  196. data/config/software/popt.rb +54 -0
  197. data/config/software/postgresql.rb +70 -0
  198. data/config/software/preparation.rb +31 -0
  199. data/config/software/python.rb +79 -0
  200. data/config/software/rabbitmq.rb +58 -0
  201. data/config/software/rb-readline.rb +33 -0
  202. data/config/software/rbnacl-libsodium.rb +42 -0
  203. data/config/software/rbzmq.rb +44 -0
  204. data/config/software/rebar.rb +42 -0
  205. data/config/software/redis-gem.rb +36 -0
  206. data/config/software/redis.rb +51 -0
  207. data/config/software/relx.rb +39 -0
  208. data/config/software/rsync.rb +55 -0
  209. data/config/software/ruby-cleanup.rb +254 -0
  210. data/config/software/ruby-msys2-devkit.rb +77 -0
  211. data/config/software/ruby-windows-devkit-bash.rb +41 -0
  212. data/config/software/ruby-windows-devkit.rb +84 -0
  213. data/config/software/ruby.rb +306 -0
  214. data/config/software/rubygems.rb +73 -0
  215. data/config/software/runit.rb +67 -0
  216. data/config/software/rust-uninstall.rb +32 -0
  217. data/config/software/rust.rb +97 -0
  218. data/config/software/sequel-gem.rb +36 -0
  219. data/config/software/server-jre.rb +125 -0
  220. data/config/software/server-open-jre.rb +112 -0
  221. data/config/software/setuptools.rb +48 -0
  222. data/config/software/shebang-cleanup.rb +101 -0
  223. data/config/software/sqitch.rb +87 -0
  224. data/config/software/stunnel.rb +86 -0
  225. data/config/software/util-macros.rb +42 -0
  226. data/config/software/version-manifest.rb +33 -0
  227. data/config/software/xproto.rb +42 -0
  228. data/config/software/zlib.rb +85 -0
  229. data/config/templates/git/config.mak.erb +31 -0
  230. data/config/templates/rubygems/register_devtools.rb.erb +33 -0
  231. data/config/templates/runit/runsvdir-start.erb +42 -0
  232. data/docker-compose.yml +15 -0
  233. data/lib/omnibus-software/version.rb +3 -0
  234. data/lib/omnibus-software.rb +115 -0
  235. data/omnibus-software.gemspec +20 -0
  236. data/test/Gemfile +10 -0
  237. data/test/config/projects/test.rb +14 -0
  238. data/test/generate_steps.rb +55 -0
  239. data/test/omnibus-build.sh +50 -0
  240. data/test/omnibus.rb +55 -0
  241. metadata +296 -0
@@ -0,0 +1,15 @@
1
+ bashline.c:65:10: fatal error: builtins/builtext.h: No such file or directory
2
+ 65 | #include "builtins/builtext.h" /* for read_builtin */
3
+ | ^~~~~~~~~~~~~~~~~~~~~
4
+
5
+ --- bash-5.1/Makefile.in
6
+ +++ bash-5.1/Makefile.in
7
+ @@ -584,6 +584,8 @@
8
+ ls -l $(Program)
9
+ -$(SIZE) $(Program)
10
+
11
+ +$(CSOURCES): $(DEFDIR)/builtext.h
12
+ +
13
+ .build: $(SOURCES) config.h Makefile version.h $(VERSPROG)
14
+ @echo
15
+ @echo " ***********************************************************"
@@ -0,0 +1,11 @@
1
+ --- bzip2-1.0.8/Makefile-libbz2_so.orig 2019-07-24 10:33:36.184131389 -0400
2
+ +++ bzip2-1.0.8/Makefile-libbz2_so 2019-07-24 10:35:20.564277676 -0400
3
+ @@ -35,7 +35,7 @@
4
+ bzlib.o
5
+
6
+ all: $(OBJS)
7
+ - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
8
+ + $(CC) -qmkshrobj -Wl,-soname -o libbz2.so.1.0.8 $(OBJS)
9
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
10
+ rm -f libbz2.so.1.0
11
+ ln -s libbz2.so.1.0.8 libbz2.so.1.0
@@ -0,0 +1,77 @@
1
+ --- bzip2-1.0.8/Makefile-orig 2019-07-13 10:50:05.000000000 -0700
2
+ +++ bzip2-1.0.8/Makefile 2020-08-14 16:35:23.000000000 -0700
3
+ @@ -35,14 +35,11 @@
4
+ decompress.o \
5
+ bzlib.o
6
+
7
+ -all: libbz2.a bzip2 bzip2recover test
8
+ +all: libbz2.a bzip2 test
9
+
10
+ bzip2: libbz2.a bzip2.o
11
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
12
+
13
+ -bzip2recover: bzip2recover.o
14
+ - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
15
+ -
16
+ libbz2.a: $(OBJS)
17
+ rm -f libbz2.a
18
+ $(AR) cq libbz2.a $(OBJS)
19
+ @@ -69,47 +66,19 @@
20
+ cmp sample3.tst sample3.ref
21
+ @cat words3
22
+
23
+ -install: bzip2 bzip2recover
24
+ +install: bzip2
25
+ if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
26
+ if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
27
+ if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
28
+ if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
29
+ if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
30
+ - cp -f bzip2 $(PREFIX)/bin/bzip2
31
+ - cp -f bzip2 $(PREFIX)/bin/bunzip2
32
+ - cp -f bzip2 $(PREFIX)/bin/bzcat
33
+ - cp -f bzip2recover $(PREFIX)/bin/bzip2recover
34
+ - chmod a+x $(PREFIX)/bin/bzip2
35
+ - chmod a+x $(PREFIX)/bin/bunzip2
36
+ - chmod a+x $(PREFIX)/bin/bzcat
37
+ - chmod a+x $(PREFIX)/bin/bzip2recover
38
+ - cp -f bzip2.1 $(PREFIX)/man/man1
39
+ - chmod a+r $(PREFIX)/man/man1/bzip2.1
40
+ cp -f bzlib.h $(PREFIX)/include
41
+ chmod a+r $(PREFIX)/include/bzlib.h
42
+ cp -f libbz2.a $(PREFIX)/lib
43
+ chmod a+r $(PREFIX)/lib/libbz2.a
44
+ - cp -f bzgrep $(PREFIX)/bin/bzgrep
45
+ - ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
46
+ - ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
47
+ - chmod a+x $(PREFIX)/bin/bzgrep
48
+ - cp -f bzmore $(PREFIX)/bin/bzmore
49
+ - ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
50
+ - chmod a+x $(PREFIX)/bin/bzmore
51
+ - cp -f bzdiff $(PREFIX)/bin/bzdiff
52
+ - ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
53
+ - chmod a+x $(PREFIX)/bin/bzdiff
54
+ - cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
55
+ - chmod a+r $(PREFIX)/man/man1/bzgrep.1
56
+ - chmod a+r $(PREFIX)/man/man1/bzmore.1
57
+ - chmod a+r $(PREFIX)/man/man1/bzdiff.1
58
+ - echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
59
+ - echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
60
+ - echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
61
+ - echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
62
+
63
+ clean:
64
+ - rm -f *.o libbz2.a bzip2 bzip2recover \
65
+ + rm -f *.o libbz2.a bzip2 \
66
+ sample1.rb2 sample2.rb2 sample3.rb2 \
67
+ sample1.tst sample2.tst sample3.tst
68
+
69
+ @@ -130,8 +99,6 @@
70
+ $(CC) $(CFLAGS) -c bzlib.c
71
+ bzip2.o: bzip2.c
72
+ $(CC) $(CFLAGS) -c bzip2.c
73
+ -bzip2recover.o: bzip2recover.c
74
+ - $(CC) $(CFLAGS) -c bzip2recover.c
75
+
76
+
77
+ distclean: clean
@@ -0,0 +1,31 @@
1
+ --- bzip2-1.0.6/Makefile-orig 2010-09-10 17:46:02.000000000 -0500
2
+ +++ bzip2-1.0.6/Makefile 2013-11-21 13:55:11.000000000 -0600
3
+ @@ -15,13 +15,13 @@
4
+
5
+ SHELL=/bin/sh
6
+
7
+ # To assist in cross-compiling
8
+ -CC=gcc
9
+ +CC?=gcc
10
+ AR=ar
11
+ RANLIB=ranlib
12
+ -LDFLAGS=
13
+ +LDFLAGS+=
14
+
15
+ -BIGFILES=-D_FILE_OFFSET_BITS=64
16
+ +BIGFILES?=-D_FILE_OFFSET_BITS=64
17
+ -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
18
+ +CFLAGS+=-Wall -Winline -O2 -g $(BIGFILES)
19
+
20
+ # Where you want it installed when you do 'make install'
21
+ PREFIX=/usr/local
22
+ --- bzip2-1.0.6/Makefile-libbz2_so-orig 2017-03-21 19:43:16.706849481 +0000
23
+ +++ bzip2-1.0.6/Makefile-libbz2_so 2017-03-21 19:43:01.187851955 +0000
24
+ @@ -22,7 +22,7 @@
25
+
26
+
27
+ SHELL=/bin/sh
28
+ -CC=gcc
29
+ +CC?=gcc
30
+ BIGFILES=-D_FILE_OFFSET_BITS=64
31
+ CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
@@ -0,0 +1,11 @@
1
+ --- bzip2-1.0.8/Makefile-libbz2_so.orig 2019-07-24 10:33:36.184131389 -0400
2
+ +++ bzip2-1.0.8/Makefile-libbz2_so 2019-07-24 10:38:15.700843785 -0400
3
+ @@ -35,7 +35,7 @@
4
+ bzlib.o
5
+
6
+ all: $(OBJS)
7
+ - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
8
+ + $(CC) -shared -Wl,-install_name -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
9
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
10
+ rm -f libbz2.so.1.0
11
+ ln -s libbz2.so.1.0.8 libbz2.so.1.0
@@ -0,0 +1,22 @@
1
+ *** lib/vtls/schannel.c.orig Thu Mar 30 23:13:48 2017
2
+ --- lib/vtls/schannel.c Thu Mar 30 23:13:54 2017
3
+ ***************
4
+ *** 48,49 ****
5
+ --- 48,53 ----
6
+
7
+ + #if defined(_AIX)
8
+ + # define HAS_ALPN 0
9
+ + #endif
10
+ +
11
+ #include "curl_sspi.h"
12
+ *** lib/vtls/openssl.c.orig Thu Mar 30 23:20:11 2017
13
+ --- lib/vtls/openssl.c Thu Mar 30 23:33:55 2017
14
+ ***************
15
+ *** 1594,1596 ****
16
+ #if OPENSSL_VERSION_NUMBER >= 0x10002000L \
17
+ ! && !defined(OPENSSL_NO_TLSEXT)
18
+ # define HAS_ALPN 1
19
+ --- 1594,1596 ----
20
+ #if OPENSSL_VERSION_NUMBER >= 0x10002000L \
21
+ ! && !defined(OPENSSL_NO_TLSEXT) && !(_AIX)
22
+ # define HAS_ALPN 1
@@ -0,0 +1,10 @@
1
+ --- curl-7.36.0/lib/hostcheck.h.orig 2015-06-08 20:57:05.000000000 +0000
2
+ +++ curl-7.36.0/lib/hostcheck.h 2015-06-08 20:57:29.000000000 +0000
3
+ @@ -23,6 +23,7 @@
4
+ ***************************************************************************/
5
+
6
+ #include <curl/curl.h>
7
+ +#include <netinet/in.h>
8
+
9
+ #define CURL_HOST_NOMATCH 0
10
+ #define CURL_HOST_MATCH 1
@@ -0,0 +1,84 @@
1
+ From fae952def3698b588b96231862123ee3547c702e Mon Sep 17 00:00:00 2001
2
+ From: Steven Danna <steve@chef.io>
3
+ Date: Tue, 14 Nov 2017 21:08:05 +0000
4
+ Subject: [PATCH] epmd: require explicitly adding address
5
+
6
+ Based on the following PR:
7
+
8
+ https://github.com/erlang/otp/pull/1075/commits/0800214dc6aec5327f4e984047dd05a8829ae5e4
9
+ ---
10
+ erts/epmd/src/epmd_srv.c | 31 ++++++++++++-------------------
11
+ 1 file changed, 12 insertions(+), 19 deletions(-)
12
+
13
+ diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
14
+ index e1bac99ef9..f42a97330e 100644
15
+ --- a/erts/epmd/src/epmd_srv.c
16
+ +++ b/erts/epmd/src/epmd_srv.c
17
+ @@ -257,14 +257,6 @@ void run(EpmdVars *g)
18
+ char *tmp = NULL;
19
+ char *token = NULL;
20
+
21
+ - /* Always listen on the loopback. */
22
+ - SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_LOOPBACK),sport);
23
+ - num_sockets++;
24
+ -#if defined(EPMD6)
25
+ - SET_ADDR6(iserv_addr[num_sockets],in6addr_loopback,sport);
26
+ - num_sockets++;
27
+ -#endif
28
+ -
29
+ if ((tmp = strdup(g->addresses)) == NULL)
30
+ {
31
+ dbg_perror(g,"cannot allocate memory");
32
+ @@ -278,7 +270,6 @@ void run(EpmdVars *g)
33
+ struct in_addr addr;
34
+ #if defined(EPMD6)
35
+ struct in6_addr addr6;
36
+ - struct sockaddr_storage *sa = &iserv_addr[num_sockets];
37
+
38
+ if (inet_pton(AF_INET6,token,&addr6) == 1)
39
+ {
40
+ @@ -301,15 +292,6 @@ void run(EpmdVars *g)
41
+ epmd_cleanup_exit(g,1);
42
+ }
43
+
44
+ -#if defined(EPMD6)
45
+ - if (sa->ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&addr6))
46
+ - continue;
47
+ -
48
+ - if (sa->ss_family == AF_INET)
49
+ -#endif
50
+ - if (IS_ADDR_LOOPBACK(addr))
51
+ - continue;
52
+ -
53
+ num_sockets++;
54
+
55
+ if (num_sockets >= MAX_LISTEN_SOCKETS)
56
+ @@ -374,13 +356,24 @@ void run(EpmdVars *g)
57
+ switch (errno) {
58
+ case EAFNOSUPPORT:
59
+ case EPROTONOSUPPORT:
60
+ + /*
61
+ + * Log error but continue. We can get here for
62
+ + * in6addr_any on machines that don't have IPv6
63
+ + * support. If we can't bind any addresses, we'll
64
+ + * exit further down
65
+ + *
66
+ + */
67
+ + dbg_perror(g,"error opening stream socket");
68
+ continue;
69
+ default:
70
+ dbg_perror(g,"error opening stream socket");
71
+ epmd_cleanup_exit(g,1);
72
+ }
73
+ }
74
+ - g->listenfd[bound++] = listensock[i];
75
+ + else
76
+ + {
77
+ + g->listenfd[bound++] = listensock[i];
78
+ + }
79
+
80
+ #if HAVE_DECL_IPV6_V6ONLY
81
+ opt = 1;
82
+ --
83
+ 2.14.1
84
+
@@ -0,0 +1,75 @@
1
+ Based on the following PR:
2
+
3
+ https://github.com/erlang/otp/pull/1075/commits/0800214dc6aec5327f4e984047dd05a8829ae5e4
4
+ ---
5
+ erts/epmd/src/epmd_srv.c | 31 ++++++++++++-------------------
6
+ 1 file changed, 12 insertions(+), 19 deletions(-)
7
+
8
+ diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
9
+ index 52fb9e4..efdcd00 100644
10
+ --- a/erts/epmd/src/epmd_srv.c
11
+ +++ b/erts/epmd/src/epmd_srv.c
12
+ @@ -295,14 +295,6 @@ void run(EpmdVars *g)
13
+ char *tmp = NULL;
14
+ char *token = NULL;
15
+
16
+ - /* Always listen on the loopback. */
17
+ - SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_LOOPBACK),sport);
18
+ - num_sockets++;
19
+ -#if defined(EPMD6)
20
+ - SET_ADDR6(iserv_addr[num_sockets],in6addr_loopback,sport);
21
+ - num_sockets++;
22
+ -#endif
23
+ -
24
+ /* IPv4 and/or IPv6 loopback may not be present, for example if
25
+ * the protocol stack is explicitly disabled in the kernel. If
26
+ * any sockets to this point fail, log the error but do not exit
27
+ @@ -324,7 +316,6 @@ void run(EpmdVars *g)
28
+ struct in_addr addr;
29
+ #if defined(EPMD6)
30
+ struct in6_addr addr6;
31
+ - struct sockaddr_storage *sa = &iserv_addr[num_sockets];
32
+
33
+ if (inet_pton(AF_INET6,token,&addr6) == 1)
34
+ {
35
+ @@ -347,15 +338,6 @@ void run(EpmdVars *g)
36
+ epmd_cleanup_exit(g,1);
37
+ }
38
+
39
+ -#if defined(EPMD6)
40
+ - if (sa->ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&addr6))
41
+ - continue;
42
+ -
43
+ - if (sa->ss_family == AF_INET)
44
+ -#endif
45
+ - if (IS_ADDR_LOOPBACK(addr))
46
+ - continue;
47
+ -
48
+ num_sockets++;
49
+
50
+ if (num_sockets >= MAX_LISTEN_SOCKETS)
51
+ @@ -420,12 +402,24 @@ void run(EpmdVars *g)
52
+ switch (errno) {
53
+ case EAFNOSUPPORT:
54
+ case EPROTONOSUPPORT:
55
+ + /*
56
+ + * Log error but continue. We can get here for
57
+ + * in6addr_any on machines that don't have IPv6
58
+ + * support. If we can't bind any addresses, we'll
59
+ + * exit further down
60
+ + *
61
+ + */
62
+ + dbg_perror(g,"error opening stream socket");
63
+ continue;
64
+ default:
65
+ dbg_perror(g,"error opening stream socket");
66
+ epmd_cleanup_exit(g,1);
67
+ }
68
+ }
69
+ + else
70
+ + {
71
+ + g->listenfd[bound++] = listensock[i];
72
+ + }
73
+
74
+ #if HAVE_DECL_IPV6_V6ONLY
75
+ opt = 1;
@@ -0,0 +1,58 @@
1
+ --- expat-2.4.1/configure.orig 2021-05-23 11:28:43.000000000 -0500
2
+ +++ expat-2.4.1/configure 2021-08-03 09:21:25.000000000 -0500
3
+ @@ -12602,7 +12602,7 @@
4
+ # endif
5
+ #endif
6
+
7
+ -/* When -fvisibility=hidden is used, assume the code has been annotated
8
+ +/* When -qvisibility=hidden is used, assume the code has been annotated
9
+ correspondingly for the symbols needed. */
10
+ #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11
+ int fnord () __attribute__((visibility("default")));
12
+ @@ -12708,7 +12708,7 @@
13
+ # endif
14
+ #endif
15
+
16
+ -/* When -fvisibility=hidden is used, assume the code has been annotated
17
+ +/* When -qvisibility=hidden is used, assume the code has been annotated
18
+ correspondingly for the symbols needed. */
19
+ #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20
+ int fnord () __attribute__((visibility("default")));
21
+ @@ -17541,7 +17541,7 @@
22
+ else
23
+ expatcfg_cv_compiler_supports_visibility=no
24
+ OLDFLAGS=$CFLAGS
25
+ - as_fn_append CFLAGS " -fvisibility=hidden -Wall -Werror -Wno-unknown-warning-option"
26
+ + as_fn_append CFLAGS " -qvisibility=hidden -Wall -Werror -Wno-unknown-warning-option"
27
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
28
+ /* end confdefs.h. */
29
+
30
+ @@ -17563,15 +17563,15 @@
31
+ if ${AM_CFLAGS+:} false; then :
32
+
33
+ case " $AM_CFLAGS " in #(
34
+ - *" -fvisibility=hidden "*) :
35
+ - { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains -fvisibility=hidden"; } >&5
36
+ - (: AM_CFLAGS already contains -fvisibility=hidden) 2>&5
37
+ + *" -qvisibility=hidden "*) :
38
+ + { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains -qvisibility=hidden"; } >&5
39
+ + (: AM_CFLAGS already contains -qvisibility=hidden) 2>&5
40
+ ac_status=$?
41
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
42
+ test $ac_status = 0; } ;; #(
43
+ *) :
44
+
45
+ - as_fn_append AM_CFLAGS " -fvisibility=hidden"
46
+ + as_fn_append AM_CFLAGS " -qvisibility=hidden"
47
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
48
+ (: AM_CFLAGS="$AM_CFLAGS") 2>&5
49
+ ac_status=$?
50
+ @@ -17582,7 +17582,7 @@
51
+
52
+ else
53
+
54
+ - AM_CFLAGS=-fvisibility=hidden
55
+ + AM_CFLAGS=-qvisibility=hidden
56
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
57
+ (: AM_CFLAGS="$AM_CFLAGS") 2>&5
58
+ ac_status=$?
@@ -0,0 +1,59 @@
1
+ --- expat-2.4.1/configure.orig 2021-05-23 11:28:43.000000000 -0500
2
+ +++ expat-2.4.1/configure 2021-08-03 09:21:25.000000000 -0500
3
+ @@ -13387,7 +13387,7 @@
4
+ # endif
5
+ #endif
6
+
7
+ -/* When -fvisibility=hidden is used, assume the code has been annotated
8
+ +/* When -qvisibility=hidden is used, assume the code has been annotated
9
+ correspondingly for the symbols needed. */
10
+ #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11
+ int fnord () __attribute__((visibility("default")));
12
+ @@ -13494,7 +13494,7 @@
13
+ # endif
14
+ #endif
15
+
16
+ -/* When -fvisibility=hidden is used, assume the code has been annotated
17
+ +/* When -qvisibility=hidden is used, assume the code has been annotated
18
+ correspondingly for the symbols needed. */
19
+ #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
20
+ int fnord () __attribute__((visibility("default")));
21
+ @@ -18325,7 +18325,7 @@
22
+ else $as_nop
23
+ expatcfg_cv_compiler_supports_visibility=no
24
+ OLDFLAGS=$CFLAGS
25
+ - as_fn_append CFLAGS " -fvisibility=hidden -Wall -Werror -Wno-unknown-warning-option"
26
+ + as_fn_append CFLAGS " -qvisibility=hidden -Wall -Werror -Wno-unknown-warning-option"
27
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
28
+ /* end confdefs.h. */
29
+
30
+ @@ -18349,16 +18349,16 @@
31
+ if test ${AM_CFLAGS+y}
32
+ then :
33
+
34
+ case " $AM_CFLAGS " in #(
35
+ - *" -fvisibility=hidden "*) :
36
+ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains -fvisibility=hidden"; } >&5
37
+ - (: AM_CFLAGS already contains -fvisibility=hidden) 2>&5
38
+ + *" -qvisibility=hidden "*) :
39
+ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains -qvisibility=hidden"; } >&5
40
+ + (: AM_CFLAGS already contains -qvisibility=hidden) 2>&5
41
+ ac_status=$?
42
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
43
+ test $ac_status = 0; } ;; #(
44
+ *) :
45
+
46
+ - as_fn_append AM_CFLAGS " -fvisibility=hidden"
47
+ + as_fn_append AM_CFLAGS " -qvisibility=hidden"
48
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
49
+ (: AM_CFLAGS="$AM_CFLAGS") 2>&5
50
+ ac_status=$?
51
+ @@ -18369,7 +18369,7 @@
52
+
53
+ else $as_nop
54
+
55
+ - AM_CFLAGS=-fvisibility=hidden
56
+ + AM_CFLAGS=-qvisibility=hidden
57
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
58
+ (: AM_CFLAGS="$AM_CFLAGS") 2>&5
59
+ ac_status=$?
@@ -0,0 +1,48 @@
1
+ diff -uarNp /tmp/figlet-2.2.5/Makefile Makefile
2
+ --- /tmp/figlet-2.2.5/Makefile 2012-06-01 07:20:17.000000000 -0500
3
+ +++ Makefile 2015-05-28 14:23:16.000000000 -0500
4
+ @@ -18,18 +18,12 @@
5
+ # for changing this is if sh is not in the same place.
6
+ SHELL = /bin/sh
7
+
8
+ -# The C compiler and linker to use
9
+ -CC = gcc
10
+ -CFLAGS = -g -O2 -Wall
11
+ -LD = gcc
12
+ -LDFLAGS =
13
+ -
14
+ # Feature flags:
15
+ # define TLF_FONTS to use TOIlet TLF fonts
16
+ XCFLAGS = -DTLF_FONTS
17
+
18
+ # Where to install files
19
+ -prefix = /usr/local
20
+ +prefix ?= /usr/local
21
+
22
+ # Where the executables should be put
23
+ BINDIR = $(prefix)/bin
24
+ diff -uarNp /tmp/figlet-2.2.5/figlet.c figlet.c
25
+ --- /tmp/figlet-2.2.5/figlet.c 2012-06-01 07:20:17.000000000 -0500
26
+ +++ figlet.c 2015-05-28 13:47:04.000000000 -0500
27
+ @@ -703,7 +703,7 @@ char *suffix;
28
+ int namelen;
29
+
30
+ namelen = MYSTRLEN(fontdirname);
31
+ - fontpath = (char*)alloca(sizeof(char)*
32
+ + fontpath = (char*)malloc(sizeof(char)*
33
+ (namelen+MYSTRLEN(name)+MYSTRLEN(suffix)+2));
34
+ fontfile = NULL;
35
+ if (!hasdirsep(name)) { /* not a full path name */
36
+ diff -uarNp /tmp/figlet-2.2.5/utf8.h utf8.h
37
+ --- /tmp/figlet-2.2.5/utf8.h 2012-06-01 07:20:17.000000000 -0500
38
+ +++ utf8.h 2015-05-28 13:47:04.000000000 -0500
39
+ @@ -13,7 +13,8 @@
40
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
41
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
42
+ */
43
+ -
44
+ + # define __BEGIN_DECLS
45
+ + # define __END_DECLS
46
+ /*
47
+ * utf8: implementation of UTF-8 charset encoding (RFC3629).
48
+ */
@@ -0,0 +1,32 @@
1
+ --- Makefile.in~ 2015-10-07 12:24:16.000000000 -0700
2
+ +++ Makefile.in 2015-10-07 12:25:50.000000000 -0700
3
+ @@ -130,22 +130,22 @@
4
+ $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
5
+ $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
6
+ $(INSTALL_ROOT)$(infodir)
7
+ - $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
8
+ - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
9
+ + $(LIBTOOL) cp libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
10
+ + cp gdbm.h \
11
+ $(INSTALL_ROOT)$(includedir)/gdbm.h
12
+ - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
13
+ + cp $(srcdir)/gdbm.3 \
14
+ $(INSTALL_ROOT)$(man3dir)/gdbm.3
15
+ - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
16
+ + cp $(srcdir)/gdbm.info \
17
+ $(INSTALL_ROOT)$(infodir)/gdbm.info
18
+
19
+ install-compat:
20
+ $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
21
+ $(INSTALL_ROOT)$(includedir)
22
+ - $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
23
+ + $(LIBTOOL) cp libgdbm_compat.la \
24
+ $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
25
+ - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
26
+ + cp $(srcdir)/dbm.h \
27
+ $(INSTALL_ROOT)$(includedir)/dbm.h
28
+ - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
29
+ + cp $(srcdir)/ndbm.h \
30
+ $(INSTALL_ROOT)$(includedir)/ndbm.h
31
+
32
+ #libgdbm.a: $(OBJS) gdbm.h
@@ -0,0 +1,20 @@
1
+ *** sha1dc/sha1.c_orig Wed Dec 6 00:18:55 2017
2
+ --- sha1dc/sha1.c Wed Dec 6 00:17:57 2017
3
+ ***************
4
+ *** 69,74 ****
5
+ --- 69,83 ----
6
+ #define SHA1DC_BIGENDIAN
7
+ #endif
8
+
9
+ + /* Not under GCC-alike */
10
+ + #elif defined(BYTE_ORDER) && defined(BIG_ENDIAN)
11
+ + /*
12
+ + * AIX doesn't use _ for constants so we're looking for these
13
+ + */
14
+ + #if BYTE_ORDER == BIG_ENDIAN
15
+ + #define SHA1DC_BIGENDIAN
16
+ + #endif
17
+ +
18
+ /* Not under GCC-alike or glibc */
19
+ #elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN)
20
+ /*
@@ -0,0 +1,13 @@
1
+ *** src/unlink.c Thu Apr 5 18:33:48 2018
2
+ --- src/unlink.c.new Thu Apr 5 18:33:48 2018
3
+ ***************
4
+ *** 124,132 ****
5
+ case ENOENT:
6
+ /* nothing to worry about */
7
+ break;
8
+ - case EEXIST:
9
+ - /* OpenSolaris >=10 sets EEXIST instead of ENOTEMPTY
10
+ - if trying to remove a non-empty directory */
11
+ case ENOTEMPTY:
12
+ /* Keep the record in list, in the hope we'll
13
+ be able to remove it later */
@@ -0,0 +1,15 @@
1
+ diff --git keepalived-1.2.9/vrrp/vrrp_ipaddress.c keepalived-1.2.9_centos5/vrrp/vrrp_ipaddress.c
2
+ index 130014f..1900327 100644
3
+ --- a/keepalived/vrrp/vrrp_ipaddress.c
4
+ +++ b/keepalived/vrrp/vrrp_ipaddress.c
5
+ @@ -76,7 +76,9 @@ netlink_ipaddress(ip_address_t *ipaddress, int cmd)
6
+ * without service. HA/VRRP setups have their own "DAD"-like
7
+ * functionality, so it's not really needed from the IPv6 stack.
8
+ */
9
+ - req.ifa.ifa_flags |= IFA_F_NODAD;
10
+ + #ifdef IFA_F_NODAD
11
+ + req.ifa.ifa_flags |= IFA_F_NODAD;
12
+ + #endif
13
+
14
+ addattr_l(&req.n, sizeof(req), IFA_LOCAL,
15
+ &ipaddress->u.sin6_addr, sizeof(ipaddress->u.sin6_addr));
@@ -0,0 +1,24 @@
1
+ diff -ruN libedit-20120601-3.0/src/vi.c libedit-20120601-3.0.fixed/src/vi.c
2
+ --- libedit-20120601-3.0/src/vi.c 2012-03-11 09:54:58.000000000 +0000
3
+ +++ libedit-20120601-3.0.fixed/src/vi.c 2013-02-08 05:22:16.338954507 +0000
4
+ @@ -918,17 +918,15 @@
5
+ * NB: posix implies that we should enter insert mode, however
6
+ * this is against historical precedent...
7
+ */
8
+ -#ifdef __weak_reference
9
+ -__weakref_visible char *my_get_alias_text(const char *)
10
+ - __weak_reference(get_alias_text);
11
+ -#endif
12
+ protected el_action_t
13
+ /*ARGSUSED*/
14
+ vi_alias(EditLine *el, Int c __attribute__((__unused__)))
15
+ {
16
+ -#ifdef __weak_reference
17
+ +#ifdef __weak_extern
18
+ char alias_name[3];
19
+ char *alias_text;
20
+ + extern __weakref_visible char *my_get_alias_text(const char *);
21
+ + __weak_extern(get_alias_text);
22
+
23
+ if (my_get_alias_text == 0) {
24
+ return CC_ERROR;
@@ -0,0 +1,48 @@
1
+ diff -ur libedit-20120601-3.0.orig/src/strlcat.c libedit-20120601-3.0/src/strlcat.c
2
+ --- libedit-20120601-3.0.orig/src/strlcat.c Wed May 13 17:47:58 2015
3
+ +++ libedit-20120601-3.0/src/strlcat.c Wed May 13 17:48:14 2015
4
+ @@ -29,7 +29,7 @@
5
+
6
+ #ifdef _LIBC
7
+ # ifdef __weak_alias
8
+ -__weak_alias(strlcat, _strlcat)
9
+ +//__weak_alias(strlcat, _strlcat)
10
+ # endif
11
+ #endif
12
+
13
+ diff -ur libedit-20120601-3.0.orig/src/strlcpy.c libedit-20120601-3.0/src/strlcpy.c
14
+ --- libedit-20120601-3.0.orig/src/strlcpy.c Wed May 13 17:47:58 2015
15
+ +++ libedit-20120601-3.0/src/strlcpy.c Wed May 13 17:48:14 2015
16
+ @@ -29,7 +29,7 @@
17
+
18
+ #ifdef _LIBC
19
+ # ifdef __weak_alias
20
+ -__weak_alias(strlcpy, _strlcpy)
21
+ +//__weak_alias(strlcpy, _strlcpy)
22
+ # endif
23
+ #endif
24
+
25
+ diff -ur libedit-20120601-3.0.orig/src/unvis.c libedit-20120601-3.0/src/unvis.c
26
+ --- libedit-20120601-3.0.orig/src/unvis.c Wed May 13 17:47:58 2015
27
+ +++ libedit-20120601-3.0/src/unvis.c Wed May 13 17:48:14 2015
28
+ @@ -50,7 +50,7 @@
29
+ #include <vis.h>
30
+
31
+ #ifdef __weak_alias
32
+ -__weak_alias(strnunvisx,_strnunvisx)
33
+ +//__weak_alias(strnunvisx,_strnunvisx)
34
+ #endif
35
+
36
+ #if !HAVE_VIS
37
+ diff -ur libedit-20120601-3.0.orig/src/vis.c libedit-20120601-3.0/src/vis.c
38
+ --- libedit-20120601-3.0.orig/src/vis.c Wed May 13 17:47:58 2015
39
+ +++ libedit-20120601-3.0/src/vis.c Wed May 13 17:48:14 2015
40
+ @@ -69,7 +69,7 @@
41
+ #include <stdlib.h>
42
+
43
+ #ifdef __weak_alias
44
+ -__weak_alias(strvisx,_strvisx)
45
+ +//__weak_alias(strvisx,_strvisx)
46
+ #endif
47
+
48
+ #if !HAVE_VIS || !HAVE_SVIS