1 diff -ur libxcrypt-4.4.19.orig/Makefile.am libxcrypt-4.4.19/Makefile.am
2 --- libxcrypt-4.4.19.orig/Makefile.am 2021-04-08 21:57:36.000000000 +0200
3 +++ libxcrypt-4.4.19/Makefile.am 2021-04-13 18:19:42.502648175 +0200
8 -if ENABLE_XCRYPT_COMPAT_FILES
9 nodist_include_HEADERS += xcrypt.h
19 -libcrypt_la_SOURCES = \
20 +libxcrypt_la_SOURCES = \
21 lib/alg-des-tables.c \
23 lib/alg-gost3411-2012-core.c \
26 # Build libcrypt.so.2 if obsolete APIs are excluded, libcrypt.so.1 otherwise.
27 if ENABLE_OBSOLETE_API
28 -libcrypt_la_VERSION = 2:0:1
29 +libxcrypt_la_VERSION = 3:0:1
31 -libcrypt_la_VERSION = 2:0:0
32 +libxcrypt_la_VERSION = 3:0:0
35 -libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERSION)
36 +libxcrypt_la_LDFLAGS = -version-info $(libxcrypt_la_VERSION)
39 -libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map
40 +libxcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map
43 -libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS)
44 +libxcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS)
46 -libcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT
47 +libxcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT
49 CONFIG_STATUS_DEPENDENCIES = lib/libcrypt.minver
50 -EXTRA_libcrypt_la_DEPENDENCIES = libcrypt.map
51 +EXTRA_libxcrypt_la_DEPENDENCIES = libcrypt.map
53 Makefile.deps Makefile.deps.T \
54 libcrypt.map libcrypt.map.T libcrypt.map.stamp \
56 uninstall-hook-xcrypt-static
57 install-exec-hook-xcrypt-static:
58 cd $(DESTDIR)$(libdir) && \
59 - $(LN_S) -f libcrypt.a libxcrypt.a
60 + $(LN_S) -f libxcrypt.a libcrypt.a
61 uninstall-hook-xcrypt-static:
62 - -rm -f $(DESTDIR)$(libdir)/libxcrypt.a
63 + -rm -f $(DESTDIR)$(libdir)/libcrypt.a
68 uninstall-hook-xcrypt-shared
69 install-exec-hook-xcrypt-shared:
70 cd $(DESTDIR)$(libdir) && \
71 - $(LN_S) -f libcrypt.so libxcrypt.so
72 + $(LN_S) -f libxcrypt.so libcrypt.so
73 uninstall-hook-xcrypt-shared:
74 - -rm -f $(DESTDIR)$(libdir)/libxcrypt.so
75 + -rm -f $(DESTDIR)$(libdir)/libcrypt.so
80 uninstall-hook-libstatic
81 install-exec-hook-libstatic:
82 cd $(DESTDIR)$(libdir) && \
83 - $(LN_S) -f libcrypt.a libowcrypt.a
84 + $(LN_S) -f libxcrypt.a libowcrypt.a
85 uninstall-hook-libstatic:
86 -rm -f $(DESTDIR)$(libdir)/libowcrypt.a
89 uninstall-hook-libshared
90 install-exec-hook-libshared:
91 cd $(DESTDIR)$(libdir) && \
92 - $(LN_S) -f libcrypt.so libowcrypt.so && \
93 - $(LN_S) -f libcrypt.so.1 libowcrypt.so.1
94 + $(LN_S) -f libxcrypt.so libowcrypt.so && \
95 + $(LN_S) -f libxcrypt.so.1 libowcrypt.so.1
96 uninstall-hook-libshared:
97 -rm -f $(DESTDIR)$(libdir)/libowcrypt.so \
98 $(DESTDIR)$(libdir)/libowcrypt.so.1
100 # This is very slow and requires nonstandard Python libraries and a shared
101 # library build of libcrypt already present in the build-tree, so we only
102 # do it when explicitly requested.
103 -regen-ka-table: libcrypt.la
104 +regen-ka-table: libxcrypt.la
105 $(PYTHON) $(srcdir)/test/ka-table-gen.py > ka-table.inc.T
106 @if cmp -s ka-table.inc.T $(srcdir)/test/ka-table.inc; \
107 then echo ka-table.inc is unchanged; rm ka-table.inc.T; \
111 if ENABLE_OBSOLETE_API
112 -libcrypt_la_SOURCES += lib/crypt-des-obsolete.c
113 +libxcrypt_la_SOURCES += lib/crypt-des-obsolete.c
114 check_PROGRAMS += test/des-obsolete test/des-obsolete_r
120 AM_TESTS_ENVIRONMENT = \
121 - lib_la="./libcrypt.la"; \
122 + lib_la="./libxcrypt.la"; \
123 lib_map="$(srcdir)/lib/libcrypt.map.in"; \
124 HAVE_CPP_dD="$(HAVE_CPP_dD)"; \
125 SYMBOL_PREFIX="$(SYMBOL_PREFIX)"; \
127 test/symbols-renames.log test/symbols-renames.trs: test/TestCommon.pm
128 test/symbols-static.log test/symbols-static.trs: test/TestCommon.pm
130 -COMMON_TEST_OBJECTS = libcrypt.la
131 +COMMON_TEST_OBJECTS = libxcrypt.la
133 test_badsalt_LDADD = $(COMMON_TEST_OBJECTS)
134 test_badsetting_LDADD = $(COMMON_TEST_OBJECTS)
135 @@ -507,81 +505,81 @@
136 # These tests call internal APIs that may not be accessible from the
137 # fully linked shared library.
138 # Refer to object files that are linked into libxcrypt with the
139 -# qualified name, lib/libcrypt_la-foobar.lo, to prevent them from
140 +# qualified name, lib/libxcrypt_la-foobar.lo, to prevent them from
141 # being compiled a second time.
142 test_gensalt_LDADD = \
143 - lib/libcrypt_la-util-xstrcpy.lo \
144 + lib/libxcrypt_la-util-xstrcpy.lo \
145 $(COMMON_TEST_OBJECTS)
146 test_alg_des_LDADD = \
147 - lib/libcrypt_la-alg-des.lo \
148 - lib/libcrypt_la-alg-des-tables.lo \
149 + lib/libxcrypt_la-alg-des.lo \
150 + lib/libxcrypt_la-alg-des-tables.lo \
151 $(COMMON_TEST_OBJECTS)
152 test_alg_gost3411_2012_LDADD = \
153 - lib/libcrypt_la-alg-gost3411-2012-core.lo \
154 - lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
155 - lib/libcrypt_la-util-xbzero.lo \
156 + lib/libxcrypt_la-alg-gost3411-2012-core.lo \
157 + lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
158 + lib/libxcrypt_la-util-xbzero.lo \
159 $(COMMON_TEST_OBJECTS)
160 test_alg_gost3411_2012_hmac_LDADD = \
161 - lib/libcrypt_la-alg-gost3411-2012-core.lo \
162 - lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
163 - lib/libcrypt_la-util-xbzero.lo \
164 + lib/libxcrypt_la-alg-gost3411-2012-core.lo \
165 + lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
166 + lib/libxcrypt_la-util-xbzero.lo \
167 $(COMMON_TEST_OBJECTS)
168 test_alg_hmac_sha1_LDADD = \
169 - lib/libcrypt_la-alg-sha1.lo \
170 - lib/libcrypt_la-alg-hmac-sha1.lo \
171 - lib/libcrypt_la-util-xbzero.lo \
172 + lib/libxcrypt_la-alg-sha1.lo \
173 + lib/libxcrypt_la-alg-hmac-sha1.lo \
174 + lib/libxcrypt_la-util-xbzero.lo \
175 $(COMMON_TEST_OBJECTS)
176 test_alg_md4_LDADD = \
177 - lib/libcrypt_la-alg-md4.lo \
178 - lib/libcrypt_la-util-xbzero.lo \
179 + lib/libxcrypt_la-alg-md4.lo \
180 + lib/libxcrypt_la-util-xbzero.lo \
181 $(COMMON_TEST_OBJECTS)
182 test_alg_md5_LDADD = \
183 - lib/libcrypt_la-alg-md5.lo \
184 - lib/libcrypt_la-util-xbzero.lo \
185 + lib/libxcrypt_la-alg-md5.lo \
186 + lib/libxcrypt_la-util-xbzero.lo \
187 $(COMMON_TEST_OBJECTS)
188 test_alg_pbkdf_hmac_sha256_LDADD = \
189 - lib/libcrypt_la-alg-sha256.lo \
190 - lib/libcrypt_la-util-xbzero.lo \
191 + lib/libxcrypt_la-alg-sha256.lo \
192 + lib/libxcrypt_la-util-xbzero.lo \
193 $(COMMON_TEST_OBJECTS)
194 test_alg_sha1_LDADD = \
195 - lib/libcrypt_la-alg-sha1.lo \
196 - lib/libcrypt_la-util-xbzero.lo \
197 + lib/libxcrypt_la-alg-sha1.lo \
198 + lib/libxcrypt_la-util-xbzero.lo \
199 $(COMMON_TEST_OBJECTS)
200 test_alg_sha256_LDADD = \
201 - lib/libcrypt_la-alg-sha256.lo \
202 - lib/libcrypt_la-util-xbzero.lo \
203 + lib/libxcrypt_la-alg-sha256.lo \
204 + lib/libxcrypt_la-util-xbzero.lo \
205 $(COMMON_TEST_OBJECTS)
206 test_alg_sha512_LDADD = \
207 - lib/libcrypt_la-alg-sha512.lo \
208 - lib/libcrypt_la-util-xbzero.lo \
209 + lib/libxcrypt_la-alg-sha512.lo \
210 + lib/libxcrypt_la-util-xbzero.lo \
211 $(COMMON_TEST_OBJECTS)
212 test_alg_yescrypt_LDADD = \
213 - lib/libcrypt_la-alg-sha256.lo \
214 - lib/libcrypt_la-alg-yescrypt-common.lo \
215 - lib/libcrypt_la-alg-yescrypt-opt.lo \
216 - lib/libcrypt_la-util-base64.lo \
217 - lib/libcrypt_la-util-xbzero.lo \
218 + lib/libxcrypt_la-alg-sha256.lo \
219 + lib/libxcrypt_la-alg-yescrypt-common.lo \
220 + lib/libxcrypt_la-alg-yescrypt-opt.lo \
221 + lib/libxcrypt_la-util-base64.lo \
222 + lib/libxcrypt_la-util-xbzero.lo \
223 $(COMMON_TEST_OBJECTS)
224 test_crypt_gost_yescrypt_LDADD = \
225 - lib/libcrypt_la-alg-gost3411-2012-core.lo \
226 - lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
227 - lib/libcrypt_la-alg-sha256.lo \
228 - lib/libcrypt_la-alg-yescrypt-common.lo \
229 - lib/libcrypt_la-alg-yescrypt-opt.lo \
230 - lib/libcrypt_la-crypt-yescrypt.lo \
231 - lib/libcrypt_la-util-base64.lo \
232 - lib/libcrypt_la-util-xbzero.lo \
233 - lib/libcrypt_la-util-xstrcpy.lo \
234 + lib/libxcrypt_la-alg-gost3411-2012-core.lo \
235 + lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \
236 + lib/libxcrypt_la-alg-sha256.lo \
237 + lib/libxcrypt_la-alg-yescrypt-common.lo \
238 + lib/libxcrypt_la-alg-yescrypt-opt.lo \
239 + lib/libxcrypt_la-crypt-yescrypt.lo \
240 + lib/libxcrypt_la-util-base64.lo \
241 + lib/libxcrypt_la-util-xbzero.lo \
242 + lib/libxcrypt_la-util-xstrcpy.lo \
243 $(COMMON_TEST_OBJECTS)
245 test_explicit_bzero_LDADD = \
246 - lib/libcrypt_la-util-xbzero.lo
247 + lib/libxcrypt_la-util-xbzero.lo
248 test_getrandom_interface_LDADD = \
249 - lib/libcrypt_la-util-get-random-bytes.lo \
250 - lib/libcrypt_la-util-xbzero.lo
251 + lib/libxcrypt_la-util-get-random-bytes.lo \
252 + lib/libxcrypt_la-util-xbzero.lo
253 test_getrandom_fallbacks_LDADD = \
254 - lib/libcrypt_la-util-get-random-bytes.lo \
255 - lib/libcrypt_la-util-xbzero.lo
256 + lib/libxcrypt_la-util-get-random-bytes.lo \
257 + lib/libxcrypt_la-util-xbzero.lo
261 diff -ur libxcrypt-4.4.19.orig/lib/libxcrypt.pc.in libxcrypt-4.4.19/lib/libxcrypt.pc.in
262 --- libxcrypt-4.4.19.orig/lib/libxcrypt.pc.in 2021-04-08 21:57:36.000000000 +0200
263 +++ libxcrypt-4.4.19/lib/libxcrypt.pc.in 2021-04-13 18:20:04.059324711 +0200
267 Description: Extended crypt library for DES, MD5, Blowfish and others
268 -Libs: -L${libdir} -lcrypt
269 +Libs: -L${libdir} -lxcrypt
270 Cflags: -I${includedir}