]>
Commit | Line | Data |
---|---|---|
53a124c9 JB |
1 | --- libxcrypt-4.4.17/Makefile.am.orig 2020-08-23 09:49:51.000000000 +0200 |
2 | +++ libxcrypt-4.4.17/Makefile.am 2020-08-23 10:47:59.294128962 +0200 | |
c6198b7e JB |
3 | @@ -84,19 +84,15 @@ |
4 | test/des-cases.h \ | |
53a124c9 | 5 | test/ka-table.inc |
c311c836 JB |
6 | |
7 | -if ENABLE_XCRYPT_COMPAT_FILES | |
c6198b7e | 8 | nodist_include_HEADERS += xcrypt.h |
c311c836 | 9 | -else |
c6198b7e | 10 | -nodist_noinst_HEADERS += xcrypt.h |
c311c836 JB |
11 | -endif |
12 | ||
c6198b7e JB |
13 | noinst_PROGRAMS = \ |
14 | lib/gen-des-tables | |
c311c836 | 15 | |
c6198b7e JB |
16 | lib_LTLIBRARIES = \ |
17 | - libcrypt.la | |
18 | + libxcrypt.la | |
c311c836 | 19 | |
c311c836 | 20 | -libcrypt_la_SOURCES = \ |
c311c836 | 21 | +libxcrypt_la_SOURCES = \ |
c6198b7e JB |
22 | lib/alg-des-tables.c \ |
23 | lib/alg-des.c \ | |
24 | lib/alg-gost3411-2012-core.c \ | |
25 | @@ -143,23 +139,23 @@ | |
c311c836 JB |
26 | |
27 | # Build libcrypt.so.2 if obsolete APIs are excluded, libcrypt.so.1 otherwise. | |
28 | if ENABLE_OBSOLETE_API | |
29 | -libcrypt_la_VERSION = 2:0:1 | |
eee95ac9 | 30 | +libxcrypt_la_VERSION = 3:0:1 |
c311c836 JB |
31 | else |
32 | -libcrypt_la_VERSION = 2:0:0 | |
eee95ac9 | 33 | +libxcrypt_la_VERSION = 3:0:0 |
c311c836 JB |
34 | endif |
35 | ||
36 | -libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERSION) | |
37 | +libxcrypt_la_LDFLAGS = -version-info $(libxcrypt_la_VERSION) | |
38 | ||
39 | if HAVE_VSCRIPT | |
40 | -libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map | |
41 | +libxcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map | |
42 | endif | |
43 | ||
c6198b7e JB |
44 | -libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS) |
45 | +libxcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS) | |
c311c836 JB |
46 | |
47 | -libcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT | |
48 | +libxcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT | |
49 | ||
c6198b7e | 50 | CONFIG_STATUS_DEPENDENCIES = lib/libcrypt.minver.$(MINVER_OS) |
c311c836 JB |
51 | -EXTRA_libcrypt_la_DEPENDENCIES = libcrypt.map |
52 | +EXTRA_libxcrypt_la_DEPENDENCIES = libcrypt.map | |
c6198b7e JB |
53 | CLEANFILES = \ |
54 | Makefile.deps Makefile.deps.T \ | |
c311c836 | 55 | libcrypt.map libcrypt.map.T \ |
c6198b7e | 56 | @@ -234,9 +230,9 @@ |
c311c836 JB |
57 | uninstall-hook-xcrypt-static |
58 | install-exec-hook-xcrypt-static: | |
59 | cd $(DESTDIR)$(libdir) && \ | |
60 | - $(LN_S) libcrypt.a libxcrypt.a | |
61 | + $(LN_S) libxcrypt.a libcrypt.a | |
62 | uninstall-hook-xcrypt-static: | |
63 | - -rm -f $(DESTDIR)$(libdir)/libxcrypt.a | |
64 | + -rm -f $(DESTDIR)$(libdir)/libcrypt.a | |
65 | endif | |
66 | ||
67 | if ENABLE_SHARED | |
c6198b7e | 68 | @@ -249,9 +245,9 @@ |
c311c836 JB |
69 | uninstall-hook-xcrypt-shared |
70 | install-exec-hook-xcrypt-shared: | |
71 | cd $(DESTDIR)$(libdir) && \ | |
72 | - $(LN_S) libcrypt.so libxcrypt.so | |
73 | + $(LN_S) libxcrypt.so libcrypt.so | |
74 | uninstall-hook-xcrypt-shared: | |
75 | - -rm -f $(DESTDIR)$(libdir)/libxcrypt.so | |
76 | + -rm -f $(DESTDIR)$(libdir)/libcrypt.so | |
77 | endif | |
78 | endif | |
79 | ||
c6198b7e | 80 | @@ -278,7 +274,7 @@ |
c311c836 JB |
81 | uninstall-hook-libstatic |
82 | install-exec-hook-libstatic: | |
83 | cd $(DESTDIR)$(libdir) && \ | |
84 | - $(LN_S) libcrypt.a libowcrypt.a | |
85 | + $(LN_S) libxcrypt.a libowcrypt.a | |
86 | uninstall-hook-libstatic: | |
87 | -rm -f $(DESTDIR)$(libdir)/libowcrypt.a | |
88 | endif | |
c6198b7e | 89 | @@ -291,8 +287,8 @@ |
c311c836 JB |
90 | uninstall-hook-libshared |
91 | install-exec-hook-libshared: | |
92 | cd $(DESTDIR)$(libdir) && \ | |
93 | - $(LN_S) libcrypt.so libowcrypt.so && \ | |
94 | - $(LN_S) libcrypt.so.1 libowcrypt.so.1 | |
95 | + $(LN_S) libxcrypt.so libowcrypt.so && \ | |
96 | + $(LN_S) libxcrypt.so.1 libowcrypt.so.1 | |
97 | uninstall-hook-libshared: | |
98 | -rm -f $(DESTDIR)$(libdir)/libowcrypt.so \ | |
99 | $(DESTDIR)$(libdir)/libowcrypt.so.1 | |
53a124c9 | 100 | @@ -401,7 +397,7 @@ |
c6198b7e | 101 | endif |
c311c836 JB |
102 | |
103 | if ENABLE_OBSOLETE_API | |
c6198b7e JB |
104 | -libcrypt_la_SOURCES += lib/crypt-des-obsolete.c |
105 | +libxcrypt_la_SOURCES += lib/crypt-des-obsolete.c | |
106 | check_PROGRAMS += test/des-obsolete test/des-obsolete_r test/fcrypt-enosys | |
c311c836 JB |
107 | endif |
108 | ||
53a124c9 | 109 | @@ -421,7 +417,7 @@ |
c311c836 JB |
110 | |
111 | AM_TESTS_ENVIRONMENT = \ | |
53a124c9 JB |
112 | host_os="$(host_os)"; \ |
113 | - lib_la="./libcrypt.la"; \ | |
114 | + lib_la="./libxcrypt.la"; \ | |
115 | lib_map="$(srcdir)/lib/libcrypt.map.in"; \ | |
116 | AWK="$(AWK)"; \ | |
117 | CC="$(CC)"; \ | |
118 | @@ -438,7 +434,7 @@ | |
c311c836 | 119 | # Refer to object files that are linked into libxcrypt with the |
c6198b7e | 120 | # qualified name, lib/libcrypt_la-foobar.lo, to prevent them from |
c311c836 | 121 | # being compiled a second time. |
c6198b7e JB |
122 | -COMMON_TEST_OBJECTS = lib/libcrypt_la-crypt-common.lo libcrypt.la |
123 | +COMMON_TEST_OBJECTS = lib/libxcrypt_la-crypt-common.lo libxcrypt.la | |
c311c836 | 124 | |
c6198b7e JB |
125 | test_badsalt_LDADD = $(COMMON_TEST_OBJECTS) |
126 | test_badsetting_LDADD = $(COMMON_TEST_OBJECTS) | |
53a124c9 | 127 | @@ -474,58 +470,58 @@ |
c311c836 JB |
128 | # These tests call internal APIs that may not be accessible from the |
129 | # fully linked shared library. | |
130 | test_alg_des_LDADD = \ | |
c6198b7e JB |
131 | - lib/libcrypt_la-alg-des.lo \ |
132 | - lib/libcrypt_la-alg-des-tables.lo \ | |
133 | + lib/libxcrypt_la-alg-des.lo \ | |
134 | + lib/libxcrypt_la-alg-des-tables.lo \ | |
c311c836 JB |
135 | $(COMMON_TEST_OBJECTS) |
136 | test_alg_gost3411_2012_LDADD = \ | |
c6198b7e JB |
137 | - lib/libcrypt_la-alg-gost3411-2012-core.lo \ |
138 | - lib/libcrypt_la-alg-gost3411-2012-hmac.lo \ | |
139 | + lib/libxcrypt_la-alg-gost3411-2012-core.lo \ | |
140 | + lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \ | |
c311c836 JB |
141 | $(COMMON_TEST_OBJECTS) |
142 | test_alg_gost3411_2012_hmac_LDADD = \ | |
c6198b7e JB |
143 | - lib/libcrypt_la-alg-gost3411-2012-core.lo \ |
144 | - lib/libcrypt_la-alg-gost3411-2012-hmac.lo \ | |
145 | + lib/libxcrypt_la-alg-gost3411-2012-core.lo \ | |
146 | + lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \ | |
c311c836 JB |
147 | $(COMMON_TEST_OBJECTS) |
148 | test_alg_hmac_sha1_LDADD = \ | |
c6198b7e JB |
149 | - lib/libcrypt_la-alg-sha1.lo \ |
150 | - lib/libcrypt_la-alg-hmac-sha1.lo \ | |
151 | + lib/libxcrypt_la-alg-sha1.lo \ | |
152 | + lib/libxcrypt_la-alg-hmac-sha1.lo \ | |
c311c836 JB |
153 | $(COMMON_TEST_OBJECTS) |
154 | test_alg_md4_LDADD = \ | |
c6198b7e JB |
155 | - lib/libcrypt_la-alg-md4.lo \ |
156 | + lib/libxcrypt_la-alg-md4.lo \ | |
c311c836 JB |
157 | $(COMMON_TEST_OBJECTS) |
158 | test_alg_md5_LDADD = \ | |
c6198b7e JB |
159 | - lib/libcrypt_la-alg-md5.lo \ |
160 | + lib/libxcrypt_la-alg-md5.lo \ | |
c311c836 JB |
161 | $(COMMON_TEST_OBJECTS) |
162 | test_alg_pbkdf_hmac_sha256_LDADD = \ | |
c6198b7e JB |
163 | - lib/libcrypt_la-alg-sha256.lo \ |
164 | + lib/libxcrypt_la-alg-sha256.lo \ | |
c311c836 JB |
165 | $(COMMON_TEST_OBJECTS) |
166 | test_alg_sha1_LDADD = \ | |
c6198b7e JB |
167 | - lib/libcrypt_la-alg-sha1.lo \ |
168 | + lib/libxcrypt_la-alg-sha1.lo \ | |
c311c836 JB |
169 | $(COMMON_TEST_OBJECTS) |
170 | test_alg_sha256_LDADD = \ | |
c6198b7e JB |
171 | - lib/libcrypt_la-alg-sha256.lo \ |
172 | + lib/libxcrypt_la-alg-sha256.lo \ | |
c311c836 JB |
173 | $(COMMON_TEST_OBJECTS) |
174 | test_alg_sha512_LDADD = \ | |
c6198b7e JB |
175 | - lib/libcrypt_la-alg-sha512.lo \ |
176 | + lib/libxcrypt_la-alg-sha512.lo \ | |
177 | $(COMMON_TEST_OBJECTS) | |
178 | test_alg_yescrypt_LDADD = \ | |
179 | - lib/libcrypt_la-alg-sha256.lo \ | |
180 | - lib/libcrypt_la-alg-yescrypt-common.lo \ | |
181 | - lib/libcrypt_la-alg-yescrypt-opt.lo \ | |
182 | + lib/libxcrypt_la-alg-sha256.lo \ | |
183 | + lib/libxcrypt_la-alg-yescrypt-common.lo \ | |
184 | + lib/libxcrypt_la-alg-yescrypt-opt.lo \ | |
c311c836 JB |
185 | $(COMMON_TEST_OBJECTS) |
186 | test_crypt_gost_yescrypt_LDADD = \ | |
c6198b7e JB |
187 | - lib/libcrypt_la-alg-gost3411-2012-core.lo \ |
188 | - lib/libcrypt_la-alg-gost3411-2012-hmac.lo \ | |
189 | - lib/libcrypt_la-alg-sha256.lo \ | |
190 | - lib/libcrypt_la-alg-yescrypt-common.lo \ | |
191 | - lib/libcrypt_la-alg-yescrypt-opt.lo \ | |
192 | - lib/libcrypt_la-crypt-yescrypt.lo \ | |
193 | + lib/libxcrypt_la-alg-gost3411-2012-core.lo \ | |
194 | + lib/libxcrypt_la-alg-gost3411-2012-hmac.lo \ | |
195 | + lib/libxcrypt_la-alg-sha256.lo \ | |
196 | + lib/libxcrypt_la-alg-yescrypt-common.lo \ | |
197 | + lib/libxcrypt_la-alg-yescrypt-opt.lo \ | |
198 | + lib/libxcrypt_la-crypt-yescrypt.lo \ | |
c311c836 JB |
199 | $(COMMON_TEST_OBJECTS) |
200 | ||
201 | test_getrandom_interface_LDADD = \ | |
c6198b7e JB |
202 | - lib/libcrypt_la-randombytes.lo \ |
203 | + lib/libxcrypt_la-randombytes.lo \ | |
c311c836 JB |
204 | $(COMMON_TEST_OBJECTS) |
205 | test_getrandom_fallbacks_LDADD = \ | |
c6198b7e JB |
206 | - lib/libcrypt_la-randombytes.lo \ |
207 | + lib/libxcrypt_la-randombytes.lo \ | |
c311c836 JB |
208 | $(COMMON_TEST_OBJECTS) |
209 | ||
210 | if HAVE_LD_WRAP | |
c6198b7e JB |
211 | --- libxcrypt-4.4.10/lib/libxcrypt.pc.in.orig 2019-09-18 18:07:41.000000000 +0200 |
212 | +++ libxcrypt-4.4.10/lib/libxcrypt.pc.in 2019-10-05 20:26:31.028284316 +0200 | |
c311c836 JB |
213 | @@ -11,5 +11,5 @@ |
214 | Name: @PACKAGE@ | |
215 | Version: @VERSION@ | |
216 | Description: Extended crypt library for DES, MD5, Blowfish and others | |
217 | -Libs: -L${libdir} -lcrypt | |
218 | +Libs: -L${libdir} -lxcrypt | |
219 | Cflags: -I${includedir} |