April 2011 - openSUSE Commits - openSUSE Mailing Lists

commit kvirc for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package kvirc for openSUSE:Factory checked in at Fri Apr 1 10:25:03 CEST 2011. -------- --- KDE/kvirc/kvirc.changes 2010-12-16 19:18:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/kvirc/kvirc.changes 2011-04-01 01:06:37.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 1 01:03:39 CEST 2011 - ro(a)suse.de + +- update to 4.0.4 + * translations updated + * many fixes to the buildsystem + * bugfixes + * details please see https://svn.kvirc.de/kvirc/timeline + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kvirc-4.0.2.tar.bz2 New: ---- kvirc-4.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvirc.spec ++++++ --- /var/tmp/diff_new_pack.ANKlVt/_old 2011-04-01 10:23:46.000000000 +0200 +++ /var/tmp/diff_new_pack.ANKlVt/_new 2011-04-01 10:23:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kvirc (Version 4.0.2) +# spec file for package kvirc # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ License: KVIrc Irc Client license Group: Productivity/Networking/IRC Summary: Graphical Front-End for IRC -Version: 4.0.2 +Version: 4.0.4 Release: 1 Source: ftp://ftp.kvirc.de/pub/kvirc/%{version}/source/kvirc-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -133,6 +133,7 @@ %{_mandir}/man?/kvirc.* %{_mandir}/de/man?/kvirc.* %{_mandir}/it/man?/kvirc.* +%{_mandir}/fr/man?/kvirc.* %files devel %defattr(-,root,root) ++++++ kvirc-4.0.2.tar.bz2 -> kvirc-4.0.4.tar.bz2 ++++++ ++++ 158824 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hydrogen for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package hydrogen for openSUSE:Factory checked in at Fri Apr 1 10:22:55 CEST 2011. -------- --- KDE/hydrogen/hydrogen.changes 2010-03-26 20:48:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/hydrogen/hydrogen.changes 2011-04-01 01:59:59.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Mar 18 01:18:26 UTC 2011 - davejplater(a)gmail.com + +- Update to Version 0.9.5 added portaudio.patch from upstream. +- Made hydrogen-no-current-time.patch use __TIMESTAMP__ instead of + __DATE__ +- No more kde3 dependency since version 0.9.4, now uses Qt4. +- Added man page created with hepl2man. +- Added hydrogen-0.9.5-desktopfile.patch which replaces + linux/hydrogen.desktop file which is installed with the one in + the top source directory. +- Upstream changes : + *load playlists at startup + *midi-learn works now with shift-click on some gui elements + *multi-track export and LADI support + *maximum number of bars is now configurable + *added czech translation + *fixed serveral export song failures + *added ogg, flac, aiff export support + *added some new commandline parameter for no_gui version + *added rubberband-cli support + *several improvements on sample editor + *added support for app bundles on OSX + *non destructive sample editor + *piano roll editor and instrument midi out + *destructive midi recording and added czech translation + *support for midi "note off" messages & virtual patterns + *time line to change song tempo and add tags + *director and at least several small changes + *Xml handling is now done by QtXml instead of TinyXML + *improved support for non-ascii filenames / strings + *remove direct dependencies to libflac +- For earlier 0.9.4 changes see ChangeLog + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hydrogen-0.9.3.tar.bz2 hydrogen-flac-1.1.4-fix.diff hydrogen-gcc4.1-fix.diff hydrogen-gcc43-fixes.diff hydrogen-gcc44-fixes.diff hydrogen-plugin-compile-fix.diff hydrogen.desktop New: ---- hydrogen-0.9.5-desktopfile.patch hydrogen-0.9.5.tar.bz2 hydrogen-no-current-time.patch hydrogen-no-return-in-nonvoid-function.patch hydrogen.1 portaudio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hydrogen.spec ++++++ --- /var/tmp/diff_new_pack.I1EcOt/_old 2011-04-01 10:14:06.000000000 +0200 +++ /var/tmp/diff_new_pack.I1EcOt/_new 2011-04-01 10:14:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package hydrogen (Version 0.9.3) +# spec file for package hydrogen # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,71 +19,118 @@ Name: hydrogen -BuildRequires: flac-devel kdelibs3-devel liblrdf-devel libsndfile-devel -%if %suse_version > 1020 -BuildRequires: libraptor-devel -%else -BuildRequires: raptor-devel -%endif +BuildRequires: alsa-devel flac-devel libjack-devel liblrdf-devel libqt4-devel libsndfile-devel +BuildRequires: ladspa-devel lash-devel libarchive-devel libraptor-devel portaudio-devel zlib-devel +BuildRequires: fdupes gcc-c++ help2man hicolor-icon-theme rsync scons subversion update-desktop-files Summary: A Real-Time Drum Machine and Sequencer -Version: 0.9.3 -Release: 249 +Version: 0.9.5 +Release: 1 License: GPLv2+ Group: Productivity/Multimedia/Sound/Midi BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.hydrogen-music.org/ -Source: %{name}-%{version}.tar.bz2 -Source1: hydrogen.desktop -Patch1: hydrogen-gcc4.1-fix.diff -Patch2: hydrogen-plugin-compile-fix.diff -Patch3: hydrogen-flac-1.1.4-fix.diff -Patch4: hydrogen-gcc43-fixes.diff -Patch5: hydrogen-gcc44-fixes.diff +Source0: %{name}-%{version}.tar.bz2 +Source1: hydrogen.1 +Patch1: portaudio.patch +Patch2: hydrogen-no-return-in-nonvoid-function.patch +Patch3: hydrogen-no-current-time.patch +Patch4: hydrogen-0.9.5-desktopfile.patch %description -Hydrogen is a simple real-time Drum machine and sequencer for computer -aided composition (CAC). It supports OSS and JACK outputs and ALSA -sequencer MIDI input. +Hydrogen is an advanced drum machine for GNU/Linux. +It's main goal is to bring professional yet simple and intuitive +pattern-based drum programming. sequencer MIDI input. +Very user-friendly, modular, fast and intuitive graphical +interface based on QT4. +Sample-based stereo audio engine, with import of sound samples +in .wav, .au and .aiff formats. +Pattern-based sequencer, with unlimited number of patterns and +ability to chain patterns into a song. +Up to 64 ticks per pattern with individual level per event and +variable pattern length. +32 instrument tracks with volume, mute, solo, pan capabilities. +Multi layer support for instruments (up to 16 samples for each +instrument). +Ability to import/export song files. +Unique human velocity, human time, pitch and swing functions. +Multiple patterns playing at once. +JACK, ALSA, PortAudio and OSS audio drivers. +ALSA MIDI input with assignable midi-in channel (1..16, ALL). +Import/export of drumkits. +Export song to wav file. +Export song to midi file. + +Authors +------- + Alessandro Cominu (aka Comix) + <comix(a)users.sourceforge.net> %prep %setup -q %patch1 %patch2 -%if %suse_version > 1020 %patch3 -%endif %patch4 -%patch5 -p1 -find . -name CVS | xargs rm -rf -. /etc/opt/kde3/common_options -# update_admin --no-unsermake -update_admin %build -. /etc/opt/kde3/common_options -export QTDIR=/usr/lib/qt3 -./configure $configkde -do_make + +build() { +#%%{?jobs:--jobs=%%jobs} +scons %{?jobs:--jobs=%jobs} \ + libarchive=1 \ + prefix=%{_prefix} \ + optflags="%{optflags} -fPIC -ggdb" \ + portaudio=1 \ + lash=1 \ + $* + +if test $? != 0; then + tail -500 config.log + : scons failed + exit 1 +fi +} +export QTDIR=%{_libdir}/qt4/ +build gui=1 %install -. /etc/opt/kde3/common_options -make DESTDIR="$RPM_BUILD_ROOT" install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp data/img/gray/icon.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/hydrogen.svg -rm -f $RPM_BUILD_ROOT/opt/kde3/share/applications/*.desktop -%suse_update_desktop_file -i hydrogen AudioVideo Sequencer + +export QTDIR=%{_libdir}/qt4/ +scons %{?jobs:--jobs=%jobs} --cache-force DESTDIR="%{buildroot}" install + +# Add man page from help2man +mkdir -p %{buildroot}%{_mandir}/man1 +cp %{S:1} %{buildroot}%{_mandir}/man1/ + +# Make con avalable for desktop file +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +ln -s ../../../../pixmaps/h2-icon.svg hydrogen.svg +ln -s ../../../../pixmaps/h2-icon.svg h2-icon.svg + +%suse_update_desktop_file -i %{name} AudioVideo Sequencer +#%%find_lang --with-qt %%{name} +%fdupes %{buildroot}%{_datadir}/ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + +%post +update-desktop-database &> /dev/null || : + +%postun +update-desktop-database &> /dev/null || : %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog README -/opt/kde3/bin/* -/opt/kde3/share/hydrogen -/opt/kde3/lib/hydrogen -# /opt/kde3/share/applications/*.desktop -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/hydrogen* +%{_bindir}/hydrogen +%doc AUTHORS COPYING ChangeLog README.txt +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/* +%{_mandir}/man1/hydrogen.1.gz +%{_datadir}/%{name}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/h2-icon.svg +%{_datadir}/icons/hicolor/scalable/apps/* %changelog ++++++ hydrogen-0.9.5-desktopfile.patch ++++++ Index: linux/hydrogen.desktop =================================================================== --- linux/hydrogen.desktop.orig 2008-11-18 04:20:01.000000000 +0200 +++ linux/hydrogen.desktop 2011-04-01 01:44:51.262302484 +0200 @@ -2,26 +2,27 @@ Name=Hydrogen Drum Machine Name[de]=Hydrogen Drumsequencer Name[ru]=Драм-машина Hydrogen -Name[hu]=Hydrogen Dobgép - +Name[tr]=Hydrogen Davul Makinası Comment=Create drum sequences Comment[de]=Schlagzeugsequenzen erstellen Comment[ru]=Создание партий ударных инструментов -Comment[hu]=Dobszekvenciákat lehet vele készíteni +Comment[tr]=Davul partisyonu yaz +GenericName=Drum Machine +GenericName[de]=Drumsequencer +GenericName[ru]=Драм-машина +GenericName[tr]=Davul Makinası -Encoding=UTF-8 Version=1.0 Type=Application -Categories=Application;AudioVideo;Sound;Audio;Qt; +Categories=AudioVideo;X-Sound;Audio;Qt; -MimeType=text/xml +MimeType=text/xml; -FilePattern=hydrogen Exec=hydrogen %F TryExec=hydrogen Terminal=false StartupNotify=true -Icon=@ac_prefix@/share/pixmaps/icon.svg \ No newline at end of file +Icon=h2-icon ++++++ hydrogen-0.9.3.tar.bz2 -> hydrogen-0.9.5.tar.bz2 ++++++ ++++ 242935 lines of diff (skipped) ++++++ hydrogen-no-current-time.patch ++++++ Index: gui/src/main.cpp =================================================================== --- gui/src/main.cpp.orig 2010-12-29 00:15:52.000000000 +0200 +++ gui/src/main.cpp 2011-03-20 13:47:57.306332380 +0200 @@ -420,7 +420,7 @@ int main(int argc, char *argv[]) */ void showInfo() { - cout << "\nHydrogen " + get_version() + " [" + __DATE__ + "] [http://www.hydrogen-music.org]" << endl; + cout << "\nHydrogen " + get_version() + " [" + __TIMESTAMP__ + "] [http://www.hydrogen-music.org]" << endl; cout << "Copyright 2002-2008 Alessandro Cominu" << endl; // _INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES) << endl; Index: gui/src/AboutDialog.cpp =================================================================== --- gui/src/AboutDialog.cpp.orig 2011-02-08 21:45:28.000000000 +0200 +++ gui/src/AboutDialog.cpp 2011-03-20 13:51:53.479323328 +0200 @@ -44,7 +44,7 @@ AboutDialog::AboutDialog(QWidget* parent move( 240, 100 ); QString about; - about += QString("<center>Hydrogen Drum Machine %1 [%2] ").arg( get_version().c_str() ).arg( __DATE__ ); + about += QString("<center>Hydrogen Drum Machine %1 [%2] ").arg( get_version().c_str() ).arg( __TIMESTAMP__ ); about += tr( "Website " ); about += "http://www.hydrogen-music.org "; about += tr( "Project page "); Index: no_gui/main.cpp =================================================================== --- no_gui/main.cpp.orig 2009-11-25 19:39:27.000000000 +0200 +++ no_gui/main.cpp 2011-03-20 13:50:15.607814849 +0200 @@ -307,7 +307,7 @@ int main(int argc, char *argv[]) */ void showInfo() { - cout << "\nHydrogen " + get_version() + " [" + __DATE__ + "] [http://www.hydrogen-music.org]" << endl; + cout << "\nHydrogen " + get_version() + " [" + __TIMESTAMP__ + "] [http://www.hydrogen-music.org]" << endl; cout << "Copyright 2002-2008 Alessandro Cominu" << endl; // _INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES) << endl; Index: gui/src/SplashScreen.cpp =================================================================== --- gui/src/SplashScreen.cpp.orig 2009-12-09 14:46:21.000000000 +0200 +++ gui/src/SplashScreen.cpp 2011-03-20 13:53:07.589383001 +0200 @@ -54,7 +54,7 @@ SplashScreen::SplashScreen() p.setFont( font ); p.setPen( QColor( 20, 20, 20 ) ); - QString version = QString( "v%1 (%2)" ).arg( get_version().c_str() ).arg( __DATE__ ); + QString version = QString( "v%1 (%2)" ).arg( get_version().c_str() ).arg( __TIMESTAMP__ ); p.drawText( 5, 5, width - 10, 40, Qt::AlignRight | Qt::AlignTop, version ); // p.drawText( 5, height - 45, width - 10, 40, Qt::AlignHCenter | Qt::AlignBottom, QString( trUtf8( "Modules: %1" ) ).arg( COMPILED_FEATURES ) ); ++++++ hydrogen-no-return-in-nonvoid-function.patch ++++++ Index: libs/hydrogen/src/sampler/sampler.cpp =================================================================== --- libs/hydrogen/src/sampler/sampler.cpp.orig 2011-02-08 21:45:28.000000000 +0200 +++ libs/hydrogen/src/sampler/sampler.cpp 2011-03-19 07:57:48.416397664 +0200 @@ -872,6 +872,7 @@ bool Sampler::is_instrument_playing( Ins } } + return false; } }; ++++++ hydrogen-0.9.3.tar.bz2 -> hydrogen.1 ++++++ Files KDE/hydrogen/hydrogen-0.9.3.tar.bz2 and /mounts/work_src_done/STABLE/hydrogen/hydrogen.1 differ ++++++ portaudio.patch ++++++ Index: libs/hydrogen/src/IO/PortAudioDriver.h =================================================================== --- libs/hydrogen/src/IO/PortAudioDriver.h.orig 2008-02-05 03:00:25.000000000 +0200 +++ libs/hydrogen/src/IO/PortAudioDriver.h 2011-03-18 02:48:47.563442960 +0200 @@ -28,6 +28,11 @@ #ifdef PORTAUDIO_SUPPORT + + +#define PortAudioStream PaStream +#define PaTimestamp PaTime + #include <inttypes.h> #include <portaudio.h> Index: libs/hydrogen/src/IO/portaudio_driver.cpp =================================================================== --- libs/hydrogen/src/IO/portaudio_driver.cpp.orig 2009-07-15 14:24:37.000000000 +0200 +++ libs/hydrogen/src/IO/portaudio_driver.cpp 2011-03-18 02:48:47.564442900 +0200 @@ -10,10 +10,11 @@ namespace H2Core { int portAudioCallback( - void *inputBuffer, + const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, - PaTimestamp outTime, + const PaStreamCallbackTimeInfo* timeInfo, + PaStreamCallbackFlags statusFlags, void *userData ) { @@ -66,9 +67,16 @@ int PortAudioDriver::connect() m_pOut_L = new float[ m_nBufferSize ]; m_pOut_R = new float[ m_nBufferSize ]; - int err = Pa_Initialize(); - + PaError err = Pa_Initialize(); + typedef struct + { + float left_phase; + float right_phase; + } paTestData; + + + if ( err != paNoError ) { ERRORLOG( "Portaudio error in Pa_Initialize: " + QString( Pa_GetErrorText( err ) ) ); return 1; @@ -81,9 +89,9 @@ int PortAudioDriver::connect() paFloat32, /* 32 bit floating point output */ m_nSampleRate, // sample rate m_nBufferSize, // frames per buffer - 0, // number of buffers, if zero then use default minimum + //0, // number of buffers, if zero then use default minimum portAudioCallback, /* specify our custom callback */ - this ); /* pass our data through to callback */ + (void*)this ); /* pass our data through to callback */ if ( err != paNoError ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at Fri Apr 1 10:13:54 CEST 2011. -------- --- lxc/lxc.changes 2011-02-28 18:20:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/lxc/lxc.changes 2011-03-24 18:04:36.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 24 14:22:15 UTC 2011 - brian(a)aljex.com + +- update to 0.7.4.1 + - fix mount path + - rename physical device to the original name + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:recompress:download_url:lxc-0.7.4.tar.bz2 New: ---- _service:recompress:download_url:lxc-0.7.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.SfsvqN/_old 2011-04-01 10:09:20.000000000 +0200 +++ /var/tmp/diff_new_pack.SfsvqN/_new 2011-04-01 10:09:20.000000000 +0200 @@ -18,14 +18,14 @@ Name: lxc -Version: 0.7.4 +Version: 0.7.4.1 Release: 1 Url: http://lxc.sourceforge.net/ Summary: Linux containers implementation Group: System/Management AutoReqProv: on License: LGPLv2.1 -Source: http://dl.sourceforge.net/sourceforge/lxc/lxc-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source1: README.SUSE BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils libcap-devel pkg-config @@ -46,50 +46,32 @@ package is useful to create Virtual Private Server, or to run isolated applications like bash or sshd. - - -Authors: --------- - Daniel Lezcano <dlezcano at fr.ibm.com> - %package devel License: LGPLv2.1 Summary: Development library for lxc -Requires: %{name} = %{version} glibc-devel +Requires: %name = %version glibc-devel Group: Development/Libraries/C and C++ %description devel Lxc header files and library needed for development of containers. - - -Authors: --------- - Daniel Lezcano <dlezcano at fr.ibm.com> - %prep -%setup -q +%setup %build -aclocal -I config -autoheader -autoconf -automake --add-missing --copy -%configure --libexecdir=%{_prefix}/lib/%{name} --disable-examples -%{__make} %{?jobs:-j%jobs} -cp %{SOURCE1} . -# copy to separate dir do we can use rpm's %%doc -rm -rf .doc -mkdir -p .doc/examples -cp doc/examples/*.conf .doc/examples +%configure --disable-examples +%__make %{?_smp_mflags} +%__cp %{SOURCE1} . +%__rm -rf .doc +%__mkdir_p .doc/examples +%__cp doc/examples/*.conf .doc/examples %install %makeinstall -install -d -m 755 %{buildroot}/var/lib/lxc -find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';' +find %buildroot -type f -name '*.la' -delete %clean -rm -rf %{buildroot} +%__rm -rf %buildroot %post -p /sbin/ldconfig @@ -97,18 +79,18 @@ %files %defattr(-,root,root) -%doc AUTHORS MAINTAINERS COPYING README +%doc AUTHORS MAINTAINERS COPYING README doc/FAQ.txt %doc README.SUSE %doc .doc/examples -%{_libdir}/liblxc.so.* -%{_libdir}/lxc +%{_libdir}/lib%{name}.so.* +%{_libdir}/%name %{_bindir}/%{name}-* %{_mandir}/man[^3]/* %files devel %defattr(-,root,root) -%{_includedir}/%{name} -%{_libdir}/liblxc.so +%{_includedir}/%name +%{_libdir}/lib%{name}.so %{_datadir}/pkgconfig/%{name}.pc %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SfsvqN/_old 2011-04-01 10:09:20.000000000 +0200 +++ /var/tmp/diff_new_pack.SfsvqN/_new 2011-04-01 10:09:20.000000000 +0200 @@ -1,11 +1,11 @@ <services> <service name="download_url"> - <param name="protocol">http</param> <param name="host">lxc.sourceforge.net</param> - <param name="path">/download/lxc/lxc-0.7.4.tar.gz</param> + <param name="protocol">http</param> + <param name="path">/download/lxc/lxc-0.7.4.1.tar.gz</param> </service> <service name="recompress"> - <param name="file">_service:download_url:lxc-0.7.4.tar.gz</param> + <param name="file">_service:download_url:lxc-*.tar.gz</param> <param name="compression">bz2</param> </service> </services> ++++++ _service:recompress:download_url:lxc-0.7.4.tar.bz2 -> _service:recompress:download_url:lxc-0.7.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/configure new/lxc-0.7.4.1/configure --- old/lxc-0.7.4/configure 2011-02-26 10:20:20.000000000 +0100 +++ new/lxc-0.7.4.1/configure 2011-03-14 21:48:53.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for lxc 0.7.4. +# Generated by GNU Autoconf 2.67 for lxc 0.7.4.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ # Identity of this package. PACKAGE_NAME='lxc' PACKAGE_TARNAME='lxc' -PACKAGE_VERSION='0.7.4' -PACKAGE_STRING='lxc 0.7.4' +PACKAGE_VERSION='0.7.4.1' +PACKAGE_STRING='lxc 0.7.4.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1266,7 +1266,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lxc 0.7.4 to adapt to many kinds of systems. +\`configure' configures lxc 0.7.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1336,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lxc 0.7.4:";; + short | recursive ) echo "Configuration of lxc 0.7.4.1:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lxc configure 0.7.4 +lxc configure 0.7.4.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1777,7 +1777,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lxc $as_me 0.7.4, which was +It was created by lxc $as_me 0.7.4.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2596,7 +2596,7 @@ # Define the identity of the package. PACKAGE='lxc' - VERSION='0.7.4' + VERSION='0.7.4.1' cat >>confdefs.h <<_ACEOF @@ -5591,7 +5591,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lxc $as_me 0.7.4, which was +This file was extended by lxc $as_me 0.7.4.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5657,7 +5657,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lxc config.status 0.7.4 +lxc config.status 0.7.4.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/configure.ac new/lxc-0.7.4.1/configure.ac --- old/lxc-0.7.4/configure.ac 2011-02-26 10:18:19.000000000 +0100 +++ new/lxc-0.7.4.1/configure.ac 2011-03-14 21:48:10.000000000 +0100 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([lxc], [0.7.4]) +AC_INIT([lxc], [0.7.4.1]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-cgroup.1 new/lxc-0.7.4.1/doc/lxc-cgroup.1 --- old/lxc-0.7.4/doc/lxc-cgroup.1 2011-02-26 10:20:27.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-cgroup.1 2011-03-14 21:49:05.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-CGROUP" "1" "26 February 2011" "" "" +.TH "LXC-CGROUP" "1" "14 March 2011" "" "" .SH NAME lxc-cgroup \- manage the control group associated with a container diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-checkpoint.1 new/lxc-0.7.4.1/doc/lxc-checkpoint.1 --- old/lxc-0.7.4/doc/lxc-checkpoint.1 2011-02-26 10:20:26.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-checkpoint.1 2011-03-14 21:49:03.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-CHECKPOINT" "1" "26 February 2011" "IBM" "" +.TH "LXC-CHECKPOINT" "1" "14 March 2011" "IBM" "" .SH NAME lxc-checkpoint \- checkpoint a running container (not implemented yet) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-console.1 new/lxc-0.7.4.1/doc/lxc-console.1 --- old/lxc-0.7.4/doc/lxc-console.1 2011-02-26 10:20:26.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-console.1 2011-03-14 21:49:03.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-CONSOLE" "1" "26 February 2011" "" "" +.TH "LXC-CONSOLE" "1" "14 March 2011" "" "" .SH NAME lxc-console \- Launch a console for the specified container diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-create.1 new/lxc-0.7.4.1/doc/lxc-create.1 --- old/lxc-0.7.4/doc/lxc-create.1 2011-02-26 10:20:25.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-create.1 2011-03-14 21:49:02.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-CREATE" "1" "26 February 2011" "" "" +.TH "LXC-CREATE" "1" "14 March 2011" "" "" .SH NAME lxc-create \- creates a container diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-destroy.1 new/lxc-0.7.4.1/doc/lxc-destroy.1 --- old/lxc-0.7.4/doc/lxc-destroy.1 2011-02-26 10:20:25.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-destroy.1 2011-03-14 21:49:02.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-DESTROY" "1" "26 February 2011" "" "" +.TH "LXC-DESTROY" "1" "14 March 2011" "" "" .SH NAME lxc-destroy \- destroy a container. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-execute.1 new/lxc-0.7.4.1/doc/lxc-execute.1 --- old/lxc-0.7.4/doc/lxc-execute.1 2011-02-26 10:20:25.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-execute.1 2011-03-14 21:49:02.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-EXECUTE" "1" "26 February 2011" "" "" +.TH "LXC-EXECUTE" "1" "14 March 2011" "" "" .SH NAME lxc-execute \- run an application inside a container. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-freeze.1 new/lxc-0.7.4.1/doc/lxc-freeze.1 --- old/lxc-0.7.4/doc/lxc-freeze.1 2011-02-26 10:20:26.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-freeze.1 2011-03-14 21:49:04.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-FREEZE" "1" "26 February 2011" "" "" +.TH "LXC-FREEZE" "1" "14 March 2011" "" "" .SH NAME lxc-freeze \- freeze all the container's processes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-kill.1 new/lxc-0.7.4.1/doc/lxc-kill.1 --- old/lxc-0.7.4/doc/lxc-kill.1 2011-02-26 10:20:27.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-kill.1 2011-03-14 21:49:05.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-KILL" "1" "26 February 2011" "IBM" "" +.TH "LXC-KILL" "1" "14 March 2011" "IBM" "" .SH NAME lxc-kill \- Send a signal to the process 1 of the container. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-ls.1 new/lxc-0.7.4.1/doc/lxc-ls.1 --- old/lxc-0.7.4/doc/lxc-ls.1 2011-02-26 10:20:27.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-ls.1 2011-03-14 21:49:04.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-LS" "1" "26 February 2011" "" "" +.TH "LXC-LS" "1" "14 March 2011" "" "" .SH NAME lxc-ls \- list the containers existing on the system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-monitor.1 new/lxc-0.7.4.1/doc/lxc-monitor.1 --- old/lxc-0.7.4/doc/lxc-monitor.1 2011-02-26 10:20:27.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-monitor.1 2011-03-14 21:49:04.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-MONITOR" "1" "26 February 2011" "" "" +.TH "LXC-MONITOR" "1" "14 March 2011" "" "" .SH NAME lxc-monitor \- monitor the container state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-ps.1 new/lxc-0.7.4.1/doc/lxc-ps.1 --- old/lxc-0.7.4/doc/lxc-ps.1 2011-02-26 10:20:27.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-ps.1 2011-03-14 21:49:05.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-PS" "1" "26 February 2011" "" "" +.TH "LXC-PS" "1" "14 March 2011" "" "" .SH NAME lxc-ps \- list the processes belonging to a specific container. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-restart.1 new/lxc-0.7.4.1/doc/lxc-restart.1 --- old/lxc-0.7.4/doc/lxc-restart.1 2011-02-26 10:20:26.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-restart.1 2011-03-14 21:49:03.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-RESTART" "1" "26 February 2011" "IBM" "" +.TH "LXC-RESTART" "1" "14 March 2011" "IBM" "" .SH NAME lxc-restart \- restart a container from a file (not implemented yet) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-start.1 new/lxc-0.7.4.1/doc/lxc-start.1 --- old/lxc-0.7.4/doc/lxc-start.1 2011-02-26 10:20:25.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-start.1 2011-03-14 21:49:03.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-START" "1" "26 February 2011" "" "" +.TH "LXC-START" "1" "14 March 2011" "" "" .SH NAME lxc-start \- run an application inside a container. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-stop.1 new/lxc-0.7.4.1/doc/lxc-stop.1 --- old/lxc-0.7.4/doc/lxc-stop.1 2011-02-26 10:20:26.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-stop.1 2011-03-14 21:49:03.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-STOP" "1" "26 February 2011" "" "" +.TH "LXC-STOP" "1" "14 March 2011" "" "" .SH NAME lxc-stop \- stop the application running inside a container diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-unfreeze.1 new/lxc-0.7.4.1/doc/lxc-unfreeze.1 --- old/lxc-0.7.4/doc/lxc-unfreeze.1 2011-02-26 10:20:26.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-unfreeze.1 2011-03-14 21:49:04.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-UNFREEZE" "1" "26 February 2011" "" "" +.TH "LXC-UNFREEZE" "1" "14 March 2011" "" "" .SH NAME lxc-unfreeze \- thaw all the container's processes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc-wait.1 new/lxc-0.7.4.1/doc/lxc-wait.1 --- old/lxc-0.7.4/doc/lxc-wait.1 2011-02-26 10:20:27.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc-wait.1 2011-03-14 21:49:04.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC-WAIT" "1" "26 February 2011" "" "" +.TH "LXC-WAIT" "1" "14 March 2011" "" "" .SH NAME lxc-wait \- wait for a specific container state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc.7 new/lxc-0.7.4.1/doc/lxc.7 --- old/lxc-0.7.4/doc/lxc.7 2011-02-26 10:20:28.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc.7 2011-03-14 21:49:06.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC" "7" "26 February 2011" "Version 0.7.4" "" +.TH "LXC" "7" "14 March 2011" "Version 0.7.4.1" "" .SH NAME lxc \- linux containers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/doc/lxc.conf.5 new/lxc-0.7.4.1/doc/lxc.conf.5 --- old/lxc-0.7.4/doc/lxc.conf.5 2011-02-26 10:20:28.000000000 +0100 +++ new/lxc-0.7.4.1/doc/lxc.conf.5 2011-03-14 21:49:05.000000000 +0100 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve(a)ggi-project.org>. -.TH "LXC.CONF" "5" "26 February 2011" "" "" +.TH "LXC.CONF" "5" "14 March 2011" "" "" .SH NAME lxc.conf \- linux container configuration file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/lxc.spec new/lxc-0.7.4.1/lxc.spec --- old/lxc-0.7.4/lxc.spec 2011-02-26 10:20:22.000000000 +0100 +++ new/lxc-0.7.4.1/lxc.spec 2011-03-14 21:48:58.000000000 +0100 @@ -21,7 +21,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Name: lxc -Version: 0.7.4 +Version: 0.7.4.1 Release: 1 URL: http://lxc.sourceforge.net Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/src/lxc/conf.c new/lxc-0.7.4.1/src/lxc/conf.c --- old/lxc-0.7.4/src/lxc/conf.c 2011-02-02 21:55:49.000000000 +0100 +++ new/lxc-0.7.4.1/src/lxc/conf.c 2011-03-14 21:47:52.000000000 +0100 @@ -979,7 +979,7 @@ goto out; } - snprintf(path, MAXPATHLEN, "%s%s", rootfs->mount, + snprintf(path, MAXPATHLEN, "%s/%s", rootfs->mount, aux + strlen(rootfs->path)); ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, @@ -1218,7 +1218,7 @@ /* empty network namespace */ if (!netdev->ifindex) { if (netdev->flags & IFF_UP) { - err = lxc_device_up("lo"); + err = lxc_netdev_up("lo"); if (err) { ERROR("failed to set the loopback up : %s", strerror(-err)); @@ -1241,7 +1241,7 @@ netdev->link : "eth%d"; /* rename the interface name */ - err = lxc_device_rename(ifname, netdev->name); + err = lxc_netdev_rename_by_name(ifname, netdev->name); if (err) { ERROR("failed to rename %s->%s : %s", ifname, netdev->name, strerror(-err)); @@ -1284,7 +1284,7 @@ if (netdev->flags & IFF_UP) { int err; - err = lxc_device_up(current_ifname); + err = lxc_netdev_up(current_ifname); if (err) { ERROR("failed to set '%s' up : %s", current_ifname, strerror(-err)); @@ -1292,7 +1292,7 @@ } /* the network is up, make the loopback up too */ - err = lxc_device_up("lo"); + err = lxc_netdev_up("lo"); if (err) { ERROR("failed to set the loopback up : %s", strerror(-err)); @@ -1381,9 +1381,9 @@ } if (netdev->mtu) { - err = lxc_device_set_mtu(veth1, atoi(netdev->mtu)); + err = lxc_netdev_set_mtu(veth1, atoi(netdev->mtu)); if (!err) - err = lxc_device_set_mtu(veth2, atoi(netdev->mtu)); + err = lxc_netdev_set_mtu(veth2, atoi(netdev->mtu)); if (err) { ERROR("failed to set mtu '%s' for %s-%s : %s", netdev->mtu, veth1, veth2, strerror(-err)); @@ -1406,7 +1406,7 @@ goto out_delete; } - err = lxc_device_up(veth1); + err = lxc_netdev_up(veth1); if (err) { ERROR("failed to set %s up : %s", veth1, strerror(-err)); goto out_delete; @@ -1425,7 +1425,7 @@ return 0; out_delete: - lxc_device_delete(veth1); + lxc_netdev_delete_by_name(veth1); return -1; } @@ -1458,7 +1458,7 @@ netdev->ifindex = if_nametoindex(peer); if (!netdev->ifindex) { ERROR("failed to retrieve the index for %s", peer); - lxc_device_delete(peer); + lxc_netdev_delete_by_name(peer); return -1; } @@ -1498,7 +1498,7 @@ netdev->ifindex = if_nametoindex(peer); if (!netdev->ifindex) { ERROR("failed to retrieve the ifindex for %s", peer); - lxc_device_delete(peer); + lxc_netdev_delete_by_name(peer); return -1; } @@ -1578,8 +1578,16 @@ lxc_list_for_each(iterator, network) { netdev = iterator->elem; - if (netdev->ifindex > 0 && netdev->type != LXC_NET_PHYS) - lxc_device_delete_index(netdev->ifindex); + if (netdev->ifindex == 0) + continue; + + /* Recent kernels already delete the virtual devices */ + if (netdev->type != LXC_NET_PHYS) + continue; + + if (lxc_netdev_rename_by_index(netdev->ifindex, netdev->link)) + WARN("failed to rename to the initial name the netdev '%s'", + netdev->link); } } @@ -1597,7 +1605,7 @@ if (!netdev->ifindex) continue; - err = lxc_device_move(netdev->ifindex, pid); + err = lxc_netdev_move_by_index(netdev->ifindex, pid); if (err) { ERROR("failed to move '%s' to the container : %s", netdev->link, strerror(-err)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/src/lxc/log.c new/lxc-0.7.4.1/src/lxc/log.c --- old/lxc-0.7.4/src/lxc/log.c 2010-10-11 15:49:37.000000000 +0200 +++ new/lxc-0.7.4.1/src/lxc/log.c 2011-03-11 23:03:44.000000000 +0100 @@ -151,7 +151,7 @@ extern int lxc_log_init(const char *file, const char *priority, const char *prefix, int quiet) { - int lxc_priority = LXC_LOG_PRIORITY_ERROR; + int lxc_priority = LXC_LOG_PRIORITY_WARN; if (priority) { lxc_priority = lxc_log_priority_to_int(priority); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/src/lxc/network.c new/lxc-0.7.4.1/src/lxc/network.c --- old/lxc-0.7.4/src/lxc/network.c 2011-02-14 09:22:02.000000000 +0100 +++ new/lxc-0.7.4.1/src/lxc/network.c 2011-03-07 12:41:35.000000000 +0100 @@ -89,7 +89,7 @@ struct ifaddrmsg ifa; }; -int lxc_device_move(int ifindex, pid_t pid) +int lxc_netdev_move_by_index(int ifindex, pid_t pid) { struct nl_handler nlh; struct nlmsg *nlmsg = NULL; @@ -122,22 +122,17 @@ return err; } -int lxc_device_delete(const char *name) +int lxc_netdev_delete_by_index(int ifindex) { struct nl_handler nlh; struct nlmsg *nlmsg = NULL, *answer = NULL; struct link_req *link_req; - int index, len, err; + int err; err = netlink_open(&nlh, NETLINK_ROUTE); if (err) return err; - err = -EINVAL; - len = strlen(name); - if (len == 1 || len > IFNAMSIZ) - goto out; - err = -ENOMEM; nlmsg = nlmsg_alloc(NLMSG_GOOD_SIZE); if (!nlmsg) @@ -147,21 +142,13 @@ if (!answer) goto out; - err = -EINVAL; - index = if_nametoindex(name); - if (!index) - goto out; - link_req = (struct link_req *)nlmsg; link_req->ifinfomsg.ifi_family = AF_UNSPEC; - link_req->ifinfomsg.ifi_index = index; + link_req->ifinfomsg.ifi_index = ifindex; nlmsg->nlmsghdr.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)); nlmsg->nlmsghdr.nlmsg_flags = NLM_F_ACK|NLM_F_REQUEST; nlmsg->nlmsghdr.nlmsg_type = RTM_DELLINK; - if (nla_put_string(nlmsg, IFLA_IFNAME, name)) - goto out; - err = netlink_transaction(&nlh, nlmsg, answer); out: netlink_close(&nlh); @@ -170,17 +157,32 @@ return err; } -int lxc_device_delete_index(int ifindex) +int lxc_netdev_delete_by_name(const char *name) +{ + int index; + + index = if_nametoindex(name); + if (!index) + return -EINVAL; + + return lxc_netdev_delete_by_index(index); +} + +int lxc_netdev_rename_by_index(int ifindex, const char *newname) { struct nl_handler nlh; struct nlmsg *nlmsg = NULL, *answer = NULL; struct link_req *link_req; - int err; + int len, err; err = netlink_open(&nlh, NETLINK_ROUTE); if (err) return err; + len = strlen(newname); + if (len == 1 || len > IFNAMSIZ) + goto out; + err = -ENOMEM; nlmsg = nlmsg_alloc(NLMSG_GOOD_SIZE); if (!nlmsg) @@ -195,7 +197,10 @@ link_req->ifinfomsg.ifi_index = ifindex; nlmsg->nlmsghdr.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)); nlmsg->nlmsghdr.nlmsg_flags = NLM_F_ACK|NLM_F_REQUEST; - nlmsg->nlmsghdr.nlmsg_type = RTM_DELLINK; + nlmsg->nlmsghdr.nlmsg_type = RTM_NEWLINK; + + if (nla_put_string(nlmsg, IFLA_IFNAME, newname)) + goto out; err = netlink_transaction(&nlh, nlmsg, answer); out: @@ -205,7 +210,22 @@ return err; } -static int device_set_flag(const char *name, int flag) +int lxc_netdev_rename_by_name(const char *oldname, const char *newname) +{ + int len, index; + + len = strlen(oldname); + if (len == 1 || len > IFNAMSIZ) + return -EINVAL; + + index = if_nametoindex(oldname); + if (!index) + return -EINVAL; + + return lxc_netdev_rename_by_index(index, newname); +} + +static int netdev_set_flag(const char *name, int flag) { struct nl_handler nlh; struct nlmsg *nlmsg = NULL, *answer = NULL; @@ -252,7 +272,7 @@ return err; } -int lxc_device_set_mtu(const char *name, int mtu) +int lxc_netdev_set_mtu(const char *name, int mtu) { struct nl_handler nlh; struct nlmsg *nlmsg = NULL, *answer = NULL; @@ -300,66 +320,14 @@ return err; } -int lxc_device_up(const char *name) +int lxc_netdev_up(const char *name) { - return device_set_flag(name, IFF_UP); + return netdev_set_flag(name, IFF_UP); } -int lxc_device_down(const char *name) +int lxc_netdev_down(const char *name) { - return device_set_flag(name, 0); -} - -int lxc_device_rename(const char *oldname, const char *newname) -{ - struct nl_handler nlh; - struct nlmsg *nlmsg = NULL, *answer = NULL; - struct link_req *link_req; - int index, len, err; - - err = netlink_open(&nlh, NETLINK_ROUTE); - if (err) - return err; - - err = -EINVAL; - len = strlen(oldname); - if (len == 1 || len > IFNAMSIZ) - goto out; - - len = strlen(newname); - if (len == 1 || len > IFNAMSIZ) - goto out; - - err = -ENOMEM; - nlmsg = nlmsg_alloc(NLMSG_GOOD_SIZE); - if (!nlmsg) - goto out; - - answer = nlmsg_alloc(NLMSG_GOOD_SIZE); - if (!answer) - goto out; - - err = -EINVAL; - index = if_nametoindex(oldname); - if (!index) - goto out; - - link_req = (struct link_req *)nlmsg; - link_req->ifinfomsg.ifi_family = AF_UNSPEC; - link_req->ifinfomsg.ifi_index = index; - nlmsg->nlmsghdr.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)); - nlmsg->nlmsghdr.nlmsg_flags = NLM_F_ACK|NLM_F_REQUEST; - nlmsg->nlmsghdr.nlmsg_type = RTM_NEWLINK; - - if (nla_put_string(nlmsg, IFLA_IFNAME, newname)) - goto out; - - err = netlink_transaction(&nlh, nlmsg, answer); -out: - netlink_close(&nlh); - nlmsg_free(answer); - nlmsg_free(nlmsg); - return err; + return netdev_set_flag(name, 0); } int lxc_veth_create(const char *name1, const char *name2) @@ -775,7 +743,7 @@ /* * There is a lxc_bridge_attach, but no need of a bridge detach - * as automatically done by kernel when device deleted. + * as automatically done by kernel when a netdev is deleted. */ int lxc_bridge_attach(const char *bridge, const char *ifname) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/src/lxc/network.h new/lxc-0.7.4.1/src/lxc/network.h --- old/lxc-0.7.4/src/lxc/network.h 2010-10-08 11:54:53.000000000 +0200 +++ new/lxc-0.7.4.1/src/lxc/network.h 2011-03-07 12:41:35.000000000 +0100 @@ -31,51 +31,36 @@ /* * Move a device between namespaces */ -extern int lxc_device_move(int ifindex, pid_t pid); +extern int lxc_netdev_move_by_index(int ifindex, pid_t pid); /* * Delete a network device */ -extern int lxc_device_delete(const char *name); +extern int lxc_netdev_delete_by_name(const char *name); +extern int lxc_netdev_delete_by_index(int ifindex); /* - * Delete a network device by the index - */ -extern int lxc_device_delete_index(int ifindex); - -/* - * Set the device network up + * Change the device name */ -extern int lxc_device_up(const char *name); +extern int lxc_netdev_rename_by_name(const char *oldname, const char *newname); +extern int lxc_netdev_rename_by_index(int ifindex, const char *newname); /* - * Set the device network down + * Set the device network up or down */ -extern int lxc_device_down(const char *name); - -/* - * Change the device name - */ -extern int lxc_device_rename(const char *oldname, const char *newname); +extern int lxc_netdev_up(const char *name); +extern int lxc_netdev_down(const char *name); /* * Change the mtu size for the specified device */ -extern int lxc_device_set_mtu(const char *name, int mtu); +extern int lxc_netdev_set_mtu(const char *name, int mtu); /* - * Create a veth network device + * Create a virtual network devices */ extern int lxc_veth_create(const char *name1, const char *name2); - -/* - * Create a macvlan network device - */ extern int lxc_macvlan_create(const char *master, const char *name, int mode); - -/* - * Create a vlan network device - */ extern int lxc_vlan_create(const char *master, const char *name, ushort vid); /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxc-0.7.4/src/lxc/setns.h new/lxc-0.7.4.1/src/lxc/setns.h --- old/lxc-0.7.4/src/lxc/setns.h 2011-01-19 14:53:05.000000000 +0100 +++ new/lxc-0.7.4.1/src/lxc/setns.h 2011-03-07 02:09:02.000000000 +0100 @@ -1 +0,0 @@ -#define __NR_setns 303 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Net-SSLGlue for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package perl-Net-SSLGlue for openSUSE:Factory checked in at Fri Apr 1 10:09:07 CEST 2011. -------- --- perl-Net-SSLGlue/perl-Net-SSLGlue.changes 2010-12-01 14:51:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Net-SSLGlue/perl-Net-SSLGlue.changes 2011-03-31 13:53:37.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 31 11:51:59 UTC 2011 - coolo(a)novell.com + +- update to 0.5: + documentation fixes: http://rt.cpan.org/Ticket/Display.html?id=65258 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Net-SSLGlue-0.4.tar.gz New: ---- Net-SSLGlue-0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-SSLGlue.spec ++++++ --- /var/tmp/diff_new_pack.B8ELFp/_old 2011-04-01 10:04:38.000000000 +0200 +++ /var/tmp/diff_new_pack.B8ELFp/_new 2011-04-01 10:04:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-Net-SSLGlue (Version 0.4) +# spec file for package perl-Net-SSLGlue # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,40 +15,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-Net-SSLGlue +Version: 0.5 +Release: 1 +License: CHECK(Distributable) %define cpan_name Net-SSLGlue -Summary: Add/extend SSL support for common perl modules -Version: 0.4 -Release: 2 -License: GPL+ or Artistic -Group: Development/Libraries/Perl +Summary: add/extend SSL support for common perl modules Url: http://search.cpan.org/dist/Net-SSLGlue/ -Source: http://www.cpan.org/modules/by-module/Net/Net-SSLGlue-%{version}.tar.gz +Group: Development/Libraries/Perl +#Source: http://www.cpan.org/authors/id/S/SU/SULLR/Net-SSLGlue-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(IO::Socket::INET) -BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(IO::Socket::SSL) >= 1.19 -BuildRequires: perl(LWP::UserAgent) >= 5.822 -Requires: perl(IO::Socket::INET) -Requires: perl(IO::Socket::INET6) Requires: perl(IO::Socket::SSL) >= 1.19 -Requires: perl(LWP::UserAgent) >= 5.822 +%{perl_requires} %description Some commonly used perl modules don't have SSL support at all, even if the protocol would support it. Others have SSL support, but most of them don't do proper checking of the servers certificate. -Authors: --------- - Steffen Ullrich +The 'Net::SSLGlue::*' modules try to add SSL support or proper certificate +to these modules. Currently is support for the following modules available: + +* Net::SMTP - add SSL from beginning or using STARTTLS + +* Net::LDAP - add proper certificate checking + +* LWP - add proper certificate checking %prep %setup -q -n %{cpan_name}-%{version} @@ -62,18 +61,14 @@ %install %perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) -%doc Changes COPYRIGHT TODO examples +%defattr(644,root,root,755) +%doc Changes COPYRIGHT README TODO %changelog ++++++ Net-SSLGlue-0.4.tar.gz -> Net-SSLGlue-0.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSLGlue-0.4/Changes new/Net-SSLGlue-0.5/Changes --- old/Net-SSLGlue-0.4/Changes 2010-06-13 21:26:32.000000000 +0200 +++ new/Net-SSLGlue-0.5/Changes 2011-02-03 19:44:35.000000000 +0100 @@ -1,3 +1,6 @@ +0.5 2011/02/03 +documentation fixes: http://rt.cpan.org/Ticket/Display.html?id=65258 + 0.4 2010/06/13 added Changes, put examples into examples/ dir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSLGlue-0.4/MANIFEST new/Net-SSLGlue-0.5/MANIFEST --- old/Net-SSLGlue-0.4/MANIFEST 2010-06-13 21:32:24.000000000 +0200 +++ new/Net-SSLGlue-0.5/MANIFEST 2011-02-03 19:46:15.000000000 +0100 @@ -14,4 +14,5 @@ examples/send-ssl-mail.pl examples/send-starttls-mail.pl Changes +README META.yml Module meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSLGlue-0.4/META.yml new/Net-SSLGlue-0.5/META.yml --- old/Net-SSLGlue-0.4/META.yml 2010-06-13 21:32:24.000000000 +0200 +++ new/Net-SSLGlue-0.5/META.yml 2011-02-03 19:46:15.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: Net-SSLGlue -version: 0.4 +version: 0.5 abstract: ~ author: [] license: unknown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSLGlue-0.4/README new/Net-SSLGlue-0.5/README --- old/Net-SSLGlue-0.4/README 1970-01-01 01:00:00.000000000 +0100 +++ new/Net-SSLGlue-0.5/README 2010-06-13 21:25:57.000000000 +0200 @@ -0,0 +1,2 @@ +This Module helps LWP, Net::SMTP and Net::LDAP to be either +SSL aware at all or to offer way for proper certificate checking. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSLGlue-0.4/lib/Net/SSLGlue/SMTP.pm new/Net-SSLGlue-0.5/lib/Net/SSLGlue/SMTP.pm --- old/Net-SSLGlue-0.4/lib/Net/SSLGlue/SMTP.pm 2008-12-31 15:43:47.000000000 +0100 +++ new/Net-SSLGlue-0.5/lib/Net/SSLGlue/SMTP.pm 2011-02-03 19:45:28.000000000 +0100 @@ -4,6 +4,7 @@ package Net::SSLGlue::SMTP; use IO::Socket::SSL 1.19; use Net::SMTP; +our $VERSION = 0.5; ############################################################################## # mix starttls method into Net::SMTP which on SSL handshake success @@ -116,7 +117,7 @@ ); my $smtp_plain = Net::SMTP->new( $host ); - $smtp_plain->startssl( SSL_ca_path => ... ); + $smtp_plain->starttls( SSL_ca_path => ... ); =head1 DESCRIPTION @@ -137,7 +138,7 @@ L<IO::Socket::INET> object but an L<IO::Socket::SSL> object. One can give the usual C<SSL_*> parameter of L<IO::Socket::SSL> to C<Net::SMTP::new>. -=item startssl +=item starttls If the connection is not yet SSLified it will issue the STARTTLS command and change the object, so that SSL will now be used. The usual C<SSL_*> parameter of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSLGlue-0.4/lib/Net/SSLGlue.pm new/Net-SSLGlue-0.5/lib/Net/SSLGlue.pm --- old/Net-SSLGlue-0.4/lib/Net/SSLGlue.pm 2010-06-13 21:26:41.000000000 +0200 +++ new/Net-SSLGlue-0.5/lib/Net/SSLGlue.pm 2011-02-03 19:45:01.000000000 +0100 @@ -1,5 +1,5 @@ package Net::SSLGlue; -$VERSION = 0.4; +our $VERSION = 0.5; =head1 NAME @@ -27,7 +27,7 @@ =head1 COPYRIGHT This module and the modules in the Net::SSLGlue Hierarchy distributed together -with this module are copyright (c) 2008, Steffen Ullrich. +with this module are copyright (c) 2008-2011, Steffen Ullrich. All Rights Reserved. These modules are free software. They may be used, redistributed and/or modified under the same terms as Perl itself. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postgrey for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package postgrey for openSUSE:Factory checked in at Fri Apr 1 10:04:30 CEST 2011. -------- --- postgrey/postgrey.changes 2011-01-17 13:28:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/postgrey/postgrey.changes 2011-03-31 10:46:05.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 31 08:45:55 UTC 2011 - chris(a)computersalat.de + +- cleanup init script (skeleton) + o added sleep 3s when restart + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgrey.spec ++++++ --- /var/tmp/diff_new_pack.cdvFmc/_old 2011-04-01 10:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.cdvFmc/_new 2011-04-01 10:03:27.000000000 +0200 @@ -29,7 +29,7 @@ Group: Productivity/Networking/Email/Utilities Summary: Postfix greylisting policy server Version: 1.33 -Release: 1 +Release: 15 Url: http://postgrey.schweikert.ch/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://postgrey.schweikert.ch/pub/%name-%{version}.tar.bz2 ++++++ postgrey.init ++++++ --- /var/tmp/diff_new_pack.cdvFmc/_old 2011-04-01 10:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.cdvFmc/_new 2011-04-01 10:03:27.000000000 +0200 @@ -31,24 +31,20 @@ ### END INIT INFO # +# Check for missing binaries (stale symlinks should not happen) +# Note: Special treatment of stop for LSB conformance POSTGREY_BIN=/usr/sbin/postgrey -POSTGREY_SYSCONFIG=/etc/sysconfig/postgrey +test -x $POSTGREY_BIN || { echo "$POSTGREY_BIN not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } -if [ ! -x $POSTGREY_BIN ] ; then - echo -n "Postfix greylisting server postgrey not installed ! " - exit 5 -fi - -if [ ! -r $POSTGREY_SYSCONFIG ]; then - echo "$POSTGREY_SYSCONFIG not existing"; - if [ x"$1" = x"stop" ]; then - exit 0 - else - exit 6 - fi -fi +# Check for existence of needed config file and read it +POSTGREY_SYSCONFIG=/etc/sysconfig/postgrey +test -r $POSTGREY_SYSCONFIG || { echo "$POSTGREY_SYSCONFIG not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } -# Load options file +# Read sysconfig . $POSTGREY_SYSCONFIG # glue all the sysconfig options to one - easier handling @@ -57,24 +53,28 @@ # Source SuSE config, only if exists with size greater zero test -s /etc/rc.status && . /etc/rc.status - +# Reset status of this service rc_reset case "$1" in start) - echo -n "Starting postgrey daemon" + echo -n "Starting postgrey daemon" ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. - startproc "$POSTGREY_BIN" -d $POSTGREY_OPTIONS - rc_status -v - ;; + /sbin/startproc "$POSTGREY_BIN" -d $POSTGREY_OPTIONS + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down postgrey daemon" + echo -n "Shutting down postgrey daemon" ## Stop daemon with killproc(8) and if this fails ## set echo the return value. - killproc -TERM "$POSTGREY_BIN" - rc_status -v - ;; + /sbin/killproc -TERM "$POSTGREY_BIN" + + # Remember status and be verbose + rc_status -v + ;; try-restart) $0 status >/dev/null && $0 restart # Remember status and be quiet @@ -83,31 +83,37 @@ restart) ## Stop the service and regardless of whether it was ## running or not, start it again. - $0 stop - $0 start + $0 stop + sleep 3s + $0 start # Remember status and be quiet - rc_status - ;; + rc_status + ;; force-reload) echo -n "Reload service postgrey not possible" rc_failed 3 + + # Remember status and be verbose rc_status -v ;; reload) ## Send daemon HUP signal with killproc(8) and if this ## fails set echo the return value. - killproc -HUP "$POSTGREY_BIN" - rc_status -v + /sbin/killproc -HUP "$POSTGREY_BIN" + + # Remember status and be verbose + rc_status -v ;; status) - echo -n "Checking for service postgrey: " - checkproc "$POSTGREY_BIN" - rc_status -v - ;; + echo -n "Checking for service postgrey: " + /sbin/checkproc "$POSTGREY_BIN" + + # Remember status and be verbose + rc_status -v + ;; *) - echo "Usage: postgrey {start|stop|try-restart|restart|reload|status}" - exit 1 + echo "Usage: postgrey {start|stop|try-restart|restart|reload|status}" + exit 1 esac - rc_exit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at Fri Apr 1 10:03:11 CEST 2011. -------- --- KDE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-03-10 01:42:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-03-30 14:03:49.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 30 12:02:00 UTC 2011 - javier(a)opensuse.org + +- remove Source4 (sysinfo_background.png) since it is already + included in kdebase4-openSUSE-11.4.tar.bz2 (bnc#680328) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sysinfo_background.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.0VdKlt/_old 2011-04-01 10:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.0VdKlt/_new 2011-04-01 10:01:14.000000000 +0200 @@ -26,11 +26,10 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.4 -Release: 37 +Release: 38 # git clone git://git.opensuse.org/projects/desktop/kdebase4-openSUSE.git Source0: kdebase4-openSUSE-%{version}.tar.bz2 Source2: devel-splash.tar.bz2 -Source4: sysinfo_background.png Requires: kdebase4-workspace Provides: kdebase4-SuSE = 11.0 Obsoletes: kdebase4-SuSE <= 11.0 @@ -135,7 +134,6 @@ cd build %makeinstall cd .. - install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/usr/share/kde4/apps/sysinfo/about/images/background.png for l in SUSEgreeter krpmview kde4-openSUSE kio_sysinfo; do %find_lang $l suse.lang done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-PPI for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package perl-PPI for openSUSE:Factory checked in at Fri Apr 1 09:59:21 CEST 2011. -------- --- perl-PPI/perl-PPI.changes 2010-12-01 10:46:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-PPI/perl-PPI.changes 2011-03-31 20:31:56.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Mar 31 18:29:18 UTC 2011 - coolo(a)novell.com + +* update to 1.215 + - Confirmed new Perl::Critic works with 1.214_02, so we + can release a new PPI now. + - Updated copyright year to 2011 (ADAMK) + - Fixed RT #64247 bless {} probably contains a hash constructor (WYANT) + - Backed out glob fix (WYANT) + - Fixed RT #65199 Cast can trump braces in + PPI::Token::Symbol->symbol (WYANT) + - index_locations on an empty document no longer warns (WYANT) + - Corrected a bug in line-spanning attribute support (WYANT) + - Regression test for line-spanning attribute support (ADAMK) + - Fixed #61305 return { foo => 1 } should parse curlys as hash + constructor, not block (WYANT) + - Fixed #63943 map and regexp confuse PPI? (ADAMK) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PPI-1.213.tar.bz2 New: ---- PPI-1.215.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-PPI.spec ++++++ --- /var/tmp/diff_new_pack.ht8bRX/_old 2011-04-01 09:58:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ht8bRX/_new 2011-04-01 09:58:39.000000000 +0200 @@ -15,22 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-PPI %define cpan_name PPI Summary: Parse, Analyze and Manipulate Perl (without perl) -Version: 1.213 -Release: 6 +Url: http://search.cpan.org/dist/PPI/ +Version: 1.215 +Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl -Url: http://search.cpan.org/dist/PPI/ -#Source: http://www.cpan.org/modules/by-module/PPI/PPI-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +#Source: http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Class::Inspector) >= 1.22 @@ -43,11 +41,9 @@ BuildRequires: perl(List::Util) >= 1.20 BuildRequires: perl(Params::Util) >= 1.00 BuildRequires: perl(Task::Weaken) -BuildRequires: perl(Test::More) >= 0.86 BuildRequires: perl(Test::NoWarnings) >= 0.084 BuildRequires: perl(Test::Object) >= 0.07 BuildRequires: perl(Test::SubCalls) >= 1.07 -# Requires: perl(Clone) >= 0.30 Requires: perl(Digest::MD5) >= 2.35 Requires: perl(File::Spec) >= 0.84 @@ -56,23 +52,18 @@ Requires: perl(List::Util) >= 1.20 Requires: perl(Params::Util) >= 1.00 Requires: perl(Task::Weaken) +%{perl_requires} %description -The purpose of PPI is not to parse Perl *Code*, but to parse Perl -*Documents*. By treating the problem this way, we are able to parse a -single file containing Perl source code "isolated" from any other -resources, such as libraries upon which the code may depend, and without -needing to run an instance of perl alongside or inside the parser. - -Authors: - Adam Kennedy <adamk(a)cpan.org> +This is the PPI manual. It describes its reason for existing, its +general structure, its use, an overview of the API, and provides a few +implementation samples. %prep %setup -q -n %{cpan_name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor - %{__make} %{?_smp_mflags} %check @@ -80,18 +71,14 @@ %install %perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(644,root,root,755) %doc Changes inline2test.conf inline2test.tpl LICENSE README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-File-Slurp for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package perl-File-Slurp for openSUSE:Factory checked in at Fri Apr 1 09:58:29 CEST 2011. -------- --- perl-File-Slurp/perl-File-Slurp.changes 2010-11-30 20:25:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-File-Slurp/perl-File-Slurp.changes 2011-03-31 13:51:28.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 31 11:45:47 UTC 2011 - coolo(a)novell.com + +* update to 9999.15 + - Added LICENCE (same as perl) to POD + - for the rest, see Changes (a lot) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- File-Slurp-9999.13.tar.bz2 New: ---- File-Slurp-9999.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-Slurp.spec ++++++ --- /var/tmp/diff_new_pack.RVSPV6/_old 2011-04-01 09:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.RVSPV6/_new 2011-04-01 09:55:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-File-Slurp (Version 9999.13) +# spec file for package perl-File-Slurp # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,47 +15,49 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%bcond_with pod Name: perl-File-Slurp -%define cpan_name File-Slurp -Summary: Efficient Reading/Writing of Complete Files -Version: 9999.13 -Release: 10 +Version: 9999.15 +Release: 1 License: GPL+ or Artistic -Group: Development/Libraries/Perl +%define cpan_name File-Slurp +Summary: Simple and Efficient Reading/Writing of Complete Files Url: http://search.cpan.org/dist/File-Slurp/ -#Source: http://www.cpan.org/modules/by-module/File/File-Slurp-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +Group: Development/Libraries/Perl +#Source: http://www.cpan.org/authors/id/U/UR/URI/File-Slurp-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros -%if %{with pod} -BuildRequires: perl(Test::Pod) >= 1.14 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 -%endif +BuildRequires: perl(Carp) +BuildRequires: perl(Exporter) +BuildRequires: perl(Fcntl) +BuildRequires: perl(POSIX) +Requires: perl(Carp) +Requires: perl(Exporter) +Requires: perl(Fcntl) +Requires: perl(POSIX) +%{perl_requires} %description This module provides subs that allow you to read or write entire files with one simple call. They are designed to be simple to use, have flexible ways to pass in or get the file contents and to be very efficient. There is also -a sub to read in all the files in a directory other than . and .. - -These slurp/spew subs work for files, pipes and sockets, and stdio, -pseudo-files, and DATA. +a sub to read in all the files in a directory other than '.' and '..' -Authors: --------- - Uri Guttman <uri(a)stemsystems.com> +These slurp/spew subs work for files, pipes and sockets, stdio, +pseudo-files, and the DATA handle. Read more about why slurping files is a +good thing in the file 'slurp_article.pod' in the extras/ directory. + +If you are interested in how fast these calls work, check out the +slurp_bench.pl program in the extras/ directory. It compares many different +forms of slurping. You can select the I/O direction, context and file +sizes. Use the --help option to see how to run it. %prep %setup -q -n %{cpan_name}-%{version} -# rpmlint: script-without-shebang -%{__chmod} a-x lib/File/Slurp.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -66,18 +68,14 @@ %install %perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) -%doc Changes README +%defattr(644,root,root,755) +%doc Changes README TODO %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-HTTP-Message for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package perl-HTTP-Message for openSUSE:Factory checked in at Fri Apr 1 09:53:45 CEST 2011. -------- --- perl-HTTP-Message/perl-HTTP-Message.changes 2011-03-17 00:37:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-HTTP-Message/perl-HTTP-Message.changes 2011-03-31 20:43:08.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 31 18:39:23 UTC 2011 - coolo(a)novell.com + +- update to 6.02 + Declare dependency on Bunzip2 v2.021 [RT#66593] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- HTTP-Message-6.01.tar.gz New: ---- HTTP-Message-6.02.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Message.spec ++++++ --- /var/tmp/diff_new_pack.bWtXD0/_old 2011-04-01 09:44:43.000000000 +0200 +++ /var/tmp/diff_new_pack.bWtXD0/_new 2011-04-01 09:44:43.000000000 +0200 @@ -18,48 +18,27 @@ Name: perl-HTTP-Message -%define cpan_name HTTP-Message -Summary: HTTP style message (base class) -Version: 6.01 +Version: 6.02 Release: 1 License: GPL+ or Artistic -Group: Development/Libraries/Perl +%define cpan_name HTTP-Message +Summary: HTTP style message (base class) Url: http://search.cpan.org/dist/HTTP-Message/ -Source: http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Message-%{version}.tar.gz +Group: Development/Libraries/Perl +#Source: http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Message-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Compress::Raw::Zlib) -BuildRequires: perl(Encode) >= 2.12 BuildRequires: perl(Encode::Locale) >= 1 BuildRequires: perl(HTML::Parser) >= 3.33 BuildRequires: perl(HTTP::Date) >= 6 -BuildRequires: perl(IO::Compress::Bzip2) -BuildRequires: perl(IO::Compress::Deflate) -BuildRequires: perl(IO::Compress::Gzip) -BuildRequires: perl(IO::Uncompress::Bunzip2) -BuildRequires: perl(IO::Uncompress::Gunzip) -BuildRequires: perl(IO::Uncompress::Inflate) -BuildRequires: perl(IO::Uncompress::RawInflate) -BuildRequires: perl(MIME::Base64) >= 2.1 -BuildRequires: perl(MIME::QuotedPrint) BuildRequires: perl(LWP::MediaTypes) >= 6 BuildRequires: perl(URI) >= 1.10 -Requires: perl(Compress::Raw::Zlib) -Requires: perl(Encode) >= 2.12 Requires: perl(Encode::Locale) >= 1 Requires: perl(HTML::Parser) >= 3.33 Requires: perl(HTTP::Date) >= 6 -Requires: perl(IO::Compress::Bzip2) -Requires: perl(IO::Compress::Deflate) -Requires: perl(IO::Compress::Gzip) -Requires: perl(IO::Uncompress::Bunzip2) -Requires: perl(IO::Uncompress::Gunzip) -Requires: perl(IO::Uncompress::Inflate) -Requires: perl(IO::Uncompress::RawInflate) -Requires: perl(MIME::Base64) >= 2.1 -Requires: perl(MIME::QuotedPrint) Requires: perl(LWP::MediaTypes) >= 6 Requires: perl(URI) >= 1.10 %{perl_requires} @@ -68,6 +47,12 @@ An 'HTTP::Message' object contains some headers and a content body. The following methods are available: +* $mess = HTTP::Message->new + +* $mess = HTTP::Message->new( $headers ) + +* $mess = HTTP::Message->new( $headers, $content ) + %prep %setup -q -n %{cpan_name}-%{version} ++++++ HTTP-Message-6.01.tar.gz -> HTTP-Message-6.02.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Message-6.01/Changes new/HTTP-Message-6.02/Changes --- old/HTTP-Message-6.01/Changes 2011-03-07 18:53:38.000000000 +0100 +++ new/HTTP-Message-6.02/Changes 2011-03-20 12:50:33.000000000 +0100 @@ -1,4 +1,11 @@ _______________________________________________________________________________ +2011-03-20 HTTP-Message 6.02 + +Declare dependency on Bunzip2 v2.021 [RT#66593] + + + +_______________________________________________________________________________ 2011-03-07 HTTP-Message 6.01 Avoid loading XML::Simple to avoid test failures. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Message-6.01/META.yml new/HTTP-Message-6.02/META.yml --- old/HTTP-Message-6.01/META.yml 2011-03-07 18:54:10.000000000 +0100 +++ new/HTTP-Message-6.02/META.yml 2011-03-20 13:10:22.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: HTTP-Message -version: 6.01 +version: 6.02 abstract: HTTP style messages author: - Gisle Aas <gisle(a)activestate.com> @@ -16,10 +16,10 @@ Encode::Locale: 1 HTML::Parser: 3.33 HTTP::Date: 6 - IO::Compress::Bzip2: 0 + IO::Compress::Bzip2: 2.021 IO::Compress::Deflate: 0 IO::Compress::Gzip: 0 - IO::Uncompress::Bunzip2: 0 + IO::Uncompress::Bunzip2: 2.021 IO::Uncompress::Gunzip: 0 IO::Uncompress::Inflate: 0 IO::Uncompress::RawInflate: 0 @@ -30,7 +30,7 @@ URI: 1.10 resources: MailingList: mailto:libwww@perl.org - repository: http://github.com/gisle/libwww-perl + repository: http://github.com/gisle/libwww-perl/tree/HTTP-Message/master no_index: directory: - t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Message-6.01/Makefile.PL new/HTTP-Message-6.02/Makefile.PL --- old/HTTP-Message-6.01/Makefile.PL 2011-03-07 18:50:50.000000000 +0100 +++ new/HTTP-Message-6.02/Makefile.PL 2011-03-20 12:30:47.000000000 +0100 @@ -24,15 +24,15 @@ 'Compress::Raw::Zlib' => 0, 'IO::Compress::Gzip' => 0, 'IO::Compress::Deflate' => 0, - 'IO::Compress::Bzip2' => 0, + 'IO::Compress::Bzip2' => '2.021', 'IO::Uncompress::Gunzip' => 0, 'IO::Uncompress::Inflate' => 0, 'IO::Uncompress::RawInflate' => 0, - 'IO::Uncompress::Bunzip2' => 0, + 'IO::Uncompress::Bunzip2' => '2.021', }, META_MERGE => { resources => { - repository => 'http://github.com/gisle/libwww-perl', + repository => 'http://github.com/gisle/libwww-perl/tree/HTTP-Message/master', MailingList => 'mailto:libwww@perl.org', } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Message-6.01/lib/HTTP/Message.pm new/HTTP-Message-6.02/lib/HTTP/Message.pm --- old/HTTP-Message-6.01/lib/HTTP/Message.pm 2011-03-07 18:51:39.000000000 +0100 +++ new/HTTP-Message-6.02/lib/HTTP/Message.pm 2011-03-20 12:49:32.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use vars qw($VERSION $AUTOLOAD); -$VERSION = "6.01"; +$VERSION = "6.02"; require HTTP::Headers; require Carp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tiff for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package tiff for openSUSE:Factory checked in at Fri Apr 1 09:07:15 CEST 2011. -------- --- tiff/tiff.changes 2011-03-03 09:30:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/tiff/tiff.changes 2011-03-31 23:13:44.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Mar 31 21:49:49 CEST 2011 - pgajdos(a)suse.cz + +- fixed regression caused by previous update [bnc#682871] + * modified CVE-2011-0192.patch +- fixed buffer overflow in thunder decoder [bnc#683337] + * added CVE-2011-1167.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tiff-3.9.4-CVE-2011-1167.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tiff.spec ++++++ --- /var/tmp/diff_new_pack.QT8QWP/_old 2011-04-01 09:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.QT8QWP/_new 2011-04-01 09:01:24.000000000 +0200 @@ -29,7 +29,7 @@ # Url: http://www.remotesensing.org/libtiff/ Version: 3.9.4 -Release: 3 +Release: 4 Summary: Tools for Converting from and to the Tiff Format Source: tiff-%{version}.tar.bz2 Source2: README.SUSE @@ -41,6 +41,7 @@ Patch8: tiff-%{version}-scanlinesize.patch Patch9: tiff-%{version}-dont-fancy-upsampling.patch Patch10: tiff-%{version}-CVE-2011-0192.patch +Patch11: tiff-3.9.4-CVE-2011-1167.patch # FYI: this issue is solved another way # http://bugzilla.maptools.org/show_bug.cgi?id=1985#c1 # Patch9: tiff-%{version}-lzw-CVE-2009-2285.patch @@ -107,6 +108,7 @@ %patch8 -p1 %patch9 -p1 %patch10 +%patch11 find -type d -name "CVS" | xargs rm -rfv find -type d | xargs chmod 755 ++++++ tiff-3.9.4-CVE-2011-0192.patch ++++++ --- /var/tmp/diff_new_pack.QT8QWP/_old 2011-04-01 09:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.QT8QWP/_new 2011-04-01 09:01:24.000000000 +0200 @@ -1,15 +1,29 @@ -Index: libtiff/tif_fax3.h -=================================================================== ---- libtiff/tif_fax3.h.orig -+++ libtiff/tif_fax3.h -@@ -478,6 +478,10 @@ done1d: \ +Protect against a fax VL(n) codeword commanding a move left. Without +this, a malicious input file can generate an indefinitely large series +of runs without a0 ever reaching the right margin, thus overrunning +our buffer of run lengths. Per CVE-2011-0192. This is a modified +version of a patch proposed by Drew Yao of Apple Product Security. +It adds an unexpected() report, and disallows the equality case except +for the first run of a line, since emitting a run without increasing a0 +still allows buffer overrun. (We have to allow it for the first run to +cover the case of encoding a zero-length run at start of line using VL.) + +http://bugzilla.maptools.org/show_bug.cgi?id=2297 + +diff -Naur libtiff/tif_fax3.h tiff-3.9.4/libtiff/tif_fax3.h +--- libtiff/tif_fax3.h 2010-06-08 14:50:42.000000000 -0400 ++++ libtiff/tif_fax3.h 2011-03-10 12:11:20.850839162 -0500 +@@ -478,6 +478,12 @@ break; \ case S_VL: \ CHECK_b1; \ -+ if (b1 <= (int) (a0 + TabEnt->Param)) { \ -+ unexpected("VL", a0); \ -+ goto eol2d; \ -+ } \ ++ if (b1 <= (int) (a0 + TabEnt->Param)) { \ ++ if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) { \ ++ unexpected("VL", a0); \ ++ goto eol2d; \ ++ } \ ++ } \ SETVALUE(b1 - a0 - TabEnt->Param); \ b1 -= *--pb; \ break; \ + ++++++ tiff-3.9.4-CVE-2011-1167.patch ++++++ Index: libtiff/tif_thunder.c =================================================================== --- libtiff/tif_thunder.c.orig +++ libtiff/tif_thunder.c @@ -25,6 +25,7 @@ */ #include "tiffiop.h" +#include <assert.h> #ifdef THUNDER_SUPPORT /* * TIFF Library. @@ -55,12 +56,32 @@ static const int twobitdeltas[4] = { 0, 1, 0, -1 }; static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 }; -#define SETPIXEL(op, v) { \ - lastpixel = (v) & 0xf; \ - if (npixels++ & 1) \ - *op++ |= lastpixel; \ - else \ +#define SETPIXEL(op, v) { \ + lastpixel = (v) & 0xf; \ + if ( npixels < maxpixels ) \ + { \ + if (npixels++ & 1) \ + *op++ |= lastpixel; \ + else \ op[0] = (tidataval_t) (lastpixel << 4); \ + } \ +} + +static int +ThunderSetupDecode(TIFF* tif) +{ + static const char module[] = "ThunderSetupDecode"; + + if( tif->tif_dir.td_bitspersample != 4 ) + { + TIFFErrorExt(tif->tif_clientdata, module, + "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.", + (int) tif->tif_dir.td_bitspersample ); + return 0; + } + + + return (1); } static int @@ -142,7 +163,8 @@ ThunderDecodeRow(TIFF* tif, tidata_t buf occ -= tif->tif_scanlinesize; row += tif->tif_scanlinesize; } - return (1); + + return (1); } int @@ -151,6 +173,7 @@ TIFFInitThunderScan(TIFF* tif, int schem (void) scheme; tif->tif_decoderow = ThunderDecodeRow; tif->tif_decodestrip = ThunderDecodeRow; + tif->tif_setupdecode = ThunderSetupDecode; return (1); } #endif /* THUNDER_SUPPORT */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0