Hello community, here is the log from the commit of package seahorse checked in at Thu Jan 10 03:29:15 CET 2008. -------- --- GNOME/seahorse/seahorse.changes 2007-12-14 20:29:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/seahorse/seahorse.changes 2008-01-10 01:06:08.680135000 +0100 @@ -1,0 +2,14 @@ +Wed Jan 9 23:41:39 CET 2008 - maw@suse.de + +- Update to 2.21.4: + + Remove ssh proxy since gnome-keyring now has a proper ssh agent + + Don't hardcode epiphany extensions directories + + Improved gnome-keyring integration + + UI and HIG improvements + + Disable automatic key uploading/retrieval by default + + Minor fixes +- Remove seahorse-desktop.patch because it has been upstreamed +- Actually remove seahorse-gpgme-version.patch +- Add seahorse-strncat.patch and seahorse-xsltproc-nonet.patch. + +------------------------------------------------------------------- Old: ---- seahorse-2.20.1.tar.bz2 seahorse-desktop.patch seahorse-gpgme-version.patch New: ---- seahorse-2.21.4.tar.bz2 seahorse-strncat.patch seahorse-xsltproc-nonet.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seahorse.spec ++++++ --- /var/tmp/diff_new_pack.Op1291/_old 2008-01-10 03:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Op1291/_new 2008-01-10 03:28:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package seahorse (Version 2.20.1) +# spec file for package seahorse (Version 2.21.4) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -16,14 +16,14 @@ Group: System/GUI/GNOME AutoReqProv: on PreReq: gconf2 -Version: 2.20.1 +Version: 2.21.4 Release: 1 Requires: %{name}-lang = %{version} Summary: GNOME2 interface for gnupg Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 -Patch0: %{name}-gpgme-version.patch -# PATCH-FIX-UPSTREAM seahorse-abuild-warnings.patch bgo503648 -Patch1: seahorse-desktop.patch +# Patch0: %{name}-gpgme-version.patch +Patch0: seahorse-strncat.patch +Patch1: seahorse-xsltproc-nonet.patch Url: http://seahorse.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -122,7 +122,7 @@ %files -f %{name}.lst %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS ChangeLog NEWS README %defattr (-, root, root) %{_prefix}/bin/* %dir %{_libdir}/seahorse @@ -156,6 +156,17 @@ %{_includedir}/libcryptui/*.h %changelog +* Wed Jan 09 2008 - maw@suse.de +- Update to 2.21.4: + + Remove ssh proxy since gnome-keyring now has a proper ssh agent + + Don't hardcode epiphany extensions directories + + Improved gnome-keyring integration + + UI and HIG improvements + + Disable automatic key uploading/retrieval by default + + Minor fixes +- Remove seahorse-desktop.patch because it has been upstreamed +- Actually remove seahorse-gpgme-version.patch +- Add seahorse-strncat.patch and seahorse-xsltproc-nonet.patch. * Fri Dec 14 2007 - jpr@suse.de - Update to 2.20.1 * Fix selection of archive names when encrypting. ++++++ seahorse-2.20.1.tar.bz2 -> seahorse-2.21.4.tar.bz2 ++++++ ++++ 23071 lines of diff (skipped) ++++++ seahorse-strncat.patch ++++++ === modified file 'libseahorse/seahorse-ssh-key-data.c' --- libseahorse/seahorse-ssh-key-data.c 2008-01-09 22:52:51 +0000 +++ libseahorse/seahorse-ssh-key-data.c 2008-01-09 23:34:20 +0000 @@ -90,7 +90,7 @@ for (i = 0; i < MD5_LEN; i++) { char hex[4]; snprintf (hex, sizeof (hex), "%02x:", (int)(digest[i])); - strncat (fingerprint, hex, MD5_LEN * 3 + 1); + strncat (fingerprint, hex, strlen(fingerprint) - (MD5_LEN * 3 + 1) - 1); } /* Remove the trailing ':' character */ ++++++ seahorse-xsltproc-nonet.patch ++++++ diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make index a5279cc..13a27e9 100644 --- a/gnome-doc-utils.make +++ b/gnome-doc-utils.make @@ -23,6 +23,8 @@ ################################################################################ ## @@ Generating Header Files +XSLTPROC=xsltproc --nonet + ## @ DOC_H_FILE ## The name of the header file to generate DOC_H_FILE ?= @@ -37,7 +39,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); list='$(DOC_H_DOCS)'; for doc in $$list; do \ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ - xsltproc --path "$$xmlpath" $(_credits) $$doc; \ + $(XSLTPROC) --path "$$xmlpath" $(_credits) $$doc; \ done | sort | uniq \ | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp @@ -50,7 +52,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ echo $$xmlpath; \ - ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ + ids=`$(XSLTPROC) --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ for id in $$ids; do \ echo '#define HELP_'`echo $$docid`'_'`echo $$id \ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ @@ -170,7 +172,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(XSLTPROC) -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_HTML ## The OMF files for HTML output @@ -185,7 +187,7 @@ if ENABLE_SK echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } endif - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(XSLTPROC) -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_ALL ## All OMF output files to be built @@ -235,7 +237,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES), \ ## All HTML documentation in the C locale # FIXME: probably have to shell escape to determine the file names _DOC_C_HTML = $(foreach f, \ - $(shell xsltproc --xinclude \ + $(shell $(XSLTPROC) --xinclude \ --stringparam db.chunk.basename "$(DOC_MODULE)" \ $(_chunks) "C/$(DOC_MODULE).xml"), \ C/$(f).xhtml) @@ -343,7 +345,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(XSLTPROC) -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org