Author: aschnell
Date: Fri Mar 16 14:41:50 2012
New Revision: 67647
URL: http://svn.opensuse.org/viewcvs/yast?rev=67647&view=rev
Log:
- do not use xcrypt (fate #312617)
Modified:
trunk/core/VERSION
trunk/core/configure.in.in
trunk/core/libycp/src/Makefile.am
trunk/core/libycp/src/YCPBuiltinString.cc
trunk/core/libycp/src/y2crypt.cc
trunk/core/package/yast2-core.changes
trunk/core/yast2-core.spec.in
Modified: trunk/core/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=67647&r1=67646&r2=67647&view=diff
==============================================================================
--- trunk/core/VERSION (original)
+++ trunk/core/VERSION Fri Mar 16 14:41:50 2012
@@ -1 +1 @@
-2.22.4
+2.22.5
Modified: trunk/core/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/configure.in.in?rev=67647&r1=67646&r2=67647&view=diff
==============================================================================
--- trunk/core/configure.in.in (original)
+++ trunk/core/configure.in.in Fri Mar 16 14:41:50 2012
@@ -24,14 +24,6 @@
# liby2:Y2SerialComponent needs termios.h in glibc-devel
# (not term.h in ncurses-devel)
-# libycp: y2crypt needs xcrypt.h -> libxcrypt, libxcrypt-devel
-yast_found_xcrypt=no
-AC_CHECK_HEADER(xcrypt.h,[yast_found_xcrypt=yes])
-if [[ "$yast_found_xcrypt" = "no" ]]; then
- AC_MSG_ERROR(Headers for xcrypt are missing. Please install the package libxcrypt-devel.)
-fi
-
-
Y2UTIL_CFLAGS='-I$(top_srcdir)/liby2util-r/src/include'
Y2UTIL_LIBS='$(top_builddir)/liby2util-r/src/liby2util.la'
AC_SUBST(Y2UTIL_CFLAGS)
Modified: trunk/core/libycp/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/Makefile.am?rev=67647&r1=67646&r2=67647&view=diff
==============================================================================
--- trunk/core/libycp/src/Makefile.am (original)
+++ trunk/core/libycp/src/Makefile.am Fri Mar 16 14:41:50 2012
@@ -68,7 +68,7 @@
libycpvalues_la_LIBADD = ${Y2UTIL_LIBS}
libycp_la_LDFLAGS = -version-info 3:0:0
-libycp_la_LIBADD = ${Y2UTIL_LIBS} -lxcrypt libycpvalues.la $(top_builddir)/debugger/liby2debug.la
+libycp_la_LIBADD = ${Y2UTIL_LIBS} -lcrypt libycpvalues.la $(top_builddir)/debugger/liby2debug.la
CLEANFILES = parser.output parser.cc scanner.cc $(BUILT_SOURCES)
Modified: trunk/core/libycp/src/YCPBuiltinString.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString.cc?rev=67647&r1=67646&r2=67647&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPBuiltinString.cc (original)
+++ trunk/core/libycp/src/YCPBuiltinString.cc Fri Mar 16 14:41:50 2012
@@ -19,10 +19,6 @@
/-*/
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE // for crypt
-#endif
-
#ifndef _GNU_SOURCE
#define _GNU_SOURCE // for snprintf
#endif
Modified: trunk/core/libycp/src/y2crypt.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/y2crypt.cc?rev=67647&r1=67646&r2=67647&view=diff
==============================================================================
--- trunk/core/libycp/src/y2crypt.cc (original)
+++ trunk/core/libycp/src/y2crypt.cc Fri Mar 16 14:41:50 2012
@@ -9,6 +9,10 @@
#define _GNU_SOURCE
#endif
+#ifndef _OW_SOURCE
+#define _OW_SOURCE
+#endif
+
#include
#include
#include
@@ -16,7 +20,10 @@
#include
#include
#include
-#include
+
+extern "C" {
+#include
+}
#include "y2log.h"
#include "y2crypt.h"
@@ -78,11 +85,8 @@
close (fd);
char output[CRYPT_GENSALT_OUTPUT_SIZE];
-#if !defined(crypt_gensalt_r)
-#define crypt_gensalt_r xcrypt_gensalt_rn
-#endif
- char* retval = crypt_gensalt_r (crypt_prefix, crypt_rounds, entropy,
- sizeof (entropy), output, sizeof (output));
+ char* retval = crypt_gensalt_rn (crypt_prefix, crypt_rounds, entropy,
+ sizeof(entropy), output, sizeof(output));
memset (entropy, 0, sizeof (entropy));
@@ -114,7 +118,7 @@
y2error ("Cannot create salt for standard crypt");
return false;
}
- newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output);
+ newencrypted = crypt_r (unencrypted.c_str (), salt, &output);
free (salt);
break;
@@ -125,10 +129,11 @@
y2error ("Cannot create salt for MD5 crypt");
return false;
}
- newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output);
+ newencrypted = crypt_r (unencrypted.c_str (), salt, &output);
free (salt);
break;
+#if 0
case BIGCRYPT:
salt = make_crypt_salt ("", 0);
if (!salt)
@@ -139,6 +144,7 @@
newencrypted = bigcrypt (unencrypted.c_str (), salt);
free (salt);
break;
+#endif
case BLOWFISH:
salt = make_crypt_salt ("$2y$", 0);
@@ -147,7 +153,7 @@
y2error ("Cannot create salt for blowfish crypt");
return false;
}
- newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output);
+ newencrypted = crypt_r (unencrypted.c_str (), salt, &output);
free (salt);
break;
@@ -158,7 +164,7 @@
y2error ("Cannot create salt for sha256 crypt");
return false;
}
- newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output);
+ newencrypted = crypt_r (unencrypted.c_str (), salt, &output);
free (salt);
break;
@@ -169,7 +175,7 @@
y2error ("Cannot create salt for sha512 crypt");
return false;
}
- newencrypted = xcrypt_r (unencrypted.c_str (), salt, &output);
+ newencrypted = crypt_r (unencrypted.c_str (), salt, &output);
free (salt);
break;
Modified: trunk/core/package/yast2-core.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=67647&r1=67646&r2=67647&view=diff
==============================================================================
--- trunk/core/package/yast2-core.changes (original)
+++ trunk/core/package/yast2-core.changes Fri Mar 16 14:41:50 2012
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Mar 16 14:40:00 CET 2012 - aschnell@suse.de
+
+- do not use xcrypt (fate #312617)
+- 2.22.5
+
+-------------------------------------------------------------------
Wed Feb 22 14:59:37 CET 2012 - aschnell@suse.de
- added tointeger builtin with explicite base qualification
Modified: trunk/core/yast2-core.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=67647&r1=67646&r2=67647&view=diff
==============================================================================
--- trunk/core/yast2-core.spec.in (original)
+++ trunk/core/yast2-core.spec.in Fri Mar 16 14:41:50 2012
@@ -21,8 +21,6 @@
# logging
# renamed: http://lists.opensuse.org/opensuse-packaging/2007-11/msg00076.html
BuildRequires: libblocxx-devel
-# libycp includes crypto built-ins
-BuildRequires: libxcrypt-devel
Summary: YaST2 - Core Libraries
Requires: perl = %{perl_version}
@@ -37,7 +35,7 @@
Summary: YaST2 - Core Libraries
Provides: liby2util-devel = 2.16.1
Obsoletes: liby2util-devel < 2.16.1
-Requires: libxcrypt-devel hwinfo-devel
+Requires: hwinfo-devel
Requires: glibc-devel libstdc++-devel pcre-devel libblocxx-devel sysfsutils
# required for libscr
# for FlexLexer.h; I think that this dependency could be made
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
