Mailinglist Archive: opensuse-commit (1159 mails)
| < Previous | Next > |
commit yast2-ca-management
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 09 Oct 2007 18:37:08 +0200
- Message-id: <20071009163708.C36EF678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-ca-management
checked in at Tue Oct 9 18:37:08 CEST 2007.
--------
--- yast2-ca-management/yast2-ca-management.changes 2007-08-14 15:09:25.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ca-management/yast2-ca-management.changes 2007-10-09 18:04:47.181079000 +0200
@@ -1,0 +2,8 @@
+Mon Oct 8 12:20:38 CEST 2007 - mc@xxxxxxx
+
+- version 2.16.0
+- fix addRequest call. [#326465]
+- implement support for MS-UPN and Krb5PrincipalName in
+ SubjectAlternativeName Extension
+
+-------------------------------------------------------------------
Old:
----
yast2-ca-management-2.15.2.tar.bz2
New:
----
yast2-ca-management-2.16.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ca-management.spec ++++++
--- /var/tmp/diff_new_pack.M26969/_old 2007-10-09 18:36:14.000000000 +0200
+++ /var/tmp/diff_new_pack.M26969/_new 2007-10-09 18:36:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ca-management (Version 2.15.2)
+# spec file for package yast2-ca-management (Version 2.16.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,17 @@
# norootforbuild
Name: yast2-ca-management
-Version: 2.15.2
+Version: 2.16.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ca-management-2.15.2.tar.bz2
-prefix: /usr
+Source0: yast2-ca-management-2.16.0.tar.bz2
+Prefix: /usr
BuildRequires: docbook-xsl-stylesheets dosfstools doxygen libxslt limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools
-Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-ca-mgm-perl limal-perl perl-Config-IniFiles perl-URI
-BuildArchitectures: noarch
+Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI
+Requires: limal-ca-mgm-perl >= 1.4.0
+BuildArch: noarch
Summary: YaST2 - CAs, Certificates and Requests Management
%description
@@ -29,7 +30,7 @@
%prep
-%setup -n yast2-ca-management-2.15.2
+%setup -n yast2-ca-management-2.16.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,8 +75,12 @@
%doc %{prefix}/share/doc/packages/yast2-ca-management
/usr/bin/generateCRL.pl
%attr(600, root, root) %config(noreplace) /etc/generateCRL.conf
-
%changelog
+* Mon Oct 08 2007 - mc@xxxxxxx
+- version 2.16.0
+- fix addRequest call. [#326465]
+- implement support for MS-UPN and Krb5PrincipalName in
+ SubjectAlternativeName Extension
* Tue Aug 14 2007 - jsuchome@xxxxxxx
- minimal support for command line interface (#300183)
- 2.15.2
++++++ yast2-ca-management-2.15.2.tar.bz2 -> yast2-ca-management-2.16.0.tar.bz2 ++++++
++++ 10893 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/configure.in new/yast2-ca-management-2.16.0/configure.in
--- old/yast2-ca-management-2.15.2/configure.in 2005-12-19 16:43:06.000000000 +0100
+++ new/yast2-ca-management-2.16.0/configure.in 2007-10-09 18:00:05.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ca-management
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ca-management, 2.13.3, http://www.suse.de/feedback, yast2-ca-management)
+AC_INIT(yast2-ca-management, 2.16.0, http://bugs.opensuse.org/, yast2-ca-management)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.3"
+VERSION="2.16.0"
RPMNAME="yast2-ca-management"
MAINTAINER="Michael Calmer <mc@xxxxxxx>"
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile doc/autodocs/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/Makefile.am new/yast2-ca-management-2.16.0/Makefile.am
--- old/yast2-ca-management-2.15.2/Makefile.am 2005-12-19 16:43:06.000000000 +0100
+++ new/yast2-ca-management-2.16.0/Makefile.am 2007-10-09 18:00:06.000000000 +0200
@@ -7,7 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -30,10 +30,10 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +95,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +116,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,16 +199,18 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = doc scripts src testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/Makefile.am.common new/yast2-ca-management-2.16.0/Makefile.am.common
--- old/yast2-ca-management-2.15.2/Makefile.am.common 2005-12-19 16:43:06.000000000 +0100
+++ new/yast2-ca-management-2.16.0/Makefile.am.common 2007-10-09 18:00:05.000000000 +0200
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/missing new/yast2-ca-management-2.16.0/missing
--- old/yast2-ca-management-2.15.2/missing 2005-12-19 16:43:11.000000000 +0100
+++ new/yast2-ca-management-2.16.0/missing 2007-10-09 18:00:11.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/src/common_cert.ycp new/yast2-ca-management-2.16.0/src/common_cert.ycp
--- old/yast2-ca-management-2.15.2/src/common_cert.ycp 2007-08-14 13:37:16.000000000 +0200
+++ new/yast2-ca-management-2.16.0/src/common_cert.ycp 2007-08-22 14:15:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Stefan Schubert <schubi@xxxxxxx>
*
- * $Id: common_cert.ycp 27284 2006-01-24 14:00:16Z mc $
+ * $Id: common_cert.ycp 40255 2007-08-14 13:09:49Z jsuchome $
*
* Showing current common server certificate
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/src/new_cert_callbacks.ycp new/yast2-ca-management-2.16.0/src/new_cert_callbacks.ycp
--- old/yast2-ca-management-2.15.2/src/new_cert_callbacks.ycp 2006-11-27 17:23:19.000000000 +0100
+++ new/yast2-ca-management-2.16.0/src/new_cert_callbacks.ycp 2007-10-08 18:41:29.000000000 +0200
@@ -13,7 +13,7 @@
* Authors:
* Stefan Schubert <schubi@xxxxxxx>
*
- * $Id: new_cert_callbacks.ycp 30822 2006-05-10 14:23:10Z mc $
+ * $Id: new_cert_callbacks.ycp 41286 2007-10-08 16:41:29Z mcalmer $
*
* Creating a new CA/Certificate
*
@@ -350,7 +350,9 @@
`RadioButton(`id("URI"), `opt(`notify), "URI"),
`RadioButton(`id("DNS"), `opt(`notify), "DNS"),
`RadioButton(`id("IP"), `opt(`notify), "IP"),
- `RadioButton(`id("RID"), `opt(`notify), "RID")
+ `RadioButton(`id("RID"), `opt(`notify), "RID"),
+ `RadioButton(`id("MS-UPN"), `opt(`notify), "MS-UPN"),
+ `RadioButton(`id("K5PN"), `opt(`notify), "K5PN")
)
),
`TextEntry(`id(`name), _("&Name:")),
@@ -701,7 +703,9 @@
`RadioButton(`id("URI"), `opt(`notify), "URI", true),
`RadioButton(`id("DNS"), `opt(`notify), "DNS"),
`RadioButton(`id("IP"), `opt(`notify), "IP"),
- `RadioButton(`id("RID"), `opt(`notify), "RID")
+ `RadioButton(`id("RID"), `opt(`notify), "RID"),
+ `RadioButton(`id("MS-UPN"), `opt(`notify), "MS-UPN"),
+ `RadioButton(`id("K5PN"), `opt(`notify), "K5PN")
)
),
`TextEntry(`id(`name), _("&Name:")),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/src/new_cert_read_write.ycp new/yast2-ca-management-2.16.0/src/new_cert_read_write.ycp
--- old/yast2-ca-management-2.15.2/src/new_cert_read_write.ycp 2006-11-27 17:23:19.000000000 +0100
+++ new/yast2-ca-management-2.16.0/src/new_cert_read_write.ycp 2007-10-08 12:20:25.000000000 +0200
@@ -13,7 +13,7 @@
* Authors:
* Stefan Schubert <schubi@xxxxxxx>
*
- * $Id: new_cert_read_write.ycp 31720 2006-06-29 14:41:46Z mc $
+ * $Id: new_cert_read_write.ycp 41279 2007-10-08 10:20:25Z mcalmer $
*
* Creating a new CA/Certificate
*
@@ -749,6 +749,7 @@
||kind == "Sub CA Request")
{
param["caName"] = CaMgm::currentCA;
+ param["caPasswd"] = getPassword(CaMgm::currentCA);
}
if (kind == "Server Certificate")
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/src/YaPI/CaManagement.pm new/yast2-ca-management-2.16.0/src/YaPI/CaManagement.pm
--- old/yast2-ca-management-2.15.2/src/YaPI/CaManagement.pm 2007-08-10 14:05:45.000000000 +0200
+++ new/yast2-ca-management-2.16.0/src/YaPI/CaManagement.pm 2007-10-08 18:41:29.000000000 +0200
@@ -1,7 +1,7 @@
###############################################################
# Copyright 2004,2005 Novell, Inc. All rights reserved.
#
-# $Id: CaManagement.pm 39238 2007-07-09 09:10:33Z mcalmer $
+# $Id: CaManagement.pm 41286 2007-10-08 16:41:29Z mcalmer $
###############################################################
package YaPI::CaManagement;
@@ -1474,13 +1474,13 @@
}
$e = YaST::caUtils->transformSubjectAltName($exts,
- $data->{'subjectAltName'});
+ $data->{'subjectAltName'}, 1);
if(!defined $e) {
return undef;
}
$e = YaST::caUtils->transformIssuerAltName($exts,
- $data->{'issuerAltName'});
+ $data->{'issuerAltName'}, 1);
if(!defined $e) {
return undef;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/src/YaPI/caUtils.pm new/yast2-ca-management-2.16.0/src/YaPI/caUtils.pm
--- old/yast2-ca-management-2.15.2/src/YaPI/caUtils.pm 2006-11-27 17:23:19.000000000 +0100
+++ new/yast2-ca-management-2.16.0/src/YaPI/caUtils.pm 2007-10-08 18:41:29.000000000 +0200
@@ -1,7 +1,7 @@
###############################################################
# Copyright 2004, Novell, Inc. All rights reserved.
#
-# $Id: caUtils.pm 33254 2006-10-06 09:46:34Z mc $
+# $Id: caUtils.pm 41286 2007-10-08 16:41:29Z mcalmer $
###############################################################
package YaST::caUtils;
@@ -580,7 +580,8 @@
my $self = shift;
my $exts = shift;
my $value = shift || "";
-
+ my $forDefaults = shift || 0;
+
my $crit = 0;
my $emailCopy = 0;
my $list = new LIMAL::CaMgm::LiteralValueList();
@@ -594,7 +595,23 @@
$emailCopy = 1;
next;
}
-
+ if($p =~ /^MS-UPN:(.+)/)
+ {
+ if(!$forDefaults)
+ {
+ $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.4.1.311.20.2.3:$1"));
+ }
+ next;
+ }
+ if($p =~ /^K5PN:(.+)/)
+ {
+ if(!$forDefaults)
+ {
+ $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.5.2.2:$1"));
+ }
+ next;
+ }
+
$list->push_back(new LIMAL::CaMgm::LiteralValue($p));
}
@@ -621,7 +638,8 @@
my $self = shift;
my $exts = shift;
my $value = shift || "";
-
+ my $forDefaults = shift || 0;
+
my $crit = 0;
my $issuerCopy = 0;
my $list = new LIMAL::CaMgm::LiteralValueList();
@@ -635,6 +653,22 @@
$issuerCopy = 1;
next;
}
+ if($p =~ /^MS-UPN:(.+)/)
+ {
+ if(!$forDefaults)
+ {
+ $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.4.1.311.20.2.3:$1"));
+ }
+ next;
+ }
+ if($p =~ /^K5PN:(.+)/)
+ {
+ if(!$forDefaults)
+ {
+ $list->push_back(new LIMAL::CaMgm::LiteralValue("1.3.6.1.5.2.2:$1"));
+ }
+ next;
+ }
$list->push_back(new LIMAL::CaMgm::LiteralValue($p));
}
@@ -1044,9 +1078,18 @@
!$list->iterator_equal($it, $list->end());
$list->iterator_incr($it))
{
-
- push @vals, $list->iterator_value($it)->toString();
-
+ if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3")
+ {
+ push @vals, "MS-UPN:".$list->iterator_value($it)->getValue();
+ }
+ elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2")
+ {
+ push @vals, "K5PN:".$list->iterator_value($it)->getValue();
+ }
+ else
+ {
+ push @vals, $list->iterator_value($it)->toString();
+ }
}
$ret->{'subjectAltName'} = join(', ', @vals);
@@ -1085,9 +1128,18 @@
!$list->iterator_equal($it, $list->end());
$list->iterator_incr($it))
{
-
- push @vals, $list->iterator_value($it)->toString();
-
+ if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3")
+ {
+ push @vals, "MS-UPN:".$list->iterator_value($it)->getValue();
+ }
+ elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2")
+ {
+ push @vals, "K5PN:".$list->iterator_value($it)->getValue();
+ }
+ else
+ {
+ push @vals, $list->iterator_value($it)->toString();
+ }
}
$ret->{'issuerAltName'} = join(', ', @vals);
@@ -1591,6 +1643,41 @@
$val =~ s/\s+$//g;
$i++;
next if $val =~ /^$/;
+ if($key eq "X509v3 Subject Alternative Name" || $key eq "X509v3 Issuer Alternative Name:")
+ {
+ my @pairs = split(/\s*,\s*/, $val);
+ $val = "";
+ foreach my $pair (@pairs)
+ {
+ my ($k, $v) = split(/:/, $pair, 2);
+ if($k eq "othername")
+ {
+ next;
+ }
+ else
+ {
+ $val .= "$pair, ";
+ }
+ }
+
+ my $list = $cert->getExtensions()->getSubjectAlternativeName()->getAlternativeNameList();
+
+ for(my $it = $list->begin();
+ !$list->iterator_equal($it, $list->end());
+ $list->iterator_incr($it)) {
+
+ if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3")
+ {
+ $val .= "MS-UPN:".$list->iterator_value($it)->getValue().", ";
+
+ }
+ elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2")
+ {
+ $val .= "K5PN:".$list->iterator_value($it)->getValue().", ";
+ }
+ }
+ }
+ $val =~ s/, $//;
push(@{$ret->{$key}}, $val);
}
} else {
@@ -1669,6 +1756,12 @@
my @sp1 = split(/:/, $t, 2);
+ if($sp1[0] eq "othername")
+ {
+ # not supported by openssl
+ next;
+ }
+
my $h = {};
$h->{type} = $transMap->{$sp1[0]};
if(!defined $h->{type}) {
@@ -1682,10 +1775,9 @@
push( @{$newExt->{$newKey}->{value}}, $h);
}
-
}
else
- {
+ {
my @sp = split(/\s?,\s?/, $b);
foreach my $t (@sp) {
if(exists $transMap->{$t}) {
@@ -1955,6 +2047,20 @@
$p, $key),
code => "PARAM_CHECK_FAILED");
}
+ } elsif ($p =~ /^\s*MS-UPN:(.+)\s*$/) {
+ if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) {
+ return $self->SetError(summary => sprintf(
+ __("Invalid value'%s' for parameter '%s'."),
+ $p, $key),
+ code => "PARAM_CHECK_FAILED");
+ }
+ } elsif ($p =~ /^\s*K5PN:(.+)\s*$/) {
+ if (!defined $1 || $1 !~ /^[^@]+@[^@]+$/) {
+ return $self->SetError(summary => sprintf(
+ __("Invalid value'%s' for parameter '%s'."),
+ $p, $key),
+ code => "PARAM_CHECK_FAILED");
+ }
} else {
return $self->SetError(summary => sprintf(
__("Invalid value'%s' for parameter '%s'."),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.15.2/VERSION new/yast2-ca-management-2.16.0/VERSION
--- old/yast2-ca-management-2.15.2/VERSION 2007-08-14 13:40:05.000000000 +0200
+++ new/yast2-ca-management-2.16.0/VERSION 2007-10-09 17:52:37.000000000 +0200
@@ -1 +1 @@
-2.15.2
+2.16.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |