June 2013 - openSUSE Commits - openSUSE Mailing Lists

commit diffutils for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package diffutils for openSUSE:Factory checked in at 2013-06-25 17:14:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffutils (Old) and /work/SRC/openSUSE:Factory/.diffutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "diffutils" Changes: -------- --- /work/SRC/openSUSE:Factory/diffutils/diffutils.changes 2013-04-05 13:04:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.diffutils.new/diffutils.changes 2013-06-25 17:20:32.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 21 07:22:47 UTC 2013 - meissner(a)suse.com + +- disable gpg key checking to avoid build cycles. will be + done by source service + +------------------------------------------------------------------- +Fri Apr 5 11:22:33 UTC 2013 - meissner(a)suse.com + +- add gpg key checking, keyring from savannah + +------------------------------------------------------------------- New: ---- diffutils-3.3.tar.xz.sig diffutils.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffutils.spec ++++++ --- /var/tmp/diff_new_pack.x3vNAx/_old 2013-06-25 17:20:33.000000000 +0200 +++ /var/tmp/diff_new_pack.x3vNAx/_new 2013-06-25 17:20:33.000000000 +0200 @@ -27,7 +27,12 @@ License: GFDL-1.2 and GPL-3.0+ Group: Productivity/Text/Utilities Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig +# http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=diffutils +Source2: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build +# will be check by source service +#BuildRequires: gpg-offline BuildRequires: xz %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ca-certificates for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package ca-certificates for openSUSE:Factory checked in at 2013-06-25 17:13:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ca-certificates (Old) and /work/SRC/openSUSE:Factory/.ca-certificates.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ca-certificates" Changes: -------- --- /work/SRC/openSUSE:Factory/ca-certificates/ca-certificates.changes 2013-06-25 14:38:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ca-certificates.new/ca-certificates.changes 2013-06-25 17:20:12.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 24 21:09:16 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Explicitly require p11-kit, otherwise trusted certificates won't + be generated + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates.spec ++++++ --- /var/tmp/diff_new_pack.mX2Yew/_old 2013-06-25 17:20:13.000000000 +0200 +++ /var/tmp/diff_new_pack.mX2Yew/_new 2013-06-25 17:20:13.000000000 +0200 @@ -33,6 +33,7 @@ Url: https://github.com/openSUSE/ca-certificates # Requires: openssl +Requires: p11-kit Requires: p11-kit-tools # needed for %post Requires(post): coreutils openssl p11-kit-tools -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit obs-service-download_files for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package obs-service-download_files for openSUSE:Factory checked in at 2013-06-25 17:15:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-download_files (Old) and /work/SRC/openSUSE:Factory/.obs-service-download_files.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-download_files" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-download_files/obs-service-download_files.changes 2013-06-24 09:35:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-download_files.new/obs-service-download_files.changes 2013-06-25 17:15:54.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 24 12:09:57 UTC 2013 - tchvatal(a)suse.com + +- Fix download from github by explicitly specifying output file. +- Use local scope where possible. +- Add bash comparsions instead of posix ones as bash invoke them + faster. +- Remove urlextension variable which was always empty. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-download_files.spec ++++++ --- /var/tmp/diff_new_pack.B5c7Cv/_old 2013-06-25 17:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.B5c7Cv/_new 2013-06-25 17:15:55.000000000 +0200 @@ -20,7 +20,7 @@ Summary: An OBS source service: download files License: GPL-2.0+ Group: Development/Tools/Building -Version: 0.4 +Version: 0.5 Release: 0 Source: download_files Source1: download_files.service ++++++ download_files ++++++ --- /var/tmp/diff_new_pack.B5c7Cv/_old 2013-06-25 17:15:55.000000000 +0200 +++ /var/tmp/diff_new_pack.B5c7Cv/_new 2013-06-25 17:15:55.000000000 +0200 @@ -1,15 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash # downloads files specified in spec files # config options for this host ? -if [ -f /etc/obs/services/download_files ]; then - . /etc/obs/services/download_files -fi +[[ -f /etc/obs/services/download_files ]] && . /etc/obs/services/download_files + # config options for this user ? -if [ -f "$HOME"/.obs/download_files ]; then - . "$HOME"/.obs/download_files -fi +[[ -f "$HOME"/.obs/download_files ]] && . "$HOME"/.obs/download_files DORECOMPRESS="" ENFORCELOCAL="" @@ -17,19 +14,19 @@ while test $# -gt 0; do case $1 in *-recompress) - if [ "$2" == "yes" ]; then + if [[ "$2" == "yes" ]]; then DORECOMPRESS="yes" fi shift ;; *-enforcelocal) - if [ "$2" == "yes" ]; then + if [[ "$2" == "yes" ]]; then ENFORCELOCAL="yes" fi shift ;; *-enforceupstream) - if [ "$2" == "yes" ]; then + if [[ "$2" == "yes" ]]; then ENFORCEUPSTREAM="yes" fi shift @@ -39,41 +36,41 @@ shift ;; *) - echo Unknown parameter $1. - echo 'this service is not accepting parameters currently' + echo "Unknown parameter $1." + echo "This service is not accepting parameters currently." exit 1 ;; esac shift done -if [ ! -d "$MYOUTDIR" ]; then - echo "ERROR: output directory does not exist" +if [[ ! -d "${MYOUTDIR}" ]]; then + echo "ERROR: output directory \"${MYOUTDIR}\" does not exist" exit 1 fi function uncompress_file() { local input=$1 local output=$2 + local uncompress="cat" + local basename="${input}" - UNCOMPRESS="cat" - BASENAME="$input" - if [ "${input%.gz}" != "$input" ]; then - UNCOMPRESS="gunzip -c" - BASENAME="${input%.gz}" - elif [ "${input%.tgz}" != "$input" ]; then - UNCOMPRESS="gunzip -c" - BASENAME="${input%.tgz}.tar" - elif [ "${input%.bz2}" != "$input" ]; then - UNCOMPRESS="bunzip2 -c" - BASENAME="${input%.bz2}" - elif [ "${FILE%.xz}" != "$input" ]; then - UNCOMPRESS="xz -dc" - BASENAME="${input%.xz}" + if [[ "${input%.gz}" != "${input}" ]]; then + uncompress="gunzip -c" + basename="${input%.gz}" + elif [[ "${input%.tgz}" != "${input}" ]]; then + uncompress="gunzip -c" + basename="${input%.tgz}.tar" + elif [[ "${input%.bz2}" != "${input}" ]]; then + uncompress="bunzip2 -c" + basename="${input%.bz2}" + elif [[ "${FILE%.xz}" != "${input}" ]]; then + uncompress="xz -dc" + basename="${input%.xz}" fi - $UNCOMPRESS "$input" > "$output" - echo $BASENAME + $uncompress "$input" > "$output" + echo $basename } @@ -86,17 +83,12 @@ MYCACHEDIRECTORY="$CACHEDIRECTORY" PROTOCOL="${url%%:*}" SAMEFILEAFTERCOMPRESSION= - if [ "$PROTOCOL" != "http" -a "$PROTOCOL" != "https" -a "$PROTOCOL" != "ftp" ]; then - continue - fi + [[ "${PROTOCOL}" != "http" && "${PROTOCOL}" != "https" && "${PROTOCOL}" != "ftp" ]] && continue # Some web sites need a special user agent if echo $url | egrep -q '^http://sourceforge.net/'; then - # default wget user agent required, but /download suffix must be added + # default wget user agent required : -# BN=`basename $url` -# WGET="$WGET -O $BN" -# urlextension="/download" else # determine intended filename from URL fragment, e.g. # https://www.example.com/gpgkeys.asc#/%{name}.keyring @@ -110,54 +102,52 @@ # We tell the server that we are an OBS tool by default WGET="$WGET -U 'OBS-wget'" - urlextension="" fi cd "$MYOUTDIR" # check local cache if configured - HASH=`echo "$url" | sha256sum | cut -d\ -f 1` + HASH=$(echo "$url" | sha256sum | cut -d\ -f 1) if [ -n "$MYCACHEDIRECTORY" -a -f "$MYCACHEDIRECTORY/file/$HASH" ]; then RECOMPRESS="" - FILE=`cat "$MYCACHEDIRECTORY/filename/$HASH"` + FILE=$(cat "$MYCACHEDIRECTORY/filename/$HASH") echo "INFO: Taking file from local cache $FILE" cp -a "$MYCACHEDIRECTORY/file/$HASH" ./"$FILE" - MYCACHEDIRECTORY="" # do not copy back elif [ -z "$DORECOMPRESS" ]; then - if ! $WGET "$url$urlextension"; then - echo "ERROR: Failed to download $url" + if ! $WGET "$url$urlextension" -O "${url##*/}"; then + echo "ERROR: Failed to download \"$url\"" exit 1 fi RECOMPRESS="" FILE="${url##*/}" else FORMAT="${url##*\.}" - if $WGET "$url$urlextension"; then + if $WGET "$url" -O "${url}"; then RECOMPRESS="" FILE="${url}" - elif $WGET "${url%$FORMAT}gz$urlextension"; then + elif $WGET "${url%$FORMAT}gz" -O "${url%$FORMAT}gz"; then RECOMPRESS="$FORMAT" FILE="${url%$FORMAT}gz" - elif $WGET "${url%$FORMAT}bz2$urlextension"; then + elif $WGET "${url%$FORMAT}bz2" -O "${url%$FORMAT}bz2"; then RECOMPRESS="$FORMAT" FILE="${url%$FORMAT}bz2" - elif $WGET "${url%$FORMAT}xz$urlextension"; then + elif $WGET "${url%$FORMAT}xz" -O "${url%$FORMAT}xz"; then RECOMPRESS="$FORMAT" FILE="${url%$FORMAT}xz" else - echo "ERROR: Fail to download $url or any other compression format" + echo "ERROR: Failed to download $url or any other compression format" exit 1 fi FILE="${FILE##*/}" fi # fill local cache, if configured - if [ -n "$MYCACHEDIRECTORY" -a ! -f "$MYCACHEDIRECTORY/file/$HASH" ]; then + if [[ -n "$MYCACHEDIRECTORY" && ! -f "$MYCACHEDIRECTORY/file/$HASH" ]]; then cp -a "$FILE" "$MYCACHEDIRECTORY/file/$HASH" && \ echo "$FILE" > "$MYCACHEDIRECTORY/filename/$HASH" fi - if [ -n "$RECOMPRESS" ]; then + if [[ -n "$RECOMPRESS" ]]; then tempfile=`mktemp` file_name=`uncompress_file "$FILE" "$tempfile"` @@ -180,7 +170,7 @@ COMPRESS="cat -" SUFFIX="" else - echo "ERROR: Unknown compression $RECOMPRESS" + echo "ERROR: Unknown compression \"$RECOMPRESS\"" RETURN=1 fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozc for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2013-06-25 17:14:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozc" Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2013-04-22 14:12:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-06-25 17:15:43.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 25 12:37:57 UTC 2013 - pgajdos(a)suse.com + +- fixed build with gcc 4.8 + * mozc-gcc48.patch + +------------------------------------------------------------------- New: ---- mozc-gcc48.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.RohZme/_old 2013-06-25 17:15:44.000000000 +0200 +++ /var/tmp/diff_new_pack.RohZme/_new 2013-06-25 17:15:44.000000000 +0200 @@ -41,6 +41,9 @@ %endif # PATCH-FIX-UPSTREAM ftake(a)geeko.jp - absolute path of protobuf, or mozc can't recognize. Patch1: fix-use_libprotobuf.patch +# PATCH-FIX-UPSTREAM nevertheless they want to turn off -Werror, sent mail with this patch +# on to cabezon.hashimoto(a)gmail.com, nobuto(a)ubuntu.com, doko(a)debian.org, yukawa(a)google.com; pgajdos(a)suse.com +Patch2: mozc-gcc48.patch BuildRequires: libopenssl-devel BuildRequires: pkgconfig @@ -113,6 +116,7 @@ %endif %patch1 -p1 +%patch2 -p1 # thease modification should be done by patches? sed -i.back -e 's|/usr/share/tegaki/models/zinnia/handwriting-ja.model|%{_datadir}/zinnia/model/tomoe/handwriting-ja.model|' handwriting/zinnia_handwriting.cc ++++++ mozc-gcc48.patch ++++++ Index: mozc-1.10.1390.102/base/port.h =================================================================== --- mozc-1.10.1390.102.orig/base/port.h +++ mozc-1.10.1390.102/base/port.h @@ -174,7 +174,7 @@ template <bool> struct CompileAssert { }; #define COMPILE_ASSERT(expr, msg) \ - typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] + typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] __attribute__((unused)) #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libtasn1 for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package libtasn1 for openSUSE:Factory checked in at 2013-06-25 17:14:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtasn1 (Old) and /work/SRC/openSUSE:Factory/.libtasn1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libtasn1" Changes: -------- --- /work/SRC/openSUSE:Factory/libtasn1/libtasn1.changes 2013-06-25 14:42:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libtasn1.new/libtasn1.changes 2013-06-25 17:15:25.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 25 12:01:36 UTC 2013 - coolo(a)suse.com + +- remove gpg source checking again to avoid this cycle: + libtasn1 -> libssh2_org -> openssh -> krb5 -> python-Jinja2 -> vim -> libtasn1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtasn1.spec ++++++ --- /var/tmp/diff_new_pack.NAfbR7/_old 2013-06-25 17:15:26.000000000 +0200 +++ /var/tmp/diff_new_pack.NAfbR7/_new 2013-06-25 17:15:26.000000000 +0200 @@ -21,6 +21,7 @@ Name: libtasn1 BuildRequires: info BuildRequires: pkg-config +#BuildRequires: gpg-offline Version: 3.3 Release: 0 Url: http://ftp.gnu.org/gnu/libtasn1/ @@ -33,9 +34,6 @@ Source2: %name.keyring Source99: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1220 -BuildRequires: gpg-offline -%endif PreReq: %install_info_prereq %description @@ -64,9 +62,6 @@ http://www.gnutls.org %prep -%if 0%{?suse_version} > 1220 -%gpg_verify %{S:1} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libopensync for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package libopensync for openSUSE:Factory checked in at 2013-06-25 17:14:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libopensync (Old) and /work/SRC/openSUSE:Factory/.libopensync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libopensync" Changes: -------- --- /work/SRC/openSUSE:Factory/libopensync/libopensync.changes 2012-10-11 11:02:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libopensync.new/libopensync.changes 2013-06-25 17:15:15.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 18 16:30:43 UTC 2013 - crrodriguez(a)opensuse.org + +- libopensync-wrong-memset.patch: fix build with gcc 48 + wrong use of memset. + +------------------------------------------------------------------- New: ---- libopensync-wrong-memset.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopensync.spec ++++++ --- /var/tmp/diff_new_pack.53gmRf/_old 2013-06-25 17:15:16.000000000 +0200 +++ /var/tmp/diff_new_pack.53gmRf/_new 2013-06-25 17:15:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libopensync # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,7 @@ Patch4: libopensync-swig-fix.diff Patch5: libopensync-fixed-unused-variables.diff Patch6: libopensync-swig-2x.patch +Patch7: libopensync-wrong-memset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define prefix /usr @@ -98,7 +99,7 @@ %patch4 -p1 %patch5 -p1 %patch6 - +%patch7 %build autoreconf -sif # -fno-strict-aliasing needed for python wrapper ++++++ libopensync-wrong-memset.patch ++++++ --- formats/vformats-xml/vformat.c.orig +++ formats/vformats-xml/vformat.c @@ -1760,7 +1760,7 @@ static void base64_init(char *rank) { int i; - memset(rank, 0xff, sizeof(rank)); + memset(rank, 0xff, strlen(rank)); for (i=0;i<64;i++) { rank[(unsigned int)base64_alphabet[i]] = i; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnettle for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package libnettle for openSUSE:Factory checked in at 2013-06-25 17:14:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnettle (Old) and /work/SRC/openSUSE:Factory/.libnettle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnettle" Changes: -------- --- /work/SRC/openSUSE:Factory/libnettle/libnettle.changes 2013-05-16 16:12:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libnettle.new/libnettle.changes 2013-06-25 17:15:12.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jun 25 14:15:48 UTC 2013 - meissner(a)suse.com + +- Update to version 2.7.1 + * Fixed ecc_modp_mul call, to avoid invalid overlap of arguments to + mpn_mul_n. Problem tracked down by Magnus Holmgren. + * ARM fixes. +- reference gpg signatures and keyring. checking not enabled as to + avoid cycles. + +------------------------------------------------------------------- Old: ---- nettle-2.7.tar.gz New: ---- libnettle.keyring nettle-2.7.1.tar.gz nettle-2.7.1.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnettle.spec ++++++ --- /var/tmp/diff_new_pack.766mZ5/_old 2013-06-25 17:15:13.000000000 +0200 +++ /var/tmp/diff_new_pack.766mZ5/_new 2013-06-25 17:15:13.000000000 +0200 @@ -18,7 +18,7 @@ Name: libnettle -Version: 2.7 +Version: 2.7.1 Release: 0 %define soname 4 %define hogweed_soname 2 @@ -26,7 +26,9 @@ License: LGPL-2.1+ and GPL-2.0+ Group: System/Libraries Source0: http://www.lysator.liu.se/~nisse/archive/nettle-%{version}.tar.gz -Source1: baselibs.conf +Source1: http://www.lysator.liu.se/~nisse/archive/nettle-%{version}.tar.gz.sig +Source2: %name.keyring +Source3: baselibs.conf BuildRequires: gmp-devel BuildRequires: makeinfo BuildRequires: pkgconfig ++++++ nettle-2.7.tar.gz -> nettle-2.7.1.tar.gz ++++++ ++++ 1627 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/nettle-2.7/ChangeLog new/nettle-2.7.1/ChangeLog --- old/nettle-2.7/ChangeLog 2013-04-24 15:26:53.000000000 +0200 +++ new/nettle-2.7.1/ChangeLog 2013-05-28 16:21:53.000000000 +0200 @@ -1,3 +1,35 @@ +2013-05-28 Niels Möller <nisse(a)lysator.liu.se> + + * Released nettle-2.7.1. + +2013-05-21 Niels Möller <nisse(a)lysator.liu.se> + + From master (2013-05-20): + * arm/v6/sha1-compress.asm: Moved into v6 directory, since it uses + the v6 instruction uadd8, sel and rev. + * arm/v6/sha256-compress.asm: Likewise. + + From master (2013-05-15): + * configure.ac (asm_path): Handle armv6 and armv7 differently from + older ARMs. Add the arm/v6 directory to asm_path when appropriate. + + * arm/v6/aes-encrypt-internal.asm: Moved into v6 directory. Uses + the uxtb instruction which is not available for older ARMs. + * arm/v6/aes-decrypt-internal.asm: Likewise. + +2013-05-21 Niels Möller <nisse(a)lysator.liu.se> + + * configure.ac: Changed version number to 2.7.1. + (LIBHOGWEED_MINOR): Bumped library version, to 4.7. + (LIBHOGWEED_MINOR): And to 2.5. + +2013-05-17 Niels Möller <nisse(a)lysator.liu.se> + + From master branch: + * ecc-j-to-a.c (ecc_j_to_a): Fixed ecc_modp_mul call, to avoid + invalid overlap of arguments to mpn_mul_n. Problem tracked down by + Magnus Holmgren. + 2013-04-24 Niels Möller <nisse(a)lysator.liu.se> * Released nettle-2.7. 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/nettle-2.7/NEWS new/nettle-2.7.1/NEWS --- old/nettle-2.7/NEWS 2013-04-24 15:26:53.000000000 +0200 +++ new/nettle-2.7.1/NEWS 2013-05-28 16:21:53.000000000 +0200 @@ -1,3 +1,50 @@ +NEWS for the 2.7.1 release + + This is a bugfix release. + + Bug fixes: + + * Fixed a bug in the new ECC code. The ecc_j_to_a function + called GMP:s mpn_mul_n (via ecc_modp_mul) with overlapping + input and output arguments, which is not supported. + + * The assembly files for SHA1, SHA256 and AES depend on ARMv6 + instructions, breaking nettle-2.7 for pre-v6 ARM processors. + The configure script now enables those assembly files only + when building for ARMv6 or later. + + * Use a more portable C expression for rotations. The + previous version used the following "standard" expression + for 32-bit rotation: + + (x << n) | (x >> (32 - n)) + + But this gives undefined behavior (according to the C + specification) for n = 0. The rotate expression is replaced + by the more portable: + + (x << n) | (x >> ((-n)&31)) + + This change affects only CAST128, which uses non-constant + rotation counts. Unfortunately, the new expression is poorly + optimized by released versions of gcc, making CAST128 a bit + slower. This is being fixed by the gcc hackers, see + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57157. + + The following problems have been reported, but are *not* fixed + in this release: + + * ARM assembly files use instruction syntax which is not + supported by all assemblers. Workaround: Use a current + version of GNU as, or configure with --disable-assembler. + + * Configuring with --disable-static doesn't work on windows. + + The libraries are intended to be binary compatible with + nettle-2.2 and later. The shared library names are + libnettle.so.4.7 and libhogweed.so.2.5, with sonames still + libnettle.so.4 and libhogweed.so.2. + NEWS for the 2.7 release This release includes an implementation of elliptic curve 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/nettle-2.7/arm/aes-decrypt-internal.asm new/nettle-2.7.1/arm/aes-decrypt-internal.asm --- old/nettle-2.7/arm/aes-decrypt-internal.asm 2013-04-24 15:26:53.000000000 +0200 +++ new/nettle-2.7.1/arm/aes-decrypt-internal.asm 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -C nettle, low-level cryptographics library -C -C Copyright (C) 2013 Niels Möller -C -C The nettle library is free software; you can redistribute it and/or modify -C it under the terms of the GNU Lesser General Public License as published by -C the Free Software Foundation; either version 2.1 of the License, or (at your -C option) any later version. -C -C The nettle library is distributed in the hope that it will be useful, but -C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public -C License for more details. -C -C You should have received a copy of the GNU Lesser General Public License -C along with the nettle library; see the file COPYING.LIB. If not, write to -C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -C MA 02111-1301, USA. - -include_src(<arm/aes.m4>) - -C Benchmarked at at 785, 914, 1051 cycles/block on cortex A9, -C for 128, 192 and 256 bit key sizes. Unclear why it is slower -C than _aes_encrypt. - -define(<CTX>, <r0>) -define(<TABLE>, <r1>) -define(<LENGTH>, <r2>) -define(<DST>, <r3>) -define(<SRC>, <r12>) - -define(<W0>, <r4>) -define(<W1>, <r5>) -define(<W2>, <r6>) -define(<W3>, <r7>) -define(<T0>, <r8>) -define(<KEY>, <r10>) -define(<ROUND>, <r11>) - -define(<X0>, <r2>) C Overlaps LENGTH, SRC, DST -define(<X1>, <r3>) -define(<X2>, <r12>) -define(<X3>, <r14>) C lr - - - .file "aes-decrypt-internal.asm" - - C _aes_decrypt(struct aes_context *ctx, - C const struct aes_table *T, - C unsigned length, uint8_t *dst, - C uint8_t *src) - .text - .align 2 -PROLOGUE(_nettle_aes_decrypt) - teq LENGTH, #0 - beq .Lend - ldr SRC, [sp] - - push {r4,r5,r6,r7,r8,r10,r11,lr} -.Lblock_loop: - mov KEY, CTX - AES_LOAD(SRC,KEY,W0) - AES_LOAD(SRC,KEY,W1) - AES_LOAD(SRC,KEY,W2) - AES_LOAD(SRC,KEY,W3) - - push {LENGTH, DST, SRC} - ldr ROUND, [CTX, #+AES_NROUNDS] - add TABLE, TABLE, #AES_TABLE0 - - b .Lentry - .align 2 -.Lround_loop: - C Transform X -> W - AES_DECRYPT_ROUND(X0, X1, X2, X3, W0, W1, W2, W3, KEY) - -.Lentry: - subs ROUND, ROUND,#2 - C Transform W -> X - AES_DECRYPT_ROUND(W0, W1, W2, W3, X0, X1, X2, X3, KEY) - - bne .Lround_loop - - sub TABLE, TABLE, #AES_TABLE0 - C Final round - AES_FINAL_ROUND(X0, X3, X2, X1, KEY, W0) - AES_FINAL_ROUND(X1, X0, X3, X2, KEY, W1) - AES_FINAL_ROUND(X2, X1, X0, X3, KEY, W2) - AES_FINAL_ROUND(X3, X2, X1, X0, KEY, W3) - - pop {LENGTH, DST, SRC} - - AES_STORE(DST,W0) - AES_STORE(DST,W1) - AES_STORE(DST,W2) - AES_STORE(DST,W3) - - subs LENGTH, LENGTH, #16 - bhi .Lblock_loop - - pop {r4,r5,r6,r7,r8,r10,r11,pc} - -.Lend: - bx lr -EPILOGUE(_nettle_aes_decrypt) 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/nettle-2.7/arm/aes-encrypt-internal.asm new/nettle-2.7.1/arm/aes-encrypt-internal.asm --- old/nettle-2.7/arm/aes-encrypt-internal.asm 2013-04-24 15:26:53.000000000 +0200 +++ new/nettle-2.7.1/arm/aes-encrypt-internal.asm 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -C nettle, low-level cryptographics library -C -C Copyright (C) 2013 Niels Möller -C -C The nettle library is free software; you can redistribute it and/or modify -C it under the terms of the GNU Lesser General Public License as published by -C the Free Software Foundation; either version 2.1 of the License, or (at your -C option) any later version. -C -C The nettle library is distributed in the hope that it will be useful, but -C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public -C License for more details. -C -C You should have received a copy of the GNU Lesser General Public License -C along with the nettle library; see the file COPYING.LIB. If not, write to -C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -C MA 02111-1301, USA. - -include_src(<arm/aes.m4>) - -C Benchmarked at at 693, 824, 950 cycles/block on cortex A9, -C for 128, 192 and 256 bit key sizes. - -C Possible improvements: More efficient load and store with -C aligned accesses. Better scheduling. - -define(<CTX>, <r0>) -define(<TABLE>, <r1>) -define(<LENGTH>, <r2>) -define(<DST>, <r3>) -define(<SRC>, <r12>) - -define(<W0>, <r4>) -define(<W1>, <r5>) -define(<W2>, <r6>) -define(<W3>, <r7>) -define(<T0>, <r8>) -define(<KEY>, <r10>) -define(<ROUND>, <r11>) - -define(<X0>, <r2>) C Overlaps LENGTH, SRC, DST -define(<X1>, <r3>) -define(<X2>, <r12>) -define(<X3>, <r14>) C lr - - - .file "aes-encrypt-internal.asm" - - C _aes_encrypt(struct aes_context *ctx, - C const struct aes_table *T, - C unsigned length, uint8_t *dst, - C uint8_t *src) - .text - .align 2 -PROLOGUE(_nettle_aes_encrypt) - teq LENGTH, #0 - beq .Lend - ldr SRC, [sp] - - push {r4,r5,r6,r7,r8,r10,r11,lr} -.Lblock_loop: - mov KEY, CTX - AES_LOAD(SRC,KEY,W0) - AES_LOAD(SRC,KEY,W1) - AES_LOAD(SRC,KEY,W2) - AES_LOAD(SRC,KEY,W3) - - push {LENGTH, DST, SRC} - ldr ROUND, [CTX, #+AES_NROUNDS] - add TABLE, TABLE, #AES_TABLE0 - - b .Lentry - .align 2 -.Lround_loop: - C Transform X -> W - AES_ENCRYPT_ROUND(X0, X1, X2, X3, W0, W1, W2, W3, KEY) - -.Lentry: - subs ROUND, ROUND,#2 - C Transform W -> X - AES_ENCRYPT_ROUND(W0, W1, W2, W3, X0, X1, X2, X3, KEY) - - bne .Lround_loop - - sub TABLE, TABLE, #AES_TABLE0 - C Final round - AES_FINAL_ROUND(X0, X1, X2, X3, KEY, W0) - AES_FINAL_ROUND(X1, X2, X3, X0, KEY, W1) - AES_FINAL_ROUND(X2, X3, X0, X1, KEY, W2) - AES_FINAL_ROUND(X3, X0, X1, X2, KEY, W3) - - pop {LENGTH, DST, SRC} - - AES_STORE(DST,W0) - AES_STORE(DST,W1) - AES_STORE(DST,W2) - AES_STORE(DST,W3) - - subs LENGTH, LENGTH, #16 - bhi .Lblock_loop - - pop {r4,r5,r6,r7,r8,r10,r11,pc} - -.Lend: - bx lr -EPILOGUE(_nettle_aes_encrypt) 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/nettle-2.7/arm/sha1-compress.asm new/nettle-2.7.1/arm/sha1-compress.asm --- old/nettle-2.7/arm/sha1-compress.asm 2013-04-24 15:26:53.000000000 +0200 +++ new/nettle-2.7.1/arm/sha1-compress.asm 1970-01-01 01:00:00.000000000 +0100 @@ -1,234 +0,0 @@ -C nettle, low-level cryptographics library -C -C Copyright (C) 2013 Niels Möller -C -C The nettle library is free software; you can redistribute it and/or modify -C it under the terms of the GNU Lesser General Public License as published by -C the Free Software Foundation; either version 2.1 of the License, or (at your -C option) any later version. -C -C The nettle library is distributed in the hope that it will be useful, but -C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public -C License for more details. -C -C You should have received a copy of the GNU Lesser General Public License -C along with the nettle library; see the file COPYING.LIB. If not, write to -C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -C MA 02111-1301, USA. - - .file "sha1-compress.asm" - -define(<STATE>, <r0>) -define(<INPUT>, <r1>) -define(<SA>, <r2>) -define(<SB>, <r3>) -define(<SC>, <r4>) -define(<SD>, <r5>) -define(<SE>, <r6>) -define(<T0>, <r7>) -define(<SHIFT>, <r8>) -define(<WPREV>, <r10>) -define(<W>, <r12>) -define(<K>, <lr>) - -C FIXME: Could avoid a mov with even and odd variants. -define(<LOAD>, < - ldr T0, [INPUT], #+4 - sel W, WPREV, T0 - ror W, W, SHIFT - mov WPREV, T0 - rev W, W - str W, [SP,#eval(4*$1)] ->) -define(<EXPN>, < - ldr W, [sp, #+eval(4*$1)] - ldr T0, [sp, #+eval(4*(($1 + 2) % 16))] - eor W, W, T0 - ldr T0, [sp, #+eval(4*(($1 + 8) % 16))] - eor W, W, T0 - ldr T0, [sp, #+eval(4*(($1 + 13) % 16))] - eor W, W, T0 - ror W, W, #31 - str W, [sp, #+eval(4*$1)] ->) - -C F1(B,C,D) = D^(B&(C^D)) -C ROUND1(A,B,C,D,E) -define(<ROUND1>, < - eor T0, $3, $4 - add $5, $5, K - and T0, T0, $2 - add $5, $5, $1, ror #27 - eor T0, T0, $4 - add $5, $5, W - ror $2, $2, #2 - add $5, $5, T0 ->) -C F2(B,C,D) = B^C^D -define(<ROUND2>, < - eor T0, $2, $4 - add $5, $5, K - eor T0, T0, $3 - add $5, $5, $1, ror #27 - add $5, $5, W - ror $2, $2, #2 - add $5, $5, T0 ->) -C F3(B,C,D) = (B&C) | (D & (B|C)) = (B & (C ^ D)) + (C & D) -define(<ROUND3>, < - eor T0, $3, $4 - add $5, $5, K - and T0, T0, $2 - add $5, $5, $1, ror #27 - add $5, $5, T0 - add $5, $5, W - and T0, $3, $4 - ror $2, $2, #2 - add $5, $5, T0 ->) - C void _nettle_sha1_compress(uint32_t *state, const uint8_t *input) - - .text - .align 2 -.LK1: - .int 0x5A827999 -.LK2: - .int 0x6ED9EBA1 -.LK3: - .int 0x8F1BBCDC - -PROLOGUE(_nettle_sha1_compress) - push {r4,r5,r6,r7,r8,r10,lr} - sub sp, sp, #64 - - C Sets SHIFT to 8*low bits of input pointer. Sets up GE flags - C as follows, corresponding to bytes to be used from WPREV - C SHIFT 0 8 16 24 - C CPSR.GE 0000 1110 1100 1000 - ands SHIFT, INPUT, #3 - and INPUT, INPUT, $-4 - ldr WPREV, [INPUT] - addne INPUT, INPUT, #4 C Unaligned input - lsl SHIFT, SHIFT, #3 - mov T0, #0 - movne T0, #-1 - lsl W, T0, SHIFT - uadd8 T0, T0, W C Sets APSR.GE bits - - ldr K, .LK1 - ldm STATE, {SA,SB,SC,SD,SE} - - LOAD( 0) ROUND1(SA, SB, SC, SD, SE) - LOAD( 1) ROUND1(SE, SA, SB, SC, SD) - LOAD( 2) ROUND1(SD, SE, SA, SB, SC) - LOAD( 3) ROUND1(SC, SD, SE, SA, SB) - LOAD( 4) ROUND1(SB, SC, SD, SE, SA) - - LOAD( 5) ROUND1(SA, SB, SC, SD, SE) - LOAD( 6) ROUND1(SE, SA, SB, SC, SD) - LOAD( 7) ROUND1(SD, SE, SA, SB, SC) - LOAD( 8) ROUND1(SC, SD, SE, SA, SB) - LOAD( 9) ROUND1(SB, SC, SD, SE, SA) - - LOAD(10) ROUND1(SA, SB, SC, SD, SE) - LOAD(11) ROUND1(SE, SA, SB, SC, SD) - LOAD(12) ROUND1(SD, SE, SA, SB, SC) - LOAD(13) ROUND1(SC, SD, SE, SA, SB) - LOAD(14) ROUND1(SB, SC, SD, SE, SA) - - LOAD(15) ROUND1(SA, SB, SC, SD, SE) - EXPN( 0) ROUND1(SE, SA, SB, SC, SD) - EXPN( 1) ROUND1(SD, SE, SA, SB, SC) - EXPN( 2) ROUND1(SC, SD, SE, SA, SB) - EXPN( 3) ROUND1(SB, SC, SD, SE, SA) - - ldr K, .LK2 - EXPN( 4) ROUND2(SA, SB, SC, SD, SE) - EXPN( 5) ROUND2(SE, SA, SB, SC, SD) - EXPN( 6) ROUND2(SD, SE, SA, SB, SC) - EXPN( 7) ROUND2(SC, SD, SE, SA, SB) - EXPN( 8) ROUND2(SB, SC, SD, SE, SA) - - EXPN( 9) ROUND2(SA, SB, SC, SD, SE) - EXPN(10) ROUND2(SE, SA, SB, SC, SD) - EXPN(11) ROUND2(SD, SE, SA, SB, SC) - EXPN(12) ROUND2(SC, SD, SE, SA, SB) - EXPN(13) ROUND2(SB, SC, SD, SE, SA) - - EXPN(14) ROUND2(SA, SB, SC, SD, SE) - EXPN(15) ROUND2(SE, SA, SB, SC, SD) - EXPN( 0) ROUND2(SD, SE, SA, SB, SC) - EXPN( 1) ROUND2(SC, SD, SE, SA, SB) - EXPN( 2) ROUND2(SB, SC, SD, SE, SA) - - EXPN( 3) ROUND2(SA, SB, SC, SD, SE) - EXPN( 4) ROUND2(SE, SA, SB, SC, SD) - EXPN( 5) ROUND2(SD, SE, SA, SB, SC) - EXPN( 6) ROUND2(SC, SD, SE, SA, SB) - EXPN( 7) ROUND2(SB, SC, SD, SE, SA) - - ldr K, .LK3 - EXPN( 8) ROUND3(SA, SB, SC, SD, SE) - EXPN( 9) ROUND3(SE, SA, SB, SC, SD) - EXPN(10) ROUND3(SD, SE, SA, SB, SC) - EXPN(11) ROUND3(SC, SD, SE, SA, SB) - EXPN(12) ROUND3(SB, SC, SD, SE, SA) - - EXPN(13) ROUND3(SA, SB, SC, SD, SE) - EXPN(14) ROUND3(SE, SA, SB, SC, SD) - EXPN(15) ROUND3(SD, SE, SA, SB, SC) - EXPN( 0) ROUND3(SC, SD, SE, SA, SB) - EXPN( 1) ROUND3(SB, SC, SD, SE, SA) - - EXPN( 2) ROUND3(SA, SB, SC, SD, SE) - EXPN( 3) ROUND3(SE, SA, SB, SC, SD) - EXPN( 4) ROUND3(SD, SE, SA, SB, SC) - EXPN( 5) ROUND3(SC, SD, SE, SA, SB) - EXPN( 6) ROUND3(SB, SC, SD, SE, SA) - - EXPN( 7) ROUND3(SA, SB, SC, SD, SE) - EXPN( 8) ROUND3(SE, SA, SB, SC, SD) - EXPN( 9) ROUND3(SD, SE, SA, SB, SC) - EXPN(10) ROUND3(SC, SD, SE, SA, SB) - EXPN(11) ROUND3(SB, SC, SD, SE, SA) - - ldr K, .LK4 - EXPN(12) ROUND2(SA, SB, SC, SD, SE) - EXPN(13) ROUND2(SE, SA, SB, SC, SD) - EXPN(14) ROUND2(SD, SE, SA, SB, SC) - EXPN(15) ROUND2(SC, SD, SE, SA, SB) - EXPN( 0) ROUND2(SB, SC, SD, SE, SA) - - EXPN( 1) ROUND2(SA, SB, SC, SD, SE) - EXPN( 2) ROUND2(SE, SA, SB, SC, SD) - EXPN( 3) ROUND2(SD, SE, SA, SB, SC) - EXPN( 4) ROUND2(SC, SD, SE, SA, SB) - EXPN( 5) ROUND2(SB, SC, SD, SE, SA) - - EXPN( 6) ROUND2(SA, SB, SC, SD, SE) - EXPN( 7) ROUND2(SE, SA, SB, SC, SD) - EXPN( 8) ROUND2(SD, SE, SA, SB, SC) - EXPN( 9) ROUND2(SC, SD, SE, SA, SB) - EXPN(10) ROUND2(SB, SC, SD, SE, SA) - - EXPN(11) ROUND2(SA, SB, SC, SD, SE) - EXPN(12) ROUND2(SE, SA, SB, SC, SD) - EXPN(13) ROUND2(SD, SE, SA, SB, SC) - EXPN(14) ROUND2(SC, SD, SE, SA, SB) - EXPN(15) ROUND2(SB, SC, SD, SE, SA) - - C Use registers we no longer need. - ldm STATE, {INPUT,T0,SHIFT,W,K} - add SA, SA, INPUT - add SB, SB, T0 - add SC, SC, SHIFT - add SD, SD, W - add SE, SE, K - add sp, sp, #64 - stm STATE, {SA,SB,SC,SD,SE} - pop {r4,r5,r6,r7,r8,r10,pc} -EPILOGUE(_nettle_sha1_compress) - -.LK4: - .int 0xCA62C1D6 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/nettle-2.7/arm/sha256-compress.asm new/nettle-2.7.1/arm/sha256-compress.asm --- old/nettle-2.7/arm/sha256-compress.asm 2013-04-24 15:26:53.000000000 +0200 +++ new/nettle-2.7.1/arm/sha256-compress.asm 1970-01-01 01:00:00.000000000 +0100 @@ -1,204 +0,0 @@ -C nettle, low-level cryptographics library -C -C Copyright (C) 2013 Niels Möller -C -C The nettle library is free software; you can redistribute it and/or modify -C it under the terms of the GNU Lesser General Public License as published by -C the Free Software Foundation; either version 2.1 of the License, or (at your -C option) any later version. -C -C The nettle library is distributed in the hope that it will be useful, but -C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public -C License for more details. -C -C You should have received a copy of the GNU Lesser General Public License -C along with the nettle library; see the file COPYING.LIB. If not, write to -C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -C MA 02111-1301, USA. - - .file "sha256-compress.asm" - -define(<STATE>, <r0>) -define(<INPUT>, <r1>) -define(<K>, <r2>) -define(<SA>, <r3>) -define(<SB>, <r4>) -define(<SC>, <r5>) -define(<SD>, <r6>) -define(<SE>, <r7>) -define(<SF>, <r8>) -define(<SG>, <r10>) -define(<SH>, <r11>) -define(<T0>, <r12>) -define(<T1>, <r1>) C Overlap INPUT -define(<COUNT>, <r0>) C Overlap STATE -define(<W>, <r14>) - -C Used for data load -define(<I0>, <r3>) -define(<I1>, <r4>) -define(<I2>, <r5>) -define(<I3>, <r6>) -define(<I4>, <r7>) -define(<DST>, <r8>) -define(<SHIFT>, <r10>) -define(<ILEFT>, <r11>) - -define(<EXPN>, < - ldr W, [sp, #+eval(4*$1)] - ldr T0, [sp, #+eval(4*(($1 + 14) % 16))] - ror T1, T0, #17 - eor T1, T1, T0, ror #19 - eor T1, T1, T0, lsr #10 - add W, W, T1 - ldr T0, [sp, #+eval(4*(($1 + 9) % 16))] - add W, W, T0 - ldr T0, [sp, #+eval(4*(($1 + 1) % 16))] - ror T1, T0, #7 - eor T1, T1, T0, ror #18 - eor T1, T1, T0, lsr #3 - add W, W, T1 - str W, [sp, #+eval(4*$1)] ->) - -C ROUND(A,B,C,D,E,F,G,H) -C -C H += S1(E) + Choice(E,F,G) + K + W -C D += H -C H += S0(A) + Majority(A,B,C) -C -C Where -C -C S1(E) = E<<<26 ^ E<<<21 ^ E<<<7 -C S0(A) = A<<<30 ^ A<<<19 ^ A<<<10 -C Choice (E, F, G) = G^(E&(F^G)) -C Majority (A,B,C) = (A&B) + (C&(A^B)) - -define(<ROUND>, < - ror T0, $5, #6 - eor T0, T0, $5, ror #11 - eor T0, T0, $5, ror #25 - add $8, $8, T0 - eor T0, $6, $7 - and T0, T0, $5 - eor T0, T0, $7 - add $8,$8, T0 - ldr T0, [K], #+4 - add $8, $8, W - add $8, $8, T0 - add $4, $4, $8 - ror T0, $1, #2 - eor T0, T0, $1, ror #13 - eor T0, T0, $1, ror #22 - add $8, $8, T0 - and T0, $1, $2 - add $8, $8, T0 - eor T0, $1, $2 - and T0, T0, $3 - add $8, $8, T0 ->) - -define(<NOEXPN>, < - ldr W, [sp, + $1] - add $1, $1, #4 ->) - C void - C _nettle_sha256_compress(uint32_t *state, const uint8_t *input, const uint32_t *k) - - .text - .align 2 - -PROLOGUE(_nettle_sha256_compress) - push {r4,r5,r6,r7,r8,r10,r11,r14} - sub sp, sp, #68 - str STATE, [sp, +#64] - - C Load data up front, since we don't have enough registers - C to load and shift on-the-fly - ands SHIFT, INPUT, #3 - and INPUT, INPUT, $-4 - ldr I0, [INPUT] - addne INPUT, INPUT, #4 - lsl SHIFT, SHIFT, #3 - mov T0, #0 - movne T0, #-1 - lsl I1, T0, SHIFT - uadd8 T0, T0, I1 C Sets APSR.GE bits - - mov DST, sp - mov ILEFT, #4 -.Lcopy: - ldm INPUT!, {I1,I2,I3,I4} - sel I0, I0, I1 - ror I0, I0, SHIFT - rev I0, I0 - sel I1, I1, I2 - ror I1, I1, SHIFT - rev I1, I1 - sel I2, I2, I3 - ror I2, I2, SHIFT - rev I2, I2 - sel I3, I3, I4 - ror I3, I3, SHIFT - rev I3, I3 - subs ILEFT, ILEFT, #1 - stm DST!, {I0,I1,I2,I3} - mov I0, I4 - bne .Lcopy - - ldm STATE, {SA,SB,SC,SD,SE,SF,SG,SH} - - mov COUNT,#0 - -.Loop1: - NOEXPN(COUNT) ROUND(SA,SB,SC,SD,SE,SF,SG,SH) - NOEXPN(COUNT) ROUND(SH,SA,SB,SC,SD,SE,SF,SG) - NOEXPN(COUNT) ROUND(SG,SH,SA,SB,SC,SD,SE,SF) - NOEXPN(COUNT) ROUND(SF,SG,SH,SA,SB,SC,SD,SE) - NOEXPN(COUNT) ROUND(SE,SF,SG,SH,SA,SB,SC,SD) - NOEXPN(COUNT) ROUND(SD,SE,SF,SG,SH,SA,SB,SC) - NOEXPN(COUNT) ROUND(SC,SD,SE,SF,SG,SH,SA,SB) - NOEXPN(COUNT) ROUND(SB,SC,SD,SE,SF,SG,SH,SA) - cmp COUNT,#64 - bne .Loop1 - - mov COUNT, #3 -.Loop2: - - EXPN( 0) ROUND(SA,SB,SC,SD,SE,SF,SG,SH) - EXPN( 1) ROUND(SH,SA,SB,SC,SD,SE,SF,SG) - EXPN( 2) ROUND(SG,SH,SA,SB,SC,SD,SE,SF) - EXPN( 3) ROUND(SF,SG,SH,SA,SB,SC,SD,SE) - EXPN( 4) ROUND(SE,SF,SG,SH,SA,SB,SC,SD) - EXPN( 5) ROUND(SD,SE,SF,SG,SH,SA,SB,SC) - EXPN( 6) ROUND(SC,SD,SE,SF,SG,SH,SA,SB) - EXPN( 7) ROUND(SB,SC,SD,SE,SF,SG,SH,SA) - EXPN( 8) ROUND(SA,SB,SC,SD,SE,SF,SG,SH) - EXPN( 9) ROUND(SH,SA,SB,SC,SD,SE,SF,SG) - EXPN(10) ROUND(SG,SH,SA,SB,SC,SD,SE,SF) - EXPN(11) ROUND(SF,SG,SH,SA,SB,SC,SD,SE) - EXPN(12) ROUND(SE,SF,SG,SH,SA,SB,SC,SD) - EXPN(13) ROUND(SD,SE,SF,SG,SH,SA,SB,SC) - EXPN(14) ROUND(SC,SD,SE,SF,SG,SH,SA,SB) - subs COUNT, COUNT, #1 - EXPN(15) ROUND(SB,SC,SD,SE,SF,SG,SH,SA) - bne .Loop2 - - ldr STATE, [sp, +#64] - C No longer needed registers - ldm STATE, {r1,r2,r12,r14} - add SA, SA, r1 - add SB, SB, r2 - add SC, SC, r12 - add SD, SD, r14 - stm STATE!, {SA,SB,SC,SD} - ldm STATE, {r1,r2,r12,r14} - add SE, SE, r1 - add SF, SF, r2 - add SG, SG, r12 - add SH, SH, r14 - stm STATE!, {SE,SF,SG,SH} - add sp, sp, #68 - pop {r4,r5,r6,r7,r8,r10,r11,pc} -EPILOGUE(_nettle_sha256_compress) 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/nettle-2.7/arm/v6/aes-decrypt-internal.asm new/nettle-2.7.1/arm/v6/aes-decrypt-internal.asm --- old/nettle-2.7/arm/v6/aes-decrypt-internal.asm 1970-01-01 01:00:00.000000000 +0100 +++ new/nettle-2.7.1/arm/v6/aes-decrypt-internal.asm 2013-05-28 16:21:54.000000000 +0200 @@ -0,0 +1,105 @@ +C nettle, low-level cryptographics library +C +C Copyright (C) 2013 Niels Möller +C +C The nettle library is free software; you can redistribute it and/or modify +C it under the terms of the GNU Lesser General Public License as published by +C the Free Software Foundation; either version 2.1 of the License, or (at your +C option) any later version. +C +C The nettle library is distributed in the hope that it will be useful, but +C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +C License for more details. +C +C You should have received a copy of the GNU Lesser General Public License +C along with the nettle library; see the file COPYING.LIB. If not, write to +C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +C MA 02111-1301, USA. + +include_src(<arm/aes.m4>) + +C Benchmarked at at 785, 914, 1051 cycles/block on cortex A9, +C for 128, 192 and 256 bit key sizes. Unclear why it is slower +C than _aes_encrypt. + +define(<CTX>, <r0>) +define(<TABLE>, <r1>) +define(<LENGTH>, <r2>) +define(<DST>, <r3>) +define(<SRC>, <r12>) + +define(<W0>, <r4>) +define(<W1>, <r5>) +define(<W2>, <r6>) +define(<W3>, <r7>) +define(<T0>, <r8>) +define(<KEY>, <r10>) +define(<ROUND>, <r11>) + +define(<X0>, <r2>) C Overlaps LENGTH, SRC, DST +define(<X1>, <r3>) +define(<X2>, <r12>) +define(<X3>, <r14>) C lr + + + .file "aes-decrypt-internal.asm" + + C _aes_decrypt(struct aes_context *ctx, + C const struct aes_table *T, + C unsigned length, uint8_t *dst, + C uint8_t *src) + .text + .align 2 +PROLOGUE(_nettle_aes_decrypt) + teq LENGTH, #0 + beq .Lend + ldr SRC, [sp] + + push {r4,r5,r6,r7,r8,r10,r11,lr} +.Lblock_loop: + mov KEY, CTX + AES_LOAD(SRC,KEY,W0) + AES_LOAD(SRC,KEY,W1) + AES_LOAD(SRC,KEY,W2) + AES_LOAD(SRC,KEY,W3) + + push {LENGTH, DST, SRC} + ldr ROUND, [CTX, #+AES_NROUNDS] + add TABLE, TABLE, #AES_TABLE0 + + b .Lentry + .align 2 +.Lround_loop: + C Transform X -> W + AES_DECRYPT_ROUND(X0, X1, X2, X3, W0, W1, W2, W3, KEY) + +.Lentry: + subs ROUND, ROUND,#2 + C Transform W -> X + AES_DECRYPT_ROUND(W0, W1, W2, W3, X0, X1, X2, X3, KEY) + + bne .Lround_loop + + sub TABLE, TABLE, #AES_TABLE0 + C Final round + AES_FINAL_ROUND(X0, X3, X2, X1, KEY, W0) + AES_FINAL_ROUND(X1, X0, X3, X2, KEY, W1) + AES_FINAL_ROUND(X2, X1, X0, X3, KEY, W2) + AES_FINAL_ROUND(X3, X2, X1, X0, KEY, W3) + + pop {LENGTH, DST, SRC} + + AES_STORE(DST,W0) + AES_STORE(DST,W1) + AES_STORE(DST,W2) + AES_STORE(DST,W3) + + subs LENGTH, LENGTH, #16 + bhi .Lblock_loop + + pop {r4,r5,r6,r7,r8,r10,r11,pc} + +.Lend: + bx lr +EPILOGUE(_nettle_aes_decrypt) 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/nettle-2.7/arm/v6/aes-encrypt-internal.asm new/nettle-2.7.1/arm/v6/aes-encrypt-internal.asm --- old/nettle-2.7/arm/v6/aes-encrypt-internal.asm 1970-01-01 01:00:00.000000000 +0100 +++ new/nettle-2.7.1/arm/v6/aes-encrypt-internal.asm 2013-05-28 16:21:54.000000000 +0200 @@ -0,0 +1,107 @@ +C nettle, low-level cryptographics library +C +C Copyright (C) 2013 Niels Möller +C +C The nettle library is free software; you can redistribute it and/or modify +C it under the terms of the GNU Lesser General Public License as published by +C the Free Software Foundation; either version 2.1 of the License, or (at your +C option) any later version. +C +C The nettle library is distributed in the hope that it will be useful, but +C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +C License for more details. +C +C You should have received a copy of the GNU Lesser General Public License +C along with the nettle library; see the file COPYING.LIB. If not, write to +C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +C MA 02111-1301, USA. + +include_src(<arm/aes.m4>) + +C Benchmarked at at 693, 824, 950 cycles/block on cortex A9, +C for 128, 192 and 256 bit key sizes. + +C Possible improvements: More efficient load and store with +C aligned accesses. Better scheduling. + +define(<CTX>, <r0>) +define(<TABLE>, <r1>) +define(<LENGTH>, <r2>) +define(<DST>, <r3>) +define(<SRC>, <r12>) + +define(<W0>, <r4>) +define(<W1>, <r5>) +define(<W2>, <r6>) +define(<W3>, <r7>) +define(<T0>, <r8>) +define(<KEY>, <r10>) +define(<ROUND>, <r11>) + +define(<X0>, <r2>) C Overlaps LENGTH, SRC, DST +define(<X1>, <r3>) +define(<X2>, <r12>) +define(<X3>, <r14>) C lr + + + .file "aes-encrypt-internal.asm" + + C _aes_encrypt(struct aes_context *ctx, + C const struct aes_table *T, + C unsigned length, uint8_t *dst, + C uint8_t *src) + .text + .align 2 +PROLOGUE(_nettle_aes_encrypt) + teq LENGTH, #0 + beq .Lend + ldr SRC, [sp] + + push {r4,r5,r6,r7,r8,r10,r11,lr} +.Lblock_loop: + mov KEY, CTX + AES_LOAD(SRC,KEY,W0) + AES_LOAD(SRC,KEY,W1) + AES_LOAD(SRC,KEY,W2) + AES_LOAD(SRC,KEY,W3) + + push {LENGTH, DST, SRC} + ldr ROUND, [CTX, #+AES_NROUNDS] + add TABLE, TABLE, #AES_TABLE0 + + b .Lentry + .align 2 +.Lround_loop: + C Transform X -> W + AES_ENCRYPT_ROUND(X0, X1, X2, X3, W0, W1, W2, W3, KEY) + +.Lentry: + subs ROUND, ROUND,#2 + C Transform W -> X + AES_ENCRYPT_ROUND(W0, W1, W2, W3, X0, X1, X2, X3, KEY) + + bne .Lround_loop + + sub TABLE, TABLE, #AES_TABLE0 + C Final round + AES_FINAL_ROUND(X0, X1, X2, X3, KEY, W0) + AES_FINAL_ROUND(X1, X2, X3, X0, KEY, W1) + AES_FINAL_ROUND(X2, X3, X0, X1, KEY, W2) + AES_FINAL_ROUND(X3, X0, X1, X2, KEY, W3) + + pop {LENGTH, DST, SRC} + + AES_STORE(DST,W0) + AES_STORE(DST,W1) + AES_STORE(DST,W2) + AES_STORE(DST,W3) + + subs LENGTH, LENGTH, #16 + bhi .Lblock_loop + + pop {r4,r5,r6,r7,r8,r10,r11,pc} + +.Lend: + bx lr +EPILOGUE(_nettle_aes_encrypt) 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/nettle-2.7/arm/v6/sha1-compress.asm new/nettle-2.7.1/arm/v6/sha1-compress.asm --- old/nettle-2.7/arm/v6/sha1-compress.asm 1970-01-01 01:00:00.000000000 +0100 +++ new/nettle-2.7.1/arm/v6/sha1-compress.asm 2013-05-28 16:21:54.000000000 +0200 @@ -0,0 +1,234 @@ +C nettle, low-level cryptographics library +C +C Copyright (C) 2013 Niels Möller +C +C The nettle library is free software; you can redistribute it and/or modify +C it under the terms of the GNU Lesser General Public License as published by +C the Free Software Foundation; either version 2.1 of the License, or (at your +C option) any later version. +C +C The nettle library is distributed in the hope that it will be useful, but +C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +C License for more details. +C +C You should have received a copy of the GNU Lesser General Public License +C along with the nettle library; see the file COPYING.LIB. If not, write to +C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +C MA 02111-1301, USA. + + .file "sha1-compress.asm" + +define(<STATE>, <r0>) +define(<INPUT>, <r1>) +define(<SA>, <r2>) +define(<SB>, <r3>) +define(<SC>, <r4>) +define(<SD>, <r5>) +define(<SE>, <r6>) +define(<T0>, <r7>) +define(<SHIFT>, <r8>) +define(<WPREV>, <r10>) +define(<W>, <r12>) +define(<K>, <lr>) + +C FIXME: Could avoid a mov with even and odd variants. +define(<LOAD>, < + ldr T0, [INPUT], #+4 + sel W, WPREV, T0 + ror W, W, SHIFT + mov WPREV, T0 + rev W, W + str W, [SP,#eval(4*$1)] +>) +define(<EXPN>, < + ldr W, [sp, #+eval(4*$1)] + ldr T0, [sp, #+eval(4*(($1 + 2) % 16))] + eor W, W, T0 + ldr T0, [sp, #+eval(4*(($1 + 8) % 16))] + eor W, W, T0 + ldr T0, [sp, #+eval(4*(($1 + 13) % 16))] + eor W, W, T0 + ror W, W, #31 + str W, [sp, #+eval(4*$1)] +>) + +C F1(B,C,D) = D^(B&(C^D)) +C ROUND1(A,B,C,D,E) +define(<ROUND1>, < + eor T0, $3, $4 + add $5, $5, K + and T0, T0, $2 + add $5, $5, $1, ror #27 + eor T0, T0, $4 + add $5, $5, W + ror $2, $2, #2 + add $5, $5, T0 +>) +C F2(B,C,D) = B^C^D +define(<ROUND2>, < + eor T0, $2, $4 + add $5, $5, K + eor T0, T0, $3 + add $5, $5, $1, ror #27 + add $5, $5, W + ror $2, $2, #2 + add $5, $5, T0 +>) +C F3(B,C,D) = (B&C) | (D & (B|C)) = (B & (C ^ D)) + (C & D) +define(<ROUND3>, < + eor T0, $3, $4 + add $5, $5, K + and T0, T0, $2 + add $5, $5, $1, ror #27 + add $5, $5, T0 + add $5, $5, W + and T0, $3, $4 + ror $2, $2, #2 + add $5, $5, T0 +>) + C void _nettle_sha1_compress(uint32_t *state, const uint8_t *input) + + .text + .align 2 +.LK1: + .int 0x5A827999 +.LK2: + .int 0x6ED9EBA1 +.LK3: + .int 0x8F1BBCDC + +PROLOGUE(_nettle_sha1_compress) + push {r4,r5,r6,r7,r8,r10,lr} + sub sp, sp, #64 + + C Sets SHIFT to 8*low bits of input pointer. Sets up GE flags + C as follows, corresponding to bytes to be used from WPREV + C SHIFT 0 8 16 24 + C CPSR.GE 0000 1110 1100 1000 + ands SHIFT, INPUT, #3 + and INPUT, INPUT, $-4 + ldr WPREV, [INPUT] + addne INPUT, INPUT, #4 C Unaligned input + lsl SHIFT, SHIFT, #3 + mov T0, #0 + movne T0, #-1 + lsl W, T0, SHIFT + uadd8 T0, T0, W C Sets APSR.GE bits + + ldr K, .LK1 + ldm STATE, {SA,SB,SC,SD,SE} + + LOAD( 0) ROUND1(SA, SB, SC, SD, SE) + LOAD( 1) ROUND1(SE, SA, SB, SC, SD) + LOAD( 2) ROUND1(SD, SE, SA, SB, SC) + LOAD( 3) ROUND1(SC, SD, SE, SA, SB) + LOAD( 4) ROUND1(SB, SC, SD, SE, SA) + + LOAD( 5) ROUND1(SA, SB, SC, SD, SE) + LOAD( 6) ROUND1(SE, SA, SB, SC, SD) + LOAD( 7) ROUND1(SD, SE, SA, SB, SC) + LOAD( 8) ROUND1(SC, SD, SE, SA, SB) + LOAD( 9) ROUND1(SB, SC, SD, SE, SA) + + LOAD(10) ROUND1(SA, SB, SC, SD, SE) + LOAD(11) ROUND1(SE, SA, SB, SC, SD) + LOAD(12) ROUND1(SD, SE, SA, SB, SC) + LOAD(13) ROUND1(SC, SD, SE, SA, SB) + LOAD(14) ROUND1(SB, SC, SD, SE, SA) + + LOAD(15) ROUND1(SA, SB, SC, SD, SE) + EXPN( 0) ROUND1(SE, SA, SB, SC, SD) + EXPN( 1) ROUND1(SD, SE, SA, SB, SC) + EXPN( 2) ROUND1(SC, SD, SE, SA, SB) + EXPN( 3) ROUND1(SB, SC, SD, SE, SA) + + ldr K, .LK2 + EXPN( 4) ROUND2(SA, SB, SC, SD, SE) + EXPN( 5) ROUND2(SE, SA, SB, SC, SD) + EXPN( 6) ROUND2(SD, SE, SA, SB, SC) + EXPN( 7) ROUND2(SC, SD, SE, SA, SB) + EXPN( 8) ROUND2(SB, SC, SD, SE, SA) + + EXPN( 9) ROUND2(SA, SB, SC, SD, SE) + EXPN(10) ROUND2(SE, SA, SB, SC, SD) + EXPN(11) ROUND2(SD, SE, SA, SB, SC) + EXPN(12) ROUND2(SC, SD, SE, SA, SB) + EXPN(13) ROUND2(SB, SC, SD, SE, SA) + + EXPN(14) ROUND2(SA, SB, SC, SD, SE) + EXPN(15) ROUND2(SE, SA, SB, SC, SD) + EXPN( 0) ROUND2(SD, SE, SA, SB, SC) + EXPN( 1) ROUND2(SC, SD, SE, SA, SB) + EXPN( 2) ROUND2(SB, SC, SD, SE, SA) + + EXPN( 3) ROUND2(SA, SB, SC, SD, SE) + EXPN( 4) ROUND2(SE, SA, SB, SC, SD) + EXPN( 5) ROUND2(SD, SE, SA, SB, SC) + EXPN( 6) ROUND2(SC, SD, SE, SA, SB) + EXPN( 7) ROUND2(SB, SC, SD, SE, SA) + + ldr K, .LK3 + EXPN( 8) ROUND3(SA, SB, SC, SD, SE) + EXPN( 9) ROUND3(SE, SA, SB, SC, SD) + EXPN(10) ROUND3(SD, SE, SA, SB, SC) + EXPN(11) ROUND3(SC, SD, SE, SA, SB) + EXPN(12) ROUND3(SB, SC, SD, SE, SA) + + EXPN(13) ROUND3(SA, SB, SC, SD, SE) + EXPN(14) ROUND3(SE, SA, SB, SC, SD) + EXPN(15) ROUND3(SD, SE, SA, SB, SC) + EXPN( 0) ROUND3(SC, SD, SE, SA, SB) + EXPN( 1) ROUND3(SB, SC, SD, SE, SA) + + EXPN( 2) ROUND3(SA, SB, SC, SD, SE) + EXPN( 3) ROUND3(SE, SA, SB, SC, SD) + EXPN( 4) ROUND3(SD, SE, SA, SB, SC) + EXPN( 5) ROUND3(SC, SD, SE, SA, SB) + EXPN( 6) ROUND3(SB, SC, SD, SE, SA) + + EXPN( 7) ROUND3(SA, SB, SC, SD, SE) + EXPN( 8) ROUND3(SE, SA, SB, SC, SD) + EXPN( 9) ROUND3(SD, SE, SA, SB, SC) + EXPN(10) ROUND3(SC, SD, SE, SA, SB) + EXPN(11) ROUND3(SB, SC, SD, SE, SA) + + ldr K, .LK4 + EXPN(12) ROUND2(SA, SB, SC, SD, SE) + EXPN(13) ROUND2(SE, SA, SB, SC, SD) + EXPN(14) ROUND2(SD, SE, SA, SB, SC) + EXPN(15) ROUND2(SC, SD, SE, SA, SB) + EXPN( 0) ROUND2(SB, SC, SD, SE, SA) + + EXPN( 1) ROUND2(SA, SB, SC, SD, SE) + EXPN( 2) ROUND2(SE, SA, SB, SC, SD) + EXPN( 3) ROUND2(SD, SE, SA, SB, SC) + EXPN( 4) ROUND2(SC, SD, SE, SA, SB) + EXPN( 5) ROUND2(SB, SC, SD, SE, SA) + + EXPN( 6) ROUND2(SA, SB, SC, SD, SE) + EXPN( 7) ROUND2(SE, SA, SB, SC, SD) + EXPN( 8) ROUND2(SD, SE, SA, SB, SC) + EXPN( 9) ROUND2(SC, SD, SE, SA, SB) + EXPN(10) ROUND2(SB, SC, SD, SE, SA) + + EXPN(11) ROUND2(SA, SB, SC, SD, SE) + EXPN(12) ROUND2(SE, SA, SB, SC, SD) + EXPN(13) ROUND2(SD, SE, SA, SB, SC) + EXPN(14) ROUND2(SC, SD, SE, SA, SB) + EXPN(15) ROUND2(SB, SC, SD, SE, SA) + + C Use registers we no longer need. + ldm STATE, {INPUT,T0,SHIFT,W,K} + add SA, SA, INPUT + add SB, SB, T0 + add SC, SC, SHIFT + add SD, SD, W + add SE, SE, K + add sp, sp, #64 + stm STATE, {SA,SB,SC,SD,SE} + pop {r4,r5,r6,r7,r8,r10,pc} +EPILOGUE(_nettle_sha1_compress) + +.LK4: + .int 0xCA62C1D6 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/nettle-2.7/arm/v6/sha256-compress.asm new/nettle-2.7.1/arm/v6/sha256-compress.asm --- old/nettle-2.7/arm/v6/sha256-compress.asm 1970-01-01 01:00:00.000000000 +0100 +++ new/nettle-2.7.1/arm/v6/sha256-compress.asm 2013-05-28 16:21:54.000000000 +0200 @@ -0,0 +1,204 @@ +C nettle, low-level cryptographics library +C +C Copyright (C) 2013 Niels Möller +C +C The nettle library is free software; you can redistribute it and/or modify +C it under the terms of the GNU Lesser General Public License as published by +C the Free Software Foundation; either version 2.1 of the License, or (at your +C option) any later version. +C +C The nettle library is distributed in the hope that it will be useful, but +C WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +C or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +C License for more details. +C +C You should have received a copy of the GNU Lesser General Public License +C along with the nettle library; see the file COPYING.LIB. If not, write to +C the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +C MA 02111-1301, USA. + + .file "sha256-compress.asm" + +define(<STATE>, <r0>) +define(<INPUT>, <r1>) +define(<K>, <r2>) +define(<SA>, <r3>) +define(<SB>, <r4>) +define(<SC>, <r5>) +define(<SD>, <r6>) +define(<SE>, <r7>) +define(<SF>, <r8>) +define(<SG>, <r10>) +define(<SH>, <r11>) +define(<T0>, <r12>) +define(<T1>, <r1>) C Overlap INPUT +define(<COUNT>, <r0>) C Overlap STATE +define(<W>, <r14>) + +C Used for data load +define(<I0>, <r3>) +define(<I1>, <r4>) +define(<I2>, <r5>) +define(<I3>, <r6>) +define(<I4>, <r7>) +define(<DST>, <r8>) +define(<SHIFT>, <r10>) +define(<ILEFT>, <r11>) + +define(<EXPN>, < + ldr W, [sp, #+eval(4*$1)] + ldr T0, [sp, #+eval(4*(($1 + 14) % 16))] + ror T1, T0, #17 + eor T1, T1, T0, ror #19 + eor T1, T1, T0, lsr #10 + add W, W, T1 + ldr T0, [sp, #+eval(4*(($1 + 9) % 16))] + add W, W, T0 + ldr T0, [sp, #+eval(4*(($1 + 1) % 16))] + ror T1, T0, #7 + eor T1, T1, T0, ror #18 + eor T1, T1, T0, lsr #3 + add W, W, T1 + str W, [sp, #+eval(4*$1)] +>) + +C ROUND(A,B,C,D,E,F,G,H) +C +C H += S1(E) + Choice(E,F,G) + K + W +C D += H +C H += S0(A) + Majority(A,B,C) +C +C Where +C +C S1(E) = E<<<26 ^ E<<<21 ^ E<<<7 +C S0(A) = A<<<30 ^ A<<<19 ^ A<<<10 +C Choice (E, F, G) = G^(E&(F^G)) +C Majority (A,B,C) = (A&B) + (C&(A^B)) + +define(<ROUND>, < + ror T0, $5, #6 + eor T0, T0, $5, ror #11 + eor T0, T0, $5, ror #25 + add $8, $8, T0 + eor T0, $6, $7 + and T0, T0, $5 + eor T0, T0, $7 + add $8,$8, T0 + ldr T0, [K], #+4 + add $8, $8, W + add $8, $8, T0 + add $4, $4, $8 + ror T0, $1, #2 + eor T0, T0, $1, ror #13 + eor T0, T0, $1, ror #22 + add $8, $8, T0 + and T0, $1, $2 + add $8, $8, T0 + eor T0, $1, $2 + and T0, T0, $3 + add $8, $8, T0 +>) + +define(<NOEXPN>, < + ldr W, [sp, + $1] + add $1, $1, #4 +>) + C void + C _nettle_sha256_compress(uint32_t *state, const uint8_t *input, const uint32_t *k) + + .text + .align 2 + +PROLOGUE(_nettle_sha256_compress) + push {r4,r5,r6,r7,r8,r10,r11,r14} + sub sp, sp, #68 + str STATE, [sp, +#64] + + C Load data up front, since we don't have enough registers + C to load and shift on-the-fly + ands SHIFT, INPUT, #3 + and INPUT, INPUT, $-4 + ldr I0, [INPUT] + addne INPUT, INPUT, #4 + lsl SHIFT, SHIFT, #3 + mov T0, #0 + movne T0, #-1 + lsl I1, T0, SHIFT + uadd8 T0, T0, I1 C Sets APSR.GE bits + + mov DST, sp + mov ILEFT, #4 +.Lcopy: + ldm INPUT!, {I1,I2,I3,I4} + sel I0, I0, I1 + ror I0, I0, SHIFT + rev I0, I0 + sel I1, I1, I2 + ror I1, I1, SHIFT + rev I1, I1 + sel I2, I2, I3 + ror I2, I2, SHIFT + rev I2, I2 + sel I3, I3, I4 + ror I3, I3, SHIFT + rev I3, I3 + subs ILEFT, ILEFT, #1 + stm DST!, {I0,I1,I2,I3} + mov I0, I4 + bne .Lcopy + + ldm STATE, {SA,SB,SC,SD,SE,SF,SG,SH} + + mov COUNT,#0 + +.Loop1: + NOEXPN(COUNT) ROUND(SA,SB,SC,SD,SE,SF,SG,SH) + NOEXPN(COUNT) ROUND(SH,SA,SB,SC,SD,SE,SF,SG) + NOEXPN(COUNT) ROUND(SG,SH,SA,SB,SC,SD,SE,SF) + NOEXPN(COUNT) ROUND(SF,SG,SH,SA,SB,SC,SD,SE) + NOEXPN(COUNT) ROUND(SE,SF,SG,SH,SA,SB,SC,SD) + NOEXPN(COUNT) ROUND(SD,SE,SF,SG,SH,SA,SB,SC) + NOEXPN(COUNT) ROUND(SC,SD,SE,SF,SG,SH,SA,SB) + NOEXPN(COUNT) ROUND(SB,SC,SD,SE,SF,SG,SH,SA) + cmp COUNT,#64 + bne .Loop1 + + mov COUNT, #3 +.Loop2: + + EXPN( 0) ROUND(SA,SB,SC,SD,SE,SF,SG,SH) + EXPN( 1) ROUND(SH,SA,SB,SC,SD,SE,SF,SG) + EXPN( 2) ROUND(SG,SH,SA,SB,SC,SD,SE,SF) + EXPN( 3) ROUND(SF,SG,SH,SA,SB,SC,SD,SE) + EXPN( 4) ROUND(SE,SF,SG,SH,SA,SB,SC,SD) + EXPN( 5) ROUND(SD,SE,SF,SG,SH,SA,SB,SC) + EXPN( 6) ROUND(SC,SD,SE,SF,SG,SH,SA,SB) + EXPN( 7) ROUND(SB,SC,SD,SE,SF,SG,SH,SA) + EXPN( 8) ROUND(SA,SB,SC,SD,SE,SF,SG,SH) + EXPN( 9) ROUND(SH,SA,SB,SC,SD,SE,SF,SG) + EXPN(10) ROUND(SG,SH,SA,SB,SC,SD,SE,SF) + EXPN(11) ROUND(SF,SG,SH,SA,SB,SC,SD,SE) + EXPN(12) ROUND(SE,SF,SG,SH,SA,SB,SC,SD) + EXPN(13) ROUND(SD,SE,SF,SG,SH,SA,SB,SC) + EXPN(14) ROUND(SC,SD,SE,SF,SG,SH,SA,SB) + subs COUNT, COUNT, #1 + EXPN(15) ROUND(SB,SC,SD,SE,SF,SG,SH,SA) + bne .Loop2 + + ldr STATE, [sp, +#64] + C No longer needed registers + ldm STATE, {r1,r2,r12,r14} + add SA, SA, r1 + add SB, SB, r2 + add SC, SC, r12 + add SD, SD, r14 + stm STATE!, {SA,SB,SC,SD} + ldm STATE, {r1,r2,r12,r14} + add SE, SE, r1 + add SF, SF, r2 + add SG, SG, r12 + add SH, SH, r14 + stm STATE!, {SE,SF,SG,SH} + add sp, sp, #68 + pop {r4,r5,r6,r7,r8,r10,r11,pc} +EPILOGUE(_nettle_sha256_compress) 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/nettle-2.7/configure.ac new/nettle-2.7.1/configure.ac --- old/nettle-2.7/configure.ac 2013-04-24 15:26:53.000000000 +0200 +++ new/nettle-2.7.1/configure.ac 2013-05-28 16:21:53.000000000 +0200 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([nettle], [2.7], [nettle-bugs(a)lists.lysator.liu.se]) +AC_INIT([nettle], [2.7.1], [nettle-bugs(a)lists.lysator.liu.se]) AC_PREREQ(2.61) AC_CONFIG_SRCDIR([arcfour.c]) # Needed to stop autoconf from looking for files in parent directories. @@ -11,10 +11,10 @@ AC_CONFIG_HEADER([config.h]) LIBNETTLE_MAJOR=4 -LIBNETTLE_MINOR=6 +LIBNETTLE_MINOR=7 LIBHOGWEED_MAJOR=2 -LIBHOGWEED_MINOR=4 +LIBHOGWEED_MINOR=5 AC_CANONICAL_HOST @@ -237,14 +237,18 @@ asm_path=sparc32 fi ;; - arm*) + armv6* | armv7*) NETTLE_CHECK_ARM_NEON - asm_path=arm + asm_path="arm/v6 arm" + if test "x$enable_arm_neon" = xyes ; then asm_path="arm/neon $asm_path" fi ;; + arm*) + asm_path=arm + ;; *) enable_assembler=no ;; 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/nettle-2.7/ecc-j-to-a.c new/nettle-2.7.1/ecc-j-to-a.c --- old/nettle-2.7/ecc-j-to-a.c 2013-04-24 15:26:52.000000000 +0200 +++ new/nettle-2.7.1/ecc-j-to-a.c 2013-05-28 16:21:53.000000000 +0200 @@ -46,6 +46,7 @@ #define up (scratch + ecc->size) #define iz2p (scratch + ecc->size) #define iz3p (scratch + 2*ecc->size) +#define izBp (scratch + 3*ecc->size) #define tp scratch mp_limb_t cy; @@ -72,11 +73,11 @@ if (flags & 1) { /* Divide this common factor by B */ - mpn_copyi (iz3p, izp, ecc->size); - mpn_zero (iz3p + ecc->size, ecc->size); - ecc->redc (ecc, iz3p); - - ecc_modp_mul (ecc, iz2p, izp, iz3p); + mpn_copyi (izBp, izp, ecc->size); + mpn_zero (izBp + ecc->size, ecc->size); + ecc->redc (ecc, izBp); + + ecc_modp_mul (ecc, iz2p, izp, izBp); } else ecc_modp_sqr (ecc, iz2p, izp); Files old/nettle-2.7/nettle.pdf and new/nettle-2.7.1/nettle.pdf differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgit2 for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package libgit2 for openSUSE:Factory checked in at 2013-06-25 17:14:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgit2 (Old) and /work/SRC/openSUSE:Factory/.libgit2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgit2" Changes: -------- --- /work/SRC/openSUSE:Factory/libgit2/libgit2.changes 2012-09-03 18:55:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgit2.new/libgit2.changes 2013-06-25 17:15:04.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 23 20:58:21 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 0.18: + + Almost one year worth of bug fixing... yet, upstream does not + publish a statement / announcement of what is actually new... + +------------------------------------------------------------------- Old: ---- libgit2-0.17.0.tar.gz New: ---- v0.18.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgit2.spec ++++++ --- /var/tmp/diff_new_pack.IJIt6u/_old 2013-06-25 17:15:05.000000000 +0200 +++ /var/tmp/diff_new_pack.IJIt6u/_new 2013-06-25 17:15:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgit2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011, Sascha Peilicke <saschpe(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -18,13 +18,13 @@ Name: libgit2 -Version: 0.17.0 +Version: 0.18.0 Release: 0 Summary: C git library License: GPL-2.0-with-GCC-exception Group: Development/Libraries/C and C++ Url: http://libgit2.github.com/ -Source0: https://github.com/downloads/libgit2/libgit2/libgit2-%{version}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: python-base @@ -67,7 +67,7 @@ cmake . \ -DCMAKE_C_FLAGS:STRING="%{optflags}" \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DINSTALL_LIB:PATH=%{_libdir} + -DLIB_INSTALL_DIR:PATH=%{_libdir} make %{?_smp_mflags} %install @@ -83,7 +83,7 @@ %files devel %defattr (-,root,root) -%doc CONVENTIONS examples +%doc examples %{_libdir}/%{name}.so %{_includedir}/git2* %{_libdir}/pkgconfig/libgit2.pc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brltty for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package brltty for openSUSE:Factory checked in at 2013-06-25 17:13:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brltty (Old) and /work/SRC/openSUSE:Factory/.brltty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brltty" Changes: -------- --- /work/SRC/openSUSE:Factory/brltty/brltty.changes 2013-03-24 21:56:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brltty.new/brltty.changes 2013-06-25 17:13:25.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 25 09:20:12 UTC 2013 - tchvatal(a)suse.com + +- Adjust the patch application to be same like with other patches. + +------------------------------------------------------------------- +Tue Jun 18 09:32:01 UTC 2013 - jengelh(a)inai.de + +- Add brltty-speechd.diff to avert packaging failure and take + into account changed speechd location. +- More robust make install call. Remove redundant %clean section. + +------------------------------------------------------------------- New: ---- brltty-speechd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brltty.spec ++++++ --- /var/tmp/diff_new_pack.zW3fjN/_old 2013-06-25 17:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.zW3fjN/_new 2013-06-25 17:13:25.000000000 +0200 @@ -33,6 +33,8 @@ License: GPL-2.0+ Group: System/Daemons Url: http://mielke.cc/brltty/ + +#SVN-Clone: svn://mielke.cc/main/brltty Source0: %{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM brltty-cppflags.patch -- Taken from Fedora, to fix build of java bindings Patch0: brltty-cppflags.patch @@ -40,6 +42,7 @@ Patch1: brltty-python-prefix.patch # PATCH-FIX-OPENSUSE brltty-java-jni-dir.patch vuntz(a)opensuse.org -- Install java file in correct paths (openSUSE use %{_lib}) Patch2: brltty-java-jni-dir.patch +Patch3: brltty-speechd.diff BuildRequires: alsa-devel BuildRequires: at-spi-devel @@ -57,7 +60,7 @@ BuildRequires: jpackage-utils BuildRequires: libbraille-devel BuildRequires: libicu-devel -BuildRequires: libspeechd-devel +BuildRequires: libspeechd-devel >= 0.8 BuildRequires: libusb-1_0-devel BuildRequires: ncurses-devel %if %{with ocaml} @@ -305,6 +308,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -321,7 +325,7 @@ %__make -j1 # not parallel build safe %install -%makeinstall +make install DESTDIR="%buildroot" install -D -m644 Documents/brltty.conf %{buildroot}%{_sysconfdir}/brltty.conf %{__rm} %{buildroot}%{_libdir}/libbrlapi.a %if %{with ocaml} @@ -347,9 +351,6 @@ %{__mkdir} -p %{buildroot}%{tcl_sitearch} %{__mv} %{buildroot}%{_libdir}/brlapi-%{api_version} %{buildroot}%{tcl_sitearch}/ -%clean -%{__rm} -rf %{buildroot} - %post -n libbrlapi0_5 -p /sbin/ldconfig %postun -n libbrlapi0_5 -p /sbin/ldconfig ++++++ brltty-speechd.diff ++++++ From: Jan Engelhardt <jengelh(a)inai.de> Date: 2013-06-18 11:27:55.105668872 +0200 speech-dispatcher-0.8 moved speechd.h from /usr/include to /usr/include/speech-dispatcher. This patch is not really for upstream; the proper way to use speech-dispatcher is by way of pkg-config. This here is just a quick way to get it building in openSUSE again. --- Drivers/Speech/SpeechDispatcher/speech.c | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: brltty-4.3/Drivers/Speech/SpeechDispatcher/speech.c =================================================================== --- brltty-4.3.orig/Drivers/Speech/SpeechDispatcher/speech.c +++ brltty-4.3/Drivers/Speech/SpeechDispatcher/speech.c @@ -38,7 +38,7 @@ typedef enum { #define SPK_HAVE_PUNCTUATION #include "spk_driver.h" -#include <libspeechd.h> +#include <speech-dispatcher/libspeechd.h> static SPDConnection *connectionHandle = NULL; static const char *moduleName; Index: brltty-4.3/configure =================================================================== --- brltty-4.3.orig/configure +++ brltty-4.3/configure @@ -17401,7 +17401,7 @@ then roots="/usr /usr/local /usr/local/speech-dispatcher /usr/local/speechd /opt/speech-dispatcher /opt/speechd" for root in ${roots} do - if test -f "${root}/include/libspeechd.h" + if test -f "${root}/include/speech-dispatcher/libspeechd.h" then speechd_root="${root}" break -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit automake for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '13

25 Jun '13

Hello community, here is the log from the commit of package automake for openSUSE:Factory checked in at 2013-06-25 17:12:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/automake (Old) and /work/SRC/openSUSE:Factory/.automake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "automake" Changes: -------- --- /work/SRC/openSUSE:Factory/automake/automake-testsuite.changes 2013-06-05 11:37:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.automake.new/automake-testsuite.changes 2013-06-25 17:13:17.000000000 +0200 @@ -1,0 +2,43 @@ +Mon Jun 17 13:43:50 CEST 2013 - pth(a)suse.de + +- Update to 1.13.4: + - Fix a minor regression introduced in Automake 1.13.3: when two or more + user-defined suffix rules were present in a single Makefile.am, + automake would needlessly include definition of some make variables + related to C compilation in the generated Makefile.in (bug#14560). + +------------------------------------------------------------------- +Wed Jun 12 15:07:16 CEST 2013 - pth(a)suse.de + +- Update to 1.13.3: + * Documentation fixes: + + - The documentation no longer mistakenly reports that the + obsolete 'AM_MKDIR_PROG_P' macro and '$(mkdir_p)' make variable + are going to be removed in Automake 2.0. + + * Bugs fixed: + + - Byte-compilation of Emacs lisp files could fail spuriously on + Solaris, when /bin/ksh or /usr/xpg4/bin/sh were used as shell. + + - If the same user-defined suffixes were transformed into + different Automake-known suffixes in different Makefile.am + files in the same project, automake could get confused and + generate inconsistent Makefiles (automake bug#14441). + For example, if 'Makefile.am' contained a ".ext.cc:" suffix + rule, and 'sub/Makefile.am' contained a ".ext.c:" suffix rule, + automake would have mistakenly placed into 'Makefile.in' rules + to compile "*.c" files into object files, and into + 'sub/Makefile.in' rules to compile "*.cc" files into object + files --- rather than the other way around. This is now fixed. + + - Several spurious failures have been fixed (they hit especially + MinGW/MSYS builds). See automake bugs #14493, #14494, #14495, + #14498, #14499, #14500, #14501, #14517 and #14528. + + - Some other minor miscellaneous changes and fixlets. + + - Patches updated to they apply cleanly and with no offset. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/automake/automake.changes 2013-06-05 11:37:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.automake.new/automake.changes 2013-06-25 17:13:17.000000000 +0200 @@ -1,0 +2,44 @@ +Mon Jun 17 13:43:50 CEST 2013 - pth(a)suse.de + +- Update to 1.13.4: + - Fix a minor regression introduced in Automake 1.13.3: when two or more + user-defined suffix rules were present in a single Makefile.am, + automake would needlessly include definition of some make variables + related to C compilation in the generated Makefile.in (bug#14560). +- Adapt automake-SuSE.patch to changed config.guess. + +------------------------------------------------------------------- +Wed Jun 12 15:07:16 CEST 2013 - pth(a)suse.de + +- Update to 1.13.3: + * Documentation fixes: + + - The documentation no longer mistakenly reports that the + obsolete 'AM_MKDIR_PROG_P' macro and '$(mkdir_p)' make variable + are going to be removed in Automake 2.0. + + * Bugs fixed: + + - Byte-compilation of Emacs lisp files could fail spuriously on + Solaris, when /bin/ksh or /usr/xpg4/bin/sh were used as shell. + + - If the same user-defined suffixes were transformed into + different Automake-known suffixes in different Makefile.am + files in the same project, automake could get confused and + generate inconsistent Makefiles (automake bug#14441). + For example, if 'Makefile.am' contained a ".ext.cc:" suffix + rule, and 'sub/Makefile.am' contained a ".ext.c:" suffix rule, + automake would have mistakenly placed into 'Makefile.in' rules + to compile "*.c" files into object files, and into + 'sub/Makefile.in' rules to compile "*.cc" files into object + files --- rather than the other way around. This is now fixed. + + - Several spurious failures have been fixed (they hit especially + MinGW/MSYS builds). See automake bugs #14493, #14494, #14495, + #14498, #14499, #14500, #14501, #14517 and #14528. + + - Some other minor miscellaneous changes and fixlets. + + - Patches updated to they apply cleanly and with no offset. + +------------------------------------------------------------------- Old: ---- automake-1.13.2.tar.xz New: ---- automake-1.13.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automake-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.orSOlk/_old 2013-06-25 17:13:18.000000000 +0200 +++ /var/tmp/diff_new_pack.orSOlk/_new 2013-06-25 17:13:18.000000000 +0200 @@ -34,7 +34,7 @@ %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.13.2 +Version: 1.13.4 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ automake.spec: same change ++++++ automake-1.13.2.tar.xz -> automake-1.13.4.tar.xz ++++++ ++++ 27515 lines of diff (skipped) ++++++ automake-SuSE.patch ++++++ --- /var/tmp/diff_new_pack.orSOlk/_old 2013-06-25 17:13:19.000000000 +0200 +++ /var/tmp/diff_new_pack.orSOlk/_new 2013-06-25 17:13:19.000000000 +0200 @@ -1,14 +1,14 @@ --- - lib/config.guess | 148 +++++++++++++++++++++++++++++-------------------------- - 1 file changed, 79 insertions(+), 69 deletions(-) + lib/config.guess | 156 +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 83 insertions(+), 73 deletions(-) Index: lib/config.guess =================================================================== ---- lib/config.guess.orig 2013-05-13 22:12:48.000000000 +0200 -+++ lib/config.guess 2013-05-27 15:26:41.399249532 +0200 -@@ -132,6 +132,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +--- lib/config.guess.orig 2013-06-14 14:32:52.000000000 +0200 ++++ lib/config.guess 2013-06-17 13:43:12.656255639 +0200 +@@ -153,6 +153,16 @@ Linux|GNU|GNU/*) + ;; + esac +case "${UNAME_MACHINE}" in + i?86) @@ -23,7 +23,7 @@ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -196,23 +206,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -217,23 +227,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -53,7 +53,7 @@ exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in -@@ -280,13 +290,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -301,13 +311,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) @@ -70,7 +70,7 @@ exit ;; *:OS/390:*:*) echo i370-ibm-openedition -@@ -301,7 +311,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -322,7 +332,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) @@ -79,7 +79,7 @@ exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp -@@ -409,7 +419,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -430,7 +440,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) @@ -88,7 +88,7 @@ exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} -@@ -720,9 +730,9 @@ EOF +@@ -741,9 +751,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then @@ -100,7 +100,7 @@ fi exit ;; parisc*:Lites*:*:*) -@@ -782,18 +792,18 @@ EOF +@@ -803,18 +813,18 @@ EOF echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) @@ -123,7 +123,7 @@ esac exit ;; i*:CYGWIN*:*) -@@ -821,10 +831,10 @@ EOF +@@ -842,10 +852,10 @@ EOF echo i586-pc-interix${UNAME_RELEASE} exit ;; authenticamd | genuineintel | EM64T) @@ -136,7 +136,7 @@ exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -@@ -843,31 +853,31 @@ EOF +@@ -864,31 +874,31 @@ EOF echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) @@ -153,164 +153,175 @@ exit ;; *:GNU:*:*) # the GNU system -- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in -@@ -881,7 +891,7 @@ EOF +@@ -902,29 +912,29 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -891,19 +901,19 @@ EOF +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabihf +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu -@@ -912,10 +922,10 @@ EOF - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} +@@ -933,22 +943,22 @@ EOF + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; hexagon:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu -@@ -934,13 +944,13 @@ EOF - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -959,48 +969,48 @@ EOF +@@ -967,63 +977,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; } ;; or1k:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; or32:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; padre:Linux:*:*) -- echo sparc-unknown-linux-gnu -+ echo sparc-${VENDOR}-linux-gnu +- echo sparc-unknown-linux-${LIBC} ++ echo sparc-${VENDOR}-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-${VENDOR}-linux-gnu +- echo hppa64-unknown-linux-${LIBC} ++ echo hppa64-${VENDOR}-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;; -+ PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;; -+ *) echo hppa-${VENDOR}-linux-gnu ;; +- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; +- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; +- *) echo hppa-unknown-linux-${LIBC} ;; ++ PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;; ++ PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;; ++ *) echo hppa-${VENDOR}-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-${VENDOR}-linux-gnu +- echo powerpc64-unknown-linux-${LIBC} ++ echo powerpc64-${VENDOR}-linux-${LIBC} exit ;; ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-${VENDOR}-linux-gnu +- echo powerpc-unknown-linux-${LIBC} ++ echo powerpc-${VENDOR}-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) +- echo powerpc64le-unknown-linux-${LIBC} ++ echo powerpc64le-${VENDOR}-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) +- echo powerpcle-unknown-linux-${LIBC} ++ echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu -@@ -1011,7 +1021,7 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1033,16 +1043,16 @@ EOF +@@ -1045,16 +1055,16 @@ EOF echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) @@ -330,7 +341,7 @@ exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1062,7 +1072,7 @@ EOF +@@ -1074,7 +1084,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -339,7 +350,7 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1101,7 +1111,7 @@ EOF +@@ -1113,7 +1123,7 @@ EOF if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. @@ -348,7 +359,7 @@ fi exit ;; mini*:CTIX:SYS*5:*) -@@ -1138,19 +1148,19 @@ EOF +@@ -1150,19 +1160,19 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) @@ -372,7 +383,7 @@ exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} -@@ -1200,7 +1210,7 @@ EOF +@@ -1212,7 +1222,7 @@ EOF if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -381,7 +392,7 @@ fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -1216,7 +1226,7 @@ EOF +@@ -1228,7 +1238,7 @@ EOF echo i586-pc-haiku exit ;; x86_64:Haiku:*:*) @@ -390,7 +401,7 @@ exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} -@@ -1297,13 +1307,13 @@ EOF +@@ -1311,13 +1321,13 @@ EOF else UNAME_MACHINE="$cputype" fi @@ -407,7 +418,7 @@ exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 -@@ -1312,16 +1322,16 @@ EOF +@@ -1326,16 +1336,16 @@ EOF echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) @@ -427,7 +438,7 @@ exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1343,7 +1353,7 @@ EOF +@@ -1357,7 +1367,7 @@ EOF echo ${UNAME_MACHINE}-pc-aros exit ;; x86_64:VMkernel:*:*) ++++++ automake-require_file.patch ++++++ --- /var/tmp/diff_new_pack.orSOlk/_old 2013-06-25 17:13:19.000000000 +0200 +++ /var/tmp/diff_new_pack.orSOlk/_new 2013-06-25 17:13:19.000000000 +0200 @@ -1,8 +1,12 @@ +--- + automake.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + Index: automake.in =================================================================== ---- automake.in.orig -+++ automake.in -@@ -7750,12 +7750,14 @@ sub required_file_check_or_copy ($$$) +--- automake.in.orig 2013-06-03 16:18:00.000000000 +0200 ++++ automake.in 2013-06-12 15:04:11.772901297 +0200 +@@ -7489,12 +7489,14 @@ sub required_file_check_or_copy ($$$) my $fullfile = "$dir/$file"; my $found_it = 0; my $dangling_sym = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0