November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit ffado for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at Tue Nov 2 16:21:25 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/ffado/ffado-mixer.changes 2010-11-01 16:00:35.000000000 +0100 @@ -0,0 +1,30 @@ +------------------------------------------------------------------- +Mon Nov 1 10:07:50 UTC 2010 - coolo(a)novell.com + +- remove qt dependency, splitted into ffado-mixer spec file + +------------------------------------------------------------------- +Thu Sep 30 10:38:42 UTC 2010 - davejplater(a)gmail.com + +- Update to version 2.0.1 +- Upstream changes :- + Make it work on the new firewire-stack. + Of course some more fixes went into the package. But its mostly + intended for distributors so they can finally deprecate/disable the + old firewire stack in kernels. + For more changelog and instructions please look back at the 2.0.0 + release announcement http://www.ffado.org/?q=release/2.0.0 + +------------------------------------------------------------------- +Wed Jun 16 06:03:13 UTC 2010 - davejplater(a)gmail.com + +- Update to svn 1856. +- Upstream changes : Make it easier for distributions to define + their own additional built-flags. + Numerous bug fixes, see ChangeLog for details. + +------------------------------------------------------------------- +Fri Apr 30 08:18:48 UTC 2010 - davejplater(a)gmail.com + +- Created package ffado version 2.0.0 + --- ffado/ffado.changes 2010-10-02 22:25:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/ffado/ffado.changes 2010-11-01 11:08:17.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 1 10:07:50 UTC 2010 - coolo(a)novell.com + +- remove qt dependency, splitted into ffado-mixer spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ffado-mixer.changes ffado-mixer.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ # # spec file for package ffado-mixer (Version 2.0.1) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # The python_sitelib macro doesn't seem to be available in 11.1 and 11.0 %if 0%{?suse_version} < 1120 %define python_sitelib %{_libexecdir}/python%{py_ver}/site-packages %endif Name: ffado-mixer %define tname libffado Version: 2.0.1 Release: 1 License: GPLv2+ Group: Productivity/Multimedia/Other Summary: FireWire 1394 support for audio devices, svn snapshot Url: http://www.ffado.org/ Source0: %{tname}-%{version}.tar.bz2 BuildRequires: libavc1394-devel libraw1394-devel >= 1.3.0 libxml++-devel scons BuildRequires: doxygen libexpat-devel pkg-config update-desktop-files xdg-utils BuildRequires: alsa-devel dbus-1-devel >= 1.0 fdupes gcc-c++ libiec61883-devel >= 1.1.0 BuildRequires: dbus-1-python-devel graphviz-gnome libqt4-devel subversion xorg-x11-fonts BuildRequires: ffado %if 0%{?suse_version} > 1110 BuildRequires: python-qt4-devel %else BuildRequires: python-qt4 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} %description FFADO aims to provide a generic, open-source solution to support FireWire(IEEE1394, iLink) based (semi-) professional audio interfaces. It's the successor of the FreeBoB project. FFADO is a volunteer-based community effort, trying to provide Linux with at least the same level of functionality that is present on the other operating systems. The range of FireWire Audio Devices that we would like to support is broad: from pure audio interfaces over mixed audio-control devices to DSP algorithm devices. This is a snapshot of svn revision 1855 %prep %setup -n %{tname}-%{version} -q %build scons %{?jobs:--jobs=%jobs} \ PREFIX=%{_prefix} \ LIBDIR=%{_libdir} \ ENABLE_GENERICAVC=yes \ SERIALIZE_USE_EXPAT=no \ DEBUG=no \ ENABLE_ALL=yes \ PYPKGDIR=%{python_sitelib} \ ENABLE_OPTIMIZATIONS=yes \ BUILD_TESTS=yes \ COMPILE_FLAGS="%{optflags} -fno-strict-aliasing -ggdb" %install rm -rf %{buildroot} scons DESTDIR=%{buildroot} \ install mv %{buildroot}%{_datadir}/%{tname}/icons %{buildroot}%{_datadir}/ rm %{buildroot}%_libdir/%tname.* rm -r %{buildroot}/usr/include/libffado rm -r %{buildroot}%_libdir/pkgconfig rpm -ql ffado | while read file; do rm -v "%{buildroot}$file" || true done mkdir -p %{buildroot}%{_datadir}/applications/ mkdir -p %{buildroot}%{_datadir}/pixmaps cp support/xdg/hi64-apps-ffado.png %{buildroot}%{_datadir}/pixmaps/ffadomixer.png %suse_update_desktop_file -c ffadomixer FfadoMixer "Mixer for ffado" ffado-mixer ffadomixer "AudioVideo;Mixer;HardwareSettings;Qt" chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_configuration.py chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_panelmanager.py chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_dbus_util.py find ./ -empty -delete %fdupes -s %{buildroot}%{_datadir} %clean rm -rf %buildroot %files %defattr(-,root,root) %doc README AUTHORS ChangeLog LICENSE.GPLv2 LICENSE.GPLv3 %{_bindir}/ffado-mixer %dir %{_datadir}/%{tname} %{_datadir}/%{tname}/* %{_datadir}/icons/* %{_datadir}/pixmaps/ffadomixer.png %{_datadir}/applications/* %changelog ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.HMvVG8/_old 2010-11-02 16:21:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HMvVG8/_new 2010-11-02 16:21:03.000000000 +0100 @@ -23,26 +23,21 @@ %endif Name: ffado -%define name libffado +%define tname libffado Version: 2.0.1 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Multimedia/Other Summary: FireWire 1394 support for audio devices, svn snapshot Url: http://www.ffado.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: %{tname}-%{version}.tar.bz2 Source1: baselibs.conf Source2: ChangeLog #Source3: %{_svn}.log BuildRequires: libavc1394-devel libraw1394-devel >= 1.3.0 libxml++-devel scons BuildRequires: doxygen libexpat-devel pkg-config update-desktop-files xdg-utils BuildRequires: alsa-devel dbus-1-devel >= 1.0 fdupes gcc-c++ libiec61883-devel >= 1.1.0 -BuildRequires: dbus-1-python-devel graphviz-gnome libqt4-devel subversion xorg-x11-fonts -%if 0%{?suse_version} > 1110 -BuildRequires: python-qt4-devel -%else -BuildRequires: python-qt4 -%endif +BuildRequires: dbus-1-python-devel graphviz-gnome xorg-x11-fonts Requires: libffado2 = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} @@ -60,13 +55,6 @@ mixed audio-control devices to DSP algorithm devices. This is a snapshot of svn revision 1855 -Authors: --------- - Daniel Wagner <wagi(a)monom.org> - Pieter Palmers <pieter.palmers(a)ffado.org> - Jonathan Woithe <jwoithe(a)physics.adelaide.edu.au> - Arnold Krille <arnold(a)arnoldarts.de> - %package -n libffado-devel License: GPLv2+ Summary: Development files for ffado @@ -77,15 +65,6 @@ This package supplys the files necessary to develop applications that use the FFADO libraries and api. - - -Authors: --------- - Daniel Wagner <wagi(a)monom.org> - Pieter Palmers <pieter.palmers(a)ffado.org> - Jonathan Woithe <jwoithe(a)physics.adelaide.edu.au> - Arnold Krille <arnold(a)arnoldarts.de> - %package -n libffado2 License: GPLv2+ Summary: FireWire 1394 support for audio devices @@ -105,13 +84,6 @@ a GUI to control these parameters (only for officially supported devices). -Authors: --------- - Daniel Wagner <wagi(a)monom.org> - Pieter Palmers <pieter.palmers(a)ffado.org> - Jonathan Woithe <jwoithe(a)physics.adelaide.edu.au> - Arnold Krille <arnold(a)arnoldarts.de> - %package doc License: GPLv2+ Summary: API documentation for ffado @@ -123,16 +95,8 @@ %description doc This package contains the libffado API documentation. -Authors: --------- - Daniel Wagner <wagi(a)monom.org> - Pieter Palmers <pieter.palmers(a)ffado.org> - Jonathan Woithe <jwoithe(a)physics.adelaide.edu.au> - Arnold Krille <arnold(a)arnoldarts.de> - - %prep -%setup -n %{name}-%{version} -q +%setup -n %{tname}-%{version} -q %build scons %{?jobs:--jobs=%jobs} \ @@ -151,7 +115,7 @@ rm -rf %{buildroot} scons DESTDIR=%{buildroot} \ install -mv %{buildroot}%{_datadir}/%{name}/icons %{buildroot}%{_datadir}/ +#mv %{buildroot}%{_datadir}/%{tname}/icons %{buildroot}%{_datadir}/ # Build API documentation export top_srcdir=$PWD @@ -162,18 +126,8 @@ cp -r reference %{buildroot}%{_docdir}/%{name} popd -mkdir -p %{buildroot}%{_datadir}/applications/ - mkdir -p %{buildroot}%{_datadir}/pixmaps - cp support/xdg/hi64-apps-ffado.png %{buildroot}%{_datadir}/pixmaps/ffadomixer.png -%suse_update_desktop_file -c ffadomixer FfadoMixer "Mixer for ffado" ffado-mixer ffadomixer "AudioVideo;Mixer;HardwareSettings;Qt" - -#find %{buildroot}%{python_sitelib}/ -#find %{buildroot}%{_datadir}/%{name}/ -executable -name *.py -exec chmod 755 {} \; -chmod 755 %{buildroot}%{_datadir}/%{name}/python/ffado_diag_helpers.py -chmod 755 %{buildroot}%{_datadir}/%{name}/python/ffado_configuration.py -chmod 755 %{buildroot}%{_datadir}/%{name}/python/ffado_panelmanager.py -chmod 755 %{buildroot}%{_datadir}/%{name}/python/helpstrings.py -chmod 755 %{buildroot}%{_datadir}/%{name}/python/ffado_dbus_util.py +chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_diag_helpers.py +chmod 755 %{buildroot}%{_datadir}/%{tname}/python/helpstrings.py cp %{S:2} ./ #cp %{S:3} ./ @@ -191,34 +145,23 @@ %files %defattr(-,root,root) %doc README AUTHORS ChangeLog LICENSE.GPLv2 LICENSE.GPLv3 -#%%{_svn}.log %{_bindir}/ffado* -#%%{_bindir}/dumpiso_mod -#%%{_bindir}/gen-loadpulses -#%%{_bindir}/scan-devreg -#%%{_bindir}/test* -#%%{_datadir}/dbus-1/services/org.ffado.Control.service -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* -%{_datadir}/icons/* -%{_datadir}/pixmaps/ffadomixer.png -%{_datadir}/applications/* +%{_datadir}/%{tname} %files -n libffado-devel %defattr(-,root,root) -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h -%{_libdir}/%{name}*.so -%{_libdir}/pkgconfig/%{name}.pc +%dir %{_includedir}/%{tname} +%{_includedir}/%{tname}/*.h +%{_libdir}/%{tname}*.so +%{_libdir}/pkgconfig/%{tname}.pc #%{_datadir}/applnk/ffado.org-ffadomixer.desktop %files -n libffado2 %defattr(-,root,root) -%{_libdir}/%{name}.so.2* +%{_libdir}/%{tname}.so.2* %files doc %defattr(-,root,root) -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/* +%{_docdir}/%{name} %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 python-pyinotify for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package python-pyinotify for openSUSE:Factory checked in at Tue Nov 2 16:20:13 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-pyinotify/python-pyinotify.changes 2010-11-02 14:28:46.000000000 +0100 @@ -0,0 +1,27 @@ +------------------------------------------------------------------- +Tue Nov 2 13:27:57 UTC 2010 - prusnak(a)opensuse.org + +- add pyinotify wrapper +- fix license in spec file + +------------------------------------------------------------------- +Thu Oct 28 18:33:27 UTC 2010 - prusnak(a)opensuse.org + +- updated to 0.9.1 +- cleanup spec file + +------------------------------------------------------------------- +Mon Oct 11 22:29:37 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 0.9.0 + +------------------------------------------------------------------- +Tue Jun 17 21:15:13 CEST 2008 - poeml(a)suse.de + +- update to 0.7.1 + +------------------------------------------------------------------- +Fri Sep 15 11:42:54 CEST 2006 - poeml(a)suse.de + +- create package (version 0.6.2) + calling whatdependson for head-i586 New: ---- pyinotify python-pyinotify.changes python-pyinotify.spec seb-m-pyinotify-0.9.1-0-g5d381ce.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyinotify.spec ++++++ # # spec file for package python-pyinotify (Version 0.9.1) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: python-pyinotify Version: 0.9.1 Release: 1 License: MIT Summary: Python module for watching filesystems changes Url: http://github.com/seb-m/pyinotify Group: Development/Libraries/Python # downloaded from http://github.com/seb-m/pyinotify/tarball/%{version} %define tag 5d381ce %define subdir 4ad6992 Source: http://download.github.com/seb-m-pyinotify-%{version}-0-g%{tag}.tar.gz Source1: pyinotify BuildRequires: perl BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1120 BuildArch: noarch %else %{py_requires} %endif %description pyinotify is a Python module for watching filesystems changes. By its design pyinotify can be used for any kind of fs monitoring. pyinotify relies on a recent Linux Kernel feature (merged in kernel 2.6.13) called inotify. inotify is an event-driven notifier, its notifications are exported from kernel space to user space. The raw interface of inotify is compounded of three system calls. pyinotify binds these system calls and provides an implementation on top of them offering a generic and abstract way to use inotify with Python. Pyinotify doesn't requires much detailed knowledge of inotify. Moreover, it only needs few statements for initializing, watching, handling (eventually trough a new separate thread), and processing events notifications through subclassing. The only things to know is the path of items to watch, the kind of events to monitor and the actions to execute on these notifications. Note: pyinotify requires Python 2.3 and above, and Linux 2.6.13 at least. %prep %setup -q -n "seb-m-pyinotify-%{subdir}" %build export CFLAGS="%{optflags}" python ./setup.py build %install python ./setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/pyinotify %clean rm -rf %{buildroot} %files -f INSTALLED_FILES %defattr(-,root,root) %doc ACKS COPYING README.md %doc python2/examples %{_bindir}/pyinotify %changelog ++++++ pyinotify ++++++ #!/bin/sh python -m pyinotify "$@" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 eric for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package eric for openSUSE:Factory checked in at Tue Nov 2 16:19:41 CET 2010. -------- --- KDE/eric/eric.changes 2010-09-10 01:52:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/eric/eric.changes 2010-10-11 19:12:55.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Oct 11 12:12:29 UTC 2010 - toddrme2178(a)gmail.com + +- update to 4.4.9 + * bugfixes. + +-update django plugin to 2.1.2 + * bugfixes. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Plugin_Project_Django-2.1.1.tar.gz eric4-4.4.8.tar.gz eric4-i18n-cs-4.4.8.tar.gz eric4-i18n-de-4.4.8.tar.gz eric4-i18n-es-4.4.8.tar.gz eric4-i18n-fr-4.4.8.tar.gz eric4-i18n-it-4.4.8.tar.gz eric4-i18n-ru-4.4.8.tar.gz eric4-i18n-tr-4.4.8.tar.gz eric4-i18n-zh_CN.GB2312-4.4.8.tar.gz New: ---- Plugin_Project_Django-2.1.2.tar.gz eric4-4.4.9.tar.gz eric4-i18n-cs-4.4.9.tar.gz eric4-i18n-de-4.4.9.tar.gz eric4-i18n-es-4.4.9.tar.gz eric4-i18n-fr-4.4.9.tar.gz eric4-i18n-it-4.4.9.tar.gz eric4-i18n-ru-4.4.9.tar.gz eric4-i18n-tr-4.4.9.tar.gz eric4-i18n-zh_CN.GB2312-4.4.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eric.spec ++++++ --- /var/tmp/diff_new_pack.60e9JY/_old 2010-11-02 16:19:20.000000000 +0100 +++ /var/tmp/diff_new_pack.60e9JY/_new 2010-11-02 16:19:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package eric (Version 4.4.8) +# spec file for package eric (Version 4.4.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ Requires: python-logilab-common >= 0.43.0 Requires: python-xml Requires: unzip -Version: 4.4.8 +Version: 4.4.9 Release: 1 Source0: eric4-%version.tar.gz Source1: %name.desktop @@ -58,7 +58,7 @@ Source14: Plugin_Tools_CharTables-4.1.4.tar.bz2 Source15: Plugin_Vcs_CVS-4.1.12.tar.bz2 Source19: Plugin_Assistant_Eric-1.2.3.tar.gz -Source20: Plugin_Project_Django-2.1.1.tar.gz +Source20: Plugin_Project_Django-2.1.2.tar.gz Source21: Plugin_Project_Pylons-1.0.0.tar.bz2 Source22: Plugin_Project_TurboGears-1.0.5.tar.bz2 Source23: Plugin_Project_wxPython-1.0.3.tar.bz2 ++++++ Plugin_Project_Django-2.1.1.tar.gz -> Plugin_Project_Django-2.1.2.tar.gz ++++++ Files old/Plugin_Project_Django-2.1.1/.eric4project/project-apis.db and new/Plugin_Project_Django-2.1.2/.eric4project/project-apis.db differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Plugin_Project_Django-2.1.1/ChangeLog new/Plugin_Project_Django-2.1.2/ChangeLog --- old/Plugin_Project_Django-2.1.1/ChangeLog 2010-06-20 14:41:26.000000000 +0200 +++ new/Plugin_Project_Django-2.1.2/ChangeLog 2010-10-01 20:43:09.000000000 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 2.1.2: +- bug fixes + Version 2.1.1: - bug fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Plugin_Project_Django-2.1.1/PluginProjectDjango.py new/Plugin_Project_Django-2.1.2/PluginProjectDjango.py --- old/Plugin_Project_Django-2.1.1/PluginProjectDjango.py 2010-06-20 14:40:54.000000000 +0200 +++ new/Plugin_Project_Django-2.1.2/PluginProjectDjango.py 2010-10-01 20:42:50.000000000 +0200 @@ -30,7 +30,7 @@ author = "Detlev Offenbach <detlev(a)die-offenbachs.de>" autoactivate = True deactivateable = True -version = "2.1.1" +version = "2.1.2" className = "ProjectDjangoPlugin" packageName = "ProjectDjango" shortDescription = "Project support for Django projects." Files old/Plugin_Project_Django-2.1.1/PluginProjectDjango.zip and new/Plugin_Project_Django-2.1.2/PluginProjectDjango.zip differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Plugin_Project_Django-2.1.1/ProjectDjango/LexerDjango.py new/Plugin_Project_Django-2.1.2/ProjectDjango/LexerDjango.py --- old/Plugin_Project_Django-2.1.1/ProjectDjango/LexerDjango.py 2010-06-20 14:42:08.000000000 +0200 +++ new/Plugin_Project_Django-2.1.2/ProjectDjango/LexerDjango.py 2010-10-01 20:38:34.000000000 +0200 @@ -221,7 +221,7 @@ if txt and txt[0] in '"\''and txt[-1] not in '"\'': style = DJANGO_STRINGEOL - tlen = len(txt) + tlen = len(txt.encode("utf-8")) if eolLen > 1: tlen += txt.count('\n') if tlen: ++++++ eric4-4.4.8.tar.gz -> eric4-4.4.9.tar.gz ++++++ KDE/eric/eric4-4.4.8.tar.gz /mounts/work_src_done/STABLE/eric/eric4-4.4.9.tar.gz differ: char 5, line 1 ++++++ eric4-i18n-cs-4.4.8.tar.gz -> eric4-i18n-cs-4.4.9.tar.gz ++++++ ++++ 5617 lines of diff (skipped) ++++++ eric4-i18n-de-4.4.8.tar.gz -> eric4-i18n-de-4.4.9.tar.gz ++++++ ++++ 5754 lines of diff (skipped) ++++++ eric4-i18n-es-4.4.8.tar.gz -> eric4-i18n-es-4.4.9.tar.gz ++++++ ++++ 3933 lines of diff (skipped) ++++++ eric4-i18n-fr-4.4.8.tar.gz -> eric4-i18n-fr-4.4.9.tar.gz ++++++ ++++ 5734 lines of diff (skipped) ++++++ eric4-i18n-it-4.4.8.tar.gz -> eric4-i18n-it-4.4.9.tar.gz ++++++ ++++ 5679 lines of diff (skipped) ++++++ eric4-i18n-ru-4.4.8.tar.gz -> eric4-i18n-ru-4.4.9.tar.gz ++++++ ++++ 5738 lines of diff (skipped) ++++++ eric4-i18n-tr-4.4.8.tar.gz -> eric4-i18n-tr-4.4.9.tar.gz ++++++ ++++ 5615 lines of diff (skipped) ++++++ eric4-i18n-zh_CN.GB2312-4.4.8.tar.gz -> eric4-i18n-zh_CN.GB2312-4.4.9.tar.gz ++++++ ++++ 5619 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 cwiid for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package cwiid for openSUSE:Factory checked in at Tue Nov 2 16:18:44 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/cwiid/cwiid.changes 2010-07-31 00:13:50.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Jul 30 22:13:20 UTC 2010 - pascal.bleser(a)opensuse.org + +- initial package (0.6.00) + calling whatdependson for head-i586 New: ---- cwiid-0.6.00.tar.bz2 cwiid-fix_ldflags.patch cwiid-hci_read.patch cwiid.changes cwiid.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cwiid.spec ++++++ # # spec file for package cwiid (Version 0.6.00) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %{!?py_ver: %global py_ver %(%__python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null)} %{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: cwiid Version: 0.6.00 Release: 1 %define soname 1 Summary: Wii Library # http://abstrakraft.org/cwiid/downloads/cwiid-%{version}.tgz Source: cwiid-%{version}.tar.bz2 Patch1: cwiid-fix_ldflags.patch Patch2: cwiid-hci_read.patch Url: http://abstrakraft.org/cwiid/ Group: System/Libraries License: GNU General Public License version 2 or later (GPL v2 or later) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex BuildRequires: bluez-devel BuildRequires: python-devel BuildRequires: gtk2-devel BuildRequires: gcc glibc-devel make pkgconfig BuildRequires: autoconf automake libtool %description ............................................................................. %package -n libcwiid%{soname} Summary: Library to access Wiimotes Provides: libcwiid%{soname} = %{version} Group: System/Libraries %description -n libcwiid%{soname} Library to use Wiimotes. %package -n libcwiid-devel License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Library to access Wiimotes Requires: libcwiid%{soname} = %{version} Group: Development/Libraries/C and C++ %description -n libcwiid-devel API and library to use Wiimotes. %package -n wminput License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Linux Event Driver for the Wiimote Requires: libcwiid%{soname} = %{version} Group: Hardware/Joystick %description -n wminput wminput is an Linux event, mouse, and joystick driver for the wiimote using the uinput system. It supports assigning key/button symbols to buttons on the wiimote, nunchuk, and classic controller, and axes symbols to wiimote axes including direction pads, "analog" sticks, and "analog" shoulder buttons. Furthermore, it provides a plugin interface through which more advanced functionality can be implemented, such as accelerometer and ir calculations. Plugins can provide button-type events and axes. %package -n wmgui License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Graphical User Interface to the Wiimote Requires: libcwiid%{soname} = %{version} Group: Hardware/Joystick %description -n wmgui Graphical user interface for the capabilities of libcwiid, a Wiimote access library. %package -n lswm License: GNU General Public License version 2 or later (GPL v2 or later) Summary: List Wiimote Devices Requires: libcwiid%{soname} = %{version} Group: Hardware/Joystick %description -n lswm lswm is a command-line utility to list Wiimote devices. %package -n python-cwiid License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Python Module to Access Wiimotes Requires: libcwiid%{soname} = %{version} Group: Development/Libraries/Python %description -n python-cwiid Python wrapper module around the libcwiid library, to access Wiimote devices. %prep %setup -q -n "cwiid-%{version}" %patch1 %patch2 %build %configure \ --disable-ldconfig %__make %{?_smp_mflags} %install %makeinstall %__rm "%{buildroot}%{_libdir}"/lib*.a %__rm -rf "%{buildroot}%{_datadir}/doc" %__chmod 0644 "%{buildroot}%{_includedir}"/*.h %__rm doc/Makefile* %post -n libcwiid%{soname} -p /sbin/ldconfig %postun -n libcwiid%{soname} -p /sbin/ldconfig %clean %{?buildroot:%__rm -rf "%{buildroot}"} %files -n lswm %defattr(-,root,root) %{_bindir}/lswm %files -n wmgui %defattr(-,root,root) %{_bindir}/wmgui %doc %{_mandir}/man1/wmgui.1%{ext_man} %files -n wminput %defattr(-,root,root) %doc doc/wminput.list %doc wminput/README %doc AUTHORS ChangeLog COPYING NEWS README %dir %{_sysconfdir}/cwiid/wminput %attr(0644,root,root) %config %{_sysconfdir}/cwiid/wminput/* %{_bindir}/wminput %dir %{_libdir}/cwiid %dir %{_libdir}/cwiid/plugins %dir %{_libdir}/cwiid/plugins/*.so %doc %{_mandir}/man1/wminput.1%{ext_man} %files -n libcwiid-devel %defattr(-,root,root) %{_includedir}/cwiid.h %{_libdir}/libcwiid.so %files -n libcwiid%{soname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %doc doc/Xmodmap %dir %{_sysconfdir}/cwiid %dir %{_libdir}/cwiid %dir %{_libdir}/cwiid/plugins %{_libdir}/libcwiid.so.%{soname} %{_libdir}/libcwiid.so.%{soname}.* %files -n python-cwiid %defattr(-,root,root) %{python_sitearch}/cwiid.so %if 0%{?suse_version} >= 1100 %{python_sitearch}/cwiid-%{version}-py%{py_ver}.egg-info %endif %changelog ++++++ cwiid-fix_ldflags.patch ++++++ --- lswm/Makefile.in.orig 2010-07-30 22:19:22.000000000 +0200 +++ lswm/Makefile.in 2010-07-30 22:19:51.000000000 +0200 @@ -8,7 +8,7 @@ CFLAGS += -I@top_builddir@/libcwiid LDFLAGS += -L@top_builddir@/libcwiid -LDLIBS += -lcwiid +LDLIBS += -lcwiid -ldl -lbluetooth -lpthread -lrt INST_DIR = @bindir@ include $(COMMON)/include/app.mak --- wmgui/Makefile.in.orig 2007-07-28 20:47:03.000000000 +0200 +++ wmgui/Makefile.in 2010-07-30 22:19:15.000000000 +0200 @@ -8,7 +8,7 @@ CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid LDFLAGS += -L@top_builddir@/libcwiid -LDLIBS += @GTK_LIBS@ -lm -lcwiid +LDLIBS += @GTK_LIBS@ -lm -lcwiid -lbluetooth -lpthread -lrt INST_DIR = @bindir@ include $(COMMON)/include/app.mak --- wminput/Makefile.in.orig 2007-07-28 20:47:03.000000000 +0200 +++ wminput/Makefile.in 2010-07-30 22:19:15.000000000 +0200 @@ -14,7 +14,7 @@ -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \ -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" -LDLIBS += -lcwiid -ldl +LDLIBS += -lcwiid -ldl -lbluetooth -lpthread -lrt LDFLAGS += -L@top_builddir@/libcwiid -rdynamic INST_DIR = @bindir@ --- wmdemo/Makefile.in.orig 2010-07-30 22:20:44.000000000 +0200 +++ wmdemo/Makefile.in 2010-07-30 22:21:06.000000000 +0200 @@ -8,7 +8,7 @@ CFLAGS += -I@top_builddir@/libcwiid LDFLAGS += -L@top_builddir@/libcwiid -LDLIBS += -lcwiid +LDLIBS += -lcwiid -ldl -lbluetooth -lpthread -lrt INST_DIR = @bindir@ include $(COMMON)/include/app.mak ++++++ cwiid-hci_read.patch ++++++ --- libcwiid/bluetooth.c.orig 2010-07-30 22:13:38.000000000 +0200 +++ libcwiid/bluetooth.c 2010-07-30 22:13:51.000000000 +0200 @@ -122,7 +122,7 @@ } /* timeout (10000) in milliseconds */ - if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, + if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, (*bdinfo)[bdinfo_count].name, 10000)) { cwiid_err(NULL, "Bluetooth name read error"); err = 1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-checkbot for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package perl-checkbot for openSUSE:Factory checked in at Tue Nov 2 16:18:12 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-checkbot/perl-checkbot.changes 2010-10-28 18:23:12.000000000 +0200 @@ -0,0 +1,47 @@ +------------------------------------------------------------------- +Thu Oct 28 16:17:17 UTC 2010 - chris(a)computersalat.de + +- update to 1.80 + * Fix handling of nofollow robots tag. + * Require newer version of LWP for better handling of character + encodings. + * Ignore mms scheme. + * Minor clarification in output. +- Changes in version 1.79 (3-Feb-2007) + * Correctly parse documents to avoid problems with UTF-8 + documents. This avoids the "Parsing of undecoded UTF-8 will give + garbage when decoding entities" messages. + * Allow regular expressions in the suppression file, and complain if + the suppression file is not a proper file. + * More robust handling of HTTP and FTP servers that have problems + responding to HEAD requests. + * Use the original URL to report problems. + * Ensure XHTML compliance. +- Changes in version 1.78 (3-May-2006) + * Don't throw errors for links that cannot be expected to be valid + all the time (e.g. the classid attribute of an object element) + * Better fallbacks for some cases where the HEAD request does not + work + * Add more classes and ids to allow more styling of results pages + (including example CSS file) + * Ensure XHTML compliance + * Better checks for optional dependencies +- renamed to perl-checker +- reworked webserver patch +- recreated by cpanspec 1.78.02 + +------------------------------------------------------------------- +Wed Jan 25 21:34:56 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Sep 28 08:29:14 CEST 2005 - schubi(a)suse.de + +- Added more output + +------------------------------------------------------------------- +Tue Sep 20 13:06:16 CEST 2005 - schubi(a)suse.de + +- initial + calling whatdependson for head-i586 New: ---- checkbot-1.80-webserver.patch checkbot-1.80.tar.bz2 perl-checkbot.changes perl-checkbot.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-checkbot.spec ++++++ # # spec file for package perl-checkbot (Version 1.80) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: perl-checkbot %define cpan_name checkbot Summary: WWW Link Verifier Version: 1.80 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/checkbot/ #Source: http://www.cpan.org/modules/by-module/checkbot/checkbot-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 Patch0: %{cpan_name}-1.80-webserver.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl(LWP) >= 5.803 BuildRequires: perl(URI) >= 1.10 BuildRequires: perl(HTML::Parser) >= 3.33 BuildRequires: perl(MIME::Base64) >= 2.00 BuildRequires: perl(Net::FTP) >= 2.58 BuildRequires: perl(Digest::MD5) BuildRequires: perl(Mail::Send) BuildRequires: perl(Time::Duration) %if 0%{?suse_version} < 1120 BuildRequires: perl-macros %endif Requires: perl = %{perl_version} Requires: perl(LWP) >= 5.803 Requires: perl(URI) >= 1.10 Requires: perl(HTML::Parser) >= 3.33 Requires: perl(MIME::Base64) >= 2.00 Requires: perl(Net::FTP) >= 2.58 Requires: perl(Digest::MD5) Requires: perl(Mail::Send) Requires: perl(Time::Duration) %description Checkbot is a perl5 script which can verify links within a region of the World Wide Web. It checks all pages within an identified region, and all links within that region. After checking all links within the region, it will also check all links which point outside of the region, and then stop. Checkbot regularly writes reports on its findings, including all servers found in the region, and all links with problems on those servers. Checkbot was written originally to check a number of servers at once. This has implied some design decisions, so you might want to keep that in mind when making suggestions. Speaking of which, be sure to check the to do file on the website for things which have been suggested for Checkbot. Authors: -------- Hans de Graaff <hans(a)degraaff.org>, 1994-2005. Based on Dimitri Tischenko, Delft University of Technology, 1994 %prep %setup -q -n %{cpan_name}-%{version} %patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %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_gen_filelist %clean %{__rm} -rf $RPM_BUILD_ROOT %files -f %{name}.files %defattr(-,root,root,-) %doc ChangeLog checkbot.css README TODO %changelog ++++++ checkbot-1.80-webserver.patch ++++++ ++++ 1689 lines (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 python-dnspython for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package python-dnspython for openSUSE:Factory checked in at Tue Nov 2 16:17:40 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-dnspython/python-dnspython.changes 2010-01-27 13:43:09.000000000 +0100 @@ -0,0 +1,26 @@ +------------------------------------------------------------------- +Wed Jan 27 12:37:35 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 1.8.0; +- Building as noarch for openSUSE >= 11.2. + +------------------------------------------------------------------- +Fri Jan 19 00:00:00 UTC 2007 - judas_iscariote(a)shorewall.net + +- update to version 1.5.0 + +------------------------------------------------------------------- +Tue Feb 28 16:46:03 CET 2006 - jmatejek(a)suse.cz + +- updated to reflect python changes due to #149809 + +------------------------------------------------------------------- +Wed Jan 25 21:40:46 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue May 31 13:35:14 CEST 2005 - poeml(a)suse.de + +- package created (1.3.3) + calling whatdependson for head-i586 New: ---- dnspython-1.8.0.tar.gz python-dnspython.changes python-dnspython.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dnspython.spec ++++++ # # spec file for package python-dnspython (Version 1.8.0) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: python-dnspython BuildRequires: python-devel Url: http://www.dnspython.org License: Other License(s), see package, BSD Group: Productivity/Networking/DNS/Utilities AutoReqProv: on Version: 1.8.0 Release: 1 Summary: A DNS toolkit for Python Source: http://www.dnspython.org/kits/stable/dnspython-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} %if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} BuildArch: noarch %endif %description dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0. dnspython provides both high and low level access to DNS. The high level classes perform queries for data of a given name, type, and class, and return an answer set. The low level classes allow direct manipulation of DNS zones, messages, names, and records. Authors: -------- Bob Halley <halley(a)dnspython.org> %prep %setup -n dnspython-%{version} %build export CFLAGS="$RPM_OPT_FLAGS" python setup.py build %install python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES chmod 644 {examples,tests}/*.py %clean rm -rf $RPM_BUILD_ROOT %files -f INSTALLED_FILES %defattr(-,root,root) %doc ChangeLog LICENSE PKG-INFO README TODO %doc examples %doc tests %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 python-optcomplete for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package python-optcomplete for openSUSE:Factory checked in at Tue Nov 2 16:17:32 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-optcomplete/python-optcomplete.changes 2010-03-24 13:23:38.000000000 +0100 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 24 12:22:06 UTC 2010 - toms(a)suse.de + +- Improved package and added bash completion code in + /etc/bash_completion.d/ and added examples and documentation + +------------------------------------------------------------------- +Wed Mar 24 11:34:54 UTC 2010 - toms(a)suse.de + +- Initial version 1.2_devel + calling whatdependson for head-i586 New: ---- optcomplete-1.2-devel.tar.bz2 python-optcomplete.changes python-optcomplete.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-optcomplete.spec ++++++ # # spec file for package python-optcomplete (Version 1.2_devel) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define modname optcomplete %define _version 1.2_devel %define unmangled_version 1.2-devel %define release 1 Summary: Automatic Shell Completion Support for Scripts Using Optparse Name: python-%{modname} Version: %{_version} Release: 1 Source0: %{modname}-%{unmangled_version}.tar.bz2 License: BSD Group: Development/Libraries/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} BuildArch: noarch %endif Url: http://furius.ca/optcomplete BuildRequires: python-devel %py_requires %description This module provide automatic bash completion support for programs that use the optparse module. The premise is that the optparse options parser specifies enough information (and more) for us to be able to generate completion strings esily. Another advantage of this over traditional completion schemes where the completion strings are hard-coded in a separate bash source file, is that the same code that parses the options is used to generate the completions, so the completions is always up-to-date with the program itself. In addition, we allow you specify a list of regular expressions or code that define what kinds of files should be proposed as completions to this file if needed. If you want to implement more complex behaviour, you can instead specify a function, which will be called with the current directory as an argument. You need to activate bash completion using the shell script function that comes with optcomplete (see http://furius.ca/optcomplete for more details). %prep %setup -n %{modname}-%{unmangled_version} %build python setup.py build %install python setup.py install \ --root=$RPM_BUILD_ROOT \ --prefix=%{_prefix} \ --record=%{name}.files mkdir -p $RPM_BUILD_ROOT%_sysconfdir/bash_completion.d mv bin example chmod -x example/README mkdir bash_completion mv etc/bashrc etc/env etc/optcomplete.zsh bash_completion/ chmod -x bash_completion/optcomplete.zsh cp -v etc/optcomplete.bash \ $RPM_BUILD_ROOT%_sysconfdir/bash_completion.d/optcomplete.sh %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.files %defattr(-,root,root) %config %_sysconfdir/bash_completion.d/* %doc README TODO VERSION CHANGES COPYING CREDITS %doc doc/* example bash_completion %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 gromacs for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package gromacs for openSUSE:Factory checked in at Tue Nov 2 16:16:34 CET 2010. -------- --- gromacs/gromacs.changes 2009-06-20 14:07:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/gromacs/gromacs.changes 2010-10-20 16:19:50.000000000 +0200 @@ -1,0 +2,60 @@ +Thu Oct 7 07:24:01 UTC 2010 - kkaempf(a)novell.com + +- Update to 4.5.1 + - fix bnc#642828 (CVE-2010-4001: Insecure use of LD_LIBRARY_PATH) + See http://www.gromacs.org/About_Gromacs/Release_Notes/Version_4.5 + for a full list of changes + + - 2D decomposition support for PME: improved load balancing with + up to 40% overall performance improvement for large systems. + - Memory usage is improved for very large systems, allowing + simulations of >100 million atoms. + - Running on multi-core nodes now automatically uses thread- + based parallelization. + - GPU computing support + - Check-pointing is made more secure:MD5sum are used to verify + that all files are correctly in-place before a simulation is + appended. Output file appending at continuation is turned on + by default + - Full Cmake support. Autoconf/automake will be deprecated after + the final 4.5 release! + - Full support for 7 AMBER force fields + - Support for CHARMM27, including cmap for dihedrals + - Efficient Generalized-Born implicit solvent support including + the Still/HCT/OBC-models to compute the Born radii, a novel way + of tabulating the generalized Born-interaction formula for + greater speed, and optimized SSE-routines for both cut-off and + all-vs-all simulations. + - Support for nucleic acid simulations + - Support for Velocity-Verlet integrators for reversible T- and + P-coupling; MTTK pressure control integrators; Nose-Hoover + chains + - Support for Bennett acceptance ratio (BAR) free energy + calculations + - Decoupling group setup for free energy + - File formats: All GROMACS tools can now read any VMD supported + trajectory format, without converting trajectory first. (VMD + is required) + - g_rdf was a little bit enhanced that structure factors can be + calculated for any system, by supplying the necessary data via + sfactor.dat. Most of the common atomtypes are already contained, + but everybody who needs more freedom can enhance the table + - Library support for "dynamic index groups" based on textual + selections (experimental feature). See the tool g_select, the + included template.c, or Doxygen documentation for information on + how to write analysis tools using the library. Existing tools + have not (yet) been converted. + - g_tune_pme: For a given number of processes or threads this tool + systematically times mdrun with various numbers of PME-only nodes + and determines which setting is fastest. It also checks whether + performance can be enhanced by shifting load between the real and + the reciprocal space part of the Ewald sum. + - g_membed: a very convenient utility for embedding membrane + proteins into equilibrated lipid bilayers + +------------------------------------------------------------------- +Sat May 22 19:29:07 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- read "/dev/urandom" instead of /dev/random + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gromacs-3.3.1.dif gromacs-3.3.1.tar.bz2 New: ---- avoid_empty_elements_in_ld_library_path.patch cmake_lib64.patch gromacs-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gromacs.spec ++++++ --- /var/tmp/diff_new_pack.v2592s/_old 2010-11-02 16:16:19.000000000 +0100 +++ /var/tmp/diff_new_pack.v2592s/_new 2010-11-02 16:16:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gromacs (Version 3.3.1) +# spec file for package gromacs (Version 4.5.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,16 +19,18 @@ Name: gromacs -BuildRequires: fftw3-devel xorg-x11-devel -Version: 3.3.1 -Release: 166 +BuildRequires: cmake fftw3-devel libxml2-devel xorg-x11-devel +BuildRequires: gcc-c++ libstdc++-devel +Version: 4.5.1 +Release: 1 Summary: Molecular Dynamics Package Url: http://www.gromacs.org -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Scientific/Chemistry AutoReqProv: on Source0: gromacs-%{version}.tar.bz2 -Patch: gromacs-%{version}.dif +Patch: avoid_empty_elements_in_ld_library_path.patch +Patch1: cmake_lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,7 +53,7 @@ Erik Lindahl <lindahl(a)gromacs.org> %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Molecular dynamics package Group: Productivity/Scientific/Chemistry Requires: %{name} = %{version} fftw3-devel glibc-devel xorg-x11-devel @@ -77,19 +79,31 @@ %prep %setup -q -%patch +%patch -p1 +%patch1 -p1 %build -autoreconf --force --install -%{?suse_update_config:%{suse_update_config -f}} -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure --disable-static --with-pic --enable-shared --without-motif-libraries -%{__make} %{?jobs:-j%jobs} +%if 0%{?fedora} +export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA" +%endif +mkdir build +cd build +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ + -DCMAKE_SKIP_RPATH=1 \ + -DPACKAGE_ARCHITECTURE=uname -m \ + -DLIB=%{_lib} \ + .. + +make %install +cd build make DESTDIR=${RPM_BUILD_ROOT} install -mv ${RPM_BUILD_ROOT}/usr/share/man/man1/disco.1 ${RPM_BUILD_ROOT}/usr/share/man/man1/g_disco.1 %{__rm} -f %{buildroot}%{_libdir}/*.la %clean @@ -108,9 +122,11 @@ %docdir %{_datadir}/gromacs/html %{_datadir}/gromacs/html/ %{_mandir}/man1/* +%{_mandir}/man7/* %{_libdir}/libgmx.so.* %{_libdir}/libgmxana.so.* %{_libdir}/libmd.so.* +%{_libdir}/libgmxpreprocess.so.* %files devel %defattr(644,root,root,755) @@ -118,5 +134,6 @@ %{_libdir}/*.so %dir %{_includedir}/gromacs %{_includedir}/gromacs/* +%{_libdir}/pkgconfig/* %changelog ++++++ avoid_empty_elements_in_ld_library_path.patch ++++++ diff -wruN -x '*~' ../orig-gromacs-4.5.1/scripts/GMXRC.bash.cmakein ./scripts/GMXRC.bash.cmakein --- ../orig-gromacs-4.5.1/scripts/GMXRC.bash.cmakein 2010-08-23 19:58:30.000000000 +0200 +++ ./scripts/GMXRC.bash.cmakein 2010-10-07 09:05:23.000000000 +0200 @@ -8,8 +8,12 @@ tmppath="" for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do if test "$i" != "$GMXLDLIB"; then + if test ${tmppath} == ""; then + tmppath=$i + else tmppath=${tmppath}:$i fi + fi done LD_LIBRARY_PATH=$tmppath diff -wruN -x '*~' ../orig-gromacs-4.5.1/scripts/GMXRC.csh.cmakein ./scripts/GMXRC.csh.cmakein --- ../orig-gromacs-4.5.1/scripts/GMXRC.csh.cmakein 2010-08-23 19:58:30.000000000 +0200 +++ ./scripts/GMXRC.csh.cmakein 2010-10-07 09:09:17.000000000 +0200 @@ -16,7 +16,13 @@ # remove previous gromacs part from ld_library_path set tmppath = "" foreach i ( `echo $LD_LIBRARY_PATH | sed "s/:/ /g"` ) - if ( "$i" != "$GMXLDLIB" ) set tmppath = "${tmppath}:$i" + if ( "$i" != "$GMXLDLIB" ) then + if ("${tmppath}" == "") then + set tmppath = "$i" + else + set tmppath = "${tmppath}:$i" + endif + endif end setenv LD_LIBRARY_PATH $tmppath diff -wruN -x '*~' ../orig-gromacs-4.5.1/scripts/GMXRC.zsh.cmakein ./scripts/GMXRC.zsh.cmakein --- ../orig-gromacs-4.5.1/scripts/GMXRC.zsh.cmakein 2010-08-23 19:58:30.000000000 +0200 +++ ./scripts/GMXRC.zsh.cmakein 2010-10-07 09:06:27.000000000 +0200 @@ -8,8 +8,12 @@ tmppath="" for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do if test "$i" != "$GMXLDLIB"; then + if test ${tmppath} == ""; then + tmppath=$i + else tmppath=${tmppath}:$i fi + fi done LD_LIBRARY_PATH=$tmppath ++++++ cmake_lib64.patch ++++++ diff -wruN -x '*~' ../orig-gromacs-4.5.1/CMakeLists.txt ./CMakeLists.txt --- ../orig-gromacs-4.5.1/CMakeLists.txt 2010-09-02 12:39:25.000000000 +0200 +++ ./CMakeLists.txt 2010-10-07 09:44:36.000000000 +0200 @@ -642,7 +642,17 @@ ######################################################################## # Specify install locations and which subdirectories to process # ######################################################################## -set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) +# Library path (lib / lib64 ) + +IF ( DEFINED LIB ) + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" ) +ELSE ( DEFINED LIB ) + IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET( LIB_SUFFIX "64" ) + ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) +ENDIF ( DEFINED LIB ) +MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/gromacs) set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/man) ++++++ gromacs-3.3.1.tar.bz2 -> gromacs-4.5.1.tar.bz2 ++++++ gromacs/gromacs-3.3.1.tar.bz2 /mounts/work_src_done/STABLE/gromacs/gromacs-4.5.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libnetfilter_queue for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package libnetfilter_queue for openSUSE:Factory checked in at Tue Nov 2 16:16:25 CET 2010. -------- --- libnetfilter_queue/libnetfilter_queue.changes 2010-02-23 23:23:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/libnetfilter_queue/libnetfilter_queue.changes 2010-11-02 14:00:06.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jul 11 16:44:46 UTC 2010 - jengelh(a)medozas.de + +- Update to new upstream release 1.0.0 +* Deprecate nfq_set_verdict_mark in favor of nfq_set_verdict2 +* Add nfq_snprintf_xml to output packet as XML + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libnetfilter_queue-0.0.17.tar.bz2 New: ---- libnetfilter_queue-1.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_queue.spec ++++++ --- /var/tmp/diff_new_pack.NaUaxi/_old 2010-11-02 16:16:09.000000000 +0100 +++ /var/tmp/diff_new_pack.NaUaxi/_new 2010-11-02 16:16:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libnetfilter_queue (Version 0.0.17) +# spec file for package libnetfilter_queue (Version 1.0.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ %define soname 1 Name: libnetfilter_queue -Version: 0.0.17 +Version: 1.0.0 Release: 1 License: GNU GPL v2 Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_queue/ -Source: http://netfilter.org/projects/libnetfilter_queue/files/%{name}-%{version}.t… +Source: http://netfilter.org/projects/libnetfilter_queue/files/%name-%version.tar.b… Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libnfnetlink-devel linux-kernel-headers >= 2.6.14 pkg-config @@ -38,27 +38,27 @@ libnetfilter_queue has been previously known as libnfnetlink_queue. -%define debug_package_requires %{name}%{soname} = %{version}-%{release} +%define debug_package_requires %name%soname = %version-%release -%package -n %{name}%{soname} +%package -n %name%soname Group: System/Libraries Summary: Userspace library for packets that have been queued by the kernel packet filter -%description -n %{name}%{soname} +%description -n %name%soname libnetfilter_queue is a userspace library providing an API to packets that have been queued by the kernel packet filter. It is is part of a system that deprecates the old ip_queue / libipq mechanism. libnetfilter_queue has been previously known as libnfnetlink_queue. -%package -n %{name}-devel - +%package devel +License: GNU GPL v2 Group: Development/Libraries/C and C++ -Requires: %{name}%{soname} = %{version} libnfnetlink-devel +Requires: %name%soname = %version, libnfnetlink-devel Summary: Userspace library for packets that have been queued by the kernel packet filter -%description -n %{name}-devel +%description devel libnetfilter_queue is a userspace library providing an API to packets that have been queued by the kernel packet filter. It is is part of a system that deprecates the old ip_queue / libipq mechanism. @@ -74,25 +74,20 @@ %install %makeinstall -find %{buildroot} -name "*.la" -delete - -%post -n %{name}%{soname} -p /sbin/ldconfig +find "%buildroot" -name "*.la" -delete -%postun -n %{name}%{soname} -p /sbin/ldconfig +%post -n %name%soname -p /sbin/ldconfig -%clean -test "%{buildroot}" != "/" && %__rm -rf %{buildroot} +%postun -n %name%soname -p /sbin/ldconfig -%files -n %{name}%{soname} +%files -n %name%soname %defattr(-,root,root) -%{_libdir}/libnetfilter_queue.so.%{soname}* -%{_libdir}/libnetfilter_queue_libipq.so.%{soname}* +%_libdir/libnetfilter_queue.so.%{soname}* %files -n %{name}-devel %defattr(-,root,root) -%{_includedir}/libnetfilter_queue -%{_libdir}/libnetfilter_queue.so -%{_libdir}/libnetfilter_queue_libipq.so -%{_libdir}/pkgconfig/libnetfilter_queue.pc +%_includedir/libnetfilter_queue +%_libdir/libnetfilter_queue.so +%_libdir/pkgconfig/libnetfilter_queue.pc %changelog ++++++ libnetfilter_queue-0.0.17.tar.bz2 -> libnetfilter_queue-1.0.0.tar.bz2 ++++++ ++++ 59284 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/Makefile.am new/libnetfilter_queue-1.0.0/Makefile.am --- old/libnetfilter_queue-0.0.17/Makefile.am 2008-05-16 17:29:58.000000000 +0200 +++ new/libnetfilter_queue-1.0.0/Makefile.am 2010-07-11 17:30:25.000000000 +0200 @@ -1,5 +1,29 @@ +# This is _NOT_ the library release version, it's an API version. +# Extracted from Chapter 6 "Library interface versions" of the libtool docs. +# +# <snippet> +# Here are a set of rules to help you update your library version information: +# +# 1. Start with version information of `0:0:0' for each libtool library. +# 2. Update the version information only immediately before a public release +# of your software. More frequent updates are unnecessary, and only guarantee +# that the current interface number gets larger faster. +# 3. If the library source code has changed at all since the last update, +# then increment revision (`c:r:a' becomes `c:r+1:a'). +# 4. If any interfaces have been added, removed, or changed since the last +# update, increment current, and set revision to 0. +# 5. If any interfaces have been added since the last public release, then +# increment age. +# 6. If any interfaces have been removed since the last public release, then +# set age to 0. +# </snippet> +# +LIBVERSION=1:0:1 + AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 +ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = $(man_MANS) SUBDIRS = include src utils diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/configure.in new/libnetfilter_queue-1.0.0/configure.in --- old/libnetfilter_queue-0.0.17/configure.in 2009-03-06 17:01:38.000000000 +0100 +++ new/libnetfilter_queue-1.0.0/configure.in 2010-07-11 17:30:25.000000000 +0200 @@ -2,8 +2,9 @@ AC_INIT AC_CANONICAL_SYSTEM +AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libnetfilter_queue, 0.0.17) +AM_INIT_AUTOMAKE(libnetfilter_queue, 1.0.0) AC_PROG_CC AC_EXEEXT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/doxygen.cfg.in new/libnetfilter_queue-1.0.0/doxygen.cfg.in --- old/libnetfilter_queue-0.0.17/doxygen.cfg.in 2009-01-06 13:16:45.000000000 +0100 +++ new/libnetfilter_queue-1.0.0/doxygen.cfg.in 2009-12-27 16:01:34.000000000 +0100 @@ -16,7 +16,6 @@ JAVADOC_AUTOBRIEF = NO QT_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 @@ -95,7 +94,7 @@ GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html -HTML_HEADER = "header.html" +HTML_HEADER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/include/libnetfilter_queue/Makefile.am new/libnetfilter_queue-1.0.0/include/libnetfilter_queue/Makefile.am --- old/libnetfilter_queue-0.0.17/include/libnetfilter_queue/Makefile.am 2008-05-16 17:29:58.000000000 +0200 +++ new/libnetfilter_queue-1.0.0/include/libnetfilter_queue/Makefile.am 2010-07-11 17:30:10.000000000 +0200 @@ -1,3 +1,3 @@ -pkginclude_HEADERS = libnetfilter_queue.h libipq.h linux_nfnetlink_queue.h +pkginclude_HEADERS = libnetfilter_queue.h linux_nfnetlink_queue.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/include/libnetfilter_queue/libipq.h new/libnetfilter_queue-1.0.0/include/libnetfilter_queue/libipq.h --- old/libnetfilter_queue-0.0.17/include/libnetfilter_queue/libipq.h 2008-06-27 12:11:02.000000000 +0200 +++ new/libnetfilter_queue-1.0.0/include/libnetfilter_queue/libipq.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -/* - * libipq.h - * - * IPQ library for userspace. - * - * Author: James Morris <jmorris(a)intercode.com.au> - * - * Copyright (c) 2000-2001 Netfilter Core Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - */ -#ifndef _LIBIPQ_H -#define _LIBIPQ_H - -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/uio.h> -#include <asm/types.h> -#include <linux/netlink.h> - -#ifdef KERNEL_64_USERSPACE_32 -#include "ip_queue_64.h" -typedef u_int64_t ipq_id_t; -#else -#include <linux/netfilter_ipv4/ip_queue.h> -typedef unsigned long ipq_id_t; -#endif - -#ifdef DEBUG_LIBIPQ -#include <stdio.h> -#define LDEBUG(x...) fprintf(stderr, ## x) -#else -#define LDEBUG(x...) -#endif /* DEBUG_LIBIPQ */ - -/* FIXME: glibc sucks */ -#ifndef MSG_TRUNC -#define MSG_TRUNC 0x20 -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -struct ipq_handle -{ - struct nfq_handle *nfqnlh; - struct nfq_q_handle *qh; - u_int8_t family; - u_int8_t blocking; -}; - -struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); - -int ipq_destroy_handle(struct ipq_handle *h); - -ssize_t ipq_read(const struct ipq_handle *h, - unsigned char *buf, size_t len, int timeout); - -int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len); - -ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf); - -int ipq_message_type(const unsigned char *buf); - -int ipq_get_msgerr(const unsigned char *buf); - -int ipq_set_verdict(const struct ipq_handle *h, - ipq_id_t id, - unsigned int verdict, - size_t data_len, - unsigned char *buf); - -int ipq_ctl(const struct ipq_handle *h, int request, ...); - -char *ipq_errstr(void); -void ipq_perror(const char *s); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _LIBIPQ_H */ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/include/libnetfilter_queue/libnetfilter_queue.h new/libnetfilter_queue-1.0.0/include/libnetfilter_queue/libnetfilter_queue.h --- old/libnetfilter_queue-0.0.17/include/libnetfilter_queue/libnetfilter_queue.h 2009-01-06 13:13:05.000000000 +0100 +++ new/libnetfilter_queue-1.0.0/include/libnetfilter_queue/libnetfilter_queue.h 2010-06-13 21:29:19.000000000 +0200 @@ -60,14 +60,22 @@ u_int32_t id, u_int32_t verdict, u_int32_t data_len, - unsigned char *buf); + const unsigned char *buf); -extern int nfq_set_verdict_mark(struct nfq_q_handle *qh, - u_int32_t id, - u_int32_t verdict, - u_int32_t mark, - u_int32_t datalen, - unsigned char *buf); +extern int nfq_set_verdict2(struct nfq_q_handle *qh, + u_int32_t id, + u_int32_t verdict, + u_int32_t mark, + u_int32_t datalen, + const unsigned char *buf); + +extern __attribute__((deprecated)) +int nfq_set_verdict_mark(struct nfq_q_handle *qh, + u_int32_t id, + u_int32_t verdict, + u_int32_t mark, + u_int32_t datalen, + const unsigned char *buf); /* message parsing function */ @@ -96,7 +104,19 @@ extern struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad); /* return -1 if problem, length otherwise */ -extern int nfq_get_payload(struct nfq_data *nfad, char **data); +extern int nfq_get_payload(struct nfq_data *nfad, unsigned char **data); + +enum { + NFQ_XML_HW = (1 << 0), + NFQ_XML_MARK = (1 << 1), + NFQ_XML_DEV = (1 << 2), + NFQ_XML_PHYSDEV = (1 << 3), + NFQ_XML_PAYLOAD = (1 << 4), + NFQ_XML_TIME = (1 << 5), + NFQ_XML_ALL = ~0U, +}; + +extern int nfq_snprintf_xml(char *buf, size_t len, struct nfq_data *tb, int flags); #ifdef __cplusplus } /* extern "C" */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/missing new/libnetfilter_queue-1.0.0/missing --- old/libnetfilter_queue-0.0.17/missing 2008-02-10 03:55:24.000000000 +0100 +++ new/libnetfilter_queue-1.0.0/missing 2010-01-18 07:28:57.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/src/Makefile.am new/libnetfilter_queue-1.0.0/src/Makefile.am --- old/libnetfilter_queue-0.0.17/src/Makefile.am 2008-05-16 17:29:58.000000000 +0200 +++ new/libnetfilter_queue-1.0.0/src/Makefile.am 2009-12-27 16:01:16.000000000 +0100 @@ -6,14 +6,8 @@ AM_CFLAGS = -fPIC -Wall LIBS = @LIBNFQUEUE_LIBS@ -lib_LTLIBRARIES = libnetfilter_queue.la libnetfilter_queue_libipq.la +lib_LTLIBRARIES = libnetfilter_queue.la libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \ -version-info $(LIBVERSION) libnetfilter_queue_la_SOURCES = libnetfilter_queue.c - -libnetfilter_queue_libipq_la_LDFLAGS = -Wc,-nostartfiles \ - -version-info 1:0:0 -libnetfilter_queue_libipq_la_LIBADD = ./libnetfilter_queue.la -libnetfilter_queue_libipq_la_SOURCES = libipq_compat.c - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/src/libipq_compat.c new/libnetfilter_queue-1.0.0/src/libipq_compat.c --- old/libnetfilter_queue-0.0.17/src/libipq_compat.c 2008-05-16 17:29:58.000000000 +0200 +++ new/libnetfilter_queue-1.0.0/src/libipq_compat.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,247 +0,0 @@ -/* - * libipq - backwards compatibility library for libnetfilter_queue - * - * (C) 2005 by Harald Welte <laforge(a)netfilter.org> - * - * Based on original libipq.c, - * Author: James Morris <jmorris(a)intercode.com.au> - * 07-11-2001 Modified by Fernando Anton to add support for IPv6. - * Copyright (c) 2000-2001 Netfilter Core Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <sys/time.h> -#include <sys/types.h> - -#include <libnetfilter_queue/libnetfilter_queue.h> -#include <libnetfilter_queue/libipq.h> - -/**************************************************************************** - * - * Private interface - * - ****************************************************************************/ - -enum { - IPQ_ERR_NONE = 0, - IPQ_ERR_IMPL, - IPQ_ERR_HANDLE, - IPQ_ERR_SOCKET, - IPQ_ERR_BIND, - IPQ_ERR_BUFFER, - IPQ_ERR_RECV, - IPQ_ERR_NLEOF, - IPQ_ERR_ADDRLEN, - IPQ_ERR_STRUNC, - IPQ_ERR_RTRUNC, - IPQ_ERR_NLRECV, - IPQ_ERR_SEND, - IPQ_ERR_SUPP, - IPQ_ERR_RECVBUF, - IPQ_ERR_TIMEOUT, - IPQ_ERR_PROTOCOL -}; -#define IPQ_MAXERR IPQ_ERR_PROTOCOL - -struct ipq_errmap_t { - int errcode; - char *message; -} ipq_errmap[] = { - { IPQ_ERR_NONE, "Unknown error" }, - { IPQ_ERR_IMPL, "Implementation error" }, - { IPQ_ERR_HANDLE, "Unable to create netlink handle" }, - { IPQ_ERR_SOCKET, "Unable to create netlink socket" }, - { IPQ_ERR_BIND, "Unable to bind netlink socket" }, - { IPQ_ERR_BUFFER, "Unable to allocate buffer" }, - { IPQ_ERR_RECV, "Failed to receive netlink message" }, - { IPQ_ERR_NLEOF, "Received EOF on netlink socket" }, - { IPQ_ERR_ADDRLEN, "Invalid peer address length" }, - { IPQ_ERR_STRUNC, "Sent message truncated" }, - { IPQ_ERR_RTRUNC, "Received message truncated" }, - { IPQ_ERR_NLRECV, "Received error from netlink" }, - { IPQ_ERR_SEND, "Failed to send netlink message" }, - { IPQ_ERR_SUPP, "Operation not supported" }, - { IPQ_ERR_RECVBUF, "Receive buffer size invalid" }, - { IPQ_ERR_TIMEOUT, "Timeout"}, - { IPQ_ERR_PROTOCOL, "Invalid protocol specified" } -}; - -static int ipq_errno = IPQ_ERR_NONE; - -static char *ipq_strerror(int errcode) -{ - if (errcode < 0 || errcode > IPQ_MAXERR) - errcode = IPQ_ERR_IMPL; - return ipq_errmap[errcode].message; -} - -/**************************************************************************** - * - * Public interface - * - ****************************************************************************/ - -/* - * Create and initialise an ipq handle. - */ -struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol) -{ - int status; - struct ipq_handle *h; - - h = (struct ipq_handle *)malloc(sizeof(struct ipq_handle)); - if (h == NULL) { - ipq_errno = IPQ_ERR_HANDLE; - return NULL; - } - - memset(h, 0, sizeof(struct ipq_handle)); - - h->nfqnlh = nfq_open(); - if (!h->nfqnlh) { - ipq_errno = IPQ_ERR_SOCKET; - goto err_free; - } - - if (protocol == PF_INET) - status = nfq_bind_pf(h->nfqnlh, PF_INET); - else if (protocol == PF_INET6) - status = nfq_bind_pf(h->nfqnlh, PF_INET6); - else { - ipq_errno = IPQ_ERR_PROTOCOL; - goto err_close; - } - h->family = protocol; - if (status < 0) { - ipq_errno = IPQ_ERR_BIND; - goto err_close; - } - - h->qh = nfq_create_queue(h->nfqnlh, 0, NULL, NULL); - if (!h->qh) { - ipq_errno = IPQ_ERR_BIND; - goto err_close; - } - - return h; - -err_close: - nfq_close(h->nfqnlh); -err_free: - free(h); - return NULL; -} - -/* - * No error condition is checked here at this stage, but it may happen - * if/when reliable messaging is implemented. - */ -int ipq_destroy_handle(struct ipq_handle *h) -{ - if (h) { - nfq_close(h->nfqnlh); - free(h); - } - return 0; -} - -int ipq_set_mode(const struct ipq_handle *h, - u_int8_t mode, size_t range) -{ - return nfq_set_mode(h->qh, mode, range); -} - -/* - * timeout is in microseconds (1 second is 1000000 (1 million) microseconds) - * - */ -ssize_t ipq_read(const struct ipq_handle *h, - unsigned char *buf, size_t len, int timeout) -{ - struct nfattr *tb[NFQA_MAX]; - struct nlmsghdr *nlh = (struct nlmsghdr *)buf; - struct nfgenmsg *msg = NULL; - struct nfattr *nfa; - - //return ipq_netlink_recvfrom(h, buf, len, timeout); - - /* This really sucks. We have to copy the whole packet - * in order to build a data structure that is compatible to - * the old ipq interface... */ - - nfa = nfnl_parse_hdr(nfq_nfnlh(h->nfqnlh), nlh, &msg); - if (!msg || !nfa) - return 0; - - if (msg->nfgen_family != h->family) - return 0; - - nfnl_parse_attr(tb, NFQA_MAX, nfa, 0xffff); - - - return 0; -} - -int ipq_message_type(const unsigned char *buf) -{ - return ((struct nlmsghdr*)buf)->nlmsg_type; -} - -int ipq_get_msgerr(const unsigned char *buf) -{ - struct nlmsghdr *h = (struct nlmsghdr *)buf; - struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); - return -err->error; -} - -ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf) -{ - return NLMSG_DATA((struct nlmsghdr *)(buf)); -} - -int ipq_set_verdict(const struct ipq_handle *h, - ipq_id_t id, - unsigned int verdict, - size_t data_len, - unsigned char *buf) -{ - return nfq_set_verdict(h->qh, id, verdict, data_len, buf); -} - -/* Not implemented yet */ -int ipq_ctl(const struct ipq_handle *h, int request, ...) -{ - return 1; -} - -char *ipq_errstr(void) -{ - return ipq_strerror(ipq_errno); -} - -void ipq_perror(const char *s) -{ - if (s) - fputs(s, stderr); - else - fputs("ERROR", stderr); - if (ipq_errno) - fprintf(stderr, ": %s", ipq_errstr()); - if (errno) - fprintf(stderr, ": %s", strerror(errno)); - fputc('\n', stderr); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/src/libnetfilter_queue.c new/libnetfilter_queue-1.0.0/src/libnetfilter_queue.c --- old/libnetfilter_queue-0.0.17/src/libnetfilter_queue.c 2009-02-17 20:55:23.000000000 +0100 +++ new/libnetfilter_queue-1.0.0/src/libnetfilter_queue.c 2010-07-11 15:07:54.000000000 +0200 @@ -55,6 +55,10 @@ * The current development version of libnetfilter_queue can be accessed * at https://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_queue.git;a=sum…. * + * \section Privileges + * You need the CAP_NET_ADMIN capability in order to allow your application + * to receive from and to send packets to kernel-space. + * * \section Using libnetfilter_queue * * To write your own program using libnetfilter_queue, you should start by reading @@ -207,13 +211,22 @@ * \verbatim fd = nfq_fd(h); - while ((rv = recv(fd, buf, sizeof(buf), 0)) && rv >= 0) { + while ((rv = recv(fd, buf, sizeof(buf), 0)) >= 0) { printf("pkt received\n"); nfq_handle_packet(h, buf, rv); } \endverbatim * When the decision on a packet has been choosed, the verdict has to be given - * by calling nfq_set_verdict() or nfq_set_verdict_mark(). + * by calling nfq_set_verdict() or nfq_set_verdict2(). The verdict + * determines the destiny of the packet as follows: + * + * - NF_DROP discarded the packet + * - NF_ACCEPT the packet passes, continue iterations + * - NF_STOLEN gone away + * - NF_QUEUE inject the packet into a different queue + * (the target queue number is in the high 16 bits of the verdict) + * - NF_REPEAT iterate the same cycle once more + * - NF_STOP accept, but don't continue iterations * * Data and information about the packet can be fetch by using message parsing * functions (See \link Parsing \endlink). @@ -537,6 +550,8 @@ * - NFQNL_COPY_NONE - do not copy any data * - NFQNL_COPY_META - copy only packet metadata * - NFQNL_COPY_PACKET - copy entire packet + * + * \return -1 on error; >=0 otherwise. */ int nfq_set_mode(struct nfq_q_handle *qh, u_int8_t mode, u_int32_t range) @@ -567,6 +582,8 @@ * Sets the size of the queue in kernel. This fixes the maximum number * of packets the kernel will store before internally before dropping * upcoming packets. + * + * \return -1 on error; >=0 otherwise. */ int nfq_set_queue_maxlen(struct nfq_q_handle *qh, u_int32_t queuelen) @@ -593,7 +610,7 @@ static int __set_verdict(struct nfq_q_handle *qh, u_int32_t id, u_int32_t verdict, u_int32_t mark, int set_mark, - u_int32_t data_len, unsigned char *data) + u_int32_t data_len, const unsigned char *data) { struct nfqnl_msg_verdict_hdr vh; union { @@ -629,8 +646,9 @@ nvecs = 1; if (data_len) { + /* The typecast here is to cast away data's const-ness: */ nfnl_build_nfa_iovec(&iov[1], &data_attr, NFQA_PAYLOAD, - data_len, data); + data_len, (unsigned char *) data); nvecs += 2; /* Add the length of the appended data to the message * header. The size of the attribute is given in the @@ -665,17 +683,19 @@ * * Notifies netfilter of the userspace verdict for the given packet. Every * queued packet _must_ have a verdict specified by userspace, either by - * calling this function, or by calling the nfq_set_verdict_mark() function. + * calling this function, or by calling the nfq_set_verdict2() function. + * + * \return -1 on error; >= 0 otherwise. */ int nfq_set_verdict(struct nfq_q_handle *qh, u_int32_t id, u_int32_t verdict, u_int32_t data_len, - unsigned char *buf) + const unsigned char *buf) { return __set_verdict(qh, id, verdict, 0, 0, data_len, buf); } /** - * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark. + * nfq_set_verdict2 - like nfq_set_verdict, but you can set the mark. * \param qh Netfilter queue handle obtained by call to nfq_create_queue(). * \param id ID assigned to packet by netfilter. * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP) @@ -683,9 +703,30 @@ * \param data_len number of bytes of data pointed to by #buf * \param buf the buffer that contains the packet data */ +int nfq_set_verdict2(struct nfq_q_handle *qh, u_int32_t id, + u_int32_t verdict, u_int32_t mark, + u_int32_t data_len, const unsigned char *buf) +{ + return __set_verdict(qh, id, verdict, htonl(mark), 1, data_len, buf); +} + +/** + * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark. + * \param qh Netfilter queue handle obtained by call to nfq_create_queue(). + * \param id ID assigned to packet by netfilter. + * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP) + * \param mark the mark to put on the packet, in network byte order. + * \param data_len number of bytes of data pointed to by #buf + * \param buf the buffer that contains the packet data + * + * \return -1 on error; >= 0 otherwise. + * + * This function is deprecated since it is broken, its use is highly + * discouraged. Please, use nfq_set_verdict2 instead. + */ int nfq_set_verdict_mark(struct nfq_q_handle *qh, u_int32_t id, u_int32_t verdict, u_int32_t mark, - u_int32_t data_len, unsigned char *buf) + u_int32_t data_len, const unsigned char *buf) { return __set_verdict(qh, id, verdict, mark, 1, data_len, buf); } @@ -825,11 +866,10 @@ * was received through * \param nlif_handle pointer to a nlif interface resolving handle * \param nfad Netlink packet data handle passed to callback function - * \param name pointer that will be set to the interface name string + * \param name pointer to the buffer to receive the interface name; + * not more than \c IFNAMSIZ bytes will be copied to it. * \return -1 in case of error, >0 if it succeed. * - * The #name variable will point to the name of the input interface. - * * To use a nlif_handle, You need first to call nlif_open() and to open * an handler. Don't forget to store the result as it will be used * during all your program life: @@ -871,10 +911,8 @@ * packet was received through * \param nlif_handle pointer to a nlif interface resolving handle * \param nfad Netlink packet data handle passed to callback function - * \param name pointer that will be set to the interface name string - * - * The #name variable will point to the name of the input physical - * interface. + * \param name pointer to the buffer to receive the interface name; + * not more than \c IFNAMSIZ bytes will be copied to it. * * See nfq_get_indev_name() documentation for nlif_handle usage. * @@ -892,9 +930,8 @@ * packet will be sent to * \param nlif_handle pointer to a nlif interface resolving handle * \param nfad Netlink packet data handle passed to callback function - * \param name pointer that will be set to the interface name string - * - * The #name variable will point to the name of the output interface. + * \param name pointer to the buffer to receive the interface name; + * not more than \c IFNAMSIZ bytes will be copied to it. * * See nfq_get_indev_name() documentation for nlif_handle usage. * @@ -912,9 +949,8 @@ * packet will be sent to * \param nlif_handle pointer to a nlif interface resolving handle * \param nfad Netlink packet data handle passed to callback function - * \param name pointer that will be set to the interface name string - * The #name variable will point to the name of the physical - * output interface. + * \param name pointer to the buffer to receive the interface name; + * not more than \c IFNAMSIZ bytes will be copied to it. * * See nfq_get_indev_name() documentation for nlif_handle usage. * @@ -967,7 +1003,7 @@ * * \return -1 on error, otherwise > 0. */ -int nfq_get_payload(struct nfq_data *nfad, char **data) +int nfq_get_payload(struct nfq_data *nfad, unsigned char **data) { *data = nfnl_get_pointer_to_data(nfad->data, NFQA_PAYLOAD, char); if (*data) @@ -976,6 +1012,160 @@ return -1; } +#define SNPRINTF_FAILURE(ret, rem, offset, len) \ +do { \ + if (ret < 0) \ + return ret; \ + len += ret; \ + if (ret > rem) \ + ret = rem; \ + offset += ret; \ + rem -= ret; \ +} while (0) + +int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) +{ + struct nfqnl_msg_packet_hdr *ph; + struct nfqnl_msg_packet_hw *hwph; + u_int32_t mark, ifi; + int size, offset = 0, len = 0, ret; + unsigned char *data; + + size = snprintf(buf + offset, rem, "<pkt>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + if (flags & NFQ_XML_TIME) { + time_t t; + struct tm tm; + + t = time(NULL); + if (localtime_r(&t, &tm) == NULL) + return -1; + + size = snprintf(buf + offset, rem, "<when>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, + "<hour>%d</hour>", tm.tm_hour); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, + rem, "<min>%02d</min>", tm.tm_min); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, + rem, "<sec>%02d</sec>", tm.tm_sec); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<wday>%d</wday>", + tm.tm_wday + 1); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<day>%d</day>", tm.tm_mday); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<month>%d</month>", + tm.tm_mon + 1); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<year>%d</year>", + 1900 + tm.tm_year); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "</when>"); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ph = nfq_get_msg_packet_hdr(tb); + if (ph) { + size = snprintf(buf + offset, rem, + "<hook>%u</hook><id>%u</id>", + ph->hook, ntohl(ph->packet_id)); + SNPRINTF_FAILURE(size, rem, offset, len); + + hwph = nfq_get_packet_hw(tb); + if (hwph && (flags & NFQ_XML_HW)) { + int i, hlen = ntohs(hwph->hw_addrlen); + + size = snprintf(buf + offset, rem, "<hw><proto>%04x" + "</proto>", + ntohs(ph->hw_protocol)); + SNPRINTF_FAILURE(size, rem, offset, len); + + size = snprintf(buf + offset, rem, "<src>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + for (i=0; i<hlen; i++) { + size = snprintf(buf + offset, rem, "%02x", + hwph->hw_addr[i]); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + size = snprintf(buf + offset, rem, "</src></hw>"); + SNPRINTF_FAILURE(size, rem, offset, len); + } else if (flags & NFQ_XML_HW) { + size = snprintf(buf + offset, rem, "<hw><proto>%04x" + "</proto></hw>", + ntohs(ph->hw_protocol)); + SNPRINTF_FAILURE(size, rem, offset, len); + } + } + + mark = nfq_get_nfmark(tb); + if (mark && (flags & NFQ_XML_MARK)) { + size = snprintf(buf + offset, rem, "<mark>%u</mark>", mark); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nfq_get_indev(tb); + if (ifi && (flags & NFQ_XML_DEV)) { + size = snprintf(buf + offset, rem, "<indev>%u</indev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nfq_get_outdev(tb); + if (ifi && (flags & NFQ_XML_DEV)) { + size = snprintf(buf + offset, rem, "<outdev>%u</outdev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nfq_get_physindev(tb); + if (ifi && (flags & NFQ_XML_PHYSDEV)) { + size = snprintf(buf + offset, rem, + "<physindev>%u</physindev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ifi = nfq_get_physoutdev(tb); + if (ifi && (flags & NFQ_XML_PHYSDEV)) { + size = snprintf(buf + offset, rem, + "<physoutdev>%u</physoutdev>", ifi); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + ret = nfq_get_payload(tb, &data); + if (ret >= 0 && (flags & NFQ_XML_PAYLOAD)) { + int i; + + size = snprintf(buf + offset, rem, "<payload>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + for (i=0; i<ret; i++) { + size = snprintf(buf + offset, rem, "%02x", + data[i] & 0xff); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + size = snprintf(buf + offset, rem, "</payload>"); + SNPRINTF_FAILURE(size, rem, offset, len); + } + + size = snprintf(buf + offset, rem, "</pkt>"); + SNPRINTF_FAILURE(size, rem, offset, len); + + return len; +} + /** * @} */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnetfilter_queue-0.0.17/utils/nfqnl_test.c new/libnetfilter_queue-1.0.0/utils/nfqnl_test.c --- old/libnetfilter_queue-0.0.17/utils/nfqnl_test.c 2009-02-17 20:27:28.000000000 +0100 +++ new/libnetfilter_queue-1.0.0/utils/nfqnl_test.c 2010-07-11 15:13:51.000000000 +0200 @@ -16,7 +16,7 @@ struct nfqnl_msg_packet_hw *hwph; u_int32_t mark,ifi; int ret; - char *data; + unsigned char *data; ph = nfq_get_msg_packet_hdr(tb); if (ph) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mkvtoolnix for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at Tue Nov 2 16:16:02 CET 2010. -------- --- mkvtoolnix/mkvtoolnix.changes 2010-09-07 19:57:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkvtoolnix/mkvtoolnix.changes 2010-11-02 11:48:32.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Nov 2 10:04:07 UTC 2010 - reddwarf(a)opensuse.org + +- Update to 4.4.0 + - It contains a lot of bug fixes and a few enhancements but no + major new features +- Drop mkvtoolnix-4.3.0-aliasing.patch +- Update mkvtoolnix-4.4.0-guide_install.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:download_url:mkvtoolnix-4.3.0.tar.bz2 mkvtoolnix-4.3.0-aliasing.patch mkvtoolnix-4.3.0-guide_install.patch New: ---- _service:download_url:mkvtoolnix-4.4.0.tar.bz2 mkvtoolnix-4.4.0-guide_install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.oaN7GV/_old 2010-11-02 16:15:05.000000000 +0100 +++ /var/tmp/diff_new_pack.oaN7GV/_new 2010-11-02 16:15:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mkvtoolnix (Version 4.3.0) +# spec file for package mkvtoolnix (Version 4.4.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,17 +18,15 @@ Name: mkvtoolnix -Version: 4.3.0 +Version: 4.4.0 Release: 1 License: GPLv2+ Summary: Tools to Create, Alter, and Inspect Matroska Files Url: http://www.bunkus.org/videotools/mkvtoolnix/ Group: Productivity/Multimedia/Other Source: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.… -# PATCH-FIX-OPENSUSE %{name}-4.3.0-guide-install.patch reddwarf(a)opensuse.org -- Install docs in %{_docdir}. -Patch0: %{name}-4.3.0-guide_install.patch -# PATCH-FIX-OPENSUSE %{name}-4.3.0-aliasing.patch reddwarf(a)opensuse.org -- Show aliasing problems -Patch1: %{name}-4.3.0-aliasing.patch +# PATCH-FIX-UPSTREAM %{name}-4.4.0-guide-install.patch emailed_upstream reddwarf(a)opensuse.org -- Install docs in %{_docdir}. +Patch0: %{name}-4.4.0-guide_install.patch BuildRequires: boost-devel BuildRequires: file-devel BuildRequires: flac-devel @@ -53,10 +51,9 @@ %prep %setup -q %patch0 -%patch1 %build -%configure --without-build-timestamp --docdir=%{_docdir} +%configure --without-build-timestamp --docdir=%{_docdir}/%{name} # V=1 so post-build-checks can check if a file is compiled without optflags ./drake %{?_smp_mflags} V=1 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.oaN7GV/_old 2010-11-02 16:15:05.000000000 +0100 +++ /var/tmp/diff_new_pack.oaN7GV/_new 2010-11-02 16:15:05.000000000 +0100 @@ -3,11 +3,11 @@ <service name="download_url"> <param name="protocol">http</param> <param name="host">www.bunkus.org</param> - <param name="path">/videotools/mkvtoolnix/sources/mkvtoolnix-4.3.0.tar.bz2</param> + <param name="path">/videotools/mkvtoolnix/sources/mkvtoolnix-4.4.0.tar.bz2</param> </service> <service name="verify_file"> - <param name="file">_service:download_url:mkvtoolnix-4.3.0.tar.bz2</param> + <param name="file">_service:download_url:mkvtoolnix-4.4.0.tar.bz2</param> <param name="verifier">sha256</param> - <param name="checksum">f98cb220495f23985c3b9f883ee9573c7fa38705ace94b025578feebfcdfcd1f</param> + <param name="checksum">d458448f099abd3609fccddf54bd0d1cf8cadf2e966478432fb09116a0aaef2a</param> </service> </services> ++++++ _service:download_url:mkvtoolnix-4.3.0.tar.bz2 -> _service:download_url:mkvtoolnix-4.4.0.tar.bz2 ++++++ ++++ 35975 lines of diff (skipped) ++++++ mkvtoolnix-4.3.0-guide_install.patch -> mkvtoolnix-4.4.0-guide_install.patch ++++++ --- mkvtoolnix/mkvtoolnix-4.3.0-guide_install.patch 2010-09-05 19:53:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkvtoolnix/mkvtoolnix-4.4.0-guide_install.patch 2010-11-02 12:51:44.000000000 +0100 @@ -2,27 +2,27 @@ =================================================================== --- Rakefile.orig +++ Rakefile -@@ -73,7 +73,7 @@ def setup_globals +@@ -78,7 +78,7 @@ def setup_globals $build_tools ||= c?(:TOOLS) -- cflags_common = "-Wall -Wno-comment -Wno-strict-aliasing #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\"" -+ cflags_common = "-Wall -Wno-comment -Wno-strict-aliasing #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_PKG_DOC_DIR=\\\"#{c(:pkgdocdir)}\\\"" +- cflags_common = "-Wall -Wno-comment #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\"" ++ cflags_common = "-Wall -Wno-comment #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\"" ldflags_extra = c?(:MINGW) ? '' : "-Wl,--enable-auto-import" $flags = { :cflags => "#{cflags_common} #{c(:USER_CFLAGS)}", -@@ -342,11 +342,11 @@ namespace :install do +@@ -349,11 +349,11 @@ namespace :install do end task :guides do - install_dir :pkgdatadir, $languages[:guides].collect { |language| "#{c(:pkgdatadir)}/guide/#{language}/images" } -+ install_dir :pkgdocdir, $languages[:guides].collect { |language| "#{c(:pkgdocdir)}/guide/#{language}/images" } ++ install_dir :docdir, $languages[:guides].collect { |language| "#{c(:docdir)}/guide/#{language}/images" } $languages[:guides].each do |language| - install_data "#{c(:pkgdatadir)}/guide/#{language}/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/mkvmerge-gui.*" ] - install_data "#{c(:pkgdatadir)}/guide/#{language}/images/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/images/*.gif" ] -+ install_data "#{c(:pkgdocdir)}/guide/#{language}/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/mkvmerge-gui.*" ] -+ install_data "#{c(:pkgdocdir)}/guide/#{language}/images/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/images/*.gif" ] ++ install_data "#{c(:docdir)}/guide/#{language}/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/mkvmerge-gui.*" ] ++ install_data "#{c(:docdir)}/guide/#{language}/images/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/images/*.gif" ] end end end @@ -38,14 +38,6 @@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ -@@ -26,6 +27,7 @@ man1dir = $(mandir)/man1 - includedir = @includedir@ - oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdocdir = $(docdir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . Index: src/mmg/mmg_dialog.cpp =================================================================== --- src/mmg/mmg_dialog.cpp.orig @@ -71,7 +63,7 @@ - // New location - potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR)); - potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR "-" VERSION)); -+ potential_help_paths.push_back(wxT(MTX_PKG_DOC_DIR)); ++ potential_help_paths.push_back(wxT(MTX_DOC_DIR)); #endif wxConfigBase *cfg = wxConfigBase::Get(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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