July 2012 - openSUSE Commits - openSUSE Mailing Lists

commit kdepim3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package kdepim3 for openSUSE:Factory checked in at 2012-07-02 10:59:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old) and /work/SRC/openSUSE:Factory/.kdepim3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes 2012-06-05 15:32:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes 2012-07-02 10:59:57.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 30 09:47:09 UTC 2012 - anixx(a)opensuse.org + +- remove unnecessary sync to speed up IMAP (patch from trinity) + +------------------------------------------------------------------- New: ---- kdepim-trinity-remove-unnecessary-sync.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.9lLJXU/_old 2012-07-02 10:59:59.000000000 +0200 +++ /var/tmp/diff_new_pack.9lLJXU/_new 2012-07-02 10:59:59.000000000 +0200 @@ -76,6 +76,7 @@ Patch137: kdepim3-gcc47.patch Patch138: kdepim-trinity-imap-optimize.patch Patch139: kdepim-trinity-imap-segfault.patch +Patch140: kdepim-trinity-remove-unnecessary-sync.patch Provides: cryptplug Obsoletes: cryptplug # authentification plugins can be useful @@ -274,6 +275,7 @@ %patch137 -p1 %patch138 -p1 %patch139 -p1 +%patch140 -p1 . /etc/opt/kde3/common_options update_admin ++++++ kdepim-trinity-remove-unnecessary-sync.patch ++++++ >From 82d4a938ce57d8611e1ef2e26924bb4367483b0c Mon Sep 17 00:00:00 2001 From: Timothy Pearson <kb9vqf(a)pearsoncomputing.net> Date: Sat, 30 Jun 2012 03:41:45 +0000 Subject: Disable unneccesary fsync() in cached IMAP handler --- diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index 72f1113..e7009a2 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -478,7 +478,7 @@ int KMFolderCachedImap::writeUidCache() str << lastUid() << endl; uidcache.flush(); if ( uidcache.status() == IO_Ok ) { - fsync( uidcache.handle() ); /* this is probably overkill */ + // fsync( uidcache.handle() ); /* this is probably overkill */ uidcache.close(); if ( uidcache.status() == IO_Ok ) return 0; -- cgit v0.9.0.2-39-g756e -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:12.2 checked in at 2012-07-02 10:59:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/kdebase4-workspace (Old) and /work/SRC/openSUSE:12.2/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/kdebase4-workspace/kdebase4-workspace.changes 2012-06-25 15:37:17.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-07-02 10:59:41.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 1 20:26:42 UTC 2012 - dap.darkness(a)gmail.com + +- plasma-calendar recommends akonadi-runtime instead of kde4_akonadi_requires +- No supplement of packageand(akonadi-runtime:kdebase4-workspace) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.uPT81D/_old 2012-07-02 10:59:42.000000000 +0200 +++ /var/tmp/diff_new_pack.uPT81D/_new 2012-07-02 10:59:42.000000000 +0200 @@ -292,10 +292,9 @@ %package plasma-calendar Summary: The calendar Plasma engine and applet Group: System/GUI/KDE -Supplements: packageand(akonadi-runtime:kdebase4-workspace) Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_calendar.so Requires: %{name} = %{version} -%kde4_akonadi_requires +Recommends: akonadi-runtime %description plasma-calendar This packages contains the calendar Plasma engine and applet, which are based on Akonadi. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2012-07-02 10:59:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2012-06-12 21:42:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-07-02 10:59:35.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 1 20:26:42 UTC 2012 - dap.darkness(a)gmail.com + +- plasma-calendar recommends akonadi-runtime instead of kde4_akonadi_requires +- No supplement of packageand(akonadi-runtime:kdebase4-workspace) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.Mtgnoc/_old 2012-07-02 10:59:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Mtgnoc/_new 2012-07-02 10:59:38.000000000 +0200 @@ -292,10 +292,9 @@ %package plasma-calendar Summary: The calendar Plasma engine and applet Group: System/GUI/KDE -Supplements: packageand(akonadi-runtime:kdebase4-workspace) Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_calendar.so Requires: %{name} = %{version} -%kde4_akonadi_requires +Recommends: akonadi-runtime %description plasma-calendar This packages contains the calendar Plasma engine and applet, which are based on Akonadi. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit itstool for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package itstool for openSUSE:Factory checked in at 2012-07-02 10:53:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/itstool (Old) and /work/SRC/openSUSE:Factory/.itstool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "itstool", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/itstool/itstool.changes 2012-05-21 08:04:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.itstool.new/itstool.changes 2012-07-02 10:53:59.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jun 27 19:22:43 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.2.0: + + Added new "join mode" for multilingual XML formats. + + Correctly handle ITS version attribute. + + Better handling of multiple localization notes. + + XML path markers are now in dedicated comments. + + Show language code when failing to get translation from PO. + + Added more regression tests. + +------------------------------------------------------------------- Old: ---- itstool-1.1.3.tar.bz2 New: ---- itstool-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ itstool.spec ++++++ --- /var/tmp/diff_new_pack.tgkVpK/_old 2012-07-02 10:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.tgkVpK/_new 2012-07-02 10:54:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: itstool -Version: 1.1.3 +Version: 1.2.0 Release: 0 Summary: Tool to translate XML documents using PO files License: GPL-3.0+ ++++++ itstool-1.1.3.tar.bz2 -> itstool-1.2.0.tar.bz2 ++++++ ++++ 1821 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit intlfonts for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package intlfonts for openSUSE:12.2 checked in at 2012-07-02 10:53:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/intlfonts (Old) and /work/SRC/openSUSE:12.2/.intlfonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "intlfonts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/intlfonts/intlfonts.changes 2012-06-25 15:35:38.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.intlfonts.new/intlfonts.changes 2012-07-02 10:53:12.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jun 30 09:45:08 UTC 2012 - i(a)marguerite.su + +- fix builds for 12.2 + * now bdftopcf is a separated package from xorg-x11. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intlfonts.spec ++++++ --- /var/tmp/diff_new_pack.TeZD06/_old 2012-07-02 10:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.TeZD06/_new 2012-07-02 10:53:12.000000000 +0200 @@ -28,9 +28,13 @@ Source2: fonts.scale.intlfonts-ttf Source3: efont-iso8859-15.tar.bz2 Patch0: intlfonts-1.2.dif -BuildRequires: freetype2 +%if 0%{?suse_version} >= 1220 +BuildRequires: bdftopcf +%else BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel +%endif +BuildRequires: freetype2 %define bitmap_fontdir /usr/share/fonts/misc %define ttf_fontdir /usr/share/fonts/truetype %define type1_fontdir /usr/share/fonts/Type1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit intlfonts for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package intlfonts for openSUSE:Factory checked in at 2012-07-02 10:53:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/intlfonts (Old) and /work/SRC/openSUSE:Factory/.intlfonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "intlfonts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/intlfonts/intlfonts.changes 2012-06-12 21:42:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.intlfonts.new/intlfonts.changes 2012-07-02 10:53:06.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jun 30 09:45:08 UTC 2012 - i(a)marguerite.su + +- fix builds for 12.2 + * now bdftopcf is a separated package from xorg-x11. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intlfonts.spec ++++++ --- /var/tmp/diff_new_pack.wSFaLj/_old 2012-07-02 10:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.wSFaLj/_new 2012-07-02 10:53:08.000000000 +0200 @@ -28,9 +28,13 @@ Source2: fonts.scale.intlfonts-ttf Source3: efont-iso8859-15.tar.bz2 Patch0: intlfonts-1.2.dif -BuildRequires: freetype2 +%if 0%{?suse_version} >= 1220 +BuildRequires: bdftopcf +%else BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel +%endif +BuildRequires: freetype2 %define bitmap_fontdir /usr/share/fonts/misc %define ttf_fontdir /usr/share/fonts/truetype %define type1_fontdir /usr/share/fonts/Type1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit imake for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package imake for openSUSE:12.2 checked in at 2012-07-02 10:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/imake (Old) and /work/SRC/openSUSE:12.2/.imake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "imake", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/imake/imake.changes 2012-06-25 15:35:33.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.imake.new/imake.changes 2012-07-02 10:52:57.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 30 14:24:10 UTC 2012 - i(a)marguerite.su + +- add Requires: xorg-cf-files. + * or every package needs imake will come with a + "Imake.tmpl: no such file or directory" error. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imake.spec ++++++ --- /var/tmp/diff_new_pack.Af28pb/_old 2012-07-02 10:52:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Af28pb/_new 2012-07-02 10:52:58.000000000 +0200 @@ -28,6 +28,8 @@ BuildRequires: pkgconfig(xproto) # This was part of the xorg-x11-util-devel package up to version 7.6 Conflicts: xorg-x11-util-devel <= 7.6 +# For Imake.tmpl, Just in case packagers don't know it's in this package. +Requires: xorg-cf-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %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 imake for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package imake for openSUSE:Factory checked in at 2012-07-02 10:52:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imake (Old) and /work/SRC/openSUSE:Factory/.imake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "imake", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/imake/imake.changes 2012-05-08 11:57:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.imake.new/imake.changes 2012-07-02 10:52:52.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 30 14:24:10 UTC 2012 - i(a)marguerite.su + +- add Requires: xorg-cf-files. + * or every package needs imake will come with a + "Imake.tmpl: no such file or directory" error. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imake.spec ++++++ --- /var/tmp/diff_new_pack.pbVsxO/_old 2012-07-02 10:52:53.000000000 +0200 +++ /var/tmp/diff_new_pack.pbVsxO/_new 2012-07-02 10:52:53.000000000 +0200 @@ -28,6 +28,8 @@ BuildRequires: pkgconfig(xproto) # This was part of the xorg-x11-util-devel package up to version 7.6 Conflicts: xorg-x11-util-devel <= 7.6 +# For Imake.tmpl, Just in case packagers don't know it's in this package. +Requires: xorg-cf-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %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 gnutls for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package gnutls for openSUSE:12.2 checked in at 2012-07-02 10:52:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/gnutls (Old) and /work/SRC/openSUSE:12.2/.gnutls.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnutls", Maintainer is "GJHe(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/gnutls/gnutls.changes 2012-06-25 15:34:26.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.gnutls.new/gnutls.changes 2012-07-02 10:52:28.000000000 +0200 @@ -1,0 +2,40 @@ +Sun Jul 1 20:00:33 UTC 2012 - coolo(a)suse.com + +- merge am-1.12 patches into 1 + +------------------------------------------------------------------- +Sat Jun 30 17:24:48 UTC 2012 - i(a)marguerite.su + +- fix 12.2 builds. + * replace depreciated am_prog_mkdir_p with ac_prog_mkdir_p. + +------------------------------------------------------------------- +Thu Jun 21 08:02:43 UTC 2012 - meissner(a)suse.com + +- Updated to version 3.0.20: + libgnutls: Corrected bug which prevented the parsing of + handshake packets spanning multiple records. + + libgnutls: Check key identifiers when checking for an issuer. + + libgnutls: Added gnutls_pubkey_verify_hash2() + + libgnutls: Added gnutls_certificate_set_x509_system_trust() + that loads the trusted CA certificates from system locations + (e.g. trusted storage in windows and CA bundle files in other systems). + + certtool: Added support for the URI subject alternative + name type in certtool. + + certtool: Increase to 128 the maximum number of distinct options + (e.g. dns_names) allowed. + + gnutls-cli: If --print-cert is given, print the certificate, + even on verification failure. + + ** API and ABI modifications: + gnutls_pk_to_sign: Added + gnutls_pubkey_verify_hash2: Added + gnutls_certificate_set_x509_system_trust: Added + +------------------------------------------------------------------- Old: ---- gnutls-3.0.19.tar.xz gnutls-introduce-gnutls_certificate_set_x509_system_trust.diff New: ---- gnutls-3.0.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnutls.spec ++++++ --- /var/tmp/diff_new_pack.bdWqqO/_old 2012-07-02 10:52:29.000000000 +0200 +++ /var/tmp/diff_new_pack.bdWqqO/_new 2012-07-02 10:52:29.000000000 +0200 @@ -21,7 +21,7 @@ %define gnutls_ossl_sover 27 Name: gnutls -Version: 3.0.19 +Version: 3.0.20 Release: 0 Summary: The GNU Transport Layer Security Library License: LGPL-3.0+ ; GPL-3.0+ @@ -29,9 +29,6 @@ Url: http://www.gnutls.org/ Source0: http://ftp.gnu.org/gnu/gnutls/%{name}-%{version}.tar.xz Source1: baselibs.conf -# upstream, will be officially available in some future gnutls -# version and can be removed then -- lnussel -Patch0: gnutls-introduce-gnutls_certificate_set_x509_system_trust.diff # suse specific, add support for certificate directories -- lnussel Patch1: gnutls-implement-trust-store-dir.diff Patch2: automake-1.12.patch @@ -126,7 +123,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 echo %{_includedir}/%{name}/abstract.h ++++++ automake-1.12.patch ++++++ --- /var/tmp/diff_new_pack.bdWqqO/_old 2012-07-02 10:52:29.000000000 +0200 +++ /var/tmp/diff_new_pack.bdWqqO/_new 2012-07-02 10:52:29.000000000 +0200 @@ -1,7 +1,7 @@ -Index: gnutls-3.0.19/configure.ac +Index: gnutls-3.0.20/configure.ac =================================================================== ---- gnutls-3.0.19.orig/configure.ac -+++ gnutls-3.0.19/configure.ac +--- gnutls-3.0.20.orig/configure.ac 2012-07-01 21:50:17.000000000 +0200 ++++ gnutls-3.0.20/configure.ac 2012-07-01 21:50:17.977499968 +0200 @@ -37,6 +37,7 @@ dnl Checks for programs. AC_PROG_CC AM_PROG_AS @@ -10,3 +10,55 @@ gl_EARLY # For includes/gnutls/gnutls.h.in. +Index: gnutls-3.0.20/aclocal.m4 +=================================================================== +--- gnutls-3.0.20.orig/aclocal.m4 2012-06-05 19:10:14.000000000 +0200 ++++ gnutls-3.0.20/aclocal.m4 2012-07-01 21:53:42.821893323 +0200 +@@ -529,7 +529,7 @@ AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) + AC_REQUIRE([AM_PROG_INSTALL_SH])dnl + AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + AC_REQUIRE([AC_PROG_AWK])dnl +@@ -773,10 +773,10 @@ fi + + # serial 1 + +-# AM_PROG_MKDIR_P ++# AC_PROG_MKDIR_P + # --------------- + # Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], ++AC_DEFUN([AC_PROG_MKDIR_P], + [AC_PREREQ([2.60])dnl + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +Index: gnutls-3.0.20/gl/m4/gnulib-common.m4 +=================================================================== +--- gnutls-3.0.20.orig/gl/m4/gnulib-common.m4 2012-06-05 19:07:51.000000000 +0200 ++++ gnutls-3.0.20/gl/m4/gnulib-common.m4 2012-07-01 21:53:42.821893323 +0200 +@@ -301,7 +301,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [ + AC_SUBST([MKDIR_P])])], [ + dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P. + AC_DEFUN_ONCE([AC_PROG_MKDIR_P], +- [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake ++ [AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake + MKDIR_P='$(mkdir_p)' + AC_SUBST([MKDIR_P])])]) + +Index: gnutls-3.0.20/m4/po.m4 +=================================================================== +--- gnutls-3.0.20.orig/m4/po.m4 2011-11-08 22:07:12.000000000 +0100 ++++ gnutls-3.0.20/m4/po.m4 2012-07-01 21:53:42.822893277 +0200 +@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], + [ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake ++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AM_NLS])dnl + + dnl Release version of the gettext macros. This is used to ensure that ++++++ gnutls-implement-trust-store-dir.diff ++++++ --- /var/tmp/diff_new_pack.bdWqqO/_old 2012-07-02 10:52:29.000000000 +0200 +++ /var/tmp/diff_new_pack.bdWqqO/_new 2012-07-02 10:52:29.000000000 +0200 @@ -1,26 +1,30 @@ -From 513244e20eb057b37edfe326c164935758772a0f Mon Sep 17 00:00:00 2001 +From a6cef9220ae251e3b8f8d663c5fa7f888e3176d8 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Tue, 8 May 2012 15:47:02 +0200 Subject: [PATCH gnutls] implement trust store dir --- configure.ac | 18 ++++++++++++- - lib/gnutls_x509.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 89 insertions(+), 1 deletions(-) + lib/gnutls_x509.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 90 insertions(+), 2 deletions(-) -Index: gnutls-3.0.19/configure.ac -=================================================================== ---- gnutls-3.0.19.orig/configure.ac -+++ gnutls-3.0.19/configure.ac -@@ -296,13 +296,23 @@ AC_ARG_WITH([default-trust-store-file], +diff --git a/configure.ac b/configure.ac +index f826704..d099e05 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -296,17 +296,27 @@ AC_ARG_WITH([default-trust-store-file], [AS_HELP_STRING([--with-default-trust-store-file=FILE], [use the given file default trust store])]) --if test "x$with_default_trust_store_pkcs11" = x -a "x$with_default_trust_store_file" = x; then +AC_ARG_WITH([default-trust-store-dir], + [AS_HELP_STRING([--with-default-trust-store-dir=DIR], + [use the given directory default trust store])]) + + AC_ARG_WITH([default-crl-file], + [AS_HELP_STRING([--with-default-crl-file=FILE], + [use the given CRL file as default])]) + +-if test "x$with_default_trust_store_pkcs11" = x -a "x$with_default_trust_store_file" = x; then +if test "x$with_default_trust_store_pkcs11" = x -a "x$with_default_trust_store_file" = x \ + -a "x$with_default_trust_store_dir" = x; then # auto detect http://lists.gnu.org/archive/html/help-gnutls/2012-05/msg00004.html @@ -37,7 +41,7 @@ if test -e $i; then with_default_trust_store_file="$i" break -@@ -315,6 +325,11 @@ if test "x$with_default_trust_store_file +@@ -319,6 +329,11 @@ if test "x$with_default_trust_store_file" != x; then ["$with_default_trust_store_file"], [use the given file default trust store]) fi @@ -46,21 +50,21 @@ + ["$with_default_trust_store_dir"], [use the given directory default trust store]) +fi + - dnl Guile bindings. - opt_guile_bindings=yes - AC_MSG_CHECKING([whether building Guile bindings]) -@@ -550,6 +565,7 @@ if features are disabled) - Anon auth support:$ac_enable_anon + if test "x$with_default_crl_file" != x; then + AC_DEFINE_UNQUOTED([DEFAULT_CRL_FILE], + ["$with_default_crl_file"], [use the given CRL file]) +@@ -560,6 +575,7 @@ if features are disabled) + Trust store pkcs: $with_default_trust_store_pkcs11 Trust store file: $with_default_trust_store_file + Trust store dir: $with_default_trust_store_dir + CRL file: $with_default_crl_file ]) - AC_MSG_NOTICE([Optional applications: -Index: gnutls-3.0.19/lib/gnutls_x509.c -=================================================================== ---- gnutls-3.0.19.orig/lib/gnutls_x509.c -+++ gnutls-3.0.19/lib/gnutls_x509.c +diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c +index 71e0d69..87eaa0c 100644 +--- a/lib/gnutls_x509.c ++++ b/lib/gnutls_x509.c @@ -36,6 +36,7 @@ #include <gnutls_pk.h> #include <gnutls_str.h> @@ -69,7 +73,7 @@ #include <x509_b64.h> #include <gnutls_x509.h> #include "x509/common.h" -@@ -1618,6 +1619,72 @@ _gnutls_certificate_set_x509_system_trus +@@ -1692,6 +1693,72 @@ set_x509_system_trust_file (gnutls_certificate_credentials_t cred) } #endif @@ -142,10 +146,19 @@ /** * gnutls_certificate_set_x509_system_trust: * @cred: is a #gnutls_certificate_credentials_t structure. -@@ -1640,6 +1707,11 @@ gnutls_certificate_set_x509_system_trust - if (ret > 0) +@@ -1710,7 +1777,7 @@ set_x509_system_trust_file (gnutls_certificate_credentials_t cred) + int + gnutls_certificate_set_x509_system_trust (gnutls_certificate_credentials_t cred) + { +-#if !defined(_WIN32) && !defined(DEFAULT_TRUST_STORE_PKCS11) && !defined(DEFAULT_TRUST_STORE_FILE) ++#if !defined(_WIN32) && !defined(DEFAULT_TRUST_STORE_PKCS11) && !defined(DEFAULT_TRUST_STORE_FILE) && !defined(DEFAULT_TRUST_STORE_DIR) + int r = GNUTLS_E_UNIMPLEMENTED_FEATURE; + #else + int ret, r = 0; +@@ -1728,6 +1795,11 @@ gnutls_certificate_set_x509_system_trust (gnutls_certificate_credentials_t cred) r += ret; #endif + +#ifdef DEFAULT_TRUST_STORE_DIR + ret = _gnutls_certificate_set_x509_system_trust_dir(cred); + if (ret > 0) @@ -154,3 +167,6 @@ return r; } +-- +1.7.7 + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnutls for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package gnutls for openSUSE:Factory checked in at 2012-07-02 10:52:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnutls (Old) and /work/SRC/openSUSE:Factory/.gnutls.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnutls", Maintainer is "GJHe(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gnutls/gnutls.changes 2012-06-25 14:08:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnutls.new/gnutls.changes 2012-07-02 10:52:24.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Jul 1 20:00:33 UTC 2012 - coolo(a)suse.com + +- merge am-1.12 patches into 1 + +------------------------------------------------------------------- +Sat Jun 30 17:24:48 UTC 2012 - i(a)marguerite.su + +- fix 12.2 builds. + * replace depreciated am_prog_mkdir_p with ac_prog_mkdir_p. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automake-1.12.patch ++++++ --- /var/tmp/diff_new_pack.UjA5df/_old 2012-07-02 10:52:26.000000000 +0200 +++ /var/tmp/diff_new_pack.UjA5df/_new 2012-07-02 10:52:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: gnutls-3.0.19/configure.ac +Index: gnutls-3.0.20/configure.ac =================================================================== ---- gnutls-3.0.19.orig/configure.ac -+++ gnutls-3.0.19/configure.ac +--- gnutls-3.0.20.orig/configure.ac 2012-07-01 21:50:17.000000000 +0200 ++++ gnutls-3.0.20/configure.ac 2012-07-01 21:50:17.977499968 +0200 @@ -37,6 +37,7 @@ dnl Checks for programs. AC_PROG_CC AM_PROG_AS @@ -10,3 +10,55 @@ gl_EARLY # For includes/gnutls/gnutls.h.in. +Index: gnutls-3.0.20/aclocal.m4 +=================================================================== +--- gnutls-3.0.20.orig/aclocal.m4 2012-06-05 19:10:14.000000000 +0200 ++++ gnutls-3.0.20/aclocal.m4 2012-07-01 21:53:42.821893323 +0200 +@@ -529,7 +529,7 @@ AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) + AC_REQUIRE([AM_PROG_INSTALL_SH])dnl + AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + AC_REQUIRE([AC_PROG_AWK])dnl +@@ -773,10 +773,10 @@ fi + + # serial 1 + +-# AM_PROG_MKDIR_P ++# AC_PROG_MKDIR_P + # --------------- + # Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], ++AC_DEFUN([AC_PROG_MKDIR_P], + [AC_PREREQ([2.60])dnl + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +Index: gnutls-3.0.20/gl/m4/gnulib-common.m4 +=================================================================== +--- gnutls-3.0.20.orig/gl/m4/gnulib-common.m4 2012-06-05 19:07:51.000000000 +0200 ++++ gnutls-3.0.20/gl/m4/gnulib-common.m4 2012-07-01 21:53:42.821893323 +0200 +@@ -301,7 +301,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [ + AC_SUBST([MKDIR_P])])], [ + dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P. + AC_DEFUN_ONCE([AC_PROG_MKDIR_P], +- [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake ++ [AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake + MKDIR_P='$(mkdir_p)' + AC_SUBST([MKDIR_P])])]) + +Index: gnutls-3.0.20/m4/po.m4 +=================================================================== +--- gnutls-3.0.20.orig/m4/po.m4 2011-11-08 22:07:12.000000000 +0100 ++++ gnutls-3.0.20/m4/po.m4 2012-07-01 21:53:42.822893277 +0200 +@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], + [ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake ++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AM_NLS])dnl + + dnl Release version of the gettext macros. This is used to ensure that -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0