diff -Nru libxcrypt-4.4.27/build-aux/ci/ci-log-logfiles libxcrypt-4.4.28/build-aux/ci/ci-log-logfiles --- libxcrypt-4.4.27/build-aux/ci/ci-log-logfiles 2021-12-17 15:14:52.000000000 +0000 +++ libxcrypt-4.4.28/build-aux/ci/ci-log-logfiles 2022-02-01 22:26:50.000000000 +0000 @@ -1,16 +1,22 @@ #! /bin/sh +generate_secure_token() { + echo head --bytes 64 /dev/urandom | sha512sum --binary | cut --fields 1 --delimiter ' ' +} + dump_log () { if [ -s "$1" ]; then + stop_command_token="$(generate_secure_token)" echo "::group::$1" - echo '::stop-commands::resume-50YEO1zJ8HSXH4Zy' + echo "::stop-commands::$stop_command_token" cat "$1" - echo '::resume-50YEO1zJ8HSXH4Zy::' + echo "::$stop_command_token::" echo '::endgroup::' + unset stop_command_token fi } dump_log config.log -for ts in $(find . -name 'test-suite*.log' -printf '%P\n'); do +find . -name 'test-suite*.log' -printf '%P\n' | while read -r ts; do dump_log "$ts" done diff -Nru libxcrypt-4.4.27/configure.ac libxcrypt-4.4.28/configure.ac --- libxcrypt-4.4.27/configure.ac 2021-12-17 15:14:52.000000000 +0000 +++ libxcrypt-4.4.28/configure.ac 2022-02-01 22:26:50.000000000 +0000 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. m4_include([build-aux/m4/zw_automodern.m4]) AC_INIT([xcrypt], - [4.4.27], + [4.4.28], [https://github.com/besser82/libxcrypt/issues], [libxcrypt], [https://github.com/besser82/libxcrypt]) diff -Nru libxcrypt-4.4.27/debian/changelog libxcrypt-4.4.28/debian/changelog --- libxcrypt-4.4.27/debian/changelog 2021-12-17 22:48:21.000000000 +0000 +++ libxcrypt-4.4.28/debian/changelog 2022-07-10 19:30:07.000000000 +0000 @@ -1,3 +1,30 @@ +libxcrypt (1:4.4.28-2) unstable; urgency=medium + + [ Helmut Grohne ] + * Move back crypt.h of libcrypt1 to the non-multiarch directory because + it broke the GCC and LLVM multilib builds. (Closes: #1014114) + + -- Marco d'Itri Sun, 10 Jul 2022 21:30:07 +0200 + +libxcrypt (1:4.4.28-1) unstable; urgency=medium + + [ Helmut Grohne ] + * Enable building for musl-linux-any. (Closes: #1004102) + * Move crypt.h to the multiarch directory. + + [ Victor Westerhuis ] + * Actually run the tests when building the package. + + -- Marco d'Itri Thu, 30 Jun 2022 01:12:35 +0200 + +libxcrypt (1:4.4.27-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix M-A:same violation in libcrypt-dev by removing --link-doc. + (Closes: #987781) + + -- Helmut Grohne Fri, 14 Jan 2022 20:10:07 +0100 + libxcrypt (1:4.4.27-1) unstable; urgency=medium * New upstream release. diff -Nru libxcrypt-4.4.27/debian/control libxcrypt-4.4.28/debian/control --- libxcrypt-4.4.27/debian/control 2021-12-17 21:55:02.000000000 +0000 +++ libxcrypt-4.4.28/debian/control 2022-06-29 22:44:22.000000000 +0000 @@ -11,7 +11,7 @@ Package: libcrypt1 Section: libs -Architecture: any +Architecture: gnu-any-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -30,18 +30,36 @@ It provides the traditional Unix 'crypt' and 'crypt_r' interfaces, as well as a set of extended interfaces like 'crypt_gensalt'. +Package: libcrypt2 +Section: libs +Architecture: musl-any-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +XB-Important: yes +Protected: yes +Breaks: musl (<< 1:4.4.27-1.2~) +Replaces: musl (<< 1:4.4.27-1.2~) +Description: libcrypt shared library + libxcrypt is a modern library for one-way hashing of passwords. + It supports DES, MD5, NTHASH, SUNMD5, SHA-2-256, SHA-2-512, and + bcrypt-based password hashes + It provides the traditional Unix 'crypt' and 'crypt_r' interfaces, + as well as a set of extended interfaces like 'crypt_gensalt'. + Package: libcrypt-dev Section: libdevel Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, ${LIBPKG} (= ${binary:Version}) -Provides: libcrypt1-dev +Provides: ${LIBPKG}-dev Conflicts: libcrypt1-dev, libcrypt2-dev Breaks: libc6-dev (<< 2.29-4), libc6.1-dev (<< 2.29-4) [alpha ia64], libc0.1-dev (<< 2.29-4) [kfreebsd-amd64 kfreebsd-i386], libc0.3-dev (<< 2.29-4) [hurd-i386], + musl-dev (<< 1:4.4.27-1.2~) [musl-any-any], manpages-dev (<< 5.01-1), Replaces: libcrypt1-dev, libcrypt2-dev, @@ -49,6 +67,7 @@ libc6.1-dev (<< 2.29-4) [alpha ia64], libc0.1-dev (<< 2.29-4) [kfreebsd-amd64 kfreebsd-i386], libc0.3-dev (<< 2.29-4) [hurd-i386], + musl-dev (<< 1:4.4.27-1.2~) [musl-any-any], manpages-dev (<< 5.01-1), Description: libcrypt development files This package contains the files needed for developing applications that @@ -57,7 +76,7 @@ Package: libcrypt1-udeb Package-Type: udeb Section: debian-installer -Architecture: any +Architecture: gnu-any-any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends} Description: libcrypt shared library diff -Nru libxcrypt-4.4.27/debian/libcrypt1.symbols libxcrypt-4.4.28/debian/libcrypt1.symbols --- libxcrypt-4.4.27/debian/libcrypt1.symbols 2021-12-17 21:55:02.000000000 +0000 +++ libxcrypt-4.4.28/debian/libcrypt1.symbols 2022-06-29 22:44:22.000000000 +0000 @@ -1,4 +1,5 @@ libcrypt.so.1 libcrypt1 #MINVER# +* Build-Depends-Package: libcrypt-dev #include "libcrypt1.symbols.common" GLIBC_2.0@GLIBC_2.0 1:4.1.0 crypt@GLIBC_2.0 1:4.1.0 diff -Nru libxcrypt-4.4.27/debian/libcrypt2.symbols libxcrypt-4.4.28/debian/libcrypt2.symbols --- libxcrypt-4.4.27/debian/libcrypt2.symbols 2021-12-17 21:55:02.000000000 +0000 +++ libxcrypt-4.4.28/debian/libcrypt2.symbols 2022-06-29 22:44:22.000000000 +0000 @@ -1,10 +1,10 @@ libcrypt.so.2 libcrypt2 #MINVER# +* Build-Depends-Package: libcrypt-dev XCRYPT_2.0@XCRYPT_2.0 1:4.1.0 XCRYPT_4.3@XCRYPT_4.3 1:4.3.0 XCRYPT_4.4@XCRYPT_4.4 1:4.4.0 crypt@XCRYPT_2.0 1:4.1.0 crypt_checksalt@XCRYPT_4.3 1:4.3.0 - crypt_gensalt_r@XCRYPT_2.0 1:4.3.4 crypt_gensalt@XCRYPT_2.0 1:4.1.0 crypt_gensalt_ra@XCRYPT_2.0 1:4.1.0 crypt_gensalt_rn@XCRYPT_2.0 1:4.1.0 @@ -12,7 +12,3 @@ crypt_r@XCRYPT_2.0 1:4.1.0 crypt_ra@XCRYPT_2.0 1:4.1.0 crypt_rn@XCRYPT_2.0 1:4.1.0 - xcrypt@XCRYPT_2.0 1:4.3.4 - xcrypt_gensalt@XCRYPT_2.0 1:4.3.4 - xcrypt_gensalt_r@XCRYPT_2.0 1:4.3.4 - xcrypt_r@XCRYPT_2.0 1:4.3.4 diff -Nru libxcrypt-4.4.27/debian/libcrypt-dev.maintscript libxcrypt-4.4.28/debian/libcrypt-dev.maintscript --- libxcrypt-4.4.27/debian/libcrypt-dev.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ libxcrypt-4.4.28/debian/libcrypt-dev.maintscript 2022-06-28 01:00:53.000000000 +0000 @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/libcrypt-dev libcrypt1 1:4.4.27-1.1~ diff -Nru libxcrypt-4.4.27/debian/rules libxcrypt-4.4.28/debian/rules --- libxcrypt-4.4.27/debian/rules 2021-12-17 21:55:02.000000000 +0000 +++ libxcrypt-4.4.28/debian/rules 2022-07-10 19:25:53.000000000 +0000 @@ -1,4 +1,5 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk DOPACKAGES := $(shell dh_listpackages) BUILD_TARGETS := @@ -31,23 +32,18 @@ CONFFLAGS = --disable-werror --prefix=/usr \ --disable-xcrypt-compat-files --enable-obsolete-api=glibc -CONFFLAGS_deb = $(CONFFLAGS) \ +CONFFLAGS_deb1 = $(CONFFLAGS) \ $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+bindnow" \ dpkg-buildflags --export=configure || true) \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) +CONFFLAGS_deb2 = $(subst api=glibc,api=no,$(CONFFLAGS_deb1)) \ + --includedir=/usr/include/$(DEB_HOST_MULTIARCH) CONFFLAGS_udeb = $(CONFFLAGS) \ $(subst -O2,-Os -fomit-frame-pointer,$(shell DEB_BUILD_MAINT_OPTIONS="hardening=-all" \ dpkg-buildflags --export=configure || true)) \ --libdir=/usr/lib ############################################################################## -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -UPSTREAM_VERSION := $(shell dpkg-parsechangelog -S Version | sed -e 's/.*://' -e 's/[+-].*//') - -SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp) - -############################################################################## %: dh $@ --reload-all-buildenv-variables $(NO_PACKAGE) @@ -56,11 +52,11 @@ dh_clean debian/copyright build-deb1/config.status: - dh_auto_configure --builddir=build-deb1 -- $(CONFFLAGS_deb) + dh_auto_configure --builddir=build-deb1 -- $(CONFFLAGS_deb1) sh debian/patch_libtool build-deb1 build-deb2/config.status: - dh_auto_configure --builddir=build-deb2 -- $(subst api=glibc,api=no,$(CONFFLAGS_deb)) + dh_auto_configure --builddir=build-deb2 -- $(CONFFLAGS_deb2) build-udeb/config.status: dh_auto_configure --builddir=build-udeb -- $(CONFFLAGS_udeb) @@ -84,10 +80,10 @@ override_dh_auto_test: ifdef BUILD_DEB1 - dh_auto_test --builddir=build-deb1 + dh_auto_test --builddir=build-deb1 -- check else ifdef BUILD_DEB2 - dh_auto_test --builddir=build-deb2 + dh_auto_test --builddir=build-deb2 -- check endif endif @@ -146,16 +142,8 @@ --owner=root --group=root --numeric-owner \ | tar xf - -C $(DS)/usr/src/libxcrypt/ -override_dh_installdocs: +execute_before_dh_installdocs: cat debian/copyright.in LICENSING > debian/copyright - dh_installdocs -plibcrypt-dev --link-doc=libcrypt$(BUILD_DEV_VER) -ifdef BUILD_DEB1 - dh_installdocs -plibcrypt1 -endif -ifdef BUILD_DEB2 - dh_installdocs -plibcrypt2 -endif - dh_installdocs -plibxcrypt-source override_dh_installchangelogs: dh_installchangelogs -XChangeLog NEWS diff -Nru libxcrypt-4.4.27/lib/libcrypt.map.in libxcrypt-4.4.28/lib/libcrypt.map.in --- libxcrypt-4.4.27/lib/libcrypt.map.in 2021-12-17 15:14:52.000000000 +0000 +++ libxcrypt-4.4.28/lib/libcrypt.map.in 2022-02-01 22:26:50.000000000 +0000 @@ -42,5 +42,5 @@ # libcrypt.minver. The ordering is left to right, top to bottom. %chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6 %chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 -%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 +%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.35 %chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4 diff -Nru libxcrypt-4.4.27/lib/libcrypt.minver libxcrypt-4.4.28/lib/libcrypt.minver --- libxcrypt-4.4.27/lib/libcrypt.minver 2021-12-17 15:14:52.000000000 +0000 +++ libxcrypt-4.4.28/lib/libcrypt.minver 2022-02-01 22:26:50.000000000 +0000 @@ -60,6 +60,7 @@ ERROR kfreebsd.*gnu . # Linux with GNU libc +GLIBC_2.35 linux.*gnu or1k GLIBC_2.33 linux.*gnu riscv32 GLIBC_2.32 linux.*gnu arc GLIBC_2.29 linux.*gnu csky diff -Nru libxcrypt-4.4.27/NEWS libxcrypt-4.4.28/NEWS --- libxcrypt-4.4.27/NEWS 2021-12-17 15:14:52.000000000 +0000 +++ libxcrypt-4.4.28/NEWS 2022-02-01 22:26:50.000000000 +0000 @@ -3,6 +3,10 @@ Please send bug reports, questions and suggestions to . +Version 4.4.28 +* Add glibc-on-or1k (OpenRISC 1000) entry to libcrypt.minver. + This was added in GNU libc 2.35. + Version 4.4.27 * Limit the maximum amount of rbytes to 64 bytes (512 bits) for yescrypt, gost-yescrypt, and scrypt. Also reflect this limit