December 2010 - openSUSE Commits - openSUSE Mailing Lists

commit open-vm-tools for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at Wed Dec 29 00:22:29 CET 2010. -------- --- open-vm-tools/open-vm-tools.changes 2010-11-25 15:09:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/open-vm-tools/open-vm-tools.changes 2010-12-22 10:27:25.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Dec 22 08:29:03 UTC 2010 - dimstar(a)opensuse.org + +- Update to version 2010.12.19: + + New version of DnD code lands in open-vm-tools. The host part + of the new DnD protocol is not available yet in VMware + products, though. + + vmtoolsd gets some new functionality to support new features + being developed internally. + + vmxnet driver for FreeBSD fixed to allow changing the MAC + address. + + lots of bug fixes and other cleanups in various areas. +- Re-enable building of X dependenices (with_X 1) +- Disable unity on openSUSE < 11.4. It requires glib >= 2.24. + +------------------------------------------------------------------- +Thu Nov 25 15:11:31 UTC 2010 - dimstar(a)opensuse.org + +- Re-Inject pvscsi for older kernel builds. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- open-vm-tools-2010.11.17-327185.tar.bz2 New: ---- open-vm-tools-2010.12.19-339835.tar.bz2 pvscsi.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.Q81ApE/_old 2010-12-29 00:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.Q81ApE/_new 2010-12-29 00:21:25.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package open-vm-tools (Version 2010.11.17) +# spec file for package open-vm-tools (Version 2010.12.19) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands. @@ -31,14 +31,14 @@ %endif # X modules are failing all the time the build currently. We need an easy way to enable/disable them. -%define with_X 0 +%define with_X 1 Name: open-vm-tools Group: System/Emulators/PC Summary: Open Virtual Machine Tools -Version: 2010.11.17 +Version: 2010.12.19 Release: 1 -%define svn_rev 327185 +%define svn_rev 339835 Url: http://open-vm-tools.sourceforge.net/ License: BSD3c ; GPLv2 ; LGPLv2.1 Source: %{name}-%{version}-%{svn_rev}.tar.bz2 @@ -54,6 +54,8 @@ Source7: vmxnet3.tar.bz2 # vmmemctl.tar.bz2 is extracted from open-vm-tools 2010.02.23 Source8: vmmemctl.tar.bz2 +# pvscsi, extracted from open-vm-tools 2010.03.18 +Source9: pvscsi.tar.bz2 Source98: preamble BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -173,6 +175,7 @@ pushd modules/linux tar xvf %{S:7} tar xvf %{S:8} +tar xvf %{S:9} popd chmod -x AUTHORS COPYING ChangeLog NEWS README # fix for an rpmlint warning regarding wrong line feeds @@ -185,7 +188,7 @@ # comments in a continued line seem not to work... shame # --disable-unity : liburiparser was not present before 11.0 %configure \ -%if 0%{?suse_version} < 1100 +%if 0%{?suse_version} < 1140 --disable-unity \ %endif --without-kernel-modules \ @@ -247,6 +250,9 @@ # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper install -D -m 0755 %{S:5} $RPM_BUILD_ROOT%{_bindir}/vmware-user-autostart-wrapper install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop +# We have our own 'safe' autostart wrapper, which checks for modules to start in autologin mode... +# Thus we drop the 'original' autostartup +%__rm %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop # handle the .destop files for translations %suse_update_desktop_file vmware-user-autostart @@ -335,9 +341,13 @@ %defattr(-, root, root) %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop %{_bindir}/vmware-toolbox -%{_bindir}/vmware-user %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper +%{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so +%{_libdir}/%{name}/plugins/vmusr/libdndcp.so %{_libdir}/%{name}/plugins/vmusr/libresolutionSet.so +%if 0%{?suse_version} >= 1140 +%{_libdir}/%{name}/plugins/vmusr/libunity.so +%endif %{_libdir}/%{name}/plugins/vmusr/libvixUser.so %{_bindir}/vmware-user-autostart-wrapper %endif ++++++ open-vm-tools-2010.11.17-327185.tar.bz2 -> open-vm-tools-2010.12.19-339835.tar.bz2 ++++++ ++++ 39943 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 openCOLLADA for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package openCOLLADA for openSUSE:Factory checked in at Wed Dec 29 00:22:18 CET 2010. -------- --- openCOLLADA/openCOLLADA.changes 2010-11-22 11:16:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/openCOLLADA/openCOLLADA.changes 2010-12-27 13:44:09.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 27 11:07:43 UTC 2010 - davejplater(a)gmail.com + +- Update to svn788 +- Upstream changes + *fix Issue 148: Glitch in ftoa and dtoa (rename variables) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openCOLLADA-svn785.tar.bz2 New: ---- openCOLLADA-svn788.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openCOLLADA.spec ++++++ --- /var/tmp/diff_new_pack.l6Nz5K/_old 2010-12-29 00:21:28.000000000 +0100 +++ /var/tmp/diff_new_pack.l6Nz5K/_new 2010-12-29 00:21:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package openCOLLADA (Version svn785) +# spec file for package openCOLLADA (Version svn788) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,10 +17,10 @@ # norootforbuild -%define libversion 0.785.0 +%define libversion 0.788.0 Name: openCOLLADA -Version: svn785 +Version: svn788 Release: 1 License: MIT Summary: Collada 3D import and export libraries ++++++ CHANGES.txt ++++++ --- /var/tmp/diff_new_pack.l6Nz5K/_old 2010-12-29 00:21:28.000000000 +0100 +++ /var/tmp/diff_new_pack.l6Nz5K/_new 2010-12-29 00:21:28.000000000 +0100 @@ -1,3 +1,16 @@ +------------------------------------------------------------------------ +r788 | robert%opencollada.org(a)gtempaccount.com | 2010-12-15 16:05:34 +0200 (Wed, 15 Dec 2010) | 1 line + +fix Issue 148: Glitch in ftoa and dtoa (rename variables) +------------------------------------------------------------------------ +r787 | robert%opencollada.org(a)gtempaccount.com | 2010-12-15 16:04:33 +0200 (Wed, 15 Dec 2010) | 1 line + +fix Issue 144: [ColladaMAX] Material names have an unnecessary and sometimes inconsisten suffix "_1" +------------------------------------------------------------------------ +r786 | robert%opencollada.org(a)gtempaccount.com | 2010-12-15 12:46:20 +0200 (Wed, 15 Dec 2010) | 1 line + +fix Issue 148: Glitch in ftoa and dtoa +------------------------------------------------------------------------ r785 | robert%opencollada.org(a)gtempaccount.com | 2010-11-22 10:36:59 +0200 (Mon, 22 Nov 2010) | 1 line fix Issue 137: SetParam does not properly export float<n> with 0's in it ++++++ openCOLLADA-svn785.tar.bz2 -> openCOLLADA-svn788.tar.bz2 ++++++ ++++ 793530 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 mysql-community-server for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at Wed Dec 29 00:21:13 CET 2010. -------- --- mysql-community-server/mysql-community-server.changes 2010-05-07 11:32:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql-community-server/mysql-community-server.changes 2010-12-14 14:49:54.000000000 +0100 @@ -1,0 +2,58 @@ +Mon Nov 22 14:19:52 CET 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.53, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-53.html + +------------------------------------------------------------------- +Sat Nov 6 10:47:07 CET 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.52, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-52.html + +------------------------------------------------------------------- +Thu Oct 21 10:50:29 CEST 2010 - mhrusecky(a)suse.cz + +- Fixed building on Mandriva + +------------------------------------------------------------------- +Mon Oct 18 16:21:40 CEST 2010 - mhrusecky(a)suse.cz + +- rewritten spec file + - build and install parts are in separate file now + - patches in the archive + - contains more documentation + - contains tags + - adding/removing patches just at in one configuration file + +------------------------------------------------------------------- +Wed Sep 29 12:49:25 CEST 2010 - mhrusecky(a)suse.cz + +- fixed init script to work on SELinux machines (bnc#635645) + +------------------------------------------------------------------- +Wed Sep 29 11:47:47 CEST 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.51, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-51.html + +------------------------------------------------------------------- +Wed Aug 11 01:53:06 CEST 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.49 (maintenance update), see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-49.html + - fixes several security issues + +------------------------------------------------------------------- +Tue Jun 29 10:33:01 CEST 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.48 (maintenance update), see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-48.html + +------------------------------------------------------------------- +Wed May 26 13:48:10 CEST 2010 - mhrusecky(a)suse.cz + +- updated to 5.1.47 (maintenance update), see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-47.html +- fixed Fedora 12 build + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- abi_test.patch libmysql-no-pkglibdir.patch mysql-5.1.30-federated-workaround.patch mysql-5.1.31-shebang.patch mysql-5.1.33-scripts-paths.patch mysql-5.1.33-ssl-lib64-macro.patch mysql-5.1.35-test-utf8.patch mysql-5.1.35-test-variables-big.patch mysql-5.1.36-bmove512.patch mysql-5.1.36-hotcopy.patch mysql-5.1.42-myslq-test.patch mysql-5.1.45-safe-process-in-bin.patch mysql-5.1.46.tar.bz2 mysql-cnf.patch mysql-enable-plugins.patch mysql-group.patch mysql-install_db-quiet.patch mysql-logrotate.patch mysql-multi-configuration.patch mysql-plugins-avoid-version.patch mysql_config.patch mysql_upgrade-exit-status.patch mysqld_multi.patch New: ---- build.inc install.inc mysql-5.1.53.tar.bz2 mysql-patches.tar.bz2 old-ssl.series series ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.Wh7ne0/_old 2010-12-29 00:20:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Wh7ne0/_new 2010-12-29 00:20:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mysql-community-server (Version 5.1.46) +# spec file for package mysql-community-server (Version 5.1.53) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ # Few definitions which will alter build %define prefered 1 %define cluster 0 -%define srv_vers 5.1.46 +%define builtin_plugins partition,csv,heap,myisam,innobase %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -31,8 +31,9 @@ Name: mysql-community-server Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.1.46 -Release: 2 +Version: 5.1.53 +Release: 1 +%define srv_vers 5.1.53 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers Url: http://www.mysql.com @@ -44,52 +45,14 @@ Source5: mysql.SuSEfirewall2 Source7: rc.mysql-multi Source8: README.SuSE -# Polishing default config file -Patch2: mysql-cnf.patch -Patch3: mysql-multi-configuration.patch -# Adds option to set group to something else similarly to the user settings -Patch4: mysql-group.patch -# Warning about initscript in mysql_install_db disabled, since the SUSE RPM comes with an init script installed -Patch5: mysql-install_db-quiet.patch -# Checks flush-logs exit status in support-files/mysql-log-rotate.sh -Patch7: mysql-logrotate.patch -# Adds reload funcionality to mysqld_multi.sh perl script and adds --datadir support -Patch8: mysqld_multi.patch -# Disables failure on one test during update and improves error message during update a little bit -Patch13: mysql_upgrade-exit-status.patch -# Changes pkglib_LIBRARIES into lib_LIBRARIES in libmysql -Patch18: libmysql-no-pkglibdir.patch -# Adds option -avoid-version to LDFLAGS for plugins blackhole, archive and example -Patch19: mysql-plugins-avoid-version.patch -# This patch loads plugins by default if there is no settings regarding plugins. -Patch23: mysql-enable-plugins.patch -# Really ugly patch which fixes federated to work as a plugin. We should get rid of this asap. -Patch24: mysql-5.1.30-federated-workaround.patch -# PATCH-FIX-UPSTREAM mysql-5.1.31-shebang.patch [] mhrusecky(a)suse.cz -- adds mising shebangs -Patch25: mysql-5.1.31-shebang.patch -# PATCH-FIX-UPSTREAM mysql-5.1.35-test-variables-big.patch [upstream bug #38811] -- different way to test whether server crashed -# http://bugs.mysql.com/bug.php?id=38811 -Patch27: mysql-5.1.35-test-variables-big.patch -# PATCH-FIX-SUSE mysql-5.1.32-myslq-test.patch mhrusecky(a)suse.cz -- installs tests into datadir not into prefix -Patch28: mysql-5.1.42-myslq-test.patch -# PATCH-FIX-UPSTREAM mysql-5.1.33-scripts-paths.patch [ upstream#45616 ] mhrusecky(a)suse.cz -- fixes build of scripts when compilation occurs somewhere else -# http://bugs.mysql.com/bug.php?id=45616 -Patch29: mysql-5.1.33-scripts-paths.patch -# PATCH-FIX-SUSE mysql-5.1.45-safe-process-in-bin.patch [] mhrusecky(a)suse.cz -- this will let us move one binary to /usr/bin instead of /usr/share/mysql-test/... -Patch30: mysql-5.1.45-safe-process-in-bin.patch -# PATCH-FIX-SUSE mysql-5.1.33-ssl-lib64-macro.patch [] mhrusecky(a)suse.cz -- search for ssl libraries also in lib64 -Patch31: mysql-5.1.33-ssl-lib64-macro.patch -# PATCH-FIX-SUSE mysql-5.1.35-test-utf8.patch [] mhrusecky(a)suse.cz -- we use utf-8 by default which produces different output with few tests -Patch35: mysql-5.1.35-test-utf8.patch -# PATCH-FIX-UPSTREAM mysql-5.1.36-bmove512.patch [ upstream#19975 ] mhrusecky(a)suse.cz -- using standard memcpy instead of bmove512 as it should be beeter -# http://bugs.mysql.com/bug.php?id=19975 -Patch37: mysql-5.1.36-bmove512.patch -# PATCH-FIX-UPSTREAM mysql-5.1.36-hotcopy.patch [ upstream#43594, bnc#525325 ] mhrusecky(a)suse.cz -- hotcopy ignores log tables -# http://bugs.mysql.com/bug.php?id=43594 -Patch38: mysql-5.1.36-hotcopy.patch -# PATCH-FIX-UPSTREAM mysql_config.patch [ upstream#39175, bnc#420313 ] mhrusecky(a)suse.cz -- Fix linking options. -Patch39: mysql_config.patch -Patch45: abi_test.patch +Source9: mysql-patches.tar.bz2 +Source10: build.inc +Source11: install.inc +%if 0%{?suse_version} > 1120 || 0%{?fedora_version} > 11 +Source12: series +%else +Source12: old-ssl.series +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils @@ -107,6 +70,9 @@ %if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 BuildRequires: fdupes %endif +%if 0%{?fedora_version} > 11 +BuildRequires: sqlite +%endif %if 0%{?suse_version} > 1030 Recommends: logrotate %else @@ -159,7 +125,7 @@ # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release Obsoletes: mysql-devel < %srv_vers -Requires: libmysqlclient16 = %srv_vers libmysqlclient_r16 = %srv_vers glibc-devel zlib-devel openssl-devel +Requires: libmysqlclient16 = %version libmysqlclient_r16 = %version glibc-devel zlib-devel openssl-devel Summary: MySQL Development Header Files and Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/C and C++ @@ -191,8 +157,8 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MySQL embedded server development files # the headers files are the shared -Requires: libmysqlclient-devel = %srv_vers -Requires: libmysqld0 = %srv_vers +Requires: libmysqlclient-devel = %version tcpd-devel +Requires: libmysqld0 = %version Group: Development/Libraries/C and C++ %description -n libmysqld-devel @@ -276,17 +242,32 @@ David Axmark <davida(a)mysql.com> #------------------------------------------------------------------------------- +%if %{defined mdkversion} + +%package debuging +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +%else + %package debug +%endif #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MySQL server with debug options turned on Group: Productivity/Databases/Servers -Requires: %{name} = %{srv_vers} +Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} Obsoletes: mysql-debug < %{srv_vers} Conflicts: otherproviders(mysql-debug) +%if %{defined mdkversion} + +%description debuging + +%else + %description debug + +%endif A version of the mysql server that has some debug code turned on. It should be only used to track down problems with the standard servers. Note that merely installing this package won't replace the @@ -298,18 +279,18 @@ Michael Widenius <monty(a)mysql.com> David Axmark <davida(a)mysql.com> - #------------------------------------------------------------------------------- + %package test #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MySQL testsuite Group: Productivity/Databases/Servers -Requires: %{name} = %{srv_vers} -Requires: %{name}-client = %{srv_vers} +Requires: %{name} = %{version} +Requires: %{name}-client = %{version} Requires: perl-DBD-mysql -Requires: %{name}-tools = %{srv_vers} -Requires: %{name}-bench = %{srv_vers} +Requires: %{name}-tools = %{version} +Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} Obsoletes: mysql-test < %{srv_vers} Conflicts: otherproviders(mysql-test) @@ -410,35 +391,18 @@ advanced user. They should be used with caution. %endif + #------------------------------------------------------------------------------- %prep #------------------------------------------------------------------------------- -%setup -q -n mysql-%version +%setup -q -n mysql-%version -D -a 9 cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . -%patch2 -%patch3 -%patch4 -%patch5 -%patch7 -%patch8 -%patch13 -%patch18 -%patch19 -%patch23 -%patch24 -%patch25 -p1 -%patch27 -%patch28 -%patch29 -%patch30 -%patch31 -%patch35 -%patch37 -%patch38 -%patch39 -%patch45 -p1 +# apply patches from series +ln -s mysql-patches/patches . +cp %{S:12} patches/series +mysql-patches/apply-series.sh patches/series # remove unneeded manpages ('make install' basically installs everything under # man/*) rm -f man/mysqlman.1 # dummy fallback manpage @@ -455,209 +419,13 @@ %build #------------------------------------------------------------------------------- -%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0 -%define socketpath /var/lib/mysql -%else -%define socketpath /var/run/mysql -%endif -autoreconf -f -i -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing" -export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" -# Make the compile a function, since we do multiple builds -BuildMySQL() { - # The --enable-assembler simply does nothing on systems that do not - # support assembler speedups. - suffix="$1"; shift - mkdir _build$suffix - pushd _build$suffix - ../configure \ - --enable-assembler \ - --without-readline \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ - --libexecdir=/usr/sbin \ - --localstatedir=/var/lib/mysql \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --sysconfdir=/etc \ - --with-mysqld-user=mysql \ - --with-mysqld-group=mysql \ - --without-debug \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --with-charset=utf8 \ - --with-collation=utf8_unicode_ci \ - --with-extra-charsets=all \ - --with-unix-socket-path=%{socketpath}/mysql.sock \ - --enable-thread-safe-client \ - --with-comment="SUSE MySQL RPM" \ - --with-libwrap \ - --with-server-suffix=$suffix \ -%ifarch s390 s390x - --with-atomic-ops=rwlocks \ -%else - --with-atomic-ops=smp \ -%endif - --with-ssl=/usr \ - --with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \ - HOSTNAME="/bin/hostname -f" \ - "$@" - # Add this for MyISAM RAID support: - # --with-raid - # benchdir does not fit in above model. Fix when we make a separate package - make %{?jobs:-j%jobs} - nm --numeric-sort sql/mysqld > sql/mysqld.sym - # needed for make check, which is not VPATH aware - # copy the files unconditionally so that manual 'make check' after - # the build works, too - cp -a ../mysql-test/* mysql-test/ - cp -a ../sql/share/{english,charsets} sql/share/ - cp -a ../scripts/*.sql scripts/ -%if %{?_with_testsuite:1}0 - pushd mysql-test; perl ./mysql-test-run.pl --force; popd -%endif - popd -} -# Build the client, extra tools, libraries -BuildMySQL "" --with-embedded-server -# build mysqld-debug -BuildMySQL "-debug" --with-debug --without-embedded-server - -%if 0%{?prefered} > 0 -mkdir -p _buildlibmysqld/tmp -cd _buildlibmysqld/tmp -ar -x ../../_build/libmysqld/libmysqld.a -gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \ -*.o \ --lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc -cd .. -rm -rf tmp -cd .. -%endif +%{expand:%(cat %_sourcedir/build.inc)} #------------------------------------------------------------------------------- %install #------------------------------------------------------------------------------- -# install the debug server first, so that we don't overwrite the standard -# /usr/sbin/mysqld -mkdir -p %buildroot%_libdir/mysql -make -C _build-debug/sql install DESTDIR=%buildroot -mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug -install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym -# install the client, extra tools, libraries and the standard server -make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ -install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym -# remove most static libs (FIXME: don't build them at all...) -rm -f %buildroot%_libdir/libmysqlclient*a -rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la -rm -f %buildroot%_libdir/mysql/plugin/*a -# XXX: package these? The ndb tools are linked statically atm -rm -f %buildroot%_libdir/mysql/libndbclient.* -rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run -rm -f %{buildroot}/usr/share/mysql-test/mtr -ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr -ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run -mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} -# generate filelist for binaries and their manpages (easier than enumerating -# all the binaries and manapages manually, esp. when there are new manpages in -# each release) -filelist() -{ - echo '%%defattr(-, root, root)' - pushd %buildroot >/dev/null - for i; do - if test -e usr/sbin/"$i"; then - echo /usr/sbin/"$i" - fi - if test -e usr/bin/"$i"; then - echo /usr/bin/"$i" - fi - if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then - echo "%%doc %_mandir/*/$i.[1-9]*" - fi - done - popd >/dev/null -} -filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip >mysql.files -filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files -filelist mysql_config >libmysqlclient-devel.files -filelist mysqlslap >mysql-bench.files -filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files -# all binaries that don't need to be in a "default" install (mysql.rpm + -# mysql-client.rpm) -filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files -filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files -filelist ndb_mgmd >mysql-ndb-management.files -filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files -### files not installed by make install -# Create directory structure -DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) -DOCDIR=%buildroot%_defaultdocdir/%name -install -d -m 755 ${DOCDIR} -install -d -m 755 %buildroot/etc/logrotate.d -install -d -m 755 %buildroot/etc/init.d -install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql -%if 0%{?prefered} > 0 -install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so -%endif -install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf -install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf -install -m 644 "${DOCS[@]}" ${DOCDIR} -install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql -ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql -# this is used by the init script -install -m 755 -d %buildroot/var/run/mysql -# SuSEfirewall service description -install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ - %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql -# testsuite -mkdir -p '%buildroot'/usr/share/mysql-test/ -install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/ -# XXX this should go under /var/..., but some tests get confused by a symlink -# var -> ../../../var/... -#ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var -mkdir '%buildroot'/usr/share/mysql-test/var -# Final fixes -find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete -%if 0%{?suse_version} > 1030 -%fdupes -s '%buildroot'/usr/share/mysql-test -%endif -%if 0%{?fedora_version} > 8 -fdupes -q -n -r '%buildroot'/usr/share/mysql-test -%endif -dos2unixConversion() { - %{__sed} -i 's/\r//g' "$1" -} -for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do - dos2unixConversion "$i" -done -%if ! 0%{cluster} > 0 -cat mysql-ndb-storage.files mysql-ndb-management.files \ - mysql-ndb-tools.files mysql-ndb-extra.files | \ - sed 's|^%%doc\ ||' | while read tmp; do - cd '%buildroot' - rm -f .$tmp -done -%endif -%if ! 0%{prefered} > 0 -cat libmysqlclient-devel.files | while read tmp; do - cd '%buildroot' - rm -f .$tmp -done -rm -rf '%buildroot'/%_libdir/libmysqld.* -rm -rf '%buildroot'/%_libdir/libmysqlclient* -rm -rf '%buildroot'/%_includedir -rm -rf '%buildroot'/%_datadir/man/*/mysql_config* -rm -rf '%buildroot'/%_datadir/aclocal -%endif -sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql -ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair -ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze -ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +%{expand:%(cat %_sourcedir/install.inc)} #------------------------------------------------------------------------------- @@ -694,7 +462,7 @@ %posttrans #------------------------------------------------------------------------------- -%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* if [ -d /var/lib/mysql ]; then touch /var/lib/mysql/.run-mysql_upgrade chown -R mysql:mysql /var/lib/mysql @@ -757,7 +525,7 @@ %postun #------------------------------------------------------------------------------- if [ $1 = 0 ]; then - %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.gz + %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* %{insserv_cleanup} fi #------------------------------------------------------------------------------- @@ -775,9 +543,11 @@ #------------------------------------------------------------------------------- %defattr(-, root, root) %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf +%dir %attr(0750, root, mysql) /etc/mysql +%config(noreplace) %attr(0640, root, mysql) /etc/mysql/* %config /etc/logrotate.d/mysql %doc %{_defaultdocdir}/%{name} -%doc %{_infodir}/mysql.info.gz +%doc %{_infodir}/mysql.info.* /etc/init.d/mysql /usr/sbin/rcmysql /usr/share/mysql/ @@ -852,8 +622,13 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- +%if %{defined mdkversion} + +%files debuging +%else %files debug +%endif #------------------------------------------------------------------------------- %defattr(-, root, root) /usr/sbin/mysqld-debug ++++++ build.inc ++++++ %if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0 %define socketpath /var/lib/mysql %else %define socketpath /var/run/mysql %endif autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing -Wno-unused-parameter" export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" # Make the compile a function, since we do multiple builds BuildMySQL() { # The --enable-assembler simply does nothing on systems that do not # support assembler speedups. suffix="$1"; shift mkdir _build$suffix pushd _build$suffix ../configure \ --enable-assembler \ --without-readline \ --infodir=%{_infodir} \ --libdir=%{_libdir} \ --libexecdir=/usr/sbin \ --localstatedir=/var/lib/mysql \ --mandir=%{_mandir} \ --prefix=%{_prefix} \ --sysconfdir=/etc \ --with-mysqld-user=mysql \ --with-mysqld-group=mysql \ --without-debug \ --datadir=/usr/share \ --includedir=/usr/include \ --with-charset=utf8 \ --with-collation=utf8_unicode_ci \ --with-extra-charsets=all \ --with-unix-socket-path=%{socketpath}/mysql.sock \ --enable-thread-safe-client \ --with-comment="SUSE MySQL RPM" \ --with-libwrap \ --with-server-suffix=$suffix \ %ifarch s390 s390x --with-atomic-ops=rwlocks \ %else --with-atomic-ops=smp \ %endif --with-ssl=/usr \ --with-plugins=%{builtin_plugins} \ HOSTNAME="/bin/hostname -f" \ "$@" # Add this for MyISAM RAID support: # --with-raid # benchdir does not fit in above model. Fix when we make a separate package make %{?jobs:-j%jobs} nm --numeric-sort sql/mysqld > sql/mysqld.sym # needed for make check, which is not VPATH aware # copy the files unconditionally so that manual 'make check' after # the build works, too cp -a ../mysql-test/* mysql-test/ for i in ../sql/share/{english,charsets}; do [ -d $i ] && cp -a $i sql/share/ done cp -a ../scripts/*.sql scripts/ %if %{?_with_testsuite:1}0 pushd mysql-test; perl ./mysql-test-run.pl --force; popd %endif popd } # Build the client, extra tools, libraries BuildMySQL "" --with-embedded-server # build mysqld-debug BuildMySQL "-debug" --with-debug --without-embedded-server %if 0%{?prefered} > 0 mkdir -p _buildlibmysqld/tmp cd _buildlibmysqld/tmp ar -x ../../_build/libmysqld/libmysqld.a gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \ *.o \ -lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc cd .. rm -rf tmp cd .. %endif ++++++ install.inc ++++++ # install the debug server first, so that we don't overwrite the standard # /usr/sbin/mysqld mkdir -p %buildroot%_libdir/mysql make -C _build-debug/sql install DESTDIR=%buildroot mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym # install the client, extra tools, libraries and the standard server make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la rm -f %buildroot%_libdir/mysql/plugin/*a # XXX: package these? The ndb tools are linked statically atm rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run rm -f %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} # generate filelist for binaries and their manpages (easier than enumerating # all the binaries and manapages manually, esp. when there are new manpages in # each release) filelist() { echo '%%defattr(-, root, root)' pushd %buildroot >/dev/null for i; do if test -e usr/sbin/"$i"; then echo /usr/sbin/"$i" fi if test -e usr/bin/"$i"; then echo /usr/bin/"$i" fi if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then echo "%%doc %_mandir/*/$i.[1-9]*" fi done popd >/dev/null } filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat >mysql.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files filelist mysql_config >libmysqlclient-devel.files filelist mysqlslap >mysql-bench.files filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) DOCDIR=%buildroot%_defaultdocdir/%name install -d -m 755 ${DOCDIR} install -d -m 755 %buildroot/etc/logrotate.d install -d -m 755 %buildroot/etc/init.d install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql %if 0%{?prefered} > 0 install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so %endif install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf install -m 644 "${DOCS[@]}" ${DOCDIR} install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql # this is used by the init script install -m 755 -d %buildroot/var/run/mysql # SuSEfirewall service description install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql # testsuite mkdir -p '%buildroot'/usr/share/mysql-test/ install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/ # XXX this should go under /var/..., but some tests get confused by a symlink # var -> ../../../var/... #ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var mkdir '%buildroot'/usr/share/mysql-test/var # Final fixes find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete %if 0%{?suse_version} > 1030 %fdupes -s '%buildroot'/usr/share/mysql-test %endif %if 0%{?fedora_version} > 8 fdupes -q -n -r '%buildroot'/usr/share/mysql-test %endif dos2unixConversion() { %{__sed} -i 's/\r//g' "$1" } for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do dos2unixConversion "$i" done %if ! 0%{cluster} > 0 cat mysql-ndb-storage.files mysql-ndb-management.files \ mysql-ndb-tools.files mysql-ndb-extra.files | \ sed 's|^%%doc\ ||' | while read tmp; do cd '%buildroot' rm -f .$tmp done %endif %if ! 0%{prefered} > 0 cat libmysqlclient-devel.files | while read tmp; do cd '%buildroot' rm -f .$tmp done rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so rm -rf '%buildroot'/%_libdir/*.a rm -rf '%buildroot'/%_includedir rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal %endif sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize mkdir -p '%buildroot'/etc/mysql [ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql ++++++ mysql-5.1.46.tar.bz2 -> mysql-5.1.53.tar.bz2 ++++++ mysql-community-server/mysql-5.1.46.tar.bz2 /mounts/work_src_done/STABLE/mysql-community-server/mysql-5.1.53.tar.bz2 differ: char 11, line 1 ++++++ old-ssl.series ++++++ mysql-community-server-5.1.30-federated-workaround.patch mysql-community-server-5.1.31-shebang.patch mysql-community-server-5.1.33-scripts-paths.patch mysql-community-server-5.1.33-ssl-lib64-macro.patch mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch mysql-community-server-5.1.45-cnf.patch mysql-community-server-5.1.45-group.patch mysql-community-server-5.1.45-multi-configuration.patch mysql-community-server-5.1.45-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mysql-community-server-5.1.50-strncat-overflow.patch mysql-community-server-5.1.51-install_db-quiet.patch mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch mysql-community-server-5.1.51-myslq-test.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch mysql-community-server-5.1.51-plugins-avoid-version.patch mysql-community-server-5.1.51-upgrade-exit-status.patch mysql-community-server-5.1.52-utf8-test-results.patch mysql-community-server-5.1.53-compilation-fix.patch ++++++ series ++++++ mysql-community-server-5.1.30-federated-workaround.patch mysql-community-server-5.1.31-shebang.patch mysql-community-server-5.1.33-scripts-paths.patch mysql-community-server-5.1.33-ssl-lib64-macro.patch mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch mysql-community-server-5.1.45-cnf.patch mysql-community-server-5.1.45-group.patch mysql-community-server-5.1.45-multi-configuration.patch mysql-community-server-5.1.45-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mysql-community-server-5.1.50-strncat-overflow.patch mysql-community-server-5.1.51-install_db-quiet.patch mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch mysql-community-server-5.1.51-myslq-test.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch mysql-community-server-5.1.51-plugins-avoid-version.patch mysql-community-server-5.1.51-upgrade-exit-status.patch mysql-community-server-5.1.52-utf8-test-results.patch mysql-community-server-5.1.53-ssl-compilation-fix.patch mysql-community-server-5.1.53-compilation-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mysql-cluster for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package mysql-cluster for openSUSE:Factory checked in at Wed Dec 29 00:21:05 CET 2010. -------- --- mysql-cluster/mysql-cluster.changes 2010-06-04 18:18:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql-cluster/mysql-cluster.changes 2010-12-21 18:08:18.000000000 +0100 @@ -1,0 +2,37 @@ +Tue Dec 14 15:22:16 CET 2010 - mhrusecky(a)suse.cz + +- updated to MySQL Cluster 7.1.9a (based on MySQL 5.1.51), see + http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-news-5-1-51-ndb-7-1-9a… + +------------------------------------------------------------------- +Fri Oct 22 11:11:41 CEST 2010 - mhrusecky(a)suse.cz + +- fixed all places where variable was used in printf for format + +------------------------------------------------------------------- +Thu Oct 21 11:10:21 CEST 2010 - mhrusecky(a)suse.cz + +- fixed Mandriva build + +------------------------------------------------------------------- +Wed Oct 20 08:45:56 CEST 2010 - mhrusecky(a)suse.cz + +- rewritten spec file + - build and install parts are in separate file now + - patches in the archive + - contains more documentation + - contains tags + - adding/removing patches just at in one configuration file + +------------------------------------------------------------------- +Wed Sep 29 13:38:34 CEST 2010 - mhrusecky(a)suse.cz + +- fixed init script to work on SELinux machines (bnc#635645) + +------------------------------------------------------------------- +Tue Aug 24 15:02:39 CEST 2010 - mhrusecky(a)suse.cz + +- updated to MySQL Cluster 7.0.16 (based on MySQL 5.1.47), see + http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-news-5-1-47-ndb-7-0-16… + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- abi_test.patch libmysql-no-pkglibdir.patch mysql-5.1.23-vpath.patch mysql-5.1.30-federated-workaround.patch mysql-5.1.31-shebang.patch mysql-5.1.33-safe-process-in-bin.patch mysql-5.1.33-ssl-lib64-macro.patch mysql-5.1.35-test-utf8.patch mysql-5.1.35-test-variables-big.patch mysql-5.1.36-bmove512.patch mysql-5.1.36-hotcopy.patch mysql-cluster-7.0.13-undefined-operation.patch mysql-cluster-7.0.9-libmysqld.patch mysql-cluster-7.0.9-myslq-test.patch mysql-cluster-gpl-7.0.13.tar.bz2 mysql-cnf.patch mysql-enable-plugins.patch mysql-group.patch mysql-install_db-quiet.patch mysql-logrotate.patch mysql-multi-configuration.patch mysql-plugins-avoid-version.patch mysql_config.patch mysql_upgrade-exit-status.patch mysqld_multi.patch New: ---- build.inc install.inc mysql-cluster-gpl-7.1.9a.tar.bz2 mysql-patches.tar.bz2 series ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-cluster.spec ++++++ --- /var/tmp/diff_new_pack.e5FsNJ/_old 2010-12-29 00:20:12.000000000 +0100 +++ /var/tmp/diff_new_pack.e5FsNJ/_new 2010-12-29 00:20:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mysql-cluster (Version 7.0.13) +# spec file for package mysql-cluster (Version 7.1.9a) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ # Few definitions which will alter build %define prefered 0 %define cluster 1 -%define srv_vers 5.1.41 +%define builtin_plugins partition,csv,heap,myisam,ndbcluster,innobase %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -31,8 +31,9 @@ Name: mysql-cluster Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 7.0.13 -Release: 2 +Version: 7.1.9a +Release: 1 +%define srv_vers 5.1.51 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers Url: http://www.mysql.com @@ -43,54 +44,10 @@ Source5: mysql.SuSEfirewall2 Source7: rc.mysql-multi Source8: README.SuSE -# Polishing default config file -Patch2: mysql-cnf.patch -Patch3: mysql-multi-configuration.patch -# Adds option to set group to something else similarly to the user settings -Patch4: mysql-group.patch -# Warning about initscript in mysql_install_db disabled, since the SUSE RPM comes with an init script installed -Patch5: mysql-install_db-quiet.patch -# Checks flush-logs exit status in support-files/mysql-log-rotate.sh -Patch7: mysql-logrotate.patch -# Adds reload funcionality to mysqld_multi.sh perl script and adds --datadir support -Patch8: mysqld_multi.patch -# Disables failure on one test during update and improves error message during update a little bit -Patch13: mysql_upgrade-exit-status.patch -# Check in configure script for readline uses variable instead of relative path now -# (maybe safer, shouldn't affect functionality, maybe it can be dropped) -Patch15: mysql-5.1.23-vpath.patch -# Changes pkglib_LIBRARIES into lib_LIBRARIES in libmysql -Patch18: libmysql-no-pkglibdir.patch -# Adds option -avoid-version to LDFLAGS for plugins blackhole, archive and example -Patch19: mysql-plugins-avoid-version.patch -# This patch loads plugins by default if there is no settings regarding plugins. -Patch23: mysql-enable-plugins.patch -# Really ugly patch which fixes federated to work as a plugin. We should get rid of this asap. -Patch24: mysql-5.1.30-federated-workaround.patch -# PATCH-FIX-UPSTREAM mysql-5.1.31-shebang.patch [] mhrusecky(a)suse.cz -- adds mising shebangs -Patch25: mysql-5.1.31-shebang.patch -# PATCH-FIX-UPSTREAM mysql-5.1.35-test-variables-big.patch [upstream bug #38811] -- different way to test whether server crashed -# http://bugs.mysql.com/bug.php?id=38811 -Patch27: mysql-5.1.35-test-variables-big.patch -# PATCH-FIX-SUSE mysql-5.1.32-myslq-test.patch mhrusecky(a)suse.cz -- installs tests into datadir not into prefix -Patch28: mysql-cluster-7.0.9-myslq-test.patch -# PATCH-FIX-SUSE mysql-5.1.33-safe-process-in-bin.patch [] mhrusecky(a)suse.cz -- this will let us move one binary to /usr/bin instead of /usr/share/mysql-test/... -Patch30: mysql-5.1.33-safe-process-in-bin.patch -# PATCH-FIX-SUSE mysql-5.1.33-ssl-lib64-macro.patch [] mhrusecky(a)suse.cz -- search for ssl libraries also in lib64 -Patch31: mysql-5.1.33-ssl-lib64-macro.patch -# PATCH-FIX-SUSE mysql-5.1.35-test-utf8.patch [] mhrusecky(a)suse.cz -- we use utf-8 by default which produces different output with few tests -Patch35: mysql-5.1.35-test-utf8.patch -# PATCH-FIX-UPSTREAM mysql-5.1.36-bmove512.patch [ upstream#19975 ] mhrusecky(a)suse.cz -- using standard memcpy instead of bmove512 as it should be beeter -# http://bugs.mysql.com/bug.php?id=19975 -Patch37: mysql-5.1.36-bmove512.patch -# PATCH-FIX-UPSTREAM mysql-5.1.36-hotcopy.patch [ upstream#43594, bnc#525325 ] mhrusecky(a)suse.cz -- hotcopy ignores log tables -# http://bugs.mysql.com/bug.php?id=43594 -Patch38: mysql-5.1.36-hotcopy.patch -# PATCH-FIX-UPSTREAM mysql_config.patch [ upstream#39175, bnc#420313 ] mhrusecky(a)suse.cz -- Fix linking options. -Patch39: mysql_config.patch -Patch45: abi_test.patch -Patch46: mysql-cluster-7.0.9-libmysqld.patch -Patch47: mysql-cluster-7.0.13-undefined-operation.patch +Source9: mysql-patches.tar.bz2 +Source10: build.inc +Source11: install.inc +Source12: series BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils @@ -101,7 +58,7 @@ %if 0%{?suse_version} PreReq: %install_info_prereq %insserv_prereq %endif -BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel zlib-devel +BuildRequires: bison gcc-c++ ncurses-devel openssl-devel procps readline-devel zlib-devel %if 0%{?suse_version} BuildRequires: pwdutils tcpd-devel %endif @@ -306,7 +263,14 @@ David Axmark <davida(a)mysql.com> #------------------------------------------------------------------------------- +%if %{defined mdkversion} + +%package debuging +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +%else + %package debug +%endif #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MySQL Cluster server with debug options turned on @@ -315,7 +279,15 @@ Provides: mysql-debug = %{srv_vers} Conflicts: otherproviders(mysql-debug) +%if %{defined mdkversion} + +%description debuging + +%else + %description debug + +%endif A version of the mysql server that has some debug code turned on. It should be only used to track down problems with the standard servers. Note that merely installing this package won't replace the @@ -327,8 +299,8 @@ Michael Widenius <monty(a)mysql.com> David Axmark <davida(a)mysql.com> - #------------------------------------------------------------------------------- + %package test #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -440,33 +412,13 @@ %prep #------------------------------------------------------------------------------- -%setup -q -n mysql-cluster-gpl-%{version} +%setup -q -n mysql-cluster-gpl-%{version} -D -a 9 cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . -%patch2 -%patch3 -%patch4 -%patch5 -%patch7 -%patch8 -%patch13 -%patch15 -%patch18 -%patch19 -%patch23 -%patch24 -%patch25 -p1 -%patch27 -%patch28 -%patch30 -%patch31 -%patch35 -%patch37 -%patch38 -%patch39 -%patch45 -%patch46 -%patch47 -p1 +# apply patches from series +ln -s mysql-patches/patches . +cp %_sourcedir/series patches +mysql-patches/apply-series.sh patches/series # remove unneeded manpages ('make install' basically installs everything under # man/*) rm -f man/mysqlman.1 # dummy fallback manpage @@ -488,207 +440,13 @@ %build #------------------------------------------------------------------------------- -%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0 -%define socketpath /var/lib/mysql -%else -%define socketpath /var/run/mysql -%endif -autoreconf -f -i -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing" -export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" -# Make the compile a function, since we do multiple builds -BuildMySQL() { - # The --enable-assembler simply does nothing on systems that do not - # support assembler speedups. - suffix="$1"; shift - mkdir _build$suffix - pushd _build$suffix - ../configure \ - --enable-assembler \ - --without-readline \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ - --libexecdir=/usr/sbin \ - --localstatedir=/var/lib/mysql \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --sysconfdir=/etc \ - --with-mysqld-user=mysql \ - --with-mysqld-group=mysql \ - --without-debug \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --with-charset=utf8 \ - --with-collation=utf8_unicode_ci \ - --with-extra-charsets=complex \ - --with-unix-socket-path=%{socketpath}/mysql.sock \ - --enable-thread-safe-client \ - --with-comment="SUSE MySQL Cluster RPM" \ - --with-libwrap \ - --with-server-suffix=$suffix \ -%ifarch s390 s390x - --with-atomic-ops=rwlocks \ -%else - --with-atomic-ops=smp \ -%endif - --with-ssl=/usr \ - --with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \ - HOSTNAME="/bin/hostname -f" \ - "$@" - # Add this for MyISAM RAID support: - # --with-raid - # benchdir does not fit in above model. Fix when we make a separate package - make %{?jobs:-j%jobs} - nm --numeric-sort sql/mysqld > sql/mysqld.sym - # needed for make check, which is not VPATH aware - # copy the files unconditionally so that manual 'make check' after - # the build works, too - cp -a ../mysql-test/* mysql-test/ - cp -a ../sql/share/{english,charsets} sql/share/ - cp -a ../scripts/*.sql scripts/ -%if %{?_with_testsuite:1}0 - pushd mysql-test; perl ./mysql-test-run.pl --force; popd -%endif - popd -} -# Build the client, extra tools, libraries -BuildMySQL "" --with-embedded-server -# build mysqld-debug -BuildMySQL "-debug" --with-debug --without-embedded-server - -%if 0%{?prefered} > 0 -mkdir -p _buildlibmysqld/tmp -cd _buildlibmysqld/tmp -ar -x ../../_build/libmysqld/libmysqld.a -gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \ -*.o \ --lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc -cd .. -rm -rf tmp -cd .. -%endif +%{expand:%(cat %_sourcedir/build.inc)} #------------------------------------------------------------------------------- %install #------------------------------------------------------------------------------- -# install the debug server first, so that we don't overwrite the standard -# /usr/sbin/mysqld -mkdir -p %buildroot%_libdir/mysql -make -C _build-debug/sql install DESTDIR=%buildroot -mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug -install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym -# install the client, extra tools, libraries and the standard server -make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ -install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym -# remove most static libs (FIXME: don't build them at all...) -rm -f %buildroot%_libdir/libmysqlclient*a -rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la -rm -f %buildroot%_libdir/mysql/plugin/*a -# XXX: package these? The ndb tools are linked statically atm -rm -f %buildroot%_libdir/mysql/libndbclient.* -rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run -rm -f %{buildroot}/usr/share/mysql-test/mtr -ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr -ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run -mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} -# generate filelist for binaries and their manpages (easier than enumerating -# all the binaries and manapages manually, esp. when there are new manpages in -# each release) -filelist() -{ - echo '%%defattr(-, root, root)' - pushd %buildroot >/dev/null - for i; do - if test -e usr/sbin/"$i"; then - echo /usr/sbin/"$i" - fi - if test -e usr/bin/"$i"; then - echo /usr/bin/"$i" - fi - if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then - echo "%%doc %_mandir/*/$i.[1-9]*" - fi - done - popd >/dev/null -} -filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip >mysql.files -filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files -filelist mysql_config >libmysqlclient-devel.files -filelist mysqlslap >mysql-bench.files -filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files -# all binaries that don't need to be in a "default" install (mysql.rpm + -# mysql-client.rpm) -filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files -filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files -filelist ndb_mgmd >mysql-ndb-management.files -filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files -### files not installed by make install -# Create directory structure -DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) -DOCDIR=%buildroot%_defaultdocdir/%name -install -d -m 755 ${DOCDIR} -install -d -m 755 %buildroot/etc/logrotate.d -install -d -m 755 %buildroot/etc/init.d -install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql -%if 0%{?prefered} > 0 -install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so -%endif -install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf -install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf -install -m 644 "${DOCS[@]}" ${DOCDIR} -install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql -ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql -# this is used by the init script -install -m 755 -d %buildroot/var/run/mysql -# SuSEfirewall service description -install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ - %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql -# testsuite -mkdir -p '%buildroot'/usr/share/mysql-test/ -install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/ -# XXX this should go under /var/..., but some tests get confused by a symlink -# var -> ../../../var/... -#ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var -mkdir '%buildroot'/usr/share/mysql-test/var -# Final fixes -find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete -%if 0%{?suse_version} > 1030 -%fdupes -s '%buildroot'/usr/share/mysql-test -%endif -%if 0%{?fedora_version} > 8 -fdupes -q -n -r '%buildroot'/usr/share/mysql-test -%endif -dos2unixConversion() { - %{__sed} -i 's/\r//g' "$1" -} -for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do - dos2unixConversion "$i" -done -%if ! 0%{cluster} > 0 -cat mysql-ndb-storage.files mysql-ndb-management.files \ - mysql-ndb-tools.files mysql-ndb-extra.files | \ - sed 's|^%%doc\ ||' | while read tmp; do - cd '%buildroot' - rm -f .$tmp -done -%endif -%if ! 0%{prefered} > 0 -cat libmysqlclient-devel.files | while read tmp; do - cd '%buildroot' - rm -f .$tmp -done -rm -rf '%buildroot'/%_libdir/libmysqld.* -rm -rf '%buildroot'/%_libdir/libmysqlclient* -rm -rf '%buildroot'/%_libdir/libmysqlclusterclient.{a,la,so} -rm -rf '%buildroot'/%_libdir/libmysqlclusterclient_r*.{a,la,so} -rm -rf '%buildroot'/%_includedir -rm -rf '%buildroot'/%_datadir/man/*/mysql_config* -rm -rf '%buildroot'/%_datadir/aclocal -%endif +%{expand:%(cat %_sourcedir/install.inc)} #------------------------------------------------------------------------------- @@ -725,7 +483,7 @@ %posttrans #------------------------------------------------------------------------------- -%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* if [ -d /var/lib/mysql ]; then touch /var/lib/mysql/.run-mysql_upgrade chown -R mysql:mysql /var/lib/mysql @@ -818,7 +576,7 @@ %postun #------------------------------------------------------------------------------- if [ $1 = 0 ]; then - %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.gz + %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* %{insserv_cleanup} fi #------------------------------------------------------------------------------- @@ -836,9 +594,11 @@ #------------------------------------------------------------------------------- %defattr(-, root, root) %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf +%dir %attr(0750, root, mysql) /etc/mysql +%config(noreplace) %attr(0640, root, mysql) /etc/mysql/* %config /etc/logrotate.d/mysql %doc %{_defaultdocdir}/%{name} -%doc %{_infodir}/mysql.info.gz +%doc %{_infodir}/mysql.info.* /etc/init.d/mysql /usr/sbin/rcmysql /usr/share/mysql/ @@ -866,6 +626,7 @@ %defattr(-, root, root) %{_libdir}/libmysqlclusterclient.so.* #------------------------------------------------------------------------------- + #------------------------------------------------------------------------------- %files -n libmysqlclusterclient_r16 @@ -874,6 +635,7 @@ %{_libdir}/libmysqlclusterclient_r.so.* #------------------------------------------------------------------------------- %endif + %if 0%{prefered} > 0 #------------------------------------------------------------------------------- @@ -929,8 +691,13 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- +%if %{defined mdkversion} + +%files debuging +%else %files debug +%endif #------------------------------------------------------------------------------- %defattr(-, root, root) /usr/sbin/mysqld-debug @@ -954,6 +721,10 @@ #------------------------------------------------------------------------------- %files tools -f mysql-tools.files +%defattr(-, root, root) +/usr/bin/mysqlanalyze +/usr/bin/mysqloptimize +/usr/bin/mysqlrepair #------------------------------------------------------------------------------- %if 0%{cluster} > 0 ++++++ build.inc ++++++ %if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0 %define socketpath /var/lib/mysql %else %define socketpath /var/run/mysql %endif autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing" export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" # Make the compile a function, since we do multiple builds BuildMySQL() { # The --enable-assembler simply does nothing on systems that do not # support assembler speedups. suffix="$1"; shift mkdir _build$suffix pushd _build$suffix ../configure \ --enable-assembler \ --without-readline \ --infodir=%{_infodir} \ --libdir=%{_libdir} \ --libexecdir=/usr/sbin \ --localstatedir=/var/lib/mysql \ --mandir=%{_mandir} \ --prefix=%{_prefix} \ --sysconfdir=/etc \ --with-mysqld-user=mysql \ --with-mysqld-group=mysql \ --without-debug \ --datadir=/usr/share \ --includedir=/usr/include \ --with-charset=utf8 \ --with-collation=utf8_unicode_ci \ --with-extra-charsets=all \ --with-unix-socket-path=%{socketpath}/mysql.sock \ --enable-thread-safe-client \ --with-comment="SUSE MySQL RPM" \ --with-libwrap \ --with-server-suffix=$suffix \ %ifarch s390 s390x --with-atomic-ops=rwlocks \ %else --with-atomic-ops=smp \ %endif --with-ssl=/usr \ --with-plugins=%{builtin_plugins} \ HOSTNAME="/bin/hostname -f" \ "$@" # Add this for MyISAM RAID support: # --with-raid # benchdir does not fit in above model. Fix when we make a separate package make %{?jobs:-j%jobs} nm --numeric-sort sql/mysqld > sql/mysqld.sym # needed for make check, which is not VPATH aware # copy the files unconditionally so that manual 'make check' after # the build works, too cp -a ../mysql-test/* mysql-test/ for i in ../sql/share/{english,charsets}; do [ -d $i ] && cp -a $i sql/share/ done cp -a ../scripts/*.sql scripts/ %if %{?_with_testsuite:1}0 pushd mysql-test; perl ./mysql-test-run.pl --force; popd %endif popd } # Build the client, extra tools, libraries BuildMySQL "" --with-embedded-server # build mysqld-debug BuildMySQL "-debug" --with-debug --without-embedded-server %if 0%{?prefered} > 0 mkdir -p _buildlibmysqld/tmp cd _buildlibmysqld/tmp ar -x ../../_build/libmysqld/libmysqld.a gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \ *.o \ -lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc cd .. rm -rf tmp cd .. %endif ++++++ install.inc ++++++ # install the debug server first, so that we don't overwrite the standard # /usr/sbin/mysqld mkdir -p %buildroot%_libdir/mysql make -C _build-debug/sql install DESTDIR=%buildroot mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym # install the client, extra tools, libraries and the standard server make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la rm -f %buildroot%_libdir/mysql/plugin/*a # XXX: package these? The ndb tools are linked statically atm rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run rm -f %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} # generate filelist for binaries and their manpages (easier than enumerating # all the binaries and manapages manually, esp. when there are new manpages in # each release) filelist() { echo '%%defattr(-, root, root)' pushd %buildroot >/dev/null for i; do if test -e usr/sbin/"$i"; then echo /usr/sbin/"$i" fi if test -e usr/bin/"$i"; then echo /usr/bin/"$i" fi if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then echo "%%doc %_mandir/*/$i.[1-9]*" fi done popd >/dev/null } filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat >mysql.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files filelist mysql_config >libmysqlclient-devel.files filelist mysqlslap >mysql-bench.files filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) DOCDIR=%buildroot%_defaultdocdir/%name install -d -m 755 ${DOCDIR} install -d -m 755 %buildroot/etc/logrotate.d install -d -m 755 %buildroot/etc/init.d install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql %if 0%{?prefered} > 0 install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so %endif install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf install -m 644 "${DOCS[@]}" ${DOCDIR} install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql # this is used by the init script install -m 755 -d %buildroot/var/run/mysql # SuSEfirewall service description install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql # testsuite mkdir -p '%buildroot'/usr/share/mysql-test/ install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/ # XXX this should go under /var/..., but some tests get confused by a symlink # var -> ../../../var/... #ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var mkdir '%buildroot'/usr/share/mysql-test/var # Final fixes find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete %if 0%{?suse_version} > 1030 %fdupes -s '%buildroot'/usr/share/mysql-test %endif %if 0%{?fedora_version} > 8 fdupes -q -n -r '%buildroot'/usr/share/mysql-test %endif dos2unixConversion() { %{__sed} -i 's/\r//g' "$1" } for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do dos2unixConversion "$i" done %if ! 0%{cluster} > 0 cat mysql-ndb-storage.files mysql-ndb-management.files \ mysql-ndb-tools.files mysql-ndb-extra.files | \ sed 's|^%%doc\ ||' | while read tmp; do cd '%buildroot' rm -f .$tmp done %endif %if ! 0%{prefered} > 0 cat libmysqlclient-devel.files | while read tmp; do cd '%buildroot' rm -f .$tmp done rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so rm -rf '%buildroot'/%_libdir/*.a rm -rf '%buildroot'/%_includedir rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal %endif sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize mkdir -p '%buildroot'/etc/mysql [ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql ++++++ series ++++++ mysql-community-server-5.1.30-federated-workaround.patch mysql-community-server-5.1.31-shebang.patch mysql-community-server-5.1.33-ssl-lib64-macro.patch mysql-community-server-5.1.35-utf8-test-results.patch mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch mysql-community-server-5.1.45-cnf.patch mysql-community-server-5.1.45-group.patch mysql-community-server-5.1.45-multi-configuration.patch mysql-community-server-5.1.45-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mysql-cluster-7.1.8-myslq-test.patch mysql-community-server-5.1.51-install_db-quiet.patch mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch mysql-community-server-5.1.51-plugins-avoid-version.patch mysql-community-server-5.1.51-upgrade-exit-status.patch mysql-cluster-7.1.8-no-mysqld-examples.patch mysql-cluster-7.1.9a-strncat-overflow.patch mysql-cluster-7.1.9a-string-format-indirect.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner20 for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package mozilla-xulrunner20 for openSUSE:Factory checked in at Wed Dec 29 00:17:17 CET 2010. -------- --- mozilla-xulrunner20/mozilla-xulrunner20.changes 2010-11-12 19:55:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner20/mozilla-xulrunner20.changes 2010-12-15 09:33:54.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 15 07:48:50 UTC 2010 - wr(a)rosenauer.org + +- update to 2.0b8 +- removed obsolete patches + * mozilla-jemalloc-symbols + * mozilla-buildsymbols + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mozilla-buildsymbols.patch mozilla-jemalloc-symbols.patch New: ---- mozilla-firefox-sync.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner20.spec ++++++ --- /var/tmp/diff_new_pack.gF9P25/_old 2010-12-29 00:16:57.000000000 +0100 +++ /var/tmp/diff_new_pack.gF9P25/_new 2010-12-29 00:16:57.000000000 +0100 @@ -31,9 +31,9 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 2.0b -Release: 3 -%define releasedate 2010110500 -%define version_internal 2.0b7 +Release: 4 +%define releasedate 2010121400 +%define version_internal 2.0b8 %define apiversion 2.0 %define uaweight 199900 Summary: Mozilla Runtime Environment 2.0 @@ -70,9 +70,8 @@ Patch10: toolkit-ui-lockdown.patch # --- Patch11: mozilla-cpuid.patch -Patch12: mozilla-buildsymbols.patch -Patch13: mozilla-language.patch -Patch14: mozilla-jemalloc-symbols.patch +Patch12: mozilla-language.patch +Patch13: mozilla-firefox-sync.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js20 = %{version} Requires(post): update-alternatives coreutils @@ -215,7 +214,6 @@ %endif %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) ++++++ compare-locales.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/CompareLocales.py new/compare-locales/lib/Mozilla/CompareLocales.py --- old/compare-locales/lib/Mozilla/CompareLocales.py 2010-11-06 13:43:49.000000000 +0100 +++ new/compare-locales/lib/Mozilla/CompareLocales.py 2010-12-15 09:07:39.000000000 +0100 @@ -418,7 +418,11 @@ shutil.copyfile(l10n_file.fullpath, outfile) f = codecs.open(outfile, 'ab', p.encoding) print "adding to " + outfile - f.write(''.join(trailing)) + def ensureNewline(s): + if not s.endswith('\n'): + return s + '\n' + return s + f.write(''.join(map(ensureNewline,trailing))) f.close() def notify(self, category, file, data): '''Check filterObserver for the found data, and if it's diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/__init__.py new/compare-locales/lib/Mozilla/__init__.py --- old/compare-locales/lib/Mozilla/__init__.py 2010-11-06 13:43:49.000000000 +0100 +++ new/compare-locales/lib/Mozilla/__init__.py 2010-12-15 09:07:39.000000000 +0100 @@ -1 +1 @@ -version="0.9" +version="0.9.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/tests/unitMerge.py new/compare-locales/lib/Mozilla/tests/unitMerge.py --- old/compare-locales/lib/Mozilla/tests/unitMerge.py 1970-01-01 01:00:00.000000000 +0100 +++ new/compare-locales/lib/Mozilla/tests/unitMerge.py 2010-12-15 09:07:39.000000000 +0100 @@ -0,0 +1,132 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is l10n test automation. +# +# The Initial Developer of the Original Code is +# Mozilla Foundation +# Portions created by the Initial Developer are Copyright (C) 2010 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Axel Hecht <l10n(a)mozilla.com> +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +import unittest +import os +from tempfile import mkdtemp +import shutil + +from Mozilla.Parser import getParser +from Mozilla.Paths import File +from Mozilla.CompareLocales import ContentComparer, Observer + +class TestProperties(unittest.TestCase): + def setUp(self): + self.tmp = mkdtemp() + os.mkdir(os.path.join(self.tmp, "merge")) + self.ref = os.path.join(self.tmp, "en-reference.properties") + open(self.ref, "w").write("""foo = fooVal +bar = barVal +eff = effVal""") + def tearDown(self): + shutil.rmtree(self.tmp) + del self.tmp + def testGood(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.properties") + open(l10n, "w").write("""foo = lFoo +bar = lBar +eff = lEff +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.properties", ""), + File(l10n, "l10n.properties", "")) + print obs.serialize() + def testMissing(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.properties") + open(l10n, "w").write("""bar = lBar +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.properties", ""), + File(l10n, "l10n.properties", "")) + print obs.serialize() + mergefile = os.path.join(self.tmp, "merge", "l10n.properties") + self.assertTrue(os.path.isfile(mergefile)) + p = getParser(mergefile) + p.readFile(mergefile) + [m,n] = p.parse() + self.assertEqual(map(lambda e:e.key,m), ["bar", "eff", "foo"]) + +class TestDTD(unittest.TestCase): + def setUp(self): + self.tmp = mkdtemp() + os.mkdir(os.path.join(self.tmp, "merge")) + self.ref = os.path.join(self.tmp, "en-reference.dtd") + open(self.ref, "w").write("""<!ENTITY foo 'fooVal'> +<!ENTITY bar 'barVal'> +<!ENTITY eff 'effVal'>""") + def tearDown(self): + shutil.rmtree(self.tmp) + del self.tmp + def testGood(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.dtd") + open(l10n, "w").write("""<!ENTITY foo 'lFoo'> +<!ENTITY bar 'lBar'> +<!ENTITY eff 'lEff'> +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.dtd", ""), + File(l10n, "l10n.dtd", "")) + print obs.serialize() + def testMissing(self): + self.assertTrue(os.path.isdir(self.tmp)) + l10n = os.path.join(self.tmp, "l10n.dtd") + open(l10n, "w").write("""<!ENTITY bar 'lBar'> +""") + obs = Observer() + cc = ContentComparer(obs) + cc.set_merge_stage(os.path.join(self.tmp, "merge")) + cc.compare(File(self.ref, "en-reference.dtd", ""), + File(l10n, "l10n.dtd", "")) + print obs.serialize() + mergefile = os.path.join(self.tmp, "merge", "l10n.dtd") + self.assertTrue(os.path.isfile(mergefile)) + p = getParser(mergefile) + p.readFile(mergefile) + [m,n] = p.parse() + self.assertEqual(map(lambda e:e.key,m), ["bar", "eff", "foo"]) + +if __name__ == '__main__': + unittest.main() ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.gF9P25/_old 2010-12-29 00:16:57.000000000 +0100 +++ /var/tmp/diff_new_pack.gF9P25/_new 2010-12-29 00:16:57.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b7_RELEASE" +RELEASE_TAG="FIREFOX_4_0b8_RELEASE" VERSION="2.0b" # mozilla ++++++ l10n-2.0b.tar.bz2 ++++++ mozilla-xulrunner20/l10n-2.0b.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/l10n-2.0b.tar.bz2 differ: char 11, line 1 ++++++ mozilla-firefox-sync.patch ++++++ ++++ 2068 lines (skipped) ++++++ xulrunner-source-2.0b.tar.bz2 ++++++ mozilla-xulrunner20/xulrunner-source-2.0b.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner20/xulrunner-source-2.0b.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 lzo for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package lzo for openSUSE:Factory checked in at Wed Dec 29 00:16:59 CET 2010. -------- --- lzo/lzo.changes 2010-10-30 21:10:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/lzo/lzo.changes 2010-12-22 04:32:14.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Dec 22 03:29:01 UTC 2010 - aj(a)suse.de + +- Fix specfile (remove deleted lzo-2.03-alias.patch). + +------------------------------------------------------------------- +Fri Nov 12 11:09:42 UTC 2010 - mrueckert(a)suse.de + +- update to 2.0.4 + * Fixed a gcc-4.5 aliasing issue in lzo_init(). + * Updated the configure system. + * Assorted cleanups. +- dropped lzo-2.03-alias.patch: + solved differently upstream +- dropped debug_package_requires define + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lzo-2.03-alias.patch lzo-2.03.tar.bz2 New: ---- lzo-2.04.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lzo.spec ++++++ --- /var/tmp/diff_new_pack.WWC8fs/_old 2010-12-29 00:16:35.000000000 +0100 +++ /var/tmp/diff_new_pack.WWC8fs/_new 2010-12-29 00:16:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lzo (Version 2.03) +# spec file for package lzo (Version 2.04) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,11 @@ Name: lzo Url: http://www.oberhumer.com/opensource/lzo/ -Version: 2.03 -Release: 12 +Version: 2.04 +Release: 1 Group: Development/Libraries/C and C++ Source: lzo-%{version}.tar.bz2 Source2: baselibs.conf -Patch1: lzo-2.03-alias.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ # bug437293 @@ -50,7 +49,6 @@ Markus Franz Xaver Johannes Oberhumer <markus(a)oberhumer.com> %define library_package liblzo2-2 -%define debug_package_requires %{library_package} = %{version}-%{release} %package -n liblzo2-2 License: GPLv2 @@ -103,7 +101,6 @@ %prep %setup -q -%patch1 %build export CFLAGS="%optflags -fvisibility=hidden" ++++++ lzo-2.03.tar.bz2 -> lzo-2.04.tar.bz2 ++++++ ++++ 91895 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 loki_setup for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package loki_setup for openSUSE:Factory checked in at Wed Dec 29 00:16:33 CET 2010. -------- --- loki_setup/loki_setup.changes 2010-09-08 16:14:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/loki_setup/loki_setup.changes 2010-12-28 11:03:58.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 28 10:03:09 UTC 2010 - dimstar(a)opensuse.org + +- Softlink duplicates only. Hardlinking /usr/bin to /usr/share is + not good practice, as the folders could remain on different + partitions. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ loki_setup.spec ++++++ --- /var/tmp/diff_new_pack.z6Wnoz/_old 2010-12-29 00:16:13.000000000 +0100 +++ /var/tmp/diff_new_pack.z6Wnoz/_new 2010-12-29 00:16:13.000000000 +0100 @@ -33,7 +33,7 @@ Url: http://icculus.org/loki_setup/ Group: Development/Tools/Other Version: 1.6.5_20070404 -Release: 189 +Release: 190 Summary: Installer Program Mainly for Games BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: loki_setup-current.tar.bz2 @@ -90,7 +90,7 @@ %package -n loki_uninstall License: GPLv2+ Version: 1.0.3_20051201 -Release: 240 +Release: 241 Summary: Uninstall program for games Group: Amusements/Games/Other @@ -108,7 +108,7 @@ %package -n loki_update License: GPLv2+ Version: 1.0.13_20040208 -Release: 275 +Release: 276 Summary: Updater program for games Group: Amusements/Games/Other @@ -360,7 +360,7 @@ %suse_update_desktop_file loki-update %suse_update_desktop_file loki-uninstall %if %suse_version > 1020 -%fdupes %{buildroot} +%fdupes -s %{buildroot} %endif %clean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libmspack for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package libmspack for openSUSE:Factory checked in at Wed Dec 29 00:16:18 CET 2010. -------- --- libmspack/libmspack.changes 2008-01-15 17:31:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmspack/libmspack.changes 2010-12-22 20:45:09.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Dec 22 05:21:45 CET 2010 - andreas.hanke(a)gmx-topmail.de + +- update to version 0.2alpha (#660942): + * matches cabextract-1.3, fixing CVE-2010-2800 and CVE-2010-2801 + * adds pkg-config support + * obsoletes half of libmspack-warnings.patch +- remove self-obsoletion +- drop -D_POSIX_SOURCE as it breaks the build with this version +- drop empty NEWS file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libmspack-0.0.20060920alpha.tar.bz2 New: ---- libmspack-0.2alpha.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmspack.spec ++++++ --- /var/tmp/diff_new_pack.t7wCtO/_old 2010-12-29 00:15:55.000000000 +0100 +++ /var/tmp/diff_new_pack.t7wCtO/_new 2010-12-29 00:15:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libmspack (Version 0.0.20060920alpha) +# spec file for package libmspack (Version 0.1.99_0.2alpha) # -# 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 @@ -17,17 +17,19 @@ # norootforbuild +%define _version 0.2alpha Name: libmspack -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: System/Libraries -Version: 0.0.20060920alpha -Release: 68 +Version: 0.1.99_%{_version} +Release: 1 Summary: Library That Implements Different Microsoft Compressions Url: http://www.cabextract.org.uk/libmspack/ -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{_version}.tar.bz2 Patch: %{name}-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkg-config %description The purpose of libmspack is to provide both compression and @@ -46,12 +48,12 @@ Markus Sinner %package -n libmspack0 -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Library That Implements Different Microsoft Compressions Group: System/Libraries # OpenSUSE <= 10.3, SLES <= 10: -Provides: libmspack = %{version} -Obsoletes: libmspack <= %{version} +Provides: libmspack = %{version}-%{release} +Obsoletes: libmspack < %{version}-%{release} %description -n libmspack0 The purpose of libmspack is to provide both compression and @@ -70,7 +72,7 @@ Markus Sinner %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Static libraries, header files and documentation for libmspack Group: Development/Libraries/C and C++ Requires: libmspack0 = %{version} @@ -91,12 +93,11 @@ Markus Sinner %prep -%setup +%setup -q -n %{name}-%{_version} %patch %build autoreconf -f -i -export CFLAGS="$RPM_OPT_FLAGS -D_POSIX_SOURCE" %configure\ --disable-static make %{?jobs:-j%jobs} @@ -115,11 +116,12 @@ %files -n libmspack0 %defattr(-,root,root) %{_libdir}/*.so.* -%doc AUTHORS COPYING.LIB ChangeLog NEWS README TODO +%doc AUTHORS COPYING.LIB ChangeLog README TODO %files devel %defattr(-,root,root) %{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc %{_includedir}/* %changelog ++++++ libmspack-0.0.20060920alpha.tar.bz2 -> libmspack-0.2alpha.tar.bz2 ++++++ ++++ 80001 lines of diff (skipped) ++++++ libmspack-warnings.patch ++++++ --- /var/tmp/diff_new_pack.t7wCtO/_old 2010-12-29 00:15:55.000000000 +0100 +++ /var/tmp/diff_new_pack.t7wCtO/_new 2010-12-29 00:15:55.000000000 +0100 @@ -1,6 +1,6 @@ --- mspack/chmd.c +++ mspack/chmd.c -@@ -514,6 +514,7 @@ +@@ -499,6 +499,7 @@ /* perform linear search on quickref segment */ sys->close(fh); sys->free(chunk); @@ -8,13 +8,3 @@ } ---- mspack/szddd.c -+++ mspack/szddd.c -@@ -188,6 +188,7 @@ - - if (!this) return MSPACK_ERR_ARGS; - sys = this->system; -+ return 0; - } - - /*************************************** ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libexif for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package libexif for openSUSE:Factory checked in at Wed Dec 29 00:15:48 CET 2010. -------- --- libexif/libexif.changes 2010-12-17 17:10:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/libexif/libexif.changes 2010-12-23 13:25:39.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 23 12:24:10 UTC 2010 - aj(a)suse.de + +- Provide/obsolete old libexif package name so that upgrade and + dependencies from other packages continue to work. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libexif.spec ++++++ --- /var/tmp/diff_new_pack.EUTSkI/_old 2010-12-29 00:14:48.000000000 +0100 +++ /var/tmp/diff_new_pack.EUTSkI/_new 2010-12-29 00:14:48.000000000 +0100 @@ -25,7 +25,7 @@ Group: System/Libraries Summary: An EXIF Tag Parsing Library for Digital Cameras Version: 0.6.20 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf @@ -36,8 +36,11 @@ %package -n %{pname} + Summary: An EXIF Tag Parsing Library for Digital Cameras Group: System/Libraries +Provides: libexif = %{version} +Obsoletes: libexif < %{version} %description This library is used to parse EXIF information from JPEGs created by ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libmnl for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '10

28 Dec '10

Hello community, here is the log from the commit of package libmnl for openSUSE:Factory checked in at Wed Dec 29 00:15:28 CET 2010. -------- --- libmnl/libmnl.changes 2010-12-17 17:26:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmnl/libmnl.changes 2010-12-26 22:33:18.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Dec 26 21:30:34 UTC 2010 - jengelh(a)medozas.de + +- Update to libmnl 1.0.1 +* examples: fix wrong group mask number in nfct-event +* header: fix signess issues in MNL_SOCKET_BUFFER_SIZE + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libmnl-1.0.0.tar.bz2 libmnl-1.0.0.tar.bz2.sig New: ---- libmnl-1.0.1.tar.bz2 libmnl-1.0.1.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmnl.spec ++++++ --- /var/tmp/diff_new_pack.0O8CuE/_old 2010-12-29 00:14:49.000000000 +0100 +++ /var/tmp/diff_new_pack.0O8CuE/_new 2010-12-29 00:14:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libmnl (Version 1.0.0) +# spec file for package libmnl (Version 1.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,13 @@ Name: libmnl Summary: Minimalistic Netlink communication library %define lname %{name}0 -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: LGPLv2+ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libmnl/ -Source: http://netfilter.org/projects/libmnl/files/libmnl-1.0.0.tar.bz2 -Source1: http://netfilter.org/projects/libmnl/files/libmnl-1.0.0.tar.bz2.sig +Source: http://netfilter.org/projects/libmnl/files/%name-%version.tar.bz2 +Source1: http://netfilter.org/projects/libmnl/files/%name-%version.tar.bz2.sig Source9: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config >= 0.19 ++++++ libmnl-1.0.0.tar.bz2 -> libmnl-1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/Make_global.am new/libmnl-1.0.1/Make_global.am --- old/libmnl-1.0.0/Make_global.am 2010-11-19 13:08:54.000000000 +0100 +++ new/libmnl-1.0.1/Make_global.am 2010-12-26 21:17:52.000000000 +0100 @@ -18,7 +18,7 @@ # set age to 0. # </snippet> # -LIBVERSION=0:0:0 +LIBVERSION=0:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/Makefile.in new/libmnl-1.0.1/Makefile.in --- old/libmnl-1.0.0/Makefile.in 2010-12-17 14:29:17.000000000 +0100 +++ new/libmnl-1.0.1/Makefile.in 2010-12-26 21:20:01.000000000 +0100 @@ -268,7 +268,7 @@ # set age to 0. # </snippet> # -LIBVERSION = 0:0:0 +LIBVERSION = 0:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} ACLOCAL_AMFLAGS = -I m4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/configure new/libmnl-1.0.1/configure --- old/libmnl-1.0.0/configure 2010-12-17 14:29:14.000000000 +0100 +++ new/libmnl-1.0.1/configure 2010-12-26 21:19:59.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libmnl 1.0.0. +# Generated by GNU Autoconf 2.65 for libmnl 1.0.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='libmnl' PACKAGE_TARNAME='libmnl' -PACKAGE_VERSION='1.0.0' -PACKAGE_STRING='libmnl 1.0.0' +PACKAGE_VERSION='1.0.1' +PACKAGE_STRING='libmnl 1.0.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1415,7 +1415,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libmnl 1.0.0 to adapt to many kinds of systems. +\`configure' configures libmnl 1.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1486,7 +1486,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libmnl 1.0.0:";; + short | recursive ) echo "Configuration of libmnl 1.0.1:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libmnl configure 1.0.0 +libmnl configure 1.0.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1863,7 +1863,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libmnl $as_me 1.0.0, which was +It was created by libmnl $as_me 1.0.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2784,7 +2784,7 @@ # Define the identity of the package. PACKAGE='libmnl' - VERSION='1.0.0' + VERSION='1.0.1' cat >>confdefs.h <<_ACEOF @@ -10550,7 +10550,7 @@ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -Wformat=2 -pipe" -ac_config_files="$ac_config_files Makefile src/Makefile include/Makefile include/libmnl/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg" +ac_config_files="$ac_config_files Makefile src/Makefile include/Makefile include/libmnl/Makefile include/linux/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11073,7 +11073,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libmnl $as_me 1.0.0, which was +This file was extended by libmnl $as_me 1.0.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11139,7 +11139,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libmnl config.status 1.0.0 +libmnl config.status 1.0.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -11524,6 +11524,7 @@ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "include/libmnl/Makefile") CONFIG_FILES="$CONFIG_FILES include/libmnl/Makefile" ;; + "include/linux/Makefile") CONFIG_FILES="$CONFIG_FILES include/linux/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/genl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/genl/Makefile" ;; "examples/netfilter/Makefile") CONFIG_FILES="$CONFIG_FILES examples/netfilter/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/configure.ac new/libmnl-1.0.1/configure.ac --- old/libmnl-1.0.0/configure.ac 2010-12-17 14:26:27.000000000 +0100 +++ new/libmnl-1.0.1/configure.ac 2010-12-26 21:14:56.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to create configure. -AC_INIT([libmnl], [1.0.0]) +AC_INIT([libmnl], [1.0.1]) AC_CANONICAL_TARGET AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -22,5 +22,5 @@ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -Wformat=2 -pipe" AC_SUBST([regular_CFLAGS]) -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg]) +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile include/linux/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/examples/genl/Makefile.in new/libmnl-1.0.1/examples/genl/Makefile.in --- old/libmnl-1.0.0/examples/genl/Makefile.in 2010-12-17 14:29:16.000000000 +0100 +++ new/libmnl-1.0.1/examples/genl/Makefile.in 2010-12-26 21:20:01.000000000 +0100 @@ -208,7 +208,7 @@ # set age to 0. # </snippet> # -LIBVERSION = 0:0:0 +LIBVERSION = 0:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} genl_family_get_SOURCES = genl-family-get.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/examples/netfilter/Makefile.in new/libmnl-1.0.1/examples/netfilter/Makefile.in --- old/libmnl-1.0.0/examples/netfilter/Makefile.in 2010-12-17 14:29:16.000000000 +0100 +++ new/libmnl-1.0.1/examples/netfilter/Makefile.in 2010-12-26 21:20:01.000000000 +0100 @@ -220,7 +220,7 @@ # set age to 0. # </snippet> # -LIBVERSION = 0:0:0 +LIBVERSION = 0:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} nf_queue_SOURCES = nf-queue.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/examples/netfilter/nfct-event.c new/libmnl-1.0.1/examples/netfilter/nfct-event.c --- old/libmnl-1.0.0/examples/netfilter/nfct-event.c 2010-11-01 22:24:28.000000000 +0100 +++ new/libmnl-1.0.1/examples/netfilter/nfct-event.c 2010-12-17 15:37:26.000000000 +0100 @@ -217,9 +217,9 @@ exit(EXIT_FAILURE); } - if (mnl_socket_bind(nl, NFNLGRP_CONNTRACK_NEW | - NFNLGRP_CONNTRACK_UPDATE | - NFNLGRP_CONNTRACK_DESTROY, + if (mnl_socket_bind(nl, NF_NETLINK_CONNTRACK_NEW | + NF_NETLINK_CONNTRACK_UPDATE | + NF_NETLINK_CONNTRACK_DESTROY, MNL_SOCKET_AUTOPID) < 0) { perror("mnl_socket_bind"); exit(EXIT_FAILURE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/examples/rtnl/Makefile.in new/libmnl-1.0.1/examples/rtnl/Makefile.in --- old/libmnl-1.0.0/examples/rtnl/Makefile.in 2010-12-17 14:29:16.000000000 +0100 +++ new/libmnl-1.0.1/examples/rtnl/Makefile.in 2010-12-26 21:20:01.000000000 +0100 @@ -235,7 +235,7 @@ # set age to 0. # </snippet> # -LIBVERSION = 0:0:0 +LIBVERSION = 0:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} rtnl_link_dump_SOURCES = rtnl-link-dump.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/include/Makefile.am new/libmnl-1.0.1/include/Makefile.am --- old/libmnl-1.0.0/include/Makefile.am 2010-10-21 13:18:10.000000000 +0200 +++ new/libmnl-1.0.1/include/Makefile.am 2010-12-22 21:04:30.000000000 +0100 @@ -1 +1 @@ -SUBDIRS = libmnl +SUBDIRS = libmnl linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/include/Makefile.in new/libmnl-1.0.1/include/Makefile.in --- old/libmnl-1.0.0/include/Makefile.in 2010-12-17 14:29:16.000000000 +0100 +++ new/libmnl-1.0.1/include/Makefile.in 2010-12-26 21:20:01.000000000 +0100 @@ -207,7 +207,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = libmnl +SUBDIRS = libmnl linux all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/include/libmnl/libmnl.h new/libmnl-1.0.1/include/libmnl/libmnl.h --- old/libmnl-1.0.0/include/libmnl/libmnl.h 2010-12-17 14:18:13.000000000 +0100 +++ new/libmnl-1.0.1/include/libmnl/libmnl.h 2010-12-25 22:25:52.000000000 +0100 @@ -9,6 +9,7 @@ # include <stdio.h> # include <stdint.h> #endif +#include <unistd.h> #include <sys/socket.h> /* for sa_family_t */ #include <linux/netlink.h> @@ -21,7 +22,7 @@ */ #define MNL_SOCKET_AUTOPID 0 -#define MNL_SOCKET_BUFFER_SIZE (getpagesize() < 8192UL ? getpagesize() : 8192UL) +#define MNL_SOCKET_BUFFER_SIZE (getpagesize() < 8192L ? getpagesize() : 8192L) struct mnl_socket; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/include/linux/Makefile.am new/libmnl-1.0.1/include/linux/Makefile.am --- old/libmnl-1.0.0/include/linux/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/libmnl-1.0.1/include/linux/Makefile.am 2010-12-22 21:31:57.000000000 +0100 @@ -0,0 +1 @@ +noinst_HEADERS = netlink.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/include/linux/Makefile.in new/libmnl-1.0.1/include/linux/Makefile.in --- old/libmnl-1.0.0/include/linux/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libmnl-1.0.1/include/linux/Makefile.in 2010-12-26 21:20:01.000000000 +0100 @@ -0,0 +1,411 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = include/linux +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gcc4_visibility.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +SOURCES = +DIST_SOURCES = +HEADERS = $(noinst_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCC_FVISIBILITY_HIDDEN = @GCC_FVISIBILITY_HIDDEN@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +regular_CFLAGS = @regular_CFLAGS@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +noinst_HEADERS = netlink.h +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/linux/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign include/linux/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(HEADERS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/include/linux/netlink.h new/libmnl-1.0.1/include/linux/netlink.h --- old/libmnl-1.0.0/include/linux/netlink.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libmnl-1.0.1/include/linux/netlink.h 2010-12-22 21:28:27.000000000 +0100 @@ -0,0 +1,274 @@ +#ifndef __LINUX_NETLINK_H +#define __LINUX_NETLINK_H + +#include <linux/socket.h> /* for sa_family_t */ +#include <linux/types.h> + +#define NETLINK_ROUTE 0 /* Routing/device hook */ +#define NETLINK_UNUSED 1 /* Unused number */ +#define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */ +#define NETLINK_FIREWALL 3 /* Firewalling hook */ +#define NETLINK_INET_DIAG 4 /* INET socket monitoring */ +#define NETLINK_NFLOG 5 /* netfilter/iptables ULOG */ +#define NETLINK_XFRM 6 /* ipsec */ +#define NETLINK_SELINUX 7 /* SELinux event notifications */ +#define NETLINK_ISCSI 8 /* Open-iSCSI */ +#define NETLINK_AUDIT 9 /* auditing */ +#define NETLINK_FIB_LOOKUP 10 +#define NETLINK_CONNECTOR 11 +#define NETLINK_NETFILTER 12 /* netfilter subsystem */ +#define NETLINK_IP6_FW 13 +#define NETLINK_DNRTMSG 14 /* DECnet routing messages */ +#define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */ +#define NETLINK_GENERIC 16 +/* leave room for NETLINK_DM (DM Events) */ +#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */ +#define NETLINK_ECRYPTFS 19 + +#define MAX_LINKS 32 + +struct sockaddr_nl { + sa_family_t nl_family; /* AF_NETLINK */ + unsigned short nl_pad; /* zero */ + __u32 nl_pid; /* port ID */ + __u32 nl_groups; /* multicast groups mask */ +}; + +struct nlmsghdr { + __u32 nlmsg_len; /* Length of message including header */ + __u16 nlmsg_type; /* Message content */ + __u16 nlmsg_flags; /* Additional flags */ + __u32 nlmsg_seq; /* Sequence number */ + __u32 nlmsg_pid; /* Sending process port ID */ +}; + +/* Flags values */ + +#define NLM_F_REQUEST 1 /* It is request message. */ +#define NLM_F_MULTI 2 /* Multipart message, terminated by NLMSG_DONE */ +#define NLM_F_ACK 4 /* Reply with ack, with zero or error code */ +#define NLM_F_ECHO 8 /* Echo this request */ + +/* Modifiers to GET request */ +#define NLM_F_ROOT 0x100 /* specify tree root */ +#define NLM_F_MATCH 0x200 /* return all matching */ +#define NLM_F_ATOMIC 0x400 /* atomic GET */ +#define NLM_F_DUMP (NLM_F_ROOT|NLM_F_MATCH) + +/* Modifiers to NEW request */ +#define NLM_F_REPLACE 0x100 /* Override existing */ +#define NLM_F_EXCL 0x200 /* Do not touch, if it exists */ +#define NLM_F_CREATE 0x400 /* Create, if it does not exist */ +#define NLM_F_APPEND 0x800 /* Add to end of list */ + +/* + 4.4BSD ADD NLM_F_CREATE|NLM_F_EXCL + 4.4BSD CHANGE NLM_F_REPLACE + + True CHANGE NLM_F_CREATE|NLM_F_REPLACE + Append NLM_F_CREATE + Check NLM_F_EXCL + */ + +#define NLMSG_ALIGNTO 4 +#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) ) +#define NLMSG_HDRLEN ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr))) +#define NLMSG_LENGTH(len) ((len)+NLMSG_ALIGN(NLMSG_HDRLEN)) +#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len)) +#define NLMSG_DATA(nlh) ((void*)(((char*)nlh) + NLMSG_LENGTH(0))) +#define NLMSG_NEXT(nlh,len) ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \ + (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))) +#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \ + (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \ + (nlh)->nlmsg_len <= (len)) +#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len))) + +#define NLMSG_NOOP 0x1 /* Nothing. */ +#define NLMSG_ERROR 0x2 /* Error */ +#define NLMSG_DONE 0x3 /* End of a dump */ +#define NLMSG_OVERRUN 0x4 /* Data lost */ + +#define NLMSG_MIN_TYPE 0x10 /* < 0x10: reserved control messages */ + +struct nlmsgerr { + int error; + struct nlmsghdr msg; +}; + +#define NETLINK_ADD_MEMBERSHIP 1 +#define NETLINK_DROP_MEMBERSHIP 2 +#define NETLINK_PKTINFO 3 +#define NETLINK_BROADCAST_ERROR 4 +#define NETLINK_NO_ENOBUFS 5 + +struct nl_pktinfo { + __u32 group; +}; + +#define NET_MAJOR 36 /* Major 36 is reserved for networking */ + +enum { + NETLINK_UNCONNECTED = 0, + NETLINK_CONNECTED, +}; + +/* + * <------- NLA_HDRLEN ------> <-- NLA_ALIGN(payload)--> + * +---------------------+- - -+- - - - - - - - - -+- - -+ + * | Header | Pad | Payload | Pad | + * | (struct nlattr) | ing | | ing | + * +---------------------+- - -+- - - - - - - - - -+- - -+ + * <-------------- nlattr->nla_len --------------> + */ + +struct nlattr { + __u16 nla_len; + __u16 nla_type; +}; + +/* + * nla_type (16 bits) + * +---+---+-------------------------------+ + * | N | O | Attribute Type | + * +---+---+-------------------------------+ + * N := Carries nested attributes + * O := Payload stored in network byte order + * + * Note: The N and O flag are mutually exclusive. + */ +#define NLA_F_NESTED (1 << 15) +#define NLA_F_NET_BYTEORDER (1 << 14) +#define NLA_TYPE_MASK ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER) + +#define NLA_ALIGNTO 4 +#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1)) +#define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr))) + +#ifdef __KERNEL__ + +#include <linux/capability.h> +#include <linux/skbuff.h> + +struct net; + +static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb) +{ + return (struct nlmsghdr *)skb->data; +} + +struct netlink_skb_parms { + struct ucred creds; /* Skb credentials */ + __u32 pid; + __u32 dst_group; + kernel_cap_t eff_cap; + __u32 loginuid; /* Login (audit) uid */ + __u32 sessionid; /* Session id (audit) */ + __u32 sid; /* SELinux security id */ +}; + +#define NETLINK_CB(skb) (*(struct netlink_skb_parms*)&((skb)->cb)) +#define NETLINK_CREDS(skb) (&NETLINK_CB((skb)).creds) + + +extern void netlink_table_grab(void); +extern void netlink_table_ungrab(void); + +extern struct sock *netlink_kernel_create(struct net *net, + int unit,unsigned int groups, + void (*input)(struct sk_buff *skb), + struct mutex *cb_mutex, + struct module *module); +extern void netlink_kernel_release(struct sock *sk); +extern int __netlink_change_ngroups(struct sock *sk, unsigned int groups); +extern int netlink_change_ngroups(struct sock *sk, unsigned int groups); +extern void __netlink_clear_multicast_users(struct sock *sk, unsigned int group); +extern void netlink_clear_multicast_users(struct sock *sk, unsigned int group); +extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err); +extern int netlink_has_listeners(struct sock *sk, unsigned int group); +extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 pid, int nonblock); +extern int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 pid, + __u32 group, gfp_t allocation); +extern int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, + __u32 pid, __u32 group, gfp_t allocation, + int (*filter)(struct sock *dsk, struct sk_buff *skb, void *data), + void *filter_data); +extern int netlink_set_err(struct sock *ssk, __u32 pid, __u32 group, int code); +extern int netlink_register_notifier(struct notifier_block *nb); +extern int netlink_unregister_notifier(struct notifier_block *nb); + +/* finegrained unicast helpers: */ +struct sock *netlink_getsockbyfilp(struct file *filp); +int netlink_attachskb(struct sock *sk, struct sk_buff *skb, + long *timeo, struct sock *ssk); +void netlink_detachskb(struct sock *sk, struct sk_buff *skb); +int netlink_sendskb(struct sock *sk, struct sk_buff *skb); + +/* + * skb should fit one page. This choice is good for headerless malloc. + * But we should limit to 8K so that userspace does not have to + * use enormous buffer sizes on recvmsg() calls just to avoid + * MSG_TRUNC when PAGE_SIZE is very large. + */ +#if PAGE_SIZE < 8192UL +#define NLMSG_GOODSIZE SKB_WITH_OVERHEAD(PAGE_SIZE) +#else +#define NLMSG_GOODSIZE SKB_WITH_OVERHEAD(8192UL) +#endif + +#define NLMSG_DEFAULT_SIZE (NLMSG_GOODSIZE - NLMSG_HDRLEN) + + +struct netlink_callback { + struct sk_buff *skb; + const struct nlmsghdr *nlh; + int (*dump)(struct sk_buff * skb, + struct netlink_callback *cb); + int (*done)(struct netlink_callback *cb); + int family; + long args[6]; +}; + +struct netlink_notify { + struct net *net; + int pid; + int protocol; +}; + +static __inline__ struct nlmsghdr * +__nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags) +{ + struct nlmsghdr *nlh; + int size = NLMSG_LENGTH(len); + + nlh = (struct nlmsghdr*)skb_put(skb, NLMSG_ALIGN(size)); + nlh->nlmsg_type = type; + nlh->nlmsg_len = size; + nlh->nlmsg_flags = flags; + nlh->nlmsg_pid = pid; + nlh->nlmsg_seq = seq; + if (!__builtin_constant_p(size) || NLMSG_ALIGN(size) - size != 0) + memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size); + return nlh; +} + +#define NLMSG_NEW(skb, pid, seq, type, len, flags) \ +({ if (unlikely(skb_tailroom(skb) < (int)NLMSG_SPACE(len))) \ + goto nlmsg_failure; \ + __nlmsg_put(skb, pid, seq, type, len, flags); }) + +#define NLMSG_PUT(skb, pid, seq, type, len) \ + NLMSG_NEW(skb, pid, seq, type, len, 0) + +extern int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, + const struct nlmsghdr *nlh, + int (*dump)(struct sk_buff *skb, struct netlink_callback*), + int (*done)(struct netlink_callback*)); + + +#define NL_NONROOT_RECV 0x1 +#define NL_NONROOT_SEND 0x2 +extern void netlink_set_nonroot(int protocol, unsigned flag); + +#endif /* __KERNEL__ */ + +#endif /* __LINUX_NETLINK_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/src/Makefile.in new/libmnl-1.0.1/src/Makefile.in --- old/libmnl-1.0.0/src/Makefile.in 2010-12-17 14:29:17.000000000 +0100 +++ new/libmnl-1.0.1/src/Makefile.in 2010-12-26 21:20:01.000000000 +0100 @@ -234,7 +234,7 @@ # set age to 0. # </snippet> # -LIBVERSION = 0:0:0 +LIBVERSION = 0:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} lib_LTLIBRARIES = libmnl.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmnl-1.0.0/src/socket.c new/libmnl-1.0.1/src/socket.c --- old/libmnl-1.0.0/src/socket.c 2010-11-19 13:06:31.000000000 +0100 +++ new/libmnl-1.0.1/src/socket.c 2010-12-17 15:44:58.000000000 +0100 @@ -31,8 +31,8 @@ * * The acronym libmnl stands for LIBrary Minimalistic NetLink. * - * (temporary) libmnl homepage is: - * http://1984.lsi.us.es/projects/libmnl/ + * libmnl homepage is: + * http://www.netfilter.org/projects/libmnl/ * * \section features Main Features * - Small: the shared library requires around 30KB for an x86-based computer. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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