June 2013 - openSUSE Commits - openSUSE Mailing Lists

commit taglib 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 taglib for openSUSE:Factory checked in at 2013-06-25 09:36:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/taglib (Old) and /work/SRC/openSUSE:Factory/.taglib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "taglib" Changes: -------- --- /work/SRC/openSUSE:Factory/taglib/taglib.changes 2013-06-13 22:42:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.taglib.new/taglib.changes 2013-06-25 14:46:42.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 21 17:45:11 UTC 2013 - jslaby(a)suse.com + +- Added-check-if-file-is-open-before-attempting-to-rea.patch: Added + check if file is open before attempting to read tags (bnc#826228) +- Fixed Urls in .spec + +------------------------------------------------------------------- New: ---- Added-check-if-file-is-open-before-attempting-to-rea.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ taglib.spec ++++++ --- /var/tmp/diff_new_pack.OM1C9a/_old 2013-06-25 14:46:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OM1C9a/_new 2013-06-25 14:46:43.000000000 +0200 @@ -22,8 +22,8 @@ Summary: Audio Meta-Data Library License: LGPL-2.1+ and MPL-1.1 Group: Productivity/Multimedia/Other -Url: http://ktown.kde.org/~wheeler/taglib/ -Source0: https://github.com/downloads/taglib/taglib/%{name}-%{version}.tar.gz +Url: http://taglib.github.io/ +Source0: http://taglib.github.io/releases/taglib-%{version}.tar.gz Source1: %{name}.desktop Source100: baselibs.conf # This patch is to fix bnc#814814. @@ -33,6 +33,8 @@ Patch2: taglib-1.8-version_fix.patch # Get example executables to build without rpath Patch3: taglib-1.8-strip-rpath.patch +# PATCH-FIX-UPSTREAM Added-check-if-file-is-open-before-attempting-to-rea.patch +Patch4: Added-check-if-file-is-open-before-attempting-to-rea.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen @@ -108,6 +110,7 @@ %patch1 -p1 %patch2 -p1 %patch3 +%patch4 -p1 %build mkdir build ++++++ Added-check-if-file-is-open-before-attempting-to-rea.patch ++++++ From: gonemad <gonemad(a)gmail.com> Date: Thu, 11 Oct 2012 21:20:03 -0400 Subject: Added check if file is open before attempting to read tags Patch-mainline: yes References: bnc#826228 Signed-off-by: Jiri Slaby <jirislaby(a)gmail.com> --- taglib/ape/apefile.cpp | 6 ++++-- taglib/asf/asffile.cpp | 6 ++++-- taglib/flac/flacfile.cpp | 9 ++++++--- taglib/it/itfile.cpp | 6 ++++-- taglib/mod/modfile.cpp | 6 ++++-- taglib/mp4/mp4file.cpp | 6 ++++-- taglib/mpc/mpcfile.cpp | 6 ++++-- taglib/ogg/flac/oggflacfile.cpp | 6 ++++-- taglib/ogg/speex/speexfile.cpp | 6 ++++-- taglib/ogg/vorbis/vorbisfile.cpp | 6 ++++-- taglib/s3m/s3mfile.cpp | 6 ++++-- taglib/wavpack/wavpackfile.cpp | 6 ++++-- taglib/xm/xmfile.cpp | 6 ++++-- 13 files changed, 54 insertions(+), 27 deletions(-) diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp index cb65224..bf6491f 100644 --- a/taglib/ape/apefile.cpp +++ b/taglib/ape/apefile.cpp @@ -90,14 +90,16 @@ APE::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) : TagLib::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } APE::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) : TagLib::File(stream) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } APE::File::~File() diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp index 455631f..6a3155a 100644 --- a/taglib/asf/asffile.cpp +++ b/taglib/asf/asffile.cpp @@ -372,14 +372,16 @@ ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle proper : TagLib::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) : TagLib::File(stream) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } ASF::File::~File() diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp index c85d959..291c42d 100644 --- a/taglib/flac/flacfile.cpp +++ b/taglib/flac/flacfile.cpp @@ -109,7 +109,8 @@ FLAC::File::File(FileName file, bool readProperties, TagLib::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory, @@ -118,7 +119,8 @@ FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory, { d = new FilePrivate; d->ID3v2FrameFactory = frameFactory; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory, @@ -127,7 +129,8 @@ FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory, { d = new FilePrivate; d->ID3v2FrameFactory = frameFactory; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } FLAC::File::~File() diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp index 4e04951..4807b9a 100644 --- a/taglib/it/itfile.cpp +++ b/taglib/it/itfile.cpp @@ -45,7 +45,8 @@ IT::File::File(FileName file, bool readProperties, Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } IT::File::File(IOStream *stream, bool readProperties, @@ -53,7 +54,8 @@ IT::File::File(IOStream *stream, bool readProperties, Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } IT::File::~File() diff --git a/taglib/mod/modfile.cpp b/taglib/mod/modfile.cpp index 25fc871..8700ca7 100644 --- a/taglib/mod/modfile.cpp +++ b/taglib/mod/modfile.cpp @@ -45,7 +45,8 @@ Mod::File::File(FileName file, bool readProperties, Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } Mod::File::File(IOStream *stream, bool readProperties, @@ -53,7 +54,8 @@ Mod::File::File(IOStream *stream, bool readProperties, Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } Mod::File::~File() diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp index 0218557..6f7e48e 100644 --- a/taglib/mp4/mp4file.cpp +++ b/taglib/mp4/mp4file.cpp @@ -67,14 +67,16 @@ MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle a : TagLib::File(file) { d = new FilePrivate; - read(readProperties, audioPropertiesStyle); + if(isOpen()) + read(readProperties, audioPropertiesStyle); } MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle audioPropertiesStyle) : TagLib::File(stream) { d = new FilePrivate; - read(readProperties, audioPropertiesStyle); + if(isOpen()) + read(readProperties, audioPropertiesStyle); } MP4::File::~File() diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp index 519a046..7734eae 100644 --- a/taglib/mpc/mpcfile.cpp +++ b/taglib/mpc/mpcfile.cpp @@ -94,14 +94,16 @@ MPC::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) : TagLib::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } MPC::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) : TagLib::File(stream) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } MPC::File::~File() diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp index 9d9c303..e523f27 100644 --- a/taglib/ogg/flac/oggflacfile.cpp +++ b/taglib/ogg/flac/oggflacfile.cpp @@ -72,14 +72,16 @@ Ogg::FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) : Ogg::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } Ogg::FLAC::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) : Ogg::File(stream) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } Ogg::FLAC::File::~File() diff --git a/taglib/ogg/speex/speexfile.cpp b/taglib/ogg/speex/speexfile.cpp index 3a4940a..58f6756 100644 --- a/taglib/ogg/speex/speexfile.cpp +++ b/taglib/ogg/speex/speexfile.cpp @@ -62,14 +62,16 @@ Speex::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) : Ogg::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } Speex::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) : Ogg::File(stream) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } Speex::File::~File() diff --git a/taglib/ogg/vorbis/vorbisfile.cpp b/taglib/ogg/vorbis/vorbisfile.cpp index e2eed9e..a6753f5 100644 --- a/taglib/ogg/vorbis/vorbisfile.cpp +++ b/taglib/ogg/vorbis/vorbisfile.cpp @@ -67,14 +67,16 @@ Vorbis::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) : Ogg::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } Vorbis::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) : Ogg::File(stream) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } Vorbis::File::~File() diff --git a/taglib/s3m/s3mfile.cpp b/taglib/s3m/s3mfile.cpp index 7ffdf91..1afe362 100644 --- a/taglib/s3m/s3mfile.cpp +++ b/taglib/s3m/s3mfile.cpp @@ -47,7 +47,8 @@ S3M::File::File(FileName file, bool readProperties, Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } S3M::File::File(IOStream *stream, bool readProperties, @@ -55,7 +56,8 @@ S3M::File::File(IOStream *stream, bool readProperties, Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } S3M::File::~File() diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp index 49f7923..ea5a8f8 100644 --- a/taglib/wavpack/wavpackfile.cpp +++ b/taglib/wavpack/wavpackfile.cpp @@ -86,14 +86,16 @@ WavPack::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) : TagLib::File(file) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } WavPack::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) : TagLib::File(stream) { d = new FilePrivate; - read(readProperties, propertiesStyle); + if(isOpen()) + read(readProperties, propertiesStyle); } WavPack::File::~File() diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp index c311a06..a0890c8 100644 --- a/taglib/xm/xmfile.cpp +++ b/taglib/xm/xmfile.cpp @@ -359,7 +359,8 @@ XM::File::File(FileName file, bool readProperties, Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } XM::File::File(IOStream *stream, bool readProperties, @@ -367,7 +368,8 @@ XM::File::File(IOStream *stream, bool readProperties, Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) { - read(readProperties); + if(isOpen()) + read(readProperties); } XM::File::~File() -- 1.8.3.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit subversion 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 subversion for openSUSE:Factory checked in at 2013-06-25 09:35:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion (Old) and /work/SRC/openSUSE:Factory/.subversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "subversion" Changes: -------- --- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2013-06-19 15:54:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes 2013-06-25 14:46:37.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 21 20:30:57 UTC 2013 - andreas.stieger(a)gmx.de + +- require krb5-devel to fix factory build +- remove unrequired BuildIgnore +- update keyring +- change swig tarball to pristine upstream file + +------------------------------------------------------------------- Old: ---- swig-1.3.36.tar.bz2 New: ---- swig-1.3.36.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.S2phR0/_old 2013-06-25 14:46:38.000000000 +0200 +++ /var/tmp/diff_new_pack.S2phR0/_new 2013-06-25 14:46:38.000000000 +0200 @@ -56,6 +56,7 @@ BuildRequires: db-devel BuildRequires: file-devel BuildRequires: gcc-c++ +BuildRequires: krb5-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -115,14 +116,6 @@ %else %define with_java 0 %endif -%if 0%{?suse_version} >= 1230 -# fix "have choice for libjpeg-devel needed by libmng-devel: libjpeg62-devel libjpeg8-devel" -#!BuildIgnore: libjpeg62-devel -%endif -%if 0%{?suse_version} >= 1310 -# fix unresolvable: conflict for provider of krb5 = 1.11.3 needed by krb5-devel, (provider krb5 is conflicted by installed krb5-mini) -#!BuildIgnore: krb5-mini -%endif %if %{with regression_tests} # svnserveautocheck.sh davautocheck.sh requirements BuildRequires: net-tools @@ -175,8 +168,7 @@ BuildRequires: gpg-offline %endif %if %with_intree_swig -# http://ovh.dl.sourceforge.net/project/swig/swig/swig-%{swig_version}/swig-%… -Source90: swig-%{swig_version}.tar.bz2 +Source90: http://sourceforge.net/projects/swig/files/swig/swig-%{swig_version}/swig-%… %else BuildRequires: swig %endif ++++++ subversion.keyring ++++++ ++++ 7257 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/subversion/subversion.keyring ++++ and /work/SRC/openSUSE:Factory/.subversion.new/subversion.keyring -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit storeBackup 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 storeBackup for openSUSE:Factory checked in at 2013-06-25 09:35:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/storeBackup (Old) and /work/SRC/openSUSE:Factory/.storeBackup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "storeBackup" Changes: -------- --- /work/SRC/openSUSE:Factory/storeBackup/storeBackup.changes 2013-03-26 16:00:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.storeBackup.new/storeBackup.changes 2013-06-25 14:46:35.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 16 10:24:35 UTC 2013 - suse(a)bugs.jan.ritzerfeld.org + +- Update to 3.3.1: + * rewritten storeBackupMount.pl, options have changed + * easy compression rule, --checkCompr (-C) on the command line + +------------------------------------------------------------------- Old: ---- storeBackup-3.3.config.default storeBackup-3.3.diff storeBackup-3.3.tar.bz2 New: ---- storeBackup-3.3.1.config.default storeBackup-3.3.1.diff storeBackup-3.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ storeBackup.spec ++++++ --- /var/tmp/diff_new_pack.HAyhUk/_old 2013-06-25 14:46:35.000000000 +0200 +++ /var/tmp/diff_new_pack.HAyhUk/_new 2013-06-25 14:46:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: storeBackup -Version: 3.3 +Version: 3.3.1 Release: 0 Summary: A disk-to-disk backup tool for Linux License: GPL-3.0+ ++++++ storeBackup-3.3.config.default -> storeBackup-3.3.1.config.default ++++++ --- /work/SRC/openSUSE:Factory/storeBackup/storeBackup-3.3.config.default 2013-03-26 16:00:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.storeBackup.new/storeBackup-3.3.1.config.default 2013-06-25 14:46:34.000000000 +0200 @@ -1,5 +1,5 @@ # configuration file for storeBackup.pl -# Generated by storeBackup.pl, 3.3 +# Generated by storeBackup.pl, 3.3.1 ### explanations ### @@ -172,6 +172,9 @@ # use_IOCompressBzip2 (suppresses the warning that you should # instal perl module IO::Compress::Bzip2 # for better performance) +# noBackupForPeriod (suppresses warnings that there are +# no backups for certain periods when using +# option keepRelative) # This option can be repeated multiple times on the command line. # Example usage in conf file: # suppressWarning = excDir fileChange crSeries hashCollision @@ -336,7 +339,7 @@ # do not compress files with the following # suffix (uppercase included): # (if you set this to '.*', no files will be compressed) -# Default is \.zip \.bz2 \.gz \.tgz \.jpg \.gif \.tiff? \.mpeg \.mpe?g \.mpe?[34] \.ogg \.gpg \.png \.lzma \.xz \.mov +# Default is \.zip \.bz2 \.gz \.tgz \.jpg \.gif \.tiff? \.mpe?g \.mp[34] \.mpe?[34] \.ogg \.gpg \.png \.lzma \.xz \.mov ;exceptSuffix= # like --exceptSuffix, but do not replace defaults, add ++++++ storeBackup-3.3.diff -> storeBackup-3.3.1.diff ++++++ ++++++ storeBackup-3.3.tar.bz2 -> storeBackup-3.3.1.tar.bz2 ++++++ ++++ 5358 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 sleuthkit 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 sleuthkit for openSUSE:Factory checked in at 2013-06-25 07:39:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sleuthkit (Old) and /work/SRC/openSUSE:Factory/.sleuthkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sleuthkit" Changes: -------- --- /work/SRC/openSUSE:Factory/sleuthkit/sleuthkit.changes 2013-03-10 09:12:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sleuthkit.new/sleuthkit.changes 2013-06-25 14:46:27.000000000 +0200 @@ -0,0 +1,29 @@ +Sat Jun 22 02:46:38 UTC 2013 - Greg.Freemyer(a)gmail.com + +- upgrade to 4.1.0 + * New Features in Core: + Added YAFFS2 support (patch from viaForensics). + Added Ext4 support (patch from kfairbanks) + + * Framework: + Added Linux and MAC support. + Added L01 support. + Added APIs to find files by name, path and extension. + Removed deprecated TskFile::getAttributes methods. + moved code around for AutoBuild tool support. + + * Java Bindings: + added DerivedFile datamodel support + added a public method to Content to add ability to close() its tsk handle before the object is gc'd + added faster skip() and random seek support to ReadContentInputStream + refactored datamodel by pushing common methods up to AbstractFile + fixed minor memory leaks + improved regression testing framework for java bindings datamodel + +- rm fiwalk patch, now in upstream +- add crc.c patch, now in upstream git repo +- sortr renamed sorter by upstream +- upstream improved soname handling, reflect improvements +- add the java bindings to sleuthkit-devel (Packaging not well tested) +- resolves BNC#815061 + Old: ---- sleuthkit-4.0.2-UPSTREAM-fiwalk.patch sleuthkit-4.0.2.tar.gz New: ---- sleuthkit-4.1.0-UPSTREAM-crc.patch sleuthkit-4.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sleuthkit.spec ++++++ --- /var/tmp/diff_new_pack.IVV9Qx/_old 2013-06-25 14:46:28.000000000 +0200 +++ /var/tmp/diff_new_pack.IVV9Qx/_new 2013-06-25 14:46:28.000000000 +0200 @@ -16,18 +16,18 @@ # -%define sosuffix -9 +%define sosuffix 10 Name: sleuthkit -Version: 4.0.2 +Version: 4.1.0 Release: 0 Summary: The Sleuth Kit (TSK): tools for file system and volume forensic analysis License: CPL-1.0 and IPL-1.0 and GPL-2.0+ Group: System/Monitoring Url: http://www.sleuthkit.org/ Source0: http://downloads.sourceforge.net/sleuthkit/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM sleuthkit-4.0.2-UPSTREAM-fiwalk.patch -- fix for "fiwalk -m" to work -Patch0: sleuthkit-4.0.2-UPSTREAM-fiwalk.patch +# PATCH-FIX-UPSTREAM sleuthkit-4.1.0-UPSTREAM-crc.patch -- remove unused code that fails to compile +Patch0: sleuthkit-4.1.0-UPSTREAM-crc.patch BuildRequires: gcc-c++ BuildRequires: libopenssl-devel BuildRequires: zlib-devel @@ -41,11 +41,11 @@ BuildRequires: libewf-devel Requires: file -Requires: libtsk3%sosuffix = %{version} +Requires: libtsk%sosuffix = %{version} Requires: mac-robber # fiwalk has been incorporated into sleuthkit. Last standalone version was 0.6.16 Obsoletes: fiwalk <= 0.6.16 -Provides: fiwalk +Provides: fiwalk-%version %description The Sleuth Kit (TSK) is a collection of UNIX-based command line tools that @@ -53,17 +53,19 @@ file and volume systems and TSK supports FAT, Ext2/3, NTFS, UFS, and ISO 9660 file systems -%package -n libtsk3%sosuffix +%package -n libtsk%sosuffix Summary: Library for %{name} Group: System/Libraries -%description -n libtsk3%sosuffix -The libtsk3%sosuffix package contains library for %{name}. +%description -n libtsk%sosuffix +The libtsk%sosuffix package contains library for %{name}. + +The name of the library was changed from libtsk3 to libtsk %package devel Summary: Development files for %{name} Group: Development/Libraries/Other -Requires: libtsk3%sosuffix = %{version} +Requires: libtsk%sosuffix = %{version} %description devel The %{name}-devel package contains libraries and header files for @@ -98,10 +100,12 @@ %make_install INSTALL="install -p" %endif find %{buildroot} -name '*.la' -exec rm -f {} ';' +mkdir -p %{buildroot}/%{_datadir}/sleuthkit +cp --archive bindings %{buildroot}/%{_datadir}/sleuthkit/bindings -%post -n libtsk3%sosuffix -p /sbin/ldconfig +%post -n libtsk%sosuffix -p /sbin/ldconfig -%postun -n libtsk3%sosuffix -p /sbin/ldconfig +%postun -n libtsk%sosuffix -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -164,8 +168,8 @@ %{_mandir}/man1/mmstat.1* %{_mandir}/man1/sigfind.1* %{_mandir}/man1/sorter.1* -%dir %{_datadir}/tsk3 -%{_datadir}/tsk3/sorter/ +%dir %{_datadir}/tsk +%{_datadir}/tsk/sorter/ %{_bindir}/tsk_comparedir %{_bindir}/tsk_gettimes @@ -176,7 +180,7 @@ %{_mandir}/man1/tsk_loaddb.1.gz %{_mandir}/man1/tsk_recover.1.gz -%files -n libtsk3%sosuffix +%files -n libtsk%sosuffix %defattr(-,root,root,-) # CPL and IBM %{_libdir}/*.so.* @@ -184,7 +188,8 @@ %files devel %defattr(-,root,root,-) # CPL and IBM -%{_includedir}/tsk3/ +%{_includedir}/tsk/ %{_libdir}/*.so +%{_datadir}/sleuthkit %changelog ++++++ sleuthkit-4.1.0-UPSTREAM-crc.patch ++++++ Index: sleuthkit-4.1.0/tsk/base/crc.c =================================================================== --- sleuthkit-4.1.0.orig/tsk/base/crc.c +++ sleuthkit-4.1.0/tsk/base/crc.c @@ -161,30 +161,6 @@ ulong cm_tab (p_cm_t p_cm, int index) } -void generate_crc_table(short *crctab[], p_cm_t p_cm){ - int i, j; - unsigned long bit, crc; - unsigned long crchighbit = (unsigned long)1 << (p_cm->cm_width-1); - unsigned long crcmask = ((((unsigned long)1<<(p_cm->cm_width-1))-1)<<1)|1; - - for (i=0; i<256; i++) - { - crc=(unsigned long)i; - if(p_cm->cm_refin) crc = reflect(crc,8); - crc <<= p_cm->cm_width-8; - for(j=0; j<8; j++) - { - bit = crc & crchighbit; - crc <<=1; - if(bit) crc ^=p_cm->cm_poly; - } - if(p_cm->cm_refin) crc = reflect(crc,p_cm->cm_width); - crc &= crcmask; - crctab[i]= crc; - } - return; -} - /******************************************************************************/ /* End of crcmodel.c */ /******************************************************************************/ ++++++ sleuthkit-4.0.2.tar.gz -> sleuthkit-4.1.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/sleuthkit/sleuthkit-4.0.2.tar.gz /work/SRC/openSUSE:Factory/.sleuthkit.new/sleuthkit-4.1.0.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE 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 skelcd-control-openSUSE for openSUSE:Factory checked in at 2013-06-25 07:39:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2013-06-05 14:24:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE.changes 2013-06-25 14:46:25.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 24 08:52:17 CEST 2013 - jsuchome(a)suse.cz + +- show checkbox for adding online repositories during installation +- add e17 desktop to the list of desktops (fate#315061) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control.xml ++++++ --- /var/tmp/diff_new_pack.Eyd6Kd/_old 2013-06-25 14:46:26.000000000 +0200 +++ /var/tmp/diff_new_pack.Eyd6Kd/_new 2013-06-25 14:46:26.000000000 +0200 @@ -37,7 +37,7 @@ <root_password_ca_check config:type="boolean">false</root_password_ca_check>  - <show_online_repositories config:type="boolean">false</show_online_repositories> + <show_online_repositories config:type="boolean">true</show_online_repositories> <online_repositories_default config:type="boolean">true</online_repositories_default>  @@ -342,6 +342,18 @@ </one_supported_desktop> <one_supported_desktop> + <name>e17</name> + <desktop>e17</desktop> + <label_id>desktop_e17</label_id> + <logon>lightdm</logon> + <cursor>DMZ</cursor> + <packages>lightdm branding-openSUSE</packages> + <order config:type="integer">7</order> + <patterns>e17 x11 base</patterns> + <icon>pattern-e17</icon> + </one_supported_desktop> + + <one_supported_desktop> <name>textmode</name> <desktop>twm</desktop> <label_id>desktop_textmode</label_id> @@ -441,6 +453,7 @@ <desktop_xfce><label>XFCE Desktop</label></desktop_xfce> <desktop_lxde><label>LXDE Desktop</label></desktop_lxde> <desktop_min_x><label>Minimal X Window</label></desktop_min_x> + <desktop_e17><label>Enlightenment Desktop</label></desktop_e17> <desktop_textmode><label>Minimal Server Selection (Text Mode)</label></desktop_textmode> </texts> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shotwell 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 shotwell for openSUSE:Factory checked in at 2013-06-25 07:39:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotwell (Old) and /work/SRC/openSUSE:Factory/.shotwell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shotwell" Changes: -------- --- /work/SRC/openSUSE:Factory/shotwell/shotwell.changes 2013-04-08 14:56:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shotwell.new/shotwell.changes 2013-06-25 14:46:23.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jun 23 11:38:50 UTC 2013 - zaitor(a)opensuse.org + +- Add shotwell-build-with-LibRaw-0.15.patch, fix build with + LibRaw-0.15. + +------------------------------------------------------------------- New: ---- shotwell-build-with-LibRaw-0.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.3doCIE/_old 2013-06-25 14:46:23.000000000 +0200 +++ /var/tmp/diff_new_pack.3doCIE/_new 2013-06-25 14:46:23.000000000 +0200 @@ -26,6 +26,8 @@ Source: http://yorba.org/download/shotwell/0.14/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM shotwell-no-libexecdir.patch dimstar(a)opensuse.org -- Move from /usr/libexec to /usr/lib. http://redmine.yorba.org/issues/5050 Patch0: shotwell-no-libexecdir.patch +# PATCH-FIX-UPSTREAM shotwell-build-with-LibRaw-0.15.patch zaitor(a)opensuse.org -- Build with new libraw http://redmine.yorba.org/issues/7012 +Patch1: shotwell-build-with-LibRaw-0.15.patch BuildRequires: libraw-devel-static BuildRequires: update-desktop-files BuildRequires: vala >= 0.17.2 @@ -64,6 +66,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build # We can't use the configure macro: it's not a standard autotools configure script ++++++ shotwell-build-with-LibRaw-0.15.patch ++++++ commit 89aa167726d12f9ae0b53c01a2fdc54601fc3cc5 Author: Jim Nelson <jim(a)yorba.org> Date: Wed May 29 11:52:09 2013 -0700 Build with LibRaw 0.15: Closes #7012 LibRaw 0.15 removed document-mode processing, which, as their release notes say, "no one uses". Compile error were nothing more than missing symbols -- Shotwell wasn't using it either. diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala index f57886e..b7c3922 100644 --- a/src/photos/GRaw.vala +++ b/src/photos/GRaw.vala @@ -21,12 +21,6 @@ public enum Colorspace { XYZ = 5 } -public enum DocMode { - STANDARD = 0, - GRAYSCALE = 1, - GRAYSCALE_NO_WHITE_BALANCE = 2 -} - public errordomain Exception { UNSPECIFIED, UNSUPPORTED_FILE, @@ -167,10 +161,6 @@ public class Processor { throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); } - public void document_mode_processing() throws Exception { - throw_exception("document_mode_processing", proc.document_mode_processing()); - } - public unowned LibRaw.ImageOther get_image_other() { return proc.get_image_other(); } @@ -244,7 +234,6 @@ public class Processor { // threshold output_params->half_size = half_size; // four_color_rgb - output_params->document_mode = GRaw.DocMode.STANDARD; output_params->highlight = GRaw.HighlightMode.CLIP; output_params->use_auto_wb = true; output_params->use_camera_wb = true; diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi index 05de461..a8a0a4d 100644 --- a/vapi/libraw.vapi +++ b/vapi/libraw.vapi @@ -104,7 +104,6 @@ public struct OutputParams { public float threshold; public bool half_size; public bool four_color_rgb; - public int document_mode; public int highlight; public bool use_auto_wb; public bool use_camera_wb; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shared-desktop-ontologies 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 shared-desktop-ontologies for openSUSE:Factory checked in at 2013-06-25 07:44:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shared-desktop-ontologies (Old) and /work/SRC/openSUSE:Factory/.shared-desktop-ontologies.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shared-desktop-ontologies" Changes: -------- --- /work/SRC/openSUSE:Factory/shared-desktop-ontologies/shared-desktop-ontologies.changes 2012-09-11 11:37:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shared-desktop-ontologies.new/shared-desktop-ontologies.changes 2013-06-25 14:46:20.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Jun 23 20:27:32 UTC 2013 - asterios.dramis(a)gmail.com + +- Update to 0.11: + * Added new properties to NMM: + nmm:albumArtist + nmm:albumProducer + nmm:albumConductor + * Make nco:emailAddress a subPropertyOf nao:identifier + * Change the range of nfo:fileSize from int to long + From 0.10.1: + * Fixed range of nmm:musicBrainzTrackID: xsd:string instead of xsd:integer +- Removed gcc-c++ build requirement (not needed). + +------------------------------------------------------------------- Old: ---- shared-desktop-ontologies-0.10.0.tar.bz2 New: ---- shared-desktop-ontologies-0.11.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-desktop-ontologies.spec ++++++ --- /var/tmp/diff_new_pack.cpmKE2/_old 2013-06-25 14:46:21.000000000 +0200 +++ /var/tmp/diff_new_pack.cpmKE2/_new 2013-06-25 14:46:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package shared-desktop-ontologies # -# 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 @@ -17,15 +17,14 @@ Name: shared-desktop-ontologies -Version: 0.10.0 +Version: 0.11.0 Release: 0 Summary: Shared Desktop Ontologies License: (CC-BY-SA-3.0 or BSD-3-Clause) and CC-BY-3.0 and W3C Group: System/X11/Utilities -Url: http://sourceforge.net/projects/oscaf +Url: http://oscaf.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/oscaf/%{name}/%{version}/%{name}-%… BuildRequires: cmake -BuildRequires: gcc-c++ BuildRequires: kde4-filesystem BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,18 +54,16 @@ %cmake_kde4 -d build %install -cd build -%makeinstall +%kde4_makeinstall -C build %files -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog LICENSE.* README %{_datadir}/ontology/ %files devel -%defattr(-,root,root) -%dir %{_datadir}/cmake/SharedDesktopOntologies -%{_datadir}/cmake/SharedDesktopOntologies/SharedDesktopOntologiesConfig.cmake -%{_datadir}/cmake/SharedDesktopOntologies/SharedDesktopOntologiesConfigVersion.cmake +%defattr(-,root,root,-) +%{_datadir}/cmake/SharedDesktopOntologies/ %{_datadir}/pkgconfig/shared-desktop-ontologies.pc %changelog ++++++ shared-desktop-ontologies-0.10.0.tar.bz2 -> shared-desktop-ontologies-0.11.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shared-desktop-ontologies-0.10.0/CMakeLists.txt new/shared-desktop-ontologies-0.11.0/CMakeLists.txt --- old/shared-desktop-ontologies-0.10.0/CMakeLists.txt 2012-06-13 10:02:47.000000000 +0200 +++ new/shared-desktop-ontologies-0.11.0/CMakeLists.txt 2013-06-11 09:36:20.000000000 +0200 @@ -7,7 +7,7 @@ # set the version to be used by SharedDesktopOntologiesConfig.cmake # =============================================================================================== set(SHAREDDESKTOPONTOLOGIES_VERSION_MAJOR 0) -set(SHAREDDESKTOPONTOLOGIES_VERSION_MINOR 10) +set(SHAREDDESKTOPONTOLOGIES_VERSION_MINOR 11) set(SHAREDDESKTOPONTOLOGIES_VERSION_RELEASE 0) set(SHAREDDESKTOPONTOLOGIES_VERSION "${SHAREDDESKTOPONTOLOGIES_VERSION_MAJOR}.${SHAREDDESKTOPONTOLOGIES_VERSION_MINOR}.${SHAREDDESKTOPONTOLOGIES_VERSION_RELEASE}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shared-desktop-ontologies-0.10.0/ChangeLog new/shared-desktop-ontologies-0.11.0/ChangeLog --- old/shared-desktop-ontologies-0.10.0/ChangeLog 2012-06-13 10:02:47.000000000 +0200 +++ new/shared-desktop-ontologies-0.11.0/ChangeLog 2013-06-11 09:36:20.000000000 +0200 @@ -1,3 +1,17 @@ +0.11.0 + 06/27/2012 - trueg + Added new properties to NMM: + nmm:albumArtist + nmm:albumProducer + nmm:albumConductor + 06/11/2013 - vhanda + Make nco:emailAddress a subPropertyOf nao:identifier + Change the range of nfo:fileSize from int to long + +0.10.1 + 08/23/2012 - trueg + Fixed range of nmm:musicBrainzTrackID: xsd:string instead of xsd:integer + 0.10.0 02/11/2012 - trueg Added nmm:TVSeason and friends to make TV seasons fully qualified resources. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shared-desktop-ontologies-0.10.0/nco/nco.trig.in new/shared-desktop-ontologies-0.11.0/nco/nco.trig.in --- old/shared-desktop-ontologies-0.10.0/nco/nco.trig.in 2012-06-13 10:02:47.000000000 +0200 +++ new/shared-desktop-ontologies-0.11.0/nco/nco.trig.in 2013-06-11 09:36:20.000000000 +0200 @@ -591,7 +591,8 @@ rdfs:domain nco:EmailAddress ; rdfs:label "emailAddress" ; rdfs:range xsd:string ; - nrl:maxCardinality 1 . + nrl:maxCardinality 1 ; + rdfs:subPropertyOf nao:identifier . nco:InternationalDeliveryAddress a rdfs:Class ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shared-desktop-ontologies-0.10.0/nfo/nfo.trig.in new/shared-desktop-ontologies-0.11.0/nfo/nfo.trig.in --- old/shared-desktop-ontologies-0.10.0/nfo/nfo.trig.in 2012-06-13 10:02:47.000000000 +0200 +++ new/shared-desktop-ontologies-0.11.0/nfo/nfo.trig.in 2013-06-11 09:36:20.000000000 +0200 @@ -905,7 +905,7 @@ rdfs:comment "The size of the file in bytes. For compressed files it means the size of the packed file, not of the contents. For folders it means the aggregated size of all contained files and folders " ; rdfs:domain nfo:FileDataObject ; rdfs:label "fileSize" ; - rdfs:range xsd:integer ; + rdfs:range xsd:long ; rdfs:subPropertyOf nie:byteSize ; nrl:maxCardinality 1 . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shared-desktop-ontologies-0.10.0/nmm/nmm.trig.in new/shared-desktop-ontologies-0.11.0/nmm/nmm.trig.in --- old/shared-desktop-ontologies-0.10.0/nmm/nmm.trig.in 2012-06-13 10:02:47.000000000 +0200 +++ new/shared-desktop-ontologies-0.11.0/nmm/nmm.trig.in 2013-06-11 09:36:20.000000000 +0200 @@ -107,7 +107,7 @@ rdfs:label "musicbrainz track ID" ; rdfs:comment "MusicBrainz track ID" ; rdfs:domain nmm:MusicPiece ; - rdfs:range xsd:integer ; + rdfs:range xsd:string ; nrl:maxCardinality 1 . nmm:trackGain @@ -388,6 +388,30 @@ rdfs:domain nmm:TVSeason ; rdfs:range nmm:TVShow ; nrl:inverseProperty nmm:isPartOfSeason . + + nmm:albumArtist + a rdf:Property, nrl:DefiningProperty ; + rdfs:subPropertyOf nco:contributor ; + rdfs:label "album artist" ; + rdfs:comment "The artist of a music album, not to be confused with the performers of the individual music pieces." ; + rdfs:domain nmm:MusicAlbum ; + rdfs:range nco:Contact . + + nmm:albumProducer + a rdf:Property, nrl:DefiningProperty ; + rdfs:subPropertyOf nco:contributor ; + rdfs:label "album producer" ; + rdfs:comment "The producer of a music album." ; + rdfs:domain nmm:MusicAlbum ; + rdfs:range nco:Contact . + + nmm:albumConductor + a rdf:Property, nrl:DefiningProperty ; + rdfs:subPropertyOf nco:contributor ; + rdfs:label "album conductor" ; + rdfs:comment "The conductor of the orchestra of a classical music album." ; + rdfs:domain nmm:MusicAlbum ; + rdfs:range nco:Contact . } <http://www.semanticdesktop.org/ontologies/2009/02/19/nmm/metadata> @@ -396,7 +420,7 @@ a nrl:DocumentGraph , nrl:Ontology ; nao:hasDefaultNamespace "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#" ; nao:hasDefaultNamespaceAbbreviation "nmm" ; - nao:lastModified "2012-02-13T13:28:29" ; + nao:lastModified "2012-08-23T97:51:29" ; nao:serializationLanguage "TriG" ; nao:status "Testing" ; nrl:updatable "0" ; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit salt 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 salt for openSUSE:Factory checked in at 2013-06-25 09:35:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2013-06-11 09:37:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2013-06-25 14:46:12.000000000 +0200 @@ -1,0 +2,24 @@ +Sat Jun 22 05:31:10 UTC 2013 - aboe76(a)gmail.com + +- Updated to salt 0.16.0RC +- New Feautures in 0.16.0: + - Multi-Master capability + - Prereq, the new requisite + - Peer system improvement + - Relative Includes + - More state Output Options + - Improved Windows Support + - Multi Targets for pkg.removed, pgk.purged States + - Random Times in cron states + - Confirmation Prompt on Key acceptance on master +- full changelog details: http://docs.saltstack.com/topics/releases/0.16.0.html + +------------------------------------------------------------------- +Wed Jun 12 20:48:36 UTC 2013 - aboe76(a)gmail.com + +- Updated init files from upstream, so init files are the same for + fedora/redhat/centos/debian/suse +- Removed salt user and daemon.conf file, so package is in line + with upstream packages fedora/centos/debian. + +------------------------------------------------------------------- Old: ---- salt-0.15.3.tar.gz salt-daemon.conf New: ---- salt-0.15.90.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.0ByJEg/_old 2013-06-25 14:46:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0ByJEg/_new 2013-06-25 14:46:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: salt -Version: 0.15.3 +Version: 0.15.90 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 @@ -31,7 +31,11 @@ Source5: %{name}-syndic.service Source6: %{name}-minion.service Source7: %{name}.logrotate -Source8: %{name}-daemon.conf +%if 0%{?sles_version} +BuildRequires: python +Requires: python +%endif +BuildRequires: python-devel BuildRequires: logrotate BuildRequires: python-Jinja2 BuildRequires: python-M2Crypto @@ -61,7 +65,9 @@ %endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} > 1110 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif @@ -119,12 +125,13 @@ ##missing directories mkdir -p %{buildroot}%{_sysconfdir}/salt/master.d -mkdir -p %{buildroot}%{_sysconfdir}/salt/syndic.d mkdir -p %{buildroot}%{_sysconfdir}/salt/minion.d mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}%{_localstatedir}/log/salt mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/ mkdir -p %{buildroot}/%{_sbindir} +mkdir -p %{buildroot}/var/log/salt +mkdir -p %{buildroot}/srv/salt # ##init scripts install -Dpm 0755 %{SOURCE1} %{buildroot}%{_initddir}/salt-master @@ -146,9 +153,6 @@ # ##logrotate file install -Dpm 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt -# -##Salt-master daemon user -install -Dpm 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/salt/master.d/salt-daemon.conf %preun -n salt-syndic %stop_on_removal salt-syndic @@ -169,10 +173,6 @@ %endif %insserv_cleanup -%pre -n salt-master -getent group salt >/dev/null || /usr/sbin/groupadd -r salt -getent passwd salt >/dev/null || /usr/sbin/useradd -r -g salt -d /srv/salt -s /bin/false -c "salt-master daemon" salt - %preun -n salt-master %stop_on_removal salt-master %if 0%{?_unitdir:1} @@ -217,7 +217,6 @@ %{_mandir}/man1/salt-syndic.1.* %{_sbindir}/rcsalt-syndic %{_sysconfdir}/init.d/salt-syndic -%{_sysconfdir}/salt/syndic.d %if 0%{?_unitdir:1} %_unitdir/salt-syndic.service %endif @@ -230,7 +229,7 @@ %{_mandir}/man1/salt-minion.1.* %{_sbindir}/rcsalt-minion %config(noreplace) %{_sysconfdir}/init.d/salt-minion -%config(noreplace) %{_sysconfdir}/salt/minion +%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/minion %{_sysconfdir}/salt/minion.d %if 0%{?_unitdir:1} %_unitdir/salt-minion.service @@ -250,9 +249,9 @@ %{_mandir}/man1/salt-run.1.* %{_sbindir}/rcsalt-master %config(noreplace) %{_sysconfdir}/init.d/salt-master -%attr(0644, salt, root) %config(noreplace) %{_sysconfdir}/salt/master -%attr(0644, salt, root) %config(noreplace) %{_sysconfdir}/salt/master.d/salt-daemon.conf +%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/master %{_sysconfdir}/salt/master.d +%dir /srv/salt %if 0%{?_unitdir:1} %_unitdir/salt-master.service %endif @@ -261,6 +260,7 @@ %defattr(-,root,root,-) %doc LICENSE %dir %{_sysconfdir}/salt +%dir /var/log/salt %{_mandir}/man7/salt.7.* %config(noreplace) %{_sysconfdir}/logrotate.d/salt %{python_sitelib}/* ++++++ salt-0.15.3.tar.gz -> salt-0.15.90.tar.gz ++++++ ++++ 37392 lines of diff (skipped) ++++++ salt-master ++++++ --- /var/tmp/diff_new_pack.0ByJEg/_old 2013-06-25 14:46:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0ByJEg/_new 2013-06-25 14:46:13.000000000 +0200 @@ -1,241 +1,144 @@ #!/bin/sh # -# Template SUSE system startup script for salt-master -# Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# /etc/init.d/salt-master -# and its symbolic link -# /(usr/)sbin/rcsalt-master -# -# -# LSB compatible service control script; see http://www.linuxbase.org/spec/ -# -# Note: This template uses functions rc_XXX defined in /etc/rc.status on -# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB -# compliant Linux distributions, you either have to provide the rc.status -# functions from UL or change the script to work without them. -# See skeleton.compat for a template that works with other distros as well. -# +# Salt master +################################### + +# LSB header + ### BEGIN INIT INFO -# Provides: salt-master -# Required-Start: $syslog $network $remote_fs -# Should-Start: $time ypbind smtp -# Required-Stop: $syslog $remote_fs -# Should-Stop: ypbind smtp -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Salt master daemon providing control minions -# Description: This is a daemon that controls the salt minions -# Salt is an open source tool to manage your infrastructure. Easy enough to get -# running in minutes and fast enough to manage tens of thousands of servers (and still -# get a response back in seconds). +# Provides: salt-master +# Required-Start: $local_fs $remote_fs $network $named $time +# Should-Start: $time ypbind smtp +# Required-Stop: $local_fs $remote_fs $network $named $time +# Should-Stop: ypbind smtp +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Salt master control daemon +# Description: This is a daemon that controls the Salt minions. ### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. + + +# chkconfig header + +# chkconfig: 345 96 05 +# description: This is a daemon that controls the Salt minions # -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. +# processname: /usr/bin/salt-master -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance if [ -f /etc/default/salt ]; then . /etc/default/salt else - SALTMASTER='/usr/bin/salt-master' + SALTMASTER=/usr/bin/salt-master + PYTHON=/usr/bin/python fi -test -x $SALTMASTER || { echo "$SALTMASTER not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# Source LSB init functions -# providing start_daemon, killproc, pidofproc, -# log_success_msg, log_failure_msg and log_warning_msg. -# This is currently not used by UnitedLinux based distributions and -# not needed for init scripts for UnitedLinux only. If it is used, -# the functions from rc.status should not be sourced or used. -#. /lib/lsb/init-functions - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. +# Sanity checks. +[ -x $SALTMASTER ] || exit 0 +DEBIAN_VERSION=/etc/debian_version +SUSE_RELEASE=/etc/SuSE-release +# Source function library. +if [ -f $DEBIAN_VERSION ]; then + break +elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then + . /etc/rc.status +else + . /etc/rc.d/init.d/functions +fi + +SERVICE=salt-master +PROCESS=salt-master +CONFIG_ARGS=" " + +RETVAL=0 + +start() { + echo -n $"Starting salt-master daemon: " + if [ -f $SUSE_RELEASE ]; then + startproc -f -p /var/run/$SERVICE.pid $SALTMASTER -d $CONFIG_ARGS + rc_status -v + elif [ -e $DEBIAN_VERSION ]; then + if [ -f $LOCKFILE ]; then + echo -n "already started, lock file found" + RETVAL=1 + elif $PYTHON $SALTMASTER -d >& /dev/null; then + echo -n "OK" + RETVAL=0 + fi + else + daemon --check $SERVICE $SALTMASTER -d $CONFIG_ARGS + fi + RETVAL=$? + echo + return $RETVAL +} + +stop() { + echo -n $"Stopping salt-master daemon: " + if [ -f $SUSE_RELEASE ]; then + killproc -TERM $SALTMASTER + rc_status -v + elif [ -f $DEBIAN_VERSION ]; then + # Added this since Debian's start-stop-daemon doesn't support spawned processes + if ps -ef | grep "$PYTHON $SALTMASTER" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then + echo -n "OK" + RETVAL=0 + else + echo -n "Daemon is not started" + RETVAL=1 + fi + else + killproc $PROCESS + fi + RETVAL=$? + echo +} + +restart() { + stop + start +} + + +# See how we were called. case "$1" in - start) - echo -n "Starting salt-master daemon: " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - /sbin/startproc ${SALTMASTER} -d - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down salt-master daemon: " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - /sbin/killproc -TERM $SALTMASTER - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; + start|stop|restart) + $1 + ;; + status) + if [ -f $SUSE_RELEASE ]; then + echo -n "Checking for service salt-master " + checkproc $SALTMASTER + rc_status -v + elif [ -f $DEBIAN_VERSION ]; then + if [ -f $LOCKFILE ]; then + RETVAL=0 + echo "salt-master is running." + else + RETVAL=1 + echo "salt-master is stopped." + fi + else + status $PROCESS + RETVAL=$? + fi + ;; + condrestart) + [ -f $LOCKFILE ] && restart || : + ;; reload) echo "can't reload configuration, you have to restart it" - ;; - status) - echo -n "Checking for service salt-master " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc $SALTMASTER - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; + if [ -f $SUSE_RELEASE ]; then + rc status -v + else + RETVAL=$? + fi + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|reload}" - exit 1 - ;; + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + exit 1 + ;; esac -rc_exit +exit $RETVAL + ++++++ salt-minion ++++++ --- /var/tmp/diff_new_pack.0ByJEg/_old 2013-06-25 14:46:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0ByJEg/_new 2013-06-25 14:46:13.000000000 +0200 @@ -1,240 +1,147 @@ #!/bin/sh # -# Template SUSE system startup script for salt-minion -# Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# /etc/init.d/salt-minion -# and its symbolic link -# /(usr/)sbin/rcsalt-minion -# -# -# LSB compatible service control script; see http://www.linuxbase.org/spec/ -# -# Note: This template uses functions rc_XXX defined in /etc/rc.status on -# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB -# compliant Linux distributions, you either have to provide the rc.status -# functions from UL or change the script to work without them. -# See skeleton.compat for a template that works with other distros as well. -# +# Salt minion +################################### + +# LSB header + ### BEGIN INIT INFO -# Provides: salt-minion -# Required-Start: $syslog $network $remote_fs -# Should-Start: $time ypbind smtp -# Required-Stop: $syslog $remote_fs -# Should-Stop: ypbind smtp -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Salt minion daemon providing control minions -# Description: This is a daemon that controls the salt minions -# Salt is an open source tool to manage your infrastructure. Easy enough to get -# running in minutes and fast enough to manage tens of thousands of servers (and still -# get a response back in seconds). +# Provides: salt-minion +# Required-Start: $local_fs $remote_fs $network $named $time +# Should-Start: $time ypbind smtp +# Required-Stop: $local_fs $remote_fs $network $named $time +# Should-Stop: ypbind smtp +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Salt minion daemon +# Description: This is the Salt minion daemon that can be controlled by the Salt master. ### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. + + +# chkconfig header + +# chkconfig: 345 97 04 +# description: This is the Salt minion daemon that can be controlled by the Salt master. # -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. +# processname: /usr/bin/salt-minion -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance if [ -f /etc/default/salt ]; then . /etc/default/salt else - SALTMINION='/usr/bin/salt-minion' + SALTMINION=/usr/bin/salt-minion + PYTHON=/usr/bin/python +fi + +# Sanity checks. +[ -x $SALTMINION ] || exit 0 + +DEBIAN_VERSION=/etc/debian_version +SUSE_RELEASE=/etc/SuSE-release +# Source function library. +if [ -f $DEBIAN_VERSION ]; then + break +elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then + . /etc/rc.status +else + . /etc/rc.d/init.d/functions fi -test -x $SALTMINION || { echo "$SALTMINION not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# Source LSB init functions -# providing start_daemon, killproc, pidofproc, -# log_success_msg, log_failure_msg and log_warning_msg. -# This is currently not used by UnitedLinux based distributions and -# not needed for init scripts for UnitedLinux only. If it is used, -# the functions from rc.status should not be sourced or used. -#. /lib/lsb/init-functions - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. +SERVICE=salt-minion +PROCESS=salt-minion +CONFIG_ARGS=" " + +RETVAL=0 + +start() { + echo -n $"Starting salt-minion daemon: " + if [ -f $SUSE_RELEASE ]; then + startproc -f -p /var/run/$SERVICE.pid $SALTMINION -d $CONFIG_ARGS + rc_status -v + elif [ -e $DEBIAN_VERSION ]; then + if [ -f $LOCKFILE ]; then + echo -n "already started, lock file found" + RETVAL=1 + elif $PYTHON $SALTMINION -d >& /dev/null; then + echo -n "OK" + RETVAL=0 + fi + else + if [ $(pidofproc $PROCESS) ]; then + RETVAL=$? + echo -n "already running" + else + daemon --check $SERVICE $SALTMINION -d $CONFIG_ARGS + RETVAL=$? + fi + fi + echo + return $RETVAL +} + +stop() { + echo -n $"Stopping salt-minion daemon: " + if [ -f $SUSE_RELEASE ]; then + killproc -TERM $SALTMINION + rc_status -v + elif [ -f $DEBIAN_VERSION ]; then + # Added this since Debian's start-stop-daemon doesn't support spawned processes + if ps -ef | grep "$PYTHON $SALTMINION" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then + echo -n "OK" + RETVAL=0 + else + echo -n "Daemon is not started" + RETVAL=1 + fi + else + killproc $PROCESS + fi + RETVAL=$? + echo +} + +restart() { + stop + start +} + +# See how we were called. case "$1" in - start) - echo -n "Starting salt-minion daemon: " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - /sbin/startproc ${SALTMINION} -d - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down salt-minion daemon: " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - /sbin/killproc -TERM $SALTMINION - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - reload) - echo "can't reload configuration, you have to restart it" - ;; + start|stop|restart) + $1 + ;; status) - echo -n "Checking for service salt-minion " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc $SALTMINION - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; + if [ -f $SUSE_RELEASE ]; then + echo -n "Checking for service salt-minion " + checkproc $SALTMINION + rc_status -v + elif [ -f $DEBIAN_VERSION ]; then + if [ -f $LOCKFILE ]; then + RETVAL=0 + echo "salt-minion is running." + else + RETVAL=1 + echo "salt-minion is stopped." + fi + else + status $PROCESS + RETVAL=$? + fi + ;; + condrestart) + [ -f $LOCKFILE ] && restart || : + ;; + reload) + echo "can't reload configuration, you have to restart it" + if [ -f $SUSE_RELEASE ]; then + rc status -v + else + RETVAL=$? + fi + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|reload}" - exit 1 - ;; + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + exit 1 + ;; esac -rc_exit +exit $RETVAL ++++++ salt-syndic ++++++ --- /var/tmp/diff_new_pack.0ByJEg/_old 2013-06-25 14:46:13.000000000 +0200 +++ /var/tmp/diff_new_pack.0ByJEg/_new 2013-06-25 14:46:13.000000000 +0200 @@ -1,240 +1,140 @@ #!/bin/sh # -# Template SUSE system startup script for salt-syndic -# Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# /etc/init.d/salt-syndic -# and its symbolic link -# /(usr/)sbin/rcsalt-syndic -# -# -# LSB compatible service control script; see http://www.linuxbase.org/spec/ -# -# Note: This template uses functions rc_XXX defined in /etc/rc.status on -# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB -# compliant Linux distributions, you either have to provide the rc.status -# functions from UL or change the script to work without them. -# See skeleton.compat for a template that works with other distros as well. -# +# Salt syndic +################################### + +# LSB header + ### BEGIN INIT INFO -# Provides: salt-syndic -# Required-Start: $syslog $network $remote_fs -# Should-Start: $time ypbind smtp -# Required-Stop: $syslog $remote_fs -# Should-Stop: ypbind smtp -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Salt master daemon providing control minions -# Description: This is a daemon that controls the salt minions -# Salt is an open source tool to manage your infrastructure. Easy enough to get -# running in minutes and fast enough to manage tens of thousands of servers (and still -# get a response back in seconds). +# Provides: salt-syndic +# Required-Start: $local_fs $remote_fs $network $named $time +# Should-Start: $time ypbind smtp +# Required-Stop: $local_fs $remote_fs $network $named $time +# Should-Stop: ypbind smtp +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Salt syndic master-minion passthrough daemon +# Description: This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough. ### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. + + +# chkconfig header + +# chkconfig: 345 99 99 +# description: This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough. # -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. +# processname: /usr/bin/salt-syndic -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance if [ -f /etc/default/salt ]; then . /etc/default/salt else - SALTSYNDIC='/usr/bin/salt-syndic' + SALTSYNDIC=/usr/bin/salt-syndic + PYTHON=/usr/bin/python fi -test -x $SALTSYNDIC || { echo "$SALTMINION not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -# Source LSB init functions -# providing start_daemon, killproc, pidofproc, -# log_success_msg, log_failure_msg and log_warning_msg. -# This is currently not used by UnitedLinux based distributions and -# not needed for init scripts for UnitedLinux only. If it is used, -# the functions from rc.status should not be sourced or used. -#. /lib/lsb/init-functions - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. +# Sanity checks. +[ -x $SALTSYNDIC ] || exit 0 + +DEBIAN_VERSION=/etc/debian_version +SUSE_RELEASE=/etc/SuSE-release +# Source function library. +if [ -f $DEBIAN_VERSION ]; then + break +elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then + . /etc/rc.status +else + . /etc/rc.d/init.d/functions +fi + +SERVICE=salt-syndic +PROCESS=salt-syndic +CONFIG_ARGS=" " + +RETVAL=0 + +start() { + echo -n $"Starting salt-syndic daemon: " + if [ -f $SUSE_RELEASE ]; then + startproc -f -p /var/run/$SERVICE.pid $SALTSYNDIC -d $CONFIG_ARGS + rc_status -v + elif [ -e $DEBIAN_VERSION ]; then + if [ -f $LOCKFILE ]; then + echo -n "already started, lock file found" + RETVAL=1 + elif $PYTHON $SALTSYNDIC -d >& /dev/null; then + echo -n "OK" + RETVAL=0 + fi + else + daemon --check $SERVICE $SALTSYNDIC -d $CONFIG_ARGS + fi + RETVAL=$? + echo + return $RETVAL +} + +stop() { + echo -n $"Stopping salt-syndic daemon: " + if [ -f $SUSE_RELEASE ]; then + killproc -TERM $SALTSYNDIC + rc_status -v + elif [ -f $DEBIAN_VERSION ]; then + # Added this since Debian's start-stop-daemon doesn't support spawned processes + if ps -ef | grep "$PYTHON $SALTSYNDIC" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then + echo -n "OK" + RETVAL=0 + else + echo -n "Daemon is not started" + RETVAL=1 + fi + else + killproc $PROCESS + fi + RETVAL=$? + echo +} + +restart() { + stop + start +} + +# See how we were called. case "$1" in - start) - echo -n "Starting salt-syndic daemon: " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - /sbin/startproc ${SALTSYNDIC} -d - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down salt-syndic daemon: " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - /sbin/killproc $SALTSYNDIC - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; - reload) - echo "can't reload configuration, you have to restart it" - ;; + start|stop|restart) + $1 + ;; status) - echo -n "Checking for service salt-syndic " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - /sbin/checkproc $SALTSYNDIC - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. - rc_status -v - ;; + if [ -f $SUSE_RELEASE ]; then + echo -n "Checking for service salt-syndic " + checkproc $SALTSYNDIC + rc_status -v + elif [ -f $DEBIAN_VERSION ]; then + if [ -f $LOCKFILE ]; then + RETVAL=0 + echo "salt-syndic is running." + else + RETVAL=1 + echo "salt-syndic is stopped." + fi + else + status $PROCESS + RETVAL=$? + fi + ;; + reload) + echo "can't reload configuration, you have to restart it" + if [ -f $SUSE_RELEASE ]; then + rc status -v + else + RETVAL=$? + fi + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|reload}" - exit 1 - ;; + echo $"Usage: $0 {start|stop|status|restart|reload}" + exit 1 + ;; esac -rc_exit +exit $RETVAL + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-nokogiri 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 rubygem-nokogiri for openSUSE:Factory checked in at 2013-06-25 07:44:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-nokogiri (Old) and /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-nokogiri" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-nokogiri/rubygem-nokogiri.changes 2013-04-02 12:56:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new/rubygem-nokogiri.changes 2013-06-25 14:46:04.000000000 +0200 @@ -1,0 +2,40 @@ +Thu Jun 13 04:59:17 UTC 2013 - coolo(a)suse.com + +- use system libs + +------------------------------------------------------------------- +Sun Jun 9 06:33:38 UTC 2013 - coolo(a)suse.com + +- updated to version 1.6.0 + * Notes + + * mini_portile is now a runtime dependency + * Ruby 1.9.2 and higher now required + + + * Features + + * (MRI) Source code for libxml 2.8.0 and libxslt 1.2.26 is packaged + with the gem. These libraries are compiled at gem install time + unless the environment variable NOKOGIRI_USE_SYSTEM_LIBRARIES is + set. VERSION_INFO (also `nokogiri -v`) exposes whether libxml was + compiled from packaged source, or the system library was used. + * (Windows) libxml upgraded to 2.8.0 + + + * Deprecations + + * Support for Ruby 1.8.7 and prior has been dropped + +------------------------------------------------------------------- +Sat Jun 8 06:26:14 UTC 2013 - coolo(a)suse.com + +- updated to version 1.5.10 + * (JRuby) Fix "null document" error when parsing an empty IO in jruby 1.7.3. #883 + * (JRuby) Fix schema validation when XSD has DOCTYPE set to DTD. #861 (Thanks, Patrick Cheng!) + * (MRI) Fix segfault when there is no default subelement for an HTML node. #917 + * (MRI) Fixed a memory leak in fragment parsing if nodes are not all subsequently reparented. #856 + * Use rb_ary_entry instead of RARRAY_PTR (you know, for Rubinius). #877 (Thanks, Dirkjan Bussink!) + * Fix TypeError when running tests. #900 (Thanks, Cédric Boutillier!) + +------------------------------------------------------------------- Old: ---- nokogiri-1.5.9.gem New: ---- nokogiri-1.6.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-nokogiri.spec ++++++ --- /var/tmp/diff_new_pack.dQsUbB/_old 2013-06-25 14:46:04.000000000 +0200 +++ /var/tmp/diff_new_pack.dQsUbB/_new 2013-06-25 14:46:04.000000000 +0200 @@ -17,31 +17,32 @@ Name: rubygem-nokogiri -Version: 1.5.9 +Version: 1.6.0 Release: 0 %define mod_name nokogiri %define mod_full_name %{mod_name}-%{version} +%define mod_branch -%{version} +%define mod_weight 10600 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ruby-macros >= 1 -Requires: ruby >= 1.8.7 -BuildRequires: ruby-devel >= 1.8.7 +Requires: ruby >= 1.9.2 +BuildRequires: ruby-devel >= 1.9.2 BuildRequires: rubygem(rdoc) > 3.10 +BuildRequires: rubygem(mini_portile) # MANUAL BuildRequires: libxml2-devel libxslt-devel Url: http://nokogiri.org Source: http://rubygems.org/gems/%{mod_full_name}.gem -Summary: Nokogiri is an HTML, XML, SAX, and Reader parser +Summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser License: MIT Group: Development/Languages/Ruby -%define mod_branch -1.5.9 -%define mod_weight 1 PreReq: update-alternatives %description -Nokogiri is an HTML, XML, SAX, and Reader parser. Among Nokogiri's +Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser. Among Nokogiri's many features is the ability to search documents via XPath or CSS3 selectors. -XML is like violence - if it doesn't solve your problems, you are not using +XML is like violence - if it doesn’t solve your problems, you are not using enough of it. %package doc @@ -63,19 +64,24 @@ %prep #gem_unpack -#if you need patches, apply them here and replace the # with a % sign in the surrounding lines #gem_build %build %install +# MANUAL +export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 %gem_install -f %gem_cleanup +# MANUAL mv %{buildroot}%{_bindir}/nokogiri{,%{mod_branch}} ln -s nokogiri%{mod_branch} %{buildroot}%{_bindir}/nokogiri +mkdir -p %{buildroot}%{_docdir}/%{name} +ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/CHANGELOG.rdoc %buildroot/%{_docdir}/%{name}/CHANGELOG.rdoc +ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/README.rdoc %buildroot/%{_docdir}/%{name}/README.rdoc %post -/usr/sbin/update-alternatives --install \ +/usr/sbin/update-alternatives --force --install \ %{_bindir}/nokogiri nokogiri %{_bindir}/nokogiri%{mod_branch} %{mod_weight} %preun @@ -85,6 +91,7 @@ %files %defattr(-,root,root,-) +%{_docdir}/%{name} %{_bindir}/nokogiri%{mod_branch} %ghost %{_bindir}/nokogiri %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsh 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 rsh for openSUSE:Factory checked in at 2013-06-25 09:35:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsh (Old) and /work/SRC/openSUSE:Factory/.rsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsh" Changes: -------- --- /work/SRC/openSUSE:Factory/rsh/rsh.changes 2012-10-19 08:51:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsh.new/rsh.changes 2013-06-25 14:45:51.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 13:10:53 UTC 2013 - jslaby(a)suse.com + +- rlogin-handle-EIO-better.patch: rlogin: handle EIO better + (bnc#816514) + +------------------------------------------------------------------- New: ---- rlogin-handle-EIO-better.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsh.spec ++++++ --- /var/tmp/diff_new_pack.8jGp94/_old 2013-06-25 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.8jGp94/_new 2013-06-25 14:45:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rsh # -# 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 @@ -50,6 +50,7 @@ Patch14: netkit-rsh-0.17-tty-4-pam.diff Patch15: netkit-rsh-0.17-pam-sess.patch Patch16: netkit-rsh-0.17-fork_before_exec.patch +Patch17: rlogin-handle-EIO-better.patch %description This package contains programs that allow users to run commands on @@ -98,6 +99,7 @@ %patch14 %patch15 %patch16 +%patch17 -p1 %build CFLAGS="$RPM_OPT_FLAGS -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIE" \ ++++++ rlogin-handle-EIO-better.patch ++++++ From: Jiri Slaby <jslaby(a)suse.cz> Subject: rlogin: handle EIO better References: bnc#816514 EIO can be returned by the TTY layer for the moment when login closed all its TTYs to perform hangup. Let's just ignore that error. --- rlogind/rlogind.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/rlogind/rlogind.c +++ b/rlogind/rlogind.c @@ -67,6 +67,7 @@ char rcsid[] = #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <time.h> #include "pathnames.h" #include "logwtmp.h" @@ -246,7 +247,15 @@ static void protocol(int f, int p) { pbp = pibuf; if (pcc < 0 && errno == EWOULDBLOCK) pcc = 0; - else if (pcc <= 0) + else if (pcc < 0 && errno == EIO) { + /* + * login hung up and closed its pty side for + * a while. Let's just ignore that. + */ + pcc = 0; + nanosleep(&(const struct timespec){ 0, 50000000 }, + NULL); + } else if (pcc <= 0) break; else if (pibuf[0] == 0) { pbp++, pcc--; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0