Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at 2020-10-18 16:19:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-core (Old) and /work/SRC/openSUSE:Factory/.yast2-core.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-core" Sun Oct 18 16:19:59 2020 rev:188 rq:839214 version:4.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-core/yast2-core.changes 2020-09-23 18:40:04.545303350 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-core.new.3486/yast2-core.changes 2020-10-18 16:20:04.356454807 +0200 @@ -1,0 +2,8 @@ +Thu Sep 24 13:56:22 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- Drop encryption builtins as they needed adjustment and + they are reimplemented in yast2-ruby-bindings anyway (bsc#1176924) + (crypt cryptmd5 cryptblowfish cryptsha256 cryptsha512) +- 4.3.3 + +------------------------------------------------------------------- @@ -4869 +4876,0 @@ - Old: ---- yast2-core-4.3.2.tar.bz2 New: ---- yast2-core-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.IhIscc/_old 2020-10-18 16:20:04.964455078 +0200 +++ /var/tmp/diff_new_pack.IhIscc/_new 2020-10-18 16:20:04.968455079 +0200 @@ -27,7 +27,7 @@ %bcond_with werror Name: yast2-core -Version: 4.3.2 +Version: 4.3.3 Release: 0 URL: https://github.com/yast/yast-core @@ -45,8 +45,6 @@ # we have a parser BuildRequires: bison BuildRequires: flex -# workaround for error when jemalloc is dlopened in ruby in old testsuite (bsc#1068883) -BuildRequires: jemalloc-devel # incompatible change, parser.h -> parser.hh BuildRequires: automake >= 1.12 # needed for all yast packages @@ -102,6 +100,11 @@ # warning/error: argument unused during compilation CFLAGS="${CFLAGS/-grecord-gcc-switches/}" CXXFLAGS="${CXXFLAGS/-grecord-gcc-switches/}" + +# "unsupported argument 'auto' to option 'flto='" +# This time it comes from RPM macro expansion +# so let's override /usr/lib/rpm/suse/macros +%define _lto_cflags %{nil} %endif %yast_build @@ -114,11 +117,6 @@ %post /sbin/ldconfig -# bnc#485992, since oS 11.2 -C=blacklist -if test -f /etc/modprobe.d/$C; then - mv -f /etc/modprobe.d/$C /etc/modprobe.d/50-$C.conf -fi %postun -p /sbin/ldconfig @@ -155,12 +153,6 @@ %dir %{perl_vendorlib}/YaST %{perl_vendorlib}/YaST/SCRAgent.pm -%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 -# .packlist -%{perl_vendorarch}/auto/ycp -/var/adm/perl-modules/%name -%endif - %files devel %defattr(-,root,root) %{yast_ybindir}/ybcdump ++++++ yast2-core-4.3.2.tar.bz2 -> yast2-core-4.3.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/Dockerfile new/yast2-core-4.3.3/Dockerfile --- old/yast2-core-4.3.2/Dockerfile 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/Dockerfile 2020-10-02 18:29:03.000000000 +0200 @@ -4,5 +4,4 @@ # Remove the preinstalled yast2-core, it interferes with the built one # when running the tests... (huh??) RUN zypper --non-interactive rm yast2-core -RUN zypper --non-interactive in jemalloc-devel COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/base/src/Makefile.am new/yast2-core-4.3.3/base/src/Makefile.am --- old/yast2-core-4.3.2/base/src/Makefile.am 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/base/src/Makefile.am 2020-10-02 18:29:03.000000000 +0200 @@ -24,10 +24,8 @@ y2base_LDADD = ${Y2UTIL_LIBS} -# -ljemalloc: workaround for error when jemalloc is dlopened in ruby in old testsuite (bsc#1068883) y2base_LDFLAGS = \ -Xlinker --whole-archive \ - -ljemalloc \ $(PERL_LDFLAGS) \ $(YAST2CORE) \ -Xlinker --no-whole-archive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/configure.in.in new/yast2-core-4.3.3/configure.in.in --- old/yast2-core-4.3.2/configure.in.in 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/configure.in.in 2020-10-02 18:29:03.000000000 +0200 @@ -56,16 +56,6 @@ Y2CORE_CFLAGS="-std=gnu++0x" AC_SUBST(Y2CORE_CFLAGS) dnl included in CXXFLAGS in YAST2-CHECKS-PROGRAM -AC_CHECK_HEADERS(xcrypt.h) - -AC_CHECK_LIB(owcrypt, crypt_gensalt_rn, - [CRYPTO_LIBS="-lowcrypt -lcrypt"], - AC_CHECK_LIB(xcrypt, crypt_gensalt_rn, - [CRYPTO_LIBS="-lxcrypt"], - [CRYPTO_LIBS="-lcrypt"]) -) -AC_SUBST(CRYPTO_LIBS) - CREATE_PKGCONFIG=true ## some common checks @YAST2-CHECKS-COMMON@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/libycp/src/Makefile.am new/yast2-core-4.3.3/libycp/src/Makefile.am --- old/yast2-core-4.3.2/libycp/src/Makefile.am 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/libycp/src/Makefile.am 2020-10-02 18:29:03.000000000 +0200 @@ -49,8 +49,7 @@ YCPBuiltinMultiset.cc \ YSymbolEntry.cc \ TypeStatics.cc \ - y2string.cc \ - y2crypt.cc y2crypt.h + y2string.cc $(srcdir)/scanner.cc: scanner.ll parser.hh flex++ -o$@ $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/libycp/src/YCPBuiltinString.cc new/yast2-core-4.3.3/libycp/src/YCPBuiltinString.cc --- old/yast2-core-4.3.2/libycp/src/YCPBuiltinString.cc 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/libycp/src/YCPBuiltinString.cc 2020-10-02 18:29:03.000000000 +0200 @@ -45,7 +45,6 @@ #include "ycp/YCPVoid.h" #include "ycp/y2log.h" #include "y2string.h" -#include "y2crypt.h" #include "ycp/StaticDeclaration.h" @@ -1240,161 +1239,6 @@ } static YCPValue -s_crypt (const YCPString &s) -{ - /** - * @builtin crypt - * @short Encrypts a string - * @description - * Encrypts the string <tt>UNENCRYPTED</tt> using the standard - * password encryption provided by the system. - * @param string UNENCRYPTED - * @return string - * - * @usage crypt ("readable") -> "Y2PEyAiaeaFy6" - */ - - if (s.isNull ()) - return YCPNull (); - - string unencrypted = s->value(); - string encrypted; - - if (YaST::crypt_pass(unencrypted, YaST::CRYPT, &encrypted)) - return YCPString (encrypted); - else - { - ycp2error ("Encryption using crypt failed"); - return YCPNull (); - } -} - - -static YCPValue -s_cryptmd5 (const YCPString &s) -{ - /** - * @builtin cryptmd5 - * @short Encrypts a string using md5 - * @description - * Encrypts the string <tt>UNENCRYPTED</tt> using MD5 - * password encryption. - * @param string UNENCRYPTED - * @return string - * - * @usage cryptmd5 ("readable") -> "$1$BBtzrzzz$zc2vEB7XnA3Iq7pOgDsxD0" - */ - - if (s.isNull ()) - return YCPNull (); - - string unencrypted = s->value(); - string encrypted; - - if (YaST::crypt_pass(unencrypted, YaST::MD5, &encrypted)) - return YCPString (encrypted); - else - { - ycp2error ("Encryption using MD5 failed"); - return YCPNull (); - } -} - - -static YCPValue -s_cryptblowfish(const YCPString& original) -{ - /** - * @builtin cryptblowfish - * @short Encrypts a string with blowfish - * @description - * Encrypts the string <tt>UNENCRYPTED</tt> using blowfish - * password encryption. The password is not truncated. - * - * @param string UNENCRYPTED - * @return string - * @usage cryptblowfish ("readable") -> "$2a$05$B3lAUExB.Bqpy8Pq0TpZt.s7EydrmxJRuhOZR04YG01ptwOUR147C" - */ - - if (original.isNull ()) - return YCPNull (); - - string unencrypted = original->value(); - string encrypted; - - if (YaST::crypt_pass(unencrypted, YaST::BLOWFISH, &encrypted)) - return YCPString (encrypted); - else - { - ycp2error ("Encryption using blowfish failed"); - return YCPNull (); - } -} - - -static YCPValue -s_cryptsha256(const YCPString& original) -{ - /** - * @builtin cryptsha256 - * @short Encrypts a string with sha256 - * @description - * Encrypts the string <tt>UNENCRYPTED</tt> using sha256 - * password encryption. The password is not truncated. - * - * @param string UNENCRYPTED - * @return string - * @usage cryptsha256 ("readable") -> "$5$keev8D8I$kZdbw1WYM7XJtn4cpl1S3QtoKXnxIIFVSqwadMAGLE3" - */ - - if (original.isNull ()) - return YCPNull (); - - string unencrypted = original->value(); - string encrypted; - - if (YaST::crypt_pass(unencrypted, YaST::SHA256, &encrypted)) - return YCPString (encrypted); - else - { - ycp2error ("Encryption using sha256 failed"); - return YCPNull (); - } -} - - -static YCPValue -s_cryptsha512(const YCPString& original) -{ - /** - * @builtin cryptsha512 - * @short Encrypts a string with sha512 - * @description - * Encrypts the string <tt>UNENCRYPTED</tt> using sha512 - * password encryption. The password is not truncated. - * - * @param string UNENCRYPTED - * @return string - * @usage cryptsha512 ("readable") -> "$6$QskPAFTK$R40N1UI047Bg.nD96ZYSGnx71mgbBgb.UEtKuR8bGGxuzYgXjCTxKIQmqXrgftBzA20m2P9ayrUKQQ2pnWzm70" - */ - - if (original.isNull ()) - return YCPNull (); - - string unencrypted = original->value(); - string encrypted; - - if (YaST::crypt_pass(unencrypted, YaST::SHA512, &encrypted)) - return YCPString (encrypted); - else - { - ycp2error ("Encryption using sha512 failed"); - return YCPNull (); - } -} - - -static YCPValue s_dgettext (const YCPString& domain, const YCPString& text) { /** @@ -1578,11 +1422,6 @@ { "substring", "string (string, integer, integer)", (void *)s_substring2, ETC }, { "timestring", "string (string, integer, boolean)", (void *)s_timestring, ETC }, { "mergestring", "string (const list <string>, string)", (void *)s_mergestring, ETC }, - { "crypt", "string (string)", (void *)s_crypt, ETC }, - { "cryptmd5", "string (string)", (void *)s_cryptmd5, ETC }, - { "cryptblowfish", "string (string)", (void *)s_cryptblowfish, ETC }, - { "cryptsha256", "string (string)", (void *)s_cryptsha256, ETC }, - { "cryptsha512", "string (string)", (void *)s_cryptsha512, ETC }, { "regexpmatch", "boolean (string, string)", (void *)s_regexpmatch, ETC }, { "regexppos", "list<integer> (string, string)", (void *)s_regexppos, ETC }, { "regexpsub", "string (string, string, string)", (void *)s_regexpsub, ETC }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/libycp/src/y2crypt.cc new/yast2-core-4.3.3/libycp/src/y2crypt.cc --- old/yast2-core-4.3.2/libycp/src/y2crypt.cc 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/libycp/src/y2crypt.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,194 +0,0 @@ - - -/* - * Author: Arvin Schnell <ar...@suse.de> - */ - - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#ifndef _OW_SOURCE -#define _OW_SOURCE -#endif - -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <errno.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> - -#include "config.h" - -extern "C" { -#ifdef HAVE_XCRYPT_H -#include <xcrypt.h> -#else -#include <crypt.h> -#endif -} - -#include "y2log.h" -#include "y2crypt.h" - -namespace YaST -{ - -static int -read_loop (int fd, char* buffer, int count) -{ - int offset, block; - - offset = 0; - while (count > 0) - { - block = read (fd, &buffer[offset], count); - - if (block < 0) - { - if (errno == EINTR) - continue; - return block; - } - - if (!block) - return offset; - - offset += block; - count -= block; - } - - return offset; -} - - -static char* -make_crypt_salt (const char* crypt_prefix, int crypt_rounds) -{ -#define CRYPT_GENSALT_OUTPUT_SIZE (7 + 22 + 1) - -#ifndef RANDOM_DEVICE -#define RANDOM_DEVICE "/dev/urandom" -#endif - - int fd = open (RANDOM_DEVICE, O_RDONLY); - if (fd < 0) - { - y2error ("Can't open %s for reading: %s\n", RANDOM_DEVICE, - strerror (errno)); - return 0; - } - - char entropy[16]; - if (read_loop (fd, entropy, sizeof(entropy)) != sizeof(entropy)) - { - close (fd); - y2error ("Unable to obtain entropy from %s\n", RANDOM_DEVICE); - return 0; - } - - close (fd); - - char output[CRYPT_GENSALT_OUTPUT_SIZE]; - char* retval = crypt_gensalt_rn (crypt_prefix, crypt_rounds, entropy, - sizeof(entropy), output, sizeof(output)); - - memset (entropy, 0, sizeof (entropy)); - - if (!retval) - { - y2error ("Unable to generate a salt, check your crypt settings.\n"); - return 0; - } - - return strdup (retval); -} - - -bool -crypt_pass (string unencrypted, crypt_t use_crypt, string* encrypted) -{ - struct crypt_data output; - memset (&output, 0, sizeof (output)); - - char* salt; - char* newencrypted = 0; - - switch (use_crypt) - { - case CRYPT: - salt = make_crypt_salt ("", 0); - if (!salt) - { - y2error ("Cannot create salt for standard crypt"); - return false; - } - newencrypted = crypt_r (unencrypted.c_str (), salt, &output); - free (salt); - break; - - case MD5: - salt = make_crypt_salt ("$1$", 0); - if (!salt) - { - y2error ("Cannot create salt for MD5 crypt"); - return false; - } - newencrypted = crypt_r (unencrypted.c_str (), salt, &output); - free (salt); - break; - - case BLOWFISH: - salt = make_crypt_salt ("$2y$", 0); - if (!salt) - { - y2error ("Cannot create salt for blowfish crypt"); - return false; - } - newencrypted = crypt_r (unencrypted.c_str (), salt, &output); - free (salt); - break; - - case SHA256: - salt = make_crypt_salt ("$5$", 0); - if (!salt) - { - y2error ("Cannot create salt for sha256 crypt"); - return false; - } - newencrypted = crypt_r (unencrypted.c_str (), salt, &output); - free (salt); - break; - - case SHA512: - salt = make_crypt_salt ("$6$", 0); - if (!salt) - { - y2error ("Cannot create salt for sha512 crypt"); - return false; - } - newencrypted = crypt_r (unencrypted.c_str (), salt, &output); - free (salt); - break; - - default: - y2error ("Don't know crypt type %d", use_crypt); - return false; - } - - if (!newencrypted - /* catch retval magic by ow-crypt/libxcrypt */ - || !strcmp(newencrypted, "*0") || !strcmp(newencrypted, "*1")) - { - y2error ("crypt_r () returns 0 pointer"); - return false; - } - - *encrypted = string (newencrypted); - return true; -} - -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/libycp/src/y2crypt.h new/yast2-core-4.3.3/libycp/src/y2crypt.h --- old/yast2-core-4.3.2/libycp/src/y2crypt.h 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/libycp/src/y2crypt.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ - - -/* - * Author: Arvin Schnell <ar...@suse.de> - */ - - -#ifndef _y2crypt_h -#define _y2crypt_h - - -#include <string> - -using std::string; - -namespace YaST -{ - -enum crypt_t { CRYPT, MD5, BLOWFISH, SHA256, SHA512 }; - -bool -crypt_pass (string unencrypted, crypt_t use_crypt, string* encrypted); - -} - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/package/yast2-core.changes new/yast2-core-4.3.3/package/yast2-core.changes --- old/yast2-core-4.3.2/package/yast2-core.changes 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/package/yast2-core.changes 2020-10-02 18:29:03.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Sep 24 13:56:22 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- Drop encryption builtins as they needed adjustment and + they are reimplemented in yast2-ruby-bindings anyway (bsc#1176924) + (crypt cryptmd5 cryptblowfish cryptsha256 cryptsha512) +- 4.3.3 + +------------------------------------------------------------------- Fri Sep 18 15:41:56 UTC 2020 - Martin Vidner <mvid...@suse.com> - Avoid 'Construct not supported' on UnmountAgent (bsc#1176594) @@ -4866,4 +4874,3 @@ yast2-core-wfm, yast2-agent-any, yast2-agent-probe, yast2-agent-ini, yast2-agent-modules, yast2-agent-system and yast2-base into new package yast2-core - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-4.3.2/package/yast2-core.spec new/yast2-core-4.3.3/package/yast2-core.spec --- old/yast2-core-4.3.2/package/yast2-core.spec 2020-09-18 18:23:31.000000000 +0200 +++ new/yast2-core-4.3.3/package/yast2-core.spec 2020-10-02 18:29:03.000000000 +0200 @@ -26,7 +26,7 @@ %bcond_with werror Name: yast2-core -Version: 4.3.2 +Version: 4.3.3 Release: 0 Url: https://github.com/yast/yast-core @@ -44,8 +44,6 @@ # we have a parser BuildRequires: bison BuildRequires: flex -# workaround for error when jemalloc is dlopened in ruby in old testsuite (bsc#1068883) -BuildRequires: jemalloc-devel # incompatible change, parser.h -> parser.hh BuildRequires: automake >= 1.12 # needed for all yast packages @@ -101,6 +99,11 @@ # warning/error: argument unused during compilation CFLAGS="${CFLAGS/-grecord-gcc-switches/}" CXXFLAGS="${CXXFLAGS/-grecord-gcc-switches/}" + +# "unsupported argument 'auto' to option 'flto='" +# This time it comes from RPM macro expansion +# so let's override /usr/lib/rpm/suse/macros +%define _lto_cflags %{nil} %endif %yast_build @@ -113,11 +116,6 @@ %post /sbin/ldconfig -# bnc#485992, since oS 11.2 -C=blacklist -if test -f /etc/modprobe.d/$C; then - mv -f /etc/modprobe.d/$C /etc/modprobe.d/50-$C.conf -fi %postun -p /sbin/ldconfig @@ -154,12 +152,6 @@ %dir %{perl_vendorlib}/YaST %{perl_vendorlib}/YaST/SCRAgent.pm -%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 -# .packlist -%{perl_vendorarch}/auto/ycp -/var/adm/perl-modules/%name -%endif - %files devel %defattr(-,root,root) %{yast_ybindir}/ybcdump
