1 --- libxcrypt-4.4.0/Makefile.am.orig 2018-11-19 20:39:12.000000000 +0100
2 +++ libxcrypt-4.4.0/Makefile.am 2018-11-29 20:46:27.369590776 +0100
4 alg-yescrypt-sysendian.h byteorder.h crypt-common.h \
5 crypt-obsolete.h crypt-port.h test-des-cases.h
7 -if ENABLE_XCRYPT_COMPAT_FILES
8 include_HEADERS = xcrypt.h
10 -noinst_HEADERS += xcrypt.h
14 noinst_PROGRAMS = gen-des-tables
16 -lib_LTLIBRARIES = libcrypt.la
17 -libcrypt_la_SOURCES = \
18 +lib_LTLIBRARIES = libxcrypt.la
19 +libxcrypt_la_SOURCES = \
20 alg-des.c alg-des-tables.c alg-gost3411-2012-core.c \
21 alg-gost3411-2012-hmac.c alg-hmac-sha1.c alg-md4.c alg-md5.c \
22 alg-sha1.c alg-sha256.c alg-sha512.c alg-yescrypt-opt.c \
25 # Build libcrypt.so.2 if obsolete APIs are excluded, libcrypt.so.1 otherwise.
26 if ENABLE_OBSOLETE_API
27 -libcrypt_la_VERSION = 2:0:1
28 +libxcrypt_la_VERSION = 2:0:1
30 -libcrypt_la_VERSION = 2:0:0
31 +libxcrypt_la_VERSION = 2:0:0
34 -libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERSION)
35 +libxcrypt_la_LDFLAGS = -version-info $(libxcrypt_la_VERSION)
38 -libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map
39 +libxcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map
42 -libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG)
43 +libxcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG)
45 -libcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT
46 +libxcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT
48 CONFIG_STATUS_DEPENDENCIES = libcrypt.minver
49 -EXTRA_libcrypt_la_DEPENDENCIES = libcrypt.map
50 +EXTRA_libxcrypt_la_DEPENDENCIES = libcrypt.map
51 CLEANFILES = Makefile.deps.T Makefile.deps \
52 libcrypt.map libcrypt.map.T \
53 crypt-symbol-vers.h crypt-symbol-vers.h.T \
55 uninstall-hook-xcrypt-static
56 install-exec-hook-xcrypt-static:
57 cd $(DESTDIR)$(libdir) && \
58 - $(LN_S) libcrypt.a libxcrypt.a
59 + $(LN_S) libxcrypt.a libcrypt.a
60 uninstall-hook-xcrypt-static:
61 - -rm -f $(DESTDIR)$(libdir)/libxcrypt.a
62 + -rm -f $(DESTDIR)$(libdir)/libcrypt.a
67 uninstall-hook-xcrypt-shared
68 install-exec-hook-xcrypt-shared:
69 cd $(DESTDIR)$(libdir) && \
70 - $(LN_S) libcrypt.so libxcrypt.so
71 + $(LN_S) libxcrypt.so libcrypt.so
72 uninstall-hook-xcrypt-shared:
73 - -rm -f $(DESTDIR)$(libdir)/libxcrypt.so
74 + -rm -f $(DESTDIR)$(libdir)/libcrypt.so
79 uninstall-hook-libstatic
80 install-exec-hook-libstatic:
81 cd $(DESTDIR)$(libdir) && \
82 - $(LN_S) libcrypt.a libowcrypt.a
83 + $(LN_S) libxcrypt.a libowcrypt.a
84 uninstall-hook-libstatic:
85 -rm -f $(DESTDIR)$(libdir)/libowcrypt.a
88 uninstall-hook-libshared
89 install-exec-hook-libshared:
90 cd $(DESTDIR)$(libdir) && \
91 - $(LN_S) libcrypt.so libowcrypt.so && \
92 - $(LN_S) libcrypt.so.1 libowcrypt.so.1
93 + $(LN_S) libxcrypt.so libowcrypt.so && \
94 + $(LN_S) libxcrypt.so.1 libowcrypt.so.1
95 uninstall-hook-libshared:
96 -rm -f $(DESTDIR)$(libdir)/libowcrypt.so \
97 $(DESTDIR)$(libdir)/libowcrypt.so.1
99 test-getrandom-interface test-getrandom-fallbacks
101 if ENABLE_OBSOLETE_API
102 -libcrypt_la_SOURCES += crypt-des-obsolete.c
103 +libxcrypt_la_SOURCES += crypt-des-obsolete.c
104 check_PROGRAMS += test-des-obsolete test-des-obsolete_r
108 EXTRA_DIST += test-symbols-static.sh test-symbols-compat.sh test-symbols-renames.sh
110 AM_TESTS_ENVIRONMENT = \
111 - lib_la="./libcrypt.la"; lib_map="$(srcdir)/libcrypt.map.in"; \
112 + lib_la="./libxcrypt.la"; lib_map="$(srcdir)/libcrypt.map.in"; \
113 CC="$(CC)"; CPP="$(CPP)"; \
114 CPPFLAGS="$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)"; \
115 CPPFLAGS="$${CPPFLAGS} $(AM_CPPFLAGS) $(CPPFLAGS)"; \
117 # Refer to object files that are linked into libxcrypt with the
118 # qualified name, libcrypt_la-foobar.lo, to prevent them from
119 # being compiled a second time.
120 -COMMON_TEST_OBJECTS = libcrypt_la-crypt-common.lo libcrypt.la
121 +COMMON_TEST_OBJECTS = libxcrypt_la-crypt-common.lo libxcrypt.la
123 test_crypt_bcrypt_LDADD = $(COMMON_TEST_OBJECTS)
124 test_crypt_des_LDADD = $(COMMON_TEST_OBJECTS)
125 @@ -293,53 +289,53 @@
126 # These tests call internal APIs that may not be accessible from the
127 # fully linked shared library.
128 test_alg_des_LDADD = \
129 - libcrypt_la-alg-des.lo \
130 - libcrypt_la-alg-des-tables.lo \
131 + libxcrypt_la-alg-des.lo \
132 + libxcrypt_la-alg-des-tables.lo \
133 $(COMMON_TEST_OBJECTS)
134 test_alg_gost3411_2012_LDADD = \
135 - libcrypt_la-alg-gost3411-2012-core.lo \
136 - libcrypt_la-alg-gost3411-2012-hmac.lo \
137 + libxcrypt_la-alg-gost3411-2012-core.lo \
138 + libxcrypt_la-alg-gost3411-2012-hmac.lo \
139 $(COMMON_TEST_OBJECTS)
140 test_alg_gost3411_2012_hmac_LDADD = \
141 - libcrypt_la-alg-gost3411-2012-core.lo \
142 - libcrypt_la-alg-gost3411-2012-hmac.lo \
143 + libxcrypt_la-alg-gost3411-2012-core.lo \
144 + libxcrypt_la-alg-gost3411-2012-hmac.lo \
145 $(COMMON_TEST_OBJECTS)
146 test_alg_hmac_sha1_LDADD = \
147 - libcrypt_la-alg-sha1.lo \
148 - libcrypt_la-alg-hmac-sha1.lo \
149 + libxcrypt_la-alg-sha1.lo \
150 + libxcrypt_la-alg-hmac-sha1.lo \
151 $(COMMON_TEST_OBJECTS)
152 test_alg_md4_LDADD = \
153 - libcrypt_la-alg-md4.lo \
154 + libxcrypt_la-alg-md4.lo \
155 $(COMMON_TEST_OBJECTS)
156 test_alg_md5_LDADD = \
157 - libcrypt_la-alg-md5.lo \
158 + libxcrypt_la-alg-md5.lo \
159 $(COMMON_TEST_OBJECTS)
160 test_alg_pbkdf_hmac_sha256_LDADD = \
161 - libcrypt_la-alg-sha256.lo \
162 + libxcrypt_la-alg-sha256.lo \
163 $(COMMON_TEST_OBJECTS)
164 test_alg_sha1_LDADD = \
165 - libcrypt_la-alg-sha1.lo \
166 + libxcrypt_la-alg-sha1.lo \
167 $(COMMON_TEST_OBJECTS)
168 test_alg_sha256_LDADD = \
169 - libcrypt_la-alg-sha256.lo \
170 + libxcrypt_la-alg-sha256.lo \
171 $(COMMON_TEST_OBJECTS)
172 test_alg_sha512_LDADD = \
173 - libcrypt_la-alg-sha512.lo \
174 + libxcrypt_la-alg-sha512.lo \
175 $(COMMON_TEST_OBJECTS)
176 test_crypt_gost_yescrypt_LDADD = \
177 - libcrypt_la-alg-gost3411-2012-core.lo \
178 - libcrypt_la-alg-gost3411-2012-hmac.lo \
179 - libcrypt_la-alg-sha256.lo \
180 - libcrypt_la-alg-yescrypt-common.lo \
181 - libcrypt_la-alg-yescrypt-opt.lo \
182 - libcrypt_la-crypt-yescrypt.lo \
183 + libxcrypt_la-alg-gost3411-2012-core.lo \
184 + libxcrypt_la-alg-gost3411-2012-hmac.lo \
185 + libxcrypt_la-alg-sha256.lo \
186 + libxcrypt_la-alg-yescrypt-common.lo \
187 + libxcrypt_la-alg-yescrypt-opt.lo \
188 + libxcrypt_la-crypt-yescrypt.lo \
189 $(COMMON_TEST_OBJECTS)
191 test_getrandom_interface_LDADD = \
192 - libcrypt_la-randombytes.lo \
193 + libxcrypt_la-randombytes.lo \
194 $(COMMON_TEST_OBJECTS)
195 test_getrandom_fallbacks_LDADD = \
196 - libcrypt_la-randombytes.lo \
197 + libxcrypt_la-randombytes.lo \
198 $(COMMON_TEST_OBJECTS)
201 --- libxcrypt-4.4.0/libxcrypt.pc.in.orig 2018-11-19 20:39:12.000000000 +0100
202 +++ libxcrypt-4.4.0/libxcrypt.pc.in 2018-11-29 20:47:35.179590003 +0100
206 Description: Extended crypt library for DES, MD5, Blowfish and others
207 -Libs: -L${libdir} -lcrypt
208 +Libs: -L${libdir} -lxcrypt
209 Cflags: -I${includedir}