Re: [Pkg-openssl-devel] l10n update for openssl

Wed, 16 Jul 2008 03:06:11 -0700 

Hi Luk,

Luk Claes schrieb:
> Christoph Martin wrote:
>> Hi release team,
> 
> Hi Christoph
> 
>> The l10n team asked for a new upload of openssl to include the pending
>> l10n updates. All  the changes for this packages were checked  in into
>> alioth.
>>
>> Would you consider letting in a new Debian release of openssl including
>> the last security fix which was NMUd, some cosmetical lintian fixes and
>> the l10n updates?
> 
> Yes, we would consider it. Please prod us again for the actual
> unblocking, TIA.

Is it ok to fix some lintian warnings together with the l10n updates?
Please have a look at the attached diff between version -10.1 and -11.
The diffs for the Makefile and crypto/opensslconf.h are irrelevant,
since these are generated files and really should not appear in the diff.

The changes are:

- Fixed configuration for debian-kfreebsd-i386. Note: This fix is only
relevant when building for debian-kfreebsd-i386. If you consider this
change not ok, I remove it.
- In postinst a check was added wether stunnel4 should be restartet
- The '-export DH_COMPAT=3' line was removed from debian/rules and a
debian/compat file with contents '3' was created to make lintian happy
- The Makefile does not ignore make clean errors as lintian requests it
- Changed Standards-Version in debian/control
- Change Depends from (= ${Source-Version}) to (= ${binary:Version}) as
lintian requested it

Christoph

-- 
============================================================================
Christoph Martin, Leiter der EDV der Verwaltung, Uni-Mainz, Germany
 Internet-Mail:  [EMAIL PROTECTED]
  Telefon: +49-6131-3926337
      Fax: +49-6131-3922856

diff -u openssl-0.9.8g/Configure openssl-0.9.8g/Configure
--- openssl-0.9.8g/Configure
+++ openssl-0.9.8g/Configure
@@ -320,7 +320,7 @@
 "debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff -u openssl-0.9.8g/Makefile openssl-0.9.8g/Makefile
--- openssl-0.9.8g/Makefile
+++ openssl-0.9.8g/Makefile
@@ -12,9 +12,9 @@
 SHLIB_MAJOR=0
 SHLIB_MINOR=9.8
 SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-PLATFORM=debian-amd64
+PLATFORM=debian-i386
 OPTIONS=--prefix=/usr --openssldir=/usr/lib/ssl enable-zlib enable-tlsext no-camellia no-gmp no-idea no-krb5 no-mdc2 no-rc5 no-rfc3779 no-seed no-shared no-zlib-dynamic
-CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext debian-amd64
+CONFIGURE_ARGS=--prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 zlib enable-tlsext debian-i386
 SHLIB_TARGET=linux-shared
 
 # HERE indicates where this Makefile lives.  This can be used to indicate
@@ -60,7 +60,7 @@
 # PKCS1_CHECK - pkcs1 tests.
 
 CC= gcc
-CFLAG= -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int -DMD5_ASM
+CFLAG= -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall
 DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED 
 PEX_LIBS= 
 EX_LIBS= -ldl -lz
@@ -86,15 +86,15 @@
 PROCESSOR= 
 
 # CPUID module collects small commonly used assembler snippets
-CPUID_OBJ= x86_64cpuid.o
-BN_ASM= x86_64-gcc.o
+CPUID_OBJ= 
+BN_ASM= bn_asm.o
 DES_ENC= des_enc.o fcrypt_b.o
 AES_ASM_OBJ= aes_core.o aes_cbc.o
 BF_ENC= bf_enc.o
 CAST_ENC= c_enc.o
 RC4_ENC= rc4_enc.o
 RC5_ENC= rc5_enc.o
-MD5_ASM_OBJ= md5-x86_64.o
+MD5_ASM_OBJ= 
 SHA1_ASM_OBJ= 
 RMD160_ASM_OBJ= 
 
@@ -143,7 +143,7 @@
 SHARED_SSL=libssl$(SHLIB_EXT)
 SHARED_LIBS=
 SHARED_LIBS_LINK_EXTS=.so
-SHARED_LDFLAGS=-m64 -Wl,--version-script=openssl.ld
+SHARED_LDFLAGS= -Wl,--version-script=openssl.ld
 
 GENERAL=        Makefile
 BASENAME=       openssl
diff -u openssl-0.9.8g/debian/libssl0.9.8.postinst openssl-0.9.8g/debian/libssl0.9.8.postinst
--- openssl-0.9.8g/debian/libssl0.9.8.postinst
+++ openssl-0.9.8g/debian/libssl0.9.8.postinst
@@ -75,6 +75,7 @@
 	    check="$check fetchmail ftpd-ssl slapd"
 	    check="$check proftpd proftpd-ldap proftpd-mysql proftpd-pgsql"
 	    check="$check partimage-server conserver-server tor"
+	    check="$check stunnel4"
 	    # Only get the ones that are installed, and configured
 	    check=$(dpkg -s $check 2> /dev/null | egrep '^Package:|^Status:' | awk '{if ($1 ~ /^Package:/) { package=$2 } else if ($0 ~ /^Status: .* installed$/) { print package }}')
 	    # apache2 ships its init script in apache2-common, but the
diff -u openssl-0.9.8g/debian/rules openssl-0.9.8g/debian/rules
--- openssl-0.9.8g/debian/rules
+++ openssl-0.9.8g/debian/rules
@@ -9,7 +9,6 @@
 #
 # Modified to be a prototype for debmake by Christoph Lameter <[EMAIL PROTECTED]>
 SHELL=/bin/bash
-export DH_COMPAT=3
 
 package=openssl
 
@@ -66,7 +65,7 @@
 	-rm -f build
 	-perl util/perlpath.pl /usr/bin
 	-./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
-	-make -f Makefile  clean clean-shared
+	[ ! -f Makefile ] || make -f Makefile  clean clean-shared
 	#-make -f Makefile  dclean
 	-perl util/perlpath.pl /usr/local/bin/perl
 #	perl util/ssldir.pl /usr/local/ssl
diff -u openssl-0.9.8g/debian/control openssl-0.9.8g/debian/control
--- openssl-0.9.8g/debian/control
+++ openssl-0.9.8g/debian/control
@@ -4,7 +4,9 @@
 Priority: optional
 Maintainer: Debian OpenSSL Team <[EMAIL PROTECTED]>
 Uploaders: Christoph Martin <[EMAIL PROTECTED]>, Kurt Roeckx <[EMAIL PROTECTED]>
-Standards-Version: 3.7.0
+Standards-Version: 3.8.0
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-openssl/openssl
+Vcs-Svn: svn://svn.debian.org/pkg-openssl/openssl/
 
 Package: openssl
 Priority: optional
@@ -52,7 +54,7 @@
 Section: libdevel
 Priority: optional
 Architecture: any
-Depends: libssl0.9.8 (= ${Source-Version}), zlib1g-dev
+Depends: libssl0.9.8 (= ${binary:Version}), zlib1g-dev
 Conflicts: ssleay (<< 0.9.2b), libssl08-dev, libssl09-dev, libssl095a-dev, libssl096-dev
 Description: SSL development libraries, header files and documentation
  libssl and libcrypto development libraries, header files and manpages.
@@ -64,5 +66,5 @@
 Priority: extra
 Architecture: any
-Depends: libssl0.9.8 (= ${Source-Version})
+Depends: libssl0.9.8 (= ${binary:Version})
 Description: Symbol tables for libssl and libcrypto
  This package is part of the OpenSSL implementation of SSL.
diff -u openssl-0.9.8g/debian/changelog openssl-0.9.8g/debian/changelog
--- openssl-0.9.8g/debian/changelog
+++ openssl-0.9.8g/debian/changelog
@@ -1,15 +1,23 @@
-openssl (0.9.8g-10.1) unstable; urgency=high
+openssl (0.9.8g-11) UNRELEASED; urgency=low
 
-  * Non-maintainer upload by the Security team.
-  * Fix denial of service if the 'Server Key exchange message'
-    is omitted from a TLS handshake which could lead to a client
-    crash (CVE-2008-1672; Closes: #483379).
-    This only works if openssl is compiled with enable-tlsext which is
-    done in Debian.
-  * Fix double free in TLS server name extension which leads to a remote
-    denial of service (CVE-2008-0891; Closes: #483379).
+  [ Christoph Martin ]
+  * updated cs, gl, sv, ru, ro debconf translation (closes: #480926, #480967,
+    #482465, #484324, #488595)
+  * add Vcs-Svn header (closes: #481654)
+  * fix debian-kfreebsd-i386 build flags (closes: #482275)
+  * add stunnel4 to restart list (closes: #482111)
+  * include fixes from 10.1 NMB by Security team
+    - Fix double free in TLS server name extension which leads to a remote
+      denial of service (CVE-2008-0891; Closes: #483379).
+    - Fix denial of service if the 'Server Key exchange message'
+      is omitted from a TLS handshake which could lead to a client
+      crash (CVE-2008-1672; Closes: #483379).
+      This only works if openssl is compiled with enable-tlsext which is
+      done in Debian.
+  * fix some lintian warnings
+  * update to newest standards version
 
- -- Nico Golde <[EMAIL PROTECTED]>  Tue, 27 May 2008 11:13:44 +0200
+ -- Christoph Martin <[EMAIL PROTECTED]>  Mon, 30 Jun 2008 16:27:56 +0200
 
 openssl (0.9.8g-10) unstable; urgency=low
 
diff -u openssl-0.9.8g/debian/po/ru.po openssl-0.9.8g/debian/po/ru.po
--- openssl-0.9.8g/debian/po/ru.po
+++ openssl-0.9.8g/debian/po/ru.po
@@ -1,31 +1,29 @@
-# translation of openssl_ru.po to Russian
-# translation of openssl_0.9.8a-8_ru.po to Russian
+# translation of openssl_0.9.8g-10.1_ru.po to Russian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
 # Yuriy Talakan' <[EMAIL PROTECTED]>, 2006.
 # Yuriy Talakan' <[EMAIL PROTECTED]>, 2007.
-#
+# Yuri Kozlov <[EMAIL PROTECTED]>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: openssl_ru\n"
+"Project-Id-Version: openssl 0.9.8g-10.1\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
 "POT-Creation-Date: 2008-01-16 21:40+0100\n"
-"PO-Revision-Date: 2007-04-11 16:53+1000\n"
-"Last-Translator: Yuriy Talakan' <[EMAIL PROTECTED]>\n"
+"PO-Revision-Date: 2008-06-03 21:21+0400\n"
+"Last-Translator: Yuri Kozlov <[EMAIL PROTECTED]>\n"
 "Language-Team: Russian <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: string
 #. Description
 #: ../libssl0.9.8.templates:1001
 msgid "Services to restart to make them use the new libraries:"
-msgstr ""
-"Перезапустить эти сервисы, чтобы они начали использовать новые библиотеки:"
+msgstr "Перезапускаемые службы для использования новой библиотеки:"
 
 #. Type: string
 #. Description
@@ -35,7 +33,7 @@
 "these fixes until they are restarted. Please note that restarting the SSH "
 "server (sshd) should not affect any existing connections."
 msgstr ""
-"Этот выпуск OpenSSL исправляет некоторые проблемы безопасности. Сервисы не "
+"Этот выпуск OpenSSL исправляет некоторые проблемы безопасности. Службы не "
 "могут использовать эти исправления, пока не будут перезапущены. Обратите "
 "внимание, что перезапуск сервера SSH (sshd) не повлияет на существующие "
 "соединения."
@@ -49,10 +47,10 @@
 "initialization script names in /etc/init.d and separated by spaces. No "
 "services will be restarted if the list is empty."
 msgstr ""
-"Проверьте список обнаруженных сервисов, которые надо перезапустить и "
-"поправьте его, если необходимо. Имена сервисов должны соответствовать именам "
-"скриптов инициализации в /etc/init.d и должны быть разделены пробелами. Если "
-"список пустой, сервисы не будут перезапущены."
+"Проверьте список обнаруженных служб, которые надо перезапустить и "
+"поправьте его, если необходимо. Имена служб должны соответствовать именам "
+"сценариев запуска в /etc/init.d и должны быть разделены пробелами. Если "
+"список пустой, службы не будут перезапущены."
 
 #. Type: string
 #. Description
@@ -62,15 +60,15 @@
 "restarted. It is recommended to reboot this host to avoid any SSL-related "
 "trouble."
 msgstr ""
-"Надо перезапустить любой сервис, который после этого обновления неожиданно "
-"начнет вызывать ошибки. Рекомендуется перегрузить машину во избежание "
+"Надо перезапустить любую службу, которая после этого обновления неожиданно "
+"начнёт работать с ошибками. Рекомендуется перегрузить машину во избежание "
 "проблем, связанных с SSL."
 
 #. Type: error
 #. Description
 #: ../libssl0.9.8.templates:2001
 msgid "Failure restarting some services for OpenSSL upgrade"
-msgstr ""
+msgstr "Не удалось перезапустить некоторые службы при обновлении OpenSSL"
 
 #. Type: error
 #. Description
@@ -81,6 +79,8 @@
 "The following services could not be restarted for the OpenSSL library "
 "upgrade:"
 msgstr ""
+"Следующие службы не удалось перезапустить при обновлении "
+"библиотеки OpenSSL:"
 
 #. Type: error
 #. Description
@@ -91,0 +92,3 @@
+"Вам нужно будет перезапустить их вручную с помощью команд '/etc/init.d/<служба> "
+"start'."
+
diff -u openssl-0.9.8g/debian/po/ro.po openssl-0.9.8g/debian/po/ro.po
--- openssl-0.9.8g/debian/po/ro.po
+++ openssl-0.9.8g/debian/po/ro.po
@@ -4,21 +4,20 @@
 # This file is distributed under the same license as the openssl package.
 #
 # Stan Ioan-Eugen <[EMAIL PROTECTED]>, 2006.
-# Eddy Petrișor <[EMAIL PROTECTED]>, 2007.
+# Eddy Petrișor <[EMAIL PROTECTED]>, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
 "POT-Creation-Date: 2008-01-16 21:40+0100\n"
-"PO-Revision-Date: 2007-04-17 12:52+0300\n"
+"PO-Revision-Date: 2008-06-30 02:26+0300\n"
 "Last-Translator: Eddy Petrișor <[EMAIL PROTECTED]>\n"
 "Language-Team: Romanian <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
+"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
 
 #. Type: string
 #. Description
@@ -70,7 +69,7 @@
 #. Description
 #: ../libssl0.9.8.templates:2001
 msgid "Failure restarting some services for OpenSSL upgrade"
-msgstr ""
+msgstr "Eșec la repornirea unor servicii pentru actualizarea lui OpenSSL"
 
 #. Type: error
 #. Description
@@ -80,7 +79,7 @@
 msgid ""
 "The following services could not be restarted for the OpenSSL library "
 "upgrade:"
-msgstr ""
+msgstr "Următoarele servicii nu au putut fi repornite pentru actualizarea bibliotecii OpenSSL:"
 
 #. Type: error
 #. Description
@@ -91,0 +91,3 @@
+"Va trebui să le porniți manual cu o comandă de tipul „/etc/init.d/<serviciu> "
+"start'."
+
diff -u openssl-0.9.8g/debian/po/gl.po openssl-0.9.8g/debian/po/gl.po
--- openssl-0.9.8g/debian/po/gl.po
+++ openssl-0.9.8g/debian/po/gl.po
@@ -1,13 +1,13 @@
 # Galician translation of openssl's debconf templates.
 # This file is distributed under the same license as the openssl package.
-# Jacobo Tarrio <[EMAIL PROTECTED]>, 2006, 2007.
+# Jacobo Tarrio <[EMAIL PROTECTED]>, 2006, 2007, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openssl\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
 "POT-Creation-Date: 2008-01-16 21:40+0100\n"
-"PO-Revision-Date: 2007-04-11 09:08+0200\n"
+"PO-Revision-Date: 2008-05-13 00:08+0100\n"
 "Last-Translator: Jacobo Tarrio <[EMAIL PROTECTED]>\n"
 "Language-Team: Galician <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@
 #. Description
 #: ../libssl0.9.8.templates:2001
 msgid "Failure restarting some services for OpenSSL upgrade"
-msgstr ""
+msgstr "Problemas ao reiniciar algúns servizos para a actualización de OpenSSL"
 
 #. Type: error
 #. Description
@@ -74,6 +74,8 @@
 "The following services could not be restarted for the OpenSSL library "
 "upgrade:"
 msgstr ""
+"Non se puido reiniciar os seguintes servizos para a actualización da "
+"biblioteca OpenSSL:"
 
 #. Type: error
 #. Description
@@ -84,0 +87,2 @@
+"Ha ter que reinicialos manualmente executando \"/etc/init.d/<servizo> start"
+"\"."
diff -u openssl-0.9.8g/debian/po/cs.po openssl-0.9.8g/debian/po/cs.po
--- openssl-0.9.8g/debian/po/cs.po
+++ openssl-0.9.8g/debian/po/cs.po
@@ -16,7 +16,7 @@
 "Project-Id-Version: openssl\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
 "POT-Creation-Date: 2008-01-16 21:40+0100\n"
-"PO-Revision-Date: 2007-04-11 18:40+0200\n"
+"PO-Revision-Date: 2008-05-12 19:14+0200\n"
 "Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
 "Language-Team: Czech <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@
 #. Description
 #: ../libssl0.9.8.templates:2001
 msgid "Failure restarting some services for OpenSSL upgrade"
-msgstr ""
+msgstr "Chyba při restartu některých služeb po aktualizaci OpenSSL"
 
 #. Type: error
 #. Description
@@ -82,6 +82,7 @@
 "The following services could not be restarted for the OpenSSL library "
 "upgrade:"
 msgstr ""
+"Následující služby se nepodařilo po aktualizaci knihovny OpenSSL restartovat:"
 
 #. Type: error
 #. Description
@@ -92 +93 @@
-msgstr ""
+msgstr "Budete je muset spustit ručně příkazem „/etc/init.d/<služba> start“."
diff -u openssl-0.9.8g/debian/po/sv.po openssl-0.9.8g/debian/po/sv.po
--- openssl-0.9.8g/debian/po/sv.po
+++ openssl-0.9.8g/debian/po/sv.po
@@ -1,3 +1,4 @@
+# translation of openssl_0.9.8g-10_sv.po to swedish
 # Translators, if you are not familiar with the PO format, gettext
 # documentation is worth reading, especially sections dedicated to
 # this format, e.g. by running:
@@ -7,27 +8,26 @@
 # /usr/share/doc/po-debconf/README-trans
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
-# , fuzzy
-#
 #
+# Martin Bagge <[EMAIL PROTECTED]>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: openssl 0.9.7g-2\n"
+"Project-Id-Version: openssl_0.9.8g-10_sv\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
 "POT-Creation-Date: 2008-01-16 21:40+0100\n"
-"PO-Revision-Date: 2007-04-11 10:05+0100\n"
-"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
-"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"PO-Revision-Date: 2008-05-23 00:17+0200\n"
+"Last-Translator: Martin Bagge <[EMAIL PROTECTED]>\n"
+"Language-Team: swedish <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Type: string
 #. Description
 #: ../libssl0.9.8.templates:1001
 msgid "Services to restart to make them use the new libraries:"
-msgstr ""
-"Tjänster som ska startas om för att få dem att använda de nya biblioteken:"
+msgstr "Tjänster som ska startas om för att få dem att använda de nya biblioteken:"
 
 #. Type: string
 #. Description
@@ -72,7 +72,7 @@
 #. Description
 #: ../libssl0.9.8.templates:2001
 msgid "Failure restarting some services for OpenSSL upgrade"
-msgstr ""
+msgstr "Misslyckades med att starta om tjänster för uppgraderingen av OpenSSL"
 
 #. Type: error
 #. Description
@@ -82,7 +82,7 @@
 msgid ""
 "The following services could not be restarted for the OpenSSL library "
 "upgrade:"
-msgstr ""
+msgstr "Följande tjönster kunde inte startas om vid uppgraderingen av OpenSSL biblioteket:"
 
 #. Type: error
 #. Description
@@ -93 +93,2 @@
-msgstr ""
+msgstr "Du måste starta om dessa tjänster manuellt genom att köra '/etc/init.d/<service> start'"
+
diff -u openssl-0.9.8g/crypto/opensslconf.h openssl-0.9.8g/crypto/opensslconf.h
--- openssl-0.9.8g/crypto/opensslconf.h
+++ openssl-0.9.8g/crypto/opensslconf.h
@@ -68,8 +68,6 @@
 # endif
 #endif
 
-#define OPENSSL_CPUID_OBJ
-
 /* crypto/opensslconf.h.in */
 
 /* Generate 80386 code? */
@@ -109,14 +107,14 @@
  * - Intel P6 because partial register stalls are very expensive;
  * - elder Alpha because it lacks byte load/store instructions;
  */
-#define RC4_INT unsigned char
+#define RC4_INT unsigned int
 #endif
 #if !defined(RC4_CHUNK)
 /*
  * This enables code handling data aligned at natural CPU word
  * boundary. See crypto/rc4/rc4_enc.c for further details.
  */
-#define RC4_CHUNK unsigned long
+#undef RC4_CHUNK
 #endif
 #endif
 
@@ -124,13 +122,13 @@
 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
  * %20 speed up (longs are 8 bytes, int's are 4). */
 #ifndef DES_LONG
-#define DES_LONG unsigned int
+#define DES_LONG unsigned long
 #endif
 #endif
 
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
 #define CONFIG_HEADER_BN_H
-#undef BN_LLONG
+#define BN_LLONG
 
 /* Should we define BN_DIV2W here? */
 
@@ -138,9 +136,9 @@
 /* The prime number generation stuff may not work when
  * EIGHT_BIT but I don't care since I've only used this mode
  * for debuging the bignum libraries */
-#define SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT_LONG
 #undef SIXTY_FOUR_BIT
-#undef THIRTY_TWO_BIT
+#define THIRTY_TWO_BIT
 #undef SIXTEEN_BIT
 #undef EIGHT_BIT
 #endif
@@ -149,12 +147,12 @@
 #define CONFIG_HEADER_RC4_LOCL_H
 /* if this is defined data[i] is used instead of *data, this is a %20
  * speedup on x86 */
-#undef RC4_INDEX
+#define RC4_INDEX
 #endif
 
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
 #define CONFIG_HEADER_BF_LOCL_H
-#define BF_PTR2
+#undef BF_PTR
 #endif /* HEADER_BF_LOCL_H */
 
 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
@@ -163,14 +161,14 @@
 /* the following is tweaked from a config script, that is why it is a
  * protected undef/define */
 #ifndef DES_PTR
-#undef DES_PTR
+#define DES_PTR
 #endif
 
 /* This helps C compiler generate the correct code for multiple functional
  * units.  It reduces register dependancies at the expense of 2 more
  * registers */
 #ifndef DES_RISC1
-#undef DES_RISC1
+#define DES_RISC1
 #endif
 
 #ifndef DES_RISC2
only in patch2:
unchanged:
--- openssl-0.9.8g.orig/debian/compat
+++ openssl-0.9.8g/debian/compat
@@ -0,0 +1 @@
+3

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to