July 2010 - openSUSE Commits - openSUSE Mailing Lists

commit apache2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at Fri Jul 30 15:54:55 CEST 2010. -------- --- apache2/apache2.changes 2010-05-11 23:43:02.000000000 +0200 +++ apache2/apache2.changes 2010-07-29 17:40:57.000000000 +0200 @@ -1,0 +2,47 @@ +Thu Jul 29 15:40:29 UTC 2010 - poeml(a)cmdline.net + +- update to 2.2.16: + SECURITY: CVE-2010-1452 (cve.mitre.org) + mod_dav, mod_cache: Fix Handling of requests without a path segment. + PR: 49246 + SECURITY: CVE-2010-2068 (cve.mitre.org) + mod_proxy_ajp, mod_proxy_http, mod_reqtimeout: Fix timeout detection + for platforms Windows, Netware and OS2. PR: 49417. + core: + - Filter init functions are now run strictly once per request + before handler invocation. The init functions are no longer run + for connection filters. PR 49328. + mod_filter: + - enable it to act on non-200 responses. PR 48377 + mod_ldap: + - LDAP caching was suppressed (and ldap-status handler returns + title page only) when any mod_ldap directives were used in VirtualHost + context. + mod_ssl: + - Fix segfault at startup if proxy client certs are shared + across multiple vhosts. PR 39915. + mod_proxy_http: + - Log the port of the remote server in various messages. + PR 48812. + apxs: + - Fix -A and -a options to ignore whitespace in httpd.conf + mod_dir: + - add FallbackResource directive, to enable admin to specify + an action to happen when a URL maps to no file, without resorting + to ErrorDocument or mod_rewrite. PR 47184 + mod_rewrite: + - Allow to set environment variables without explicitely + giving a value. +- add Requires and BuildRequires on libapr1 >= 1.4.2. In the past, libapr1 >= + 1.0 was sufficient. But since 2.2.16, a failure to create listen sockets can + occur, unless newer libapr1 is used. See + https://bugzilla.redhat.com/show_bug.cgi?id=516331 +- remove obsolete httpd-2.2.15-deprecated_use_of_build_in_variable.patch + +------------------------------------------------------------------- +Mon May 17 14:33:47 UTC 2010 - poeml(a)cmdline.net + +- add type and encoding for zipped SVG images (.svgz) + Thanks to Sebastian Siebert (via Submit Request #40059) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- httpd-2.2.15-deprecated_use_of_build_in_variable.patch httpd-2.2.15.tar.bz2 New: ---- httpd-2.2.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.i8BNM3/_old 2010-07-30 15:51:11.000000000 +0200 +++ /var/tmp/diff_new_pack.i8BNM3/_new 2010-07-30 15:51:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package apache2 (Version 2.2.15) +# spec file for package apache2 (Version 2.2.16) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: apache2 -BuildRequires: db-devel ed libapr-util1-devel libapr1-devel openldap2 openldap2-devel +BuildRequires: db-devel ed libapr-util1-devel libapr1-devel >= 1.4.2 openldap2 openldap2-devel BuildRequires: openssl-devel pcre-devel zlib-devel %if %{?suse_version:1}0 %define httpduser wwwrun @@ -62,9 +62,9 @@ %define platform_string Linux/%VENDOR License: ASLv.. Group: Productivity/Networking/Web/Servers -%define realver 2.2.15 -Version: 2.2.15 -Release: 3 +%define realver 2.2.16 +Version: 2.2.16 +Release: 1 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 # Add file to take mtime from it in prep section @@ -120,8 +120,6 @@ Patch67: httpd-2.2.0-apxs-a2enmod.dif Patch68: httpd-2.x.x-logresolve.patch Patch100: apache2.2-mpm-itk-20090414-00.patch -# PATCH-FIX-UPSTREAM fix deprecated usage of $[ in apxs2 -Patch101: httpd-2.2.15-deprecated_use_of_build_in_variable.patch Url: http://httpd.apache.org/ Icon: Apache.xpm Summary: The Apache Web Server Version 2.0 @@ -130,7 +128,10 @@ Requires: %{pname}-MPM /etc/mime.types PreReq: %{name}-utils Requires: logrotate -Requires: libapr1 >= 1.0 +# in the past, libapr1 >= 1.0 was sufficient. But since 2.2.16, a failure to +# create listen sockets can occur, unless newer libapr1 is used, with certain kernels. +# see https://bugzilla.redhat.com/show_bug.cgi?id=516331 +Requires: libapr1 >= 1.4.2 Requires: libapr1 < 2.0 PreReq: fileutils textutils grep sed %if %{?suse_version:1}0 @@ -175,12 +176,6 @@ See /usr/share/doc/packages/apache2/, http://httpd.apache.org/, and http://httpd.apache.org/docs-2.0/upgrading.html. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %if %worker %package worker @@ -229,12 +224,6 @@ This combination offers a performance boost and retains some of the stability of the multi-process model. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %endif %if %prefork @@ -245,12 +234,6 @@ maximum stability because each server runs in its own process. If a process dies it will not affect other servers. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %endif %if %event @@ -266,12 +249,6 @@ This MPM depends on APR's atomic compare-and-swap operations for thread synchronization. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %endif %if %itk @@ -287,13 +264,6 @@ See http://mpm-itk.sesse.net/ - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - Steinar H. Gunderson (ITK module) - %endif %package devel @@ -341,12 +311,6 @@ Some Example pages for Apache that show information about the installed server. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %package example-certificates License: ASLv.. Summary: Example certificates for the Apache 2 Web Server @@ -355,12 +319,6 @@ %description example-certificates Snakeoil example certificates for Apache. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - %package utils License: ASLv.. Summary: Apache 2 utilities @@ -370,13 +328,6 @@ Utilities provided by the Apache 2 Web Server project which are useful to administrators of web servers in general. - - -Authors: --------- - Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE - - %prep # # O/ ._ .__ ._ @@ -391,7 +342,6 @@ %patch67 -p1 %patch68 -p1 %patch100 -p1 -%patch101 -p0 # cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # ++++++ apache2-mod_mime-defaults.conf ++++++ --- /var/tmp/diff_new_pack.i8BNM3/_old 2010-07-30 15:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.i8BNM3/_new 2010-07-30 15:51:12.000000000 +0200 @@ -128,6 +128,11 @@ # are so commonly used that we add them here. Addtype image/x-icon .ico +# Zipped SVG files (.svgz) are not registered by IANA yet, and we should hint +# clients about their encoding +AddType image/svg+xml .svg .svgz +AddEncoding gzip .svgz + # # For type maps (negotiated resources): # (This is enabled by default to allow the Apache "It Worked" page ++++++ httpd-2.2.0-apxs-a2enmod.dif ++++++ --- /var/tmp/diff_new_pack.i8BNM3/_old 2010-07-30 15:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.i8BNM3/_new 2010-07-30 15:51:12.000000000 +0200 @@ -1,7 +1,8 @@ -diff -uNr httpd-2.2.0.orig/support/apxs.in httpd-2.2.0/support/apxs.in ---- httpd-2.2.0.orig/support/apxs.in 2005-06-10 11:18:14.000000000 +0200 -+++ httpd-2.2.0/support/apxs.in 2005-12-07 11:04:38.337999601 +0100 -@@ -527,105 +527,14 @@ +Index: httpd-2.2.16/support/apxs.in +=================================================================== +--- httpd-2.2.16.orig/support/apxs.in ++++ httpd-2.2.16/support/apxs.in +@@ -526,108 +526,14 @@ if ($opt_i or $opt_e) { # activate module via LoadModule/AddModule directive if ($opt_a or $opt_A) { @@ -25,7 +26,10 @@ $c = '#' if ($opt_A); foreach $lmd (@lmd) { - my $what = $opt_A ? "preparing" : "activating"; -- if ($content !~ m|\n#?\s*$lmd|) { +- my $lmd_re = $lmd; +- $lmd_re =~ s/\s+/\\s+/g; +- +- if ($content !~ m|\n#?\s*$lmd_re|) { - # check for open <containers>, so that the new LoadModule - # directive always appears *outside* of an <container>. - @@ -88,7 +92,7 @@ - } - } else { - # replace already existing LoadModule line -- $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s; +- $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s; - } - $lmd =~ m|LoadModule\s+(.+?)_module.*|; - notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]"); ++++++ httpd-2.2.15.tar.bz2 -> httpd-2.2.16.tar.bz2 ++++++ ++++ 105488 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 sed for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package sed for openSUSE:Factory checked in at Fri Jul 30 15:50:47 CEST 2010. -------- --- sed/sed.changes 2009-12-08 00:01:37.000000000 +0100 +++ sed/sed.changes 2010-06-28 08:51:13.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sed.spec ++++++ --- /var/tmp/diff_new_pack.hEsF6l/_old 2010-07-30 15:50:34.000000000 +0200 +++ /var/tmp/diff_new_pack.hEsF6l/_new 2010-07-30 15:50:34.000000000 +0200 @@ -21,8 +21,8 @@ Name: sed Url: http://www.gnu.org/directory/sed.html Version: 4.1.5 -Release: 129 -License: GPL v2 or later +Release: 137 +License: GPLv2+ Group: System/Base Summary: A Stream-Oriented Non-Interactive Text Editor Provides: base:/bin/sed @@ -130,14 +130,14 @@ --enable-html \ %{_target_cpu}-suse-linux %if %do_profiling - make %{?jobs:-j%jobs} CFLAGS="$CFLAGS "%cflags_profile_generate - make %{?jobs:-j%jobs} check + make %{?_smp_mflags} CFLAGS="$CFLAGS "%cflags_profile_generate + make %{?_smp_mflags} check make clean - make %{?jobs:-j%jobs} CFLAGS="$CFLAGS "%cflags_profile_feedback + make %{?_smp_mflags} CFLAGS="$CFLAGS "%cflags_profile_feedback %else - make %{?jobs:-j%jobs} + make %{?_smp_mflags} %endif -make %{?jobs:-j%jobs} check +make %{?_smp_mflags} check %install %makeinstall ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzypp for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Fri Jul 30 15:50:26 CEST 2010. -------- --- libzypp/libzypp.changes 2010-06-29 18:13:30.000000000 +0200 +++ libzypp/libzypp.changes 2010-07-27 16:51:03.000000000 +0200 @@ -1,0 +2,37 @@ +Tue Jul 27 15:38:00 CEST 2010 - ma(a)suse.de + +- Fix bug in PoolQuery::addDependency +- Disable MediaAria and enable MultiCurl as default http/ftp backend. + MultiCurl implements MetaLink and Zsync support using libcurl. In + case of trouble set ZYPP_MULTICURL=0 in the envirionment to disable + the new backend. +- version 8.0.1 (0) + +------------------------------------------------------------------- +Mon Jul 26 17:05:14 CEST 2010 - ma(a)suse.de + +- Bump heads major version after 11.3 branched away. +- version 8.0.0 (0) + +------------------------------------------------------------------- +Thu Jul 22 01:13:27 CEST 2010 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Wed Jul 7 13:56:49 CEST 2010 - ma(a)suse.de + +- Add PoolQuery for name, edition AND architecture in one go. (bnc#614362) +- version 7.8.0 (6) + +------------------------------------------------------------------- +Mon Jul 5 13:03:57 CEST 2010 - ma(a)suse.de + +- Fix requirement to /usr/bin/uuidgen (bnc#613304) + +------------------------------------------------------------------- +Sun Jul 4 01:13:29 CEST 2010 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-7.7.5.tar.bz2 New: ---- libzypp-8.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.oY0Nqi/_old 2010-07-30 15:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.oY0Nqi/_new 2010-07-30 15:49:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 7.7.5) +# spec file for package libzypp (Version 8.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 7.7.5 -Release: 5 +Version: 8.0.1 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Provides: yast2-packagemanager @@ -63,7 +63,7 @@ BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files BuildRequires: rpm-devel -Requires: uuid-runtime +Requires: /usr/bin/uuidgen %endif %if 0%{?fedora_version} @@ -104,7 +104,7 @@ # need CURLOPT_REDIR_PROTOCOLS: %define min_curl_version 7.19.4 # want aria2: -Requires: aria2 >= %{min_aria_version} +Conflicts: aria2 < %{min_aria_version} BuildRequires: aria2 >= %{min_aria_version} %endif # --------------------------------------------------------------- ++++++ libzypp-7.7.5.tar.bz2 -> libzypp-8.0.1.tar.bz2 ++++++ ++++ 10374 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 aria2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package aria2 for openSUSE:Factory checked in at Fri Jul 30 15:49:03 CEST 2010. -------- --- aria2/aria2.changes 2010-04-15 00:42:35.000000000 +0200 +++ aria2/aria2.changes 2010-07-19 21:56:53.000000000 +0200 @@ -1,0 +2,56 @@ +Mon Jul 19 19:17:47 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.10.0: + * adds an option to limit the number of connections to the same host in each download + * aria2 now chooses the server which is least used in the aria2c instance + * adds Chromium cookie support + * adds HTTP only conditional download support in which a file is downloaded only when the local file is older than the remote file + * aria2 now can handle %2F in FTP URI properly + * the HTTP/1.1 chunked decoder was fixed + * aria2 uses fallocate by default if it is usable + +------------------------------------------------------------------- +Mon Jun 28 20:04:24 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.9.5: + * fixes the bug that caused corrupted files + * also fixes an assertion error in the DefaultPeerStorage class + * aria2 no longer resets the referer to the empty string on redirect + * the log and log-level options can be used in the aria2.changeGlobalOption XML-RPC method: this means you can dynamically start or stop logging and change log file and log level + +------------------------------------------------------------------- +Sun Jun 6 07:54:47 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.9.4: + * fixes the bug where connection reuse on FTP did not work if the + FTP server changed the root directory based on account + * fixes the bug where reading a Metalink document from a pipe + (the -M- option) does not work when aria2 is built with expat + or old libxml2 (2.7.6 or earlier) + * now aria2 does not emit an error if the given Metalink document + is empty (no file element) + * the response of the aria2.tellStopped XML-RPC method now has + more information: totalLength, completedLength, uploadLength, + bitfield, and so on. + +------------------------------------------------------------------- +Sun May 9 12:10:21 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.9.3: + * fixes the bug in which aria2 cuts a filename after a ";" + character if the filename in the Content-Disposition header + includes a ";" character + * fixes the bug in which the name attribute of the file element + in a Metalink file is not properly sanitized + +------------------------------------------------------------------- +Wed Apr 28 19:19:06 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.9.2: + * adds poll() support for socket event notification to eliminate + the limitation to 1024 file descriptors of the select() call + * fixes the bug in which the aria2.unpause and aria2.unpauseAll + XML-RPC methods fail when -s1 is given in a command-line + argument + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- aria2-1.9.1.tar.bz2 New: ---- aria2-1.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aria2.spec ++++++ --- /var/tmp/diff_new_pack.ODvepy/_old 2010-07-30 15:43:53.000000000 +0200 +++ /var/tmp/diff_new_pack.ODvepy/_new 2010-07-30 15:43:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package aria2 (Version 1.9.1) +# spec file for package aria2 (Version 1.10.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,11 +25,6 @@ %undefine with_gnutls %endif -%if 0%{?opensuse_bs} -%define with_dht 0 -%else -%define with_dht 1 -%endif %if 0%{?suse_version} > 0 && 0%{?suse_version} >= 1020 %define with_sqlite 1 %else @@ -37,7 +32,7 @@ %endif Name: aria2 -Version: 1.9.1 +Version: 1.10.0 Release: 1 Summary: Parallelizing Multi-Protocol Utility for Downloading Files Source: http://prdownloads.sourceforge.net/aria2/aria2-%{version}.tar.bz2 @@ -148,8 +143,24 @@ # a buglet in the configure script causes this directive to cause the opposite, so comment it out # poeml, Mon Aug 4 16:30:55 CEST 2008 #--enable-metalink -#echo '#define HAVE_LIBGEN_H 1' >> config.h -#%__rm src/libgen.h + +# fix fallocate64 usage on 32bit: fallocate is broken because of a glibc bug +# (but only on < 11.3 and i586), but posix_fallocate works: +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1130 +%if 0%{?suse_version} >= 1120 && "%{_lib}"=="lib" +# openSUSE 11.2, 32bit +%__sed -i '/ HAVE_FALLOCATE /d' config.h +%else +# openSUSE <= 11.2 +%if 0%{?suse_version} < 1120 +# openSUSE < 11.2 +%__sed -i '/ HAVE_FALLOCATE /d' config.h +%__sed -i '/ HAVE_SOME_FALLOCATE /d' config.h +%__sed -i '/ HAVE_POSIX_FALLOCATE /d' config.h +%endif # < 1120 +%endif # 1120 32bit +%endif # openSUSE + %__make %{?jobs:-j%{jobs}} %install @@ -170,7 +181,7 @@ #__make check %clean -%__rm -rf "%{buildroot}" +%{?buildroot:%__rm -rf "%{buildroot}"} %files -f "aria2.lang" %defattr(-,root,root) ++++++ aria2-1.9.1.tar.bz2 -> aria2-1.10.0.tar.bz2 ++++++ ++++ 135833 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 rrdtool for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package rrdtool for openSUSE:Factory checked in at Fri Jul 30 15:43:44 CEST 2010. -------- --- rrdtool/rrdtool.changes 2010-04-16 19:45:02.000000000 +0200 +++ rrdtool/rrdtool.changes 2010-07-27 17:34:30.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jul 27 16:20:46 CEST 2010 - anicka(a)suse.cz + +- update to 1.4.4 + * legal: Relicense the RRDCacheD client interface under the MIT + license + * legal: Updted FLOSS Exception for latest PHP license + * rrd_cached: better help output + * bugfixes +- remove last patch, fixed in upstream +- disable calling autoreconf (needs too new gettext) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rrdtool-1.4.3-double.diff rrdtool-1.4.3.tar.bz2 New: ---- rrdtool-1.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rrdtool.spec ++++++ --- /var/tmp/diff_new_pack.VaW9wD/_old 2010-07-30 15:43:07.000000000 +0200 +++ /var/tmp/diff_new_pack.VaW9wD/_new 2010-07-30 15:43:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rrdtool (Version 1.4.3) +# spec file for package rrdtool (Version 1.4.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,11 +24,10 @@ Group: Productivity/Scientific/Math AutoReqProv: on Requires: perl = %{perl_version} -Version: 1.4.3 -Release: 2 +Version: 1.4.4 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: cgilib-0.5.tar.bz2 -Patch: %{name}-%{version}-double.diff Url: http://oss.oetiker.ch/rrdtool/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A tool for data logging and analysis @@ -42,7 +41,6 @@ %prep %setup -q -a1 -%patch -p1 %build # first prepare cgilib @@ -56,7 +54,8 @@ # build rrdtool %{suse_update_config} if [ ! -d m4 ]; then mkdir m4; fi -autoreconf -i -f +# we need getext 0.18 +#autoreconf -i -f export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ %configure --disable-static --with-pic --enable-shared \ --with-tcllib=%{_libdir} \ ++++++ rrdtool-1.4.3.tar.bz2 -> rrdtool-1.4.4.tar.bz2 ++++++ ++++ 21244 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 ImageMagick for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at Fri Jul 30 15:41:52 CEST 2010. -------- --- ImageMagick/ImageMagick.changes 2010-06-22 18:39:46.000000000 +0200 +++ ImageMagick/ImageMagick.changes 2010-07-29 13:45:19.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 29 13:08:43 CEST 2010 - pgajdos(a)suse.cz + +- updated to 6.6.3-1: + * obsoletes units.patch + * obsoletes grayscale-tiff-jpeg.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ImageMagick-6.6.1-0.tar.bz2 ImageMagick-6.6.1.0-doc.patch ImageMagick-6.6.1.0-examples.patch ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch ImageMagick-6.6.1.0-units.patch New: ---- ImageMagick-6.6.3-1.tar.bz2 ImageMagick-6.6.3.1-doc.patch ImageMagick-6.6.3.1-examples.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.8yo7qE/_old 2010-07-30 15:35:33.000000000 +0200 +++ /var/tmp/diff_new_pack.8yo7qE/_new 2010-07-30 15:35:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ImageMagick (Version 6.6.1.0) +# spec file for package ImageMagick (Version 6.6.3.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,10 +29,10 @@ License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.6.1.0 -Release: 4 -%define source_version 6.6.1-0 -%define libver 3 +Version: 6.6.3.1 +Release: 1 +%define source_version 6.6.3-1 +%define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org Source: ImageMagick-%{source_version}.tar.bz2 @@ -42,8 +42,6 @@ Source3: baselibs.conf Patch1: ImageMagick-%{version}-examples.patch Patch2: ImageMagick-%{version}-doc.patch -Patch3: ImageMagick-%{version}-units.patch -Patch4: ImageMagick-%{version}-grayscale-tiff-jpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -121,8 +119,6 @@ %setup -n ImageMagick-%{source_version} -b 2 %patch1 %patch2 -%patch3 -p1 -%patch4 -p1 %build %define system_ltdl 0 ++++++ ImageMagick-6.6.1-0.tar.bz2 -> ImageMagick-6.6.3-1.tar.bz2 ++++++ ImageMagick/ImageMagick-6.6.1-0.tar.bz2 ImageMagick/ImageMagick-6.6.3-1.tar.bz2 differ: char 11, line 1 ++++++ ImageMagick-6.6.1.0-doc.patch -> ImageMagick-6.6.3.1-doc.patch ++++++ ++++++ ImageMagick-6.6.1.0-examples.patch -> ImageMagick-6.6.3.1-examples.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 iputils for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at Fri Jul 30 15:35:15 CEST 2010. -------- --- iputils/iputils.changes 2010-06-04 09:28:32.000000000 +0200 +++ iputils/iputils.changes 2010-07-14 14:07:31.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Jul 14 13:42:08 CEST 2010 - ms(a)suse.de + +- fixed device broadcast setup (bnc #614389) +- upstream maintainer has changed. new maintainer is + YOSHIFUJI Hideaki. Along with this change the versioning + of the package also changed. Current version is: s20100418 + from 18-Apr-2010 +- many patches upstream now, reduced patch set + +------------------------------------------------------------------- +Tue Jul 13 17:03:24 CEST 2010 - ms(a)suse.de + +- reverted arping-infiniband.diff, it breaks arping + (bnc #614389) and (bnc #610839) + +------------------------------------------------------------------- +Thu Jul 8 16:24:50 CEST 2010 - ms(a)suse.de + +- security fix: replies by a malicious system can + make ping run into an endless loop (bnc #620837) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- iputils-HZ.patch iputils-headers.patch iputils-ifenslave-1.1.0.tar.bz2 iputils-ifenslave.patch iputils-ss021109-arping-infiniband.diff iputils-ss021109-locallinksyntax.diff iputils-ss021109-open_max.diff iputils-ss021109-ping-R-option-doc.diff iputils-ss021109-ping-interrupt.diff iputils-ss021109-ping6_getaddrinfo.patch iputils-ss021109-ping6kernel261x.diff iputils-ss021109-ping_common.dif iputils-ss021109-pingnamelookuponce.diff iputils-ss021109-rdisc-server.patch iputils-ss021109-sec-ping-setuid-retvalcheck.diff iputils-ss021109-sec-ping6-setuid-retvalcheck.diff iputils-ss021109-sec-traceroute6-setuid-retvalcheck.diff iputils-ss021109-traceroute6-stdint.diff iputils-ss021109-traceroute6-ttab.diff iputils-ss021109-try.tar.bz2 iputils-ss021109.diff New: ---- iputils-arping-set_device_broadcast.diff iputils-ifenslave.diff iputils-ifenslave.tar.bz2 iputils-pingnamelookuponce.diff iputils-traceroute6-stdint.diff iputils.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.SkhOiI/_old 2010-07-30 15:20:33.000000000 +0200 +++ /var/tmp/diff_new_pack.SkhOiI/_new 2010-07-30 15:20:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package iputils (Version ss021109) +# spec file for package iputils (Version s20100418) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,37 +19,22 @@ Name: iputils -BuildRequires: sysfsutils +BuildRequires: docbook_3 iso_ent libopenssl-devel opensp perl-SGMLS sysfsutils Summary: IPv4and IPv6 Networking Utilities -Version: ss021109 -Release: 295 +Version: s20100418 +Release: 1 License: BSD3c ; GPLv2+ Group: Productivity/Networking/Other Provides: nkitb Obsoletes: nkitb -Url: ftp://ftp.tux.org/people/alexey-kuznetsov/ip-routing -Source: iputils-%{version}-try.tar.bz2 -Source1: iputils-ifenslave-1.1.0.tar.bz2 -Patch: %name-%version.diff -Patch1: %name-%version-rdisc-server.patch -Patch2: %name-%version-sec-traceroute6-setuid-retvalcheck.diff -Patch3: %name-%version-sec-ping6-setuid-retvalcheck.diff -Patch4: %name-%version-sec-ping-setuid-retvalcheck.diff -Patch5: %name-%version-ping-R-option-doc.diff -Patch6: %name-headers.patch -Patch7: %name-%version-pingnamelookuponce.diff -Patch8: %name-ss021109-traceroute6-stdint.diff -Patch9: %name-ADDLIB.diff -Patch10: %name-ss021109-locallinksyntax.diff -Patch11: iputils-ss021109-ping6kernel261x.diff -Patch12: %name-ifenslave.patch -Patch13: %name-HZ.patch -Patch14: %name-%version-ping6_getaddrinfo.patch -Patch15: %name-%version-ping_common.dif -Patch16: %name-ss021109-traceroute6-ttab.diff -Patch17: %name-%version-open_max.diff -Patch18: %name-%version-ping-interrupt.diff -Patch19: %name-%version-arping-infiniband.diff +Url: http://www.skbuff.net/iputils +Source: iputils.tar.bz2 +Source1: iputils-ifenslave.tar.bz2 +Patch1: %name-pingnamelookuponce.diff +Patch2: %name-traceroute6-stdint.diff +Patch3: %name-ifenslave.diff +Patch4: %name-arping-set_device_broadcast.diff +Patch5: %name-ADDLIB.diff Prefix: %_prefix BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,29 +47,15 @@ Authors: -------- Alexey Kuznetsov <kuznet(a)ms2.inr.ac.ru> + YOSHIFUJI Hideaki <yoshfuji(a)linux-ipv6.org> %prep %setup -q -n %name -b1 -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -%patch7 -p1 -%patch8 -%patch9 -%patch10 -p1 -%patch11 -p1 -%patch12 -%patch13 -%patch14 -%patch15 -%patch16 -%patch17 -p1 -%patch18 -%patch19 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 mkdir linux touch linux/autoconf.h @@ -92,6 +63,8 @@ make %{?_smp_mflags} KERNEL_INCLUDE=$PWD DEFINES='%optflags -fpie' ADDLIB='-pie' gcc $RPM_OPT_FLAGS -o ifenslave ifenslave.c +make man + %install mkdir -p $RPM_BUILD_ROOT%_sbindir mkdir -p $RPM_BUILD_ROOT/{bin,sbin} ++++++ iputils-ADDLIB.diff ++++++ --- /var/tmp/diff_new_pack.SkhOiI/_old 2010-07-30 15:20:33.000000000 +0200 +++ /var/tmp/diff_new_pack.SkhOiI/_new 2010-07-30 15:20:33.000000000 +0200 @@ -1,12 +1,12 @@ ---- Makefile -+++ Makefile -@@ -5,8 +5,8 @@ +--- Makefile 2010-07-14 13:38:32.257045463 +0200 ++++ Makefile 2010-07-14 13:39:00.482319644 +0200 +@@ -4,8 +4,8 @@ DEFINES= #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) --LDLIBS=-lresolv +-LDLIBS= ADDLIB= +LDLIBS=-lresolv $(ADDLIB) - ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h)) - ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h)) + #options if you compile with libc5, and without a bind>=4.9.4 libresolv + # NOT AVAILABLE. Please, use libresolv. ++++++ iputils-arping-set_device_broadcast.diff ++++++ --- arping.c +++ arping.c @@ -335,8 +335,8 @@ void set_device_broadcast(char *device, unsigned char *ba, size_t balen) exit(2); } - for (p = ba, ch = 0; p < ba + balen; p++, ch += 3) - *p++ = strtoul(brdcast->value + ch * 3, NULL, 16); + for (p = ba, ch = 0; p < ba + balen; ch += 3) + *p++ = strtoul(brdcast->value + ch, NULL, 16); return; } -- 1.7.1 ++++++ iputils-ifenslave.diff ++++++ --- ifenslave.c +++ ifenslave.c @@ -520,8 +520,8 @@ static int if_getconfig(char *ifname) if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0) return -1; printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n", - ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1], - ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]); + ifr.ifr_addr.sa_data[2] & 0xff, ifr.ifr_addr.sa_data[3] & 0xff, + ifr.ifr_addr.sa_data[4] & 0xff, ifr.ifr_addr.sa_data[5] & 0xff); strcpy(ifr.ifr_name, ifname); if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) ++++++ iputils-ifenslave-1.1.0.tar.bz2 -> iputils-ifenslave.tar.bz2 ++++++ ++++ no output (probably identical) ++++++ iputils-pingnamelookuponce.diff ++++++ diff -ur iputils/ping.c iputils.new/ping.c --- ping.c 2004-03-17 12:36:43.000000000 +0100 +++ ping.c 2004-03-17 12:35:49.000000000 +0100 @@ -1141,15 +1141,24 @@ char * pr_addr(__u32 addr) { - struct hostent *hp; + struct hostent *hp = NULL; + static __u32 last_addr; static char buf[4096]; - if ((options & F_NUMERIC) || - !(hp = gethostbyaddr((char *)&addr, 4, AF_INET))) - sprintf(buf, "%s", inet_ntoa(*(struct in_addr *)&addr)); - else + if (!(options & F_NUMERIC)) { + if (buf[0] && addr == last_addr) + return buf; + hp = gethostbyaddr((char *)&addr, 4, AF_INET); + } + + if (hp) { snprintf(buf, sizeof(buf), "%s (%s)", hp->h_name, inet_ntoa(*(struct in_addr *)&addr)); + } else { + sprintf(buf, "%s", inet_ntoa(*(struct in_addr *)&addr)); + } + + last_addr = addr; return(buf); } diff -ur iputils/ping6.c iputils.new/ping6.c --- ping6.c 2004-03-17 12:36:43.000000000 +0100 +++ ping6.c 2004-03-17 12:36:29.000000000 +0100 @@ -898,11 +898,22 @@ char * pr_addr(struct in6_addr *addr) { struct hostent *hp = NULL; + static struct in6_addr last_addr; + static char buf[1024]; - if (!(options&F_NUMERIC)) + if (!(options&F_NUMERIC)) { + if (buf[0] && !memcmp(&last_addr, addr, sizeof(*addr))) + return buf; hp = gethostbyaddr((__u8*)addr, sizeof(struct in6_addr), AF_INET6); + } - return hp ? hp->h_name : pr_addr_n(addr); + if (hp && strlen(hp->h_name) < sizeof(buf)) { + strcpy(buf, hp->h_name); + } else { + inet_ntop(AF_INET6, addr, buf, sizeof(buf)); + } + last_addr = *addr; + return buf; } char * pr_addr_n(struct in6_addr *addr) ++++++ iputils-traceroute6-stdint.diff ++++++ --- traceroute6.c +++ traceroute6.c 2004/09/03 09:38:22 @@ -230,6 +230,7 @@ * Tue Dec 20 03:50:13 PST 1988 */ +#include <stdint.h> #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> ++++++ iputils-ifenslave-1.1.0.tar.bz2 -> iputils.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iputils/ifenslave.c new/iputils/ifenslave.c --- old/iputils/ifenslave.c 2010-04-23 16:02:33.000000000 +0200 +++ new/iputils/ifenslave.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1103 +0,0 @@ -/* Mode: C; - * ifenslave.c: Configure network interfaces for parallel routing. - * - * This program controls the Linux implementation of running multiple - * network interfaces in parallel. - * - * Author: Donald Becker <becker(a)cesdis.gsfc.nasa.gov> - * Copyright 1994-1996 Donald Becker - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation. - * - * The author may be reached as becker(a)CESDIS.gsfc.nasa.gov, or C/O - * Center of Excellence in Space Data and Information Sciences - * Code 930.5, Goddard Space Flight Center, Greenbelt MD 20771 - * - * Changes : - * - 2000/10/02 Willy Tarreau <willy at meta-x.org> : - * - few fixes. Master's MAC address is now correctly taken from - * the first device when not previously set ; - * - detach support : call BOND_RELEASE to detach an enslaved interface. - * - give a mini-howto from command-line help : # ifenslave -h - * - * - 2001/02/16 Chad N. Tindel <ctindel at ieee dot org> : - * - Master is now brought down before setting the MAC address. In - * the 2.4 kernel you can't change the MAC address while the device is - * up because you get EBUSY. - * - * - 2001/09/13 Takao Indoh <indou dot takao at jp dot fujitsu dot com> - * - Added the ability to change the active interface on a mode 1 bond - * at runtime. - * - * - 2001/10/23 Chad N. Tindel <ctindel at ieee dot org> : - * - No longer set the MAC address of the master. The bond device will - * take care of this itself - * - Try the SIOC*** versions of the bonding ioctls before using the - * old versions - * - 2002/02/18 Erik Habbinga <erik_habbinga @ hp dot com> : - * - ifr2.ifr_flags was not initialized in the hwaddr_notset case, - * SIOCGIFFLAGS now called before hwaddr_notset test - * - * - 2002/10/31 Tony Cureington <tony.cureington * hp_com> : - * - If the master does not have a hardware address when the first slave - * is enslaved, the master is assigned the hardware address of that - * slave - there is a comment in bonding.c stating "ifenslave takes - * care of this now." This corrects the problem of slaves having - * different hardware addresses in active-backup mode when - * multiple interfaces are specified on a single ifenslave command - * (ifenslave bond0 eth0 eth1). - * - * - 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and - * Shmulik Hen <shmulik.hen at intel dot com> - * - Moved setting the slave's mac address and openning it, from - * the application to the driver. This enables support of modes - * that need to use the unique mac address of each slave. - * The driver also takes care of closing the slave and restoring its - * original mac address upon release. - * In addition, block possibility of enslaving before the master is up. - * This prevents putting the system in an undefined state. - * - * - 2003/05/01 - Amir Noam <amir.noam at intel dot com> - * - Added ABI version control to restore compatibility between - * new/old ifenslave and new/old bonding. - * - Prevent adding an adapter that is already a slave. - * Fixes the problem of stalling the transmission and leaving - * the slave in a down state. - * - * - 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com> - * - Prevent enslaving if the bond device is down. - * Fixes the problem of leaving the system in unstable state and - * halting when trying to remove the module. - * - Close socket on all abnormal exists. - * - Add versioning scheme that follows that of the bonding driver. - * current version is 1.0.0 as a base line. - * - * - 2003/05/22 - Jay Vosburgh <fubar at us dot ibm dot com> - * - ifenslave -c was broken; it's now fixed - * - Fixed problem with routes vanishing from master during enslave - * processing. - * - * - 2003/05/27 - Amir Noam <amir.noam at intel dot com> - * - Fix backward compatibility issues: - * For drivers not using ABI versions, slave was set down while - * it should be left up before enslaving. - * Also, master was not set down and the default set_mac_address() - * would fail and generate an error message in the system log. - * - For opt_c: slave should not be set to the master's setting - * while it is running. It was already set during enslave. To - * simplify things, it is now handled separately. - * - * - 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com> - * - Code cleanup and style changes - * set version to 1.1.0 - */ - -#define APP_VERSION "1.1.0" -#define APP_RELDATE "December 1, 2003" -#define APP_NAME "ifenslave" - -static char *version = -APP_NAME ".c:v" APP_VERSION " (" APP_RELDATE ")\n" -"o Donald Becker (becker(a)cesdis.gsfc.nasa.gov).\n" -"o Detach support added on 2000/10/02 by Willy Tarreau (willy at meta-x.org).\n" -"o 2.4 kernel support added on 2001/02/16 by Chad N. Tindel\n" -" (ctindel at ieee dot org).\n"; - -static const char *usage_msg = -"Usage: ifenslave [-f] <master-if> <slave-if> [<slave-if>...]\n" -" ifenslave -d <master-if> <slave-if> [<slave-if>...]\n" -" ifenslave -c <master-if> <slave-if>\n" -" ifenslave --help\n"; - -static const char *help_msg = -"\n" -" To create a bond device, simply follow these three steps :\n" -" - ensure that the required drivers are properly loaded :\n" -" # modprobe bonding ; modprobe <3c59x|eepro100|pcnet32|tulip|...>\n" -" - assign an IP address to the bond device :\n" -" # ifconfig bond0 <addr> netmask <mask> broadcast <bcast>\n" -" - attach all the interfaces you need to the bond device :\n" -" # ifenslave [{-f|--force}] bond0 eth0 [eth1 [eth2]...]\n" -" If bond0 didn't have a MAC address, it will take eth0's. Then, all\n" -" interfaces attached AFTER this assignment will get the same MAC addr.\n" -" (except for ALB/TLB modes)\n" -"\n" -" To set the bond device down and automatically release all the slaves :\n" -" # ifconfig bond0 down\n" -"\n" -" To detach a dead interface without setting the bond device down :\n" -" # ifenslave {-d|--detach} bond0 eth0 [eth1 [eth2]...]\n" -"\n" -" To change active slave :\n" -" # ifenslave {-c|--change-active} bond0 eth0\n" -"\n" -" To show master interface info\n" -" # ifenslave bond0\n" -"\n" -" To show all interfaces info\n" -" # ifenslave {-a|--all-interfaces}\n" -"\n" -" To be more verbose\n" -" # ifenslave {-v|--verbose} ...\n" -"\n" -" # ifenslave {-u|--usage} Show usage\n" -" # ifenslave {-V|--version} Show version\n" -" # ifenslave {-h|--help} This message\n" -"\n"; - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> -#include <string.h> -#include <errno.h> -#include <fcntl.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <linux/if.h> -#include <net/if_arp.h> -#include <linux/if_ether.h> -#include <linux/if_bonding.h> -#include <linux/sockios.h> - -typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h */ -typedef __uint32_t u32; /* ditto */ -typedef __uint16_t u16; /* ditto */ -typedef __uint8_t u8; /* ditto */ -#include <linux/ethtool.h> - -struct option longopts[] = { - /* { name has_arg *flag val } */ - {"all-interfaces", 0, 0, 'a'}, /* Show all interfaces. */ - {"change-active", 0, 0, 'c'}, /* Change the active slave. */ - {"detach", 0, 0, 'd'}, /* Detach a slave interface. */ - {"force", 0, 0, 'f'}, /* Force the operation. */ - {"help", 0, 0, 'h'}, /* Give help */ - {"usage", 0, 0, 'u'}, /* Give usage */ - {"verbose", 0, 0, 'v'}, /* Report each action taken. */ - {"version", 0, 0, 'V'}, /* Emit version information. */ - { 0, 0, 0, 0} -}; - -/* Command-line flags. */ -unsigned int -opt_a = 0, /* Show-all-interfaces flag. */ -opt_c = 0, /* Change-active-slave flag. */ -opt_d = 0, /* Detach a slave interface. */ -opt_f = 0, /* Force the operation. */ -opt_h = 0, /* Help */ -opt_u = 0, /* Usage */ -opt_v = 0, /* Verbose flag. */ -opt_V = 0; /* Version */ - -int skfd = -1; /* AF_INET socket for ioctl() calls.*/ -int abi_ver = 0; /* userland - kernel ABI version */ -int hwaddr_set = 0; /* Master's hwaddr is set */ -int saved_errno; - -struct ifreq master_mtu, master_flags, master_hwaddr; -struct ifreq slave_mtu, slave_flags, slave_hwaddr; - -struct dev_ifr { - struct ifreq *req_ifr; - char *req_name; - int req_type; -}; - -struct dev_ifr master_ifra[] = { - {&master_mtu, "SIOCGIFMTU", SIOCGIFMTU}, - {&master_flags, "SIOCGIFFLAGS", SIOCGIFFLAGS}, - {&master_hwaddr, "SIOCGIFHWADDR", SIOCGIFHWADDR}, - {NULL, "", 0} -}; - -struct dev_ifr slave_ifra[] = { - {&slave_mtu, "SIOCGIFMTU", SIOCGIFMTU}, - {&slave_flags, "SIOCGIFFLAGS", SIOCGIFFLAGS}, - {&slave_hwaddr, "SIOCGIFHWADDR", SIOCGIFHWADDR}, - {NULL, "", 0} -}; - -static void if_print(char *ifname); -static int get_drv_info(char *master_ifname); -static int get_if_settings(char *ifname, struct dev_ifr ifra[]); -static int get_slave_flags(char *slave_ifname); -static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr); -static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr); -static int set_slave_mtu(char *slave_ifname, int mtu); -static int set_if_flags(char *ifname, short flags); -static int set_if_up(char *ifname, short flags); -static int set_if_down(char *ifname, short flags); -static int clear_if_addr(char *ifname); -static int set_if_addr(char *master_ifname, char *slave_ifname); -static int change_active(char *master_ifname, char *slave_ifname); -static int enslave(char *master_ifname, char *slave_ifname); -static int release(char *master_ifname, char *slave_ifname); -#define v_print(fmt, args...) \ - if (opt_v) \ - fprintf(stderr, fmt, ## args ) - -int main(int argc, char *argv[]) -{ - char **spp, *master_ifname, *slave_ifname; - int c, i, rv; - int res = 0; - int exclusive = 0; - - while ((c = getopt_long(argc, argv, "acdfhuvV", longopts, 0)) != EOF) { - switch (c) { - case 'a': opt_a++; exclusive++; break; - case 'c': opt_c++; exclusive++; break; - case 'd': opt_d++; exclusive++; break; - case 'f': opt_f++; exclusive++; break; - case 'h': opt_h++; exclusive++; break; - case 'u': opt_u++; exclusive++; break; - case 'v': opt_v++; break; - case 'V': opt_V++; exclusive++; break; - - case '?': - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - } - - /* options check */ - if (exclusive > 1) { - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - - if (opt_v || opt_V) { - printf(version); - if (opt_V) { - res = 0; - goto out; - } - } - - if (opt_u) { - printf(usage_msg); - res = 0; - goto out; - } - - if (opt_h) { - printf(usage_msg); - printf(help_msg); - res = 0; - goto out; - } - - /* Open a basic socket */ - if ((skfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - perror("socket"); - res = 1; - goto out; - } - - if (opt_a) { - if (optind == argc) { - /* No remaining args */ - /* show all interfaces */ - if_print((char *)NULL); - goto out; - } else { - /* Just show usage */ - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - } - - /* Copy the interface name */ - spp = argv + optind; - master_ifname = *spp++; - - if (master_ifname == NULL) { - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - - /* exchange abi version with bonding module */ - res = get_drv_info(master_ifname); - if (res) { - fprintf(stderr, - "Master '%s': Error: handshake with driver failed. " - "Aborting\n", - master_ifname); - goto out; - } - - slave_ifname = *spp++; - - if (slave_ifname == NULL) { - if (opt_d || opt_c) { - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - - /* A single arg means show the - * configuration for this interface - */ - if_print(master_ifname); - goto out; - } - - res = get_if_settings(master_ifname, master_ifra); - if (res) { - /* Probably a good reason not to go on */ - fprintf(stderr, - "Master '%s': Error: get settings failed: %s. " - "Aborting\n", - master_ifname, strerror(res)); - goto out; - } - - /* check if master is indeed a master; - * if not then fail any operation - */ - if (!(master_flags.ifr_flags & IFF_MASTER)) { - fprintf(stderr, - "Illegal operation; the specified interface '%s' " - "is not a master. Aborting\n", - master_ifname); - res = 1; - goto out; - } - - /* check if master is up; if not then fail any operation */ - if (!(master_flags.ifr_flags & IFF_UP)) { - fprintf(stderr, - "Illegal operation; the specified master interface " - "'%s' is not up.\n", - master_ifname); - res = 1; - goto out; - } - - /* Only for enslaving */ - if (!opt_c && !opt_d) { - sa_family_t master_family = master_hwaddr.ifr_hwaddr.sa_family; - unsigned char *hwaddr = - (unsigned char *)master_hwaddr.ifr_hwaddr.sa_data; - - /* The family '1' is ARPHRD_ETHER for ethernet. */ - if (master_family != 1 && !opt_f) { - fprintf(stderr, - "Illegal operation: The specified master " - "interface '%s' is not ethernet-like.\n " - "This program is designed to work with " - "ethernet-like network interfaces.\n " - "Use the '-f' option to force the " - "operation.\n", - master_ifname); - res = 1; - goto out; - } - - /* Check master's hw addr */ - for (i = 0; i < 6; i++) { - if (hwaddr[i] != 0) { - hwaddr_set = 1; - break; - } - } - - if (hwaddr_set) { - v_print("current hardware address of master '%s' " - "is %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, " - "type %d\n", - master_ifname, - hwaddr[0], hwaddr[1], - hwaddr[2], hwaddr[3], - hwaddr[4], hwaddr[5], - master_family); - } - } - - /* Accepts only one slave */ - if (opt_c) { - /* change active slave */ - res = get_slave_flags(slave_ifname); - if (res) { - fprintf(stderr, - "Slave '%s': Error: get flags failed. " - "Aborting\n", - slave_ifname); - goto out; - } - res = change_active(master_ifname, slave_ifname); - if (res) { - fprintf(stderr, - "Master '%s', Slave '%s': Error: " - "Change active failed\n", - master_ifname, slave_ifname); - } - } else { - /* Accept multiple slaves */ - do { - if (opt_d) { - /* detach a slave interface from the master */ - rv = get_slave_flags(slave_ifname); - if (rv) { - /* Can't work with this slave. */ - /* remember the error and skip it*/ - fprintf(stderr, - "Slave '%s': Error: get flags " - "failed. Skipping\n", - slave_ifname); - res = rv; - continue; - } - rv = release(master_ifname, slave_ifname); - if (rv) { - fprintf(stderr, - "Master '%s', Slave '%s': Error: " - "Release failed\n", - master_ifname, slave_ifname); - res = rv; - } - } else { - /* attach a slave interface to the master */ - rv = get_if_settings(slave_ifname, slave_ifra); - if (rv) { - /* Can't work with this slave. */ - /* remember the error and skip it*/ - fprintf(stderr, - "Slave '%s': Error: get " - "settings failed: %s. " - "Skipping\n", - slave_ifname, strerror(rv)); - res = rv; - continue; - } - rv = enslave(master_ifname, slave_ifname); - if (rv) { - fprintf(stderr, - "Master '%s', Slave '%s': Error: " - "Enslave failed\n", - master_ifname, slave_ifname); - res = rv; - } - } - } while ((slave_ifname = *spp++) != NULL); - } - -out: - if (skfd >= 0) { - close(skfd); - } - - return res; -} - -static short mif_flags; - -/* Get the inteface configuration from the kernel. */ -static int if_getconfig(char *ifname) -{ - struct ifreq ifr; - int metric, mtu; /* Parameters of the master interface. */ - struct sockaddr dstaddr, broadaddr, netmask; - unsigned char *hwaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) - return -1; - mif_flags = ifr.ifr_flags; - printf("The result of SIOCGIFFLAGS on %s is %x.\n", - ifname, ifr.ifr_flags); - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0) - return -1; - printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n", - ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1], - ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]); - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) - return -1; - - /* Gotta convert from 'char' to unsigned for printf(). */ - hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data; - printf("The result of SIOCGIFHWADDR is type %d " - "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", - ifr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1], - hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]); - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFMETRIC, &ifr) < 0) { - metric = 0; - } else - metric = ifr.ifr_metric; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFMTU, &ifr) < 0) - mtu = 0; - else - mtu = ifr.ifr_mtu; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFDSTADDR, &ifr) < 0) { - memset(&dstaddr, 0, sizeof(struct sockaddr)); - } else - dstaddr = ifr.ifr_dstaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFBRDADDR, &ifr) < 0) { - memset(&broadaddr, 0, sizeof(struct sockaddr)); - } else - broadaddr = ifr.ifr_broadaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFNETMASK, &ifr) < 0) { - memset(&netmask, 0, sizeof(struct sockaddr)); - } else - netmask = ifr.ifr_netmask; - - return 0; -} - -static void if_print(char *ifname) -{ - char buff[1024]; - struct ifconf ifc; - struct ifreq *ifr; - int i; - - if (ifname == (char *)NULL) { - ifc.ifc_len = sizeof(buff); - ifc.ifc_buf = buff; - if (ioctl(skfd, SIOCGIFCONF, &ifc) < 0) { - perror("SIOCGIFCONF failed"); - return; - } - - ifr = ifc.ifc_req; - for (i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; ifr++) { - if (if_getconfig(ifr->ifr_name) < 0) { - fprintf(stderr, - "%s: unknown interface.\n", - ifr->ifr_name); - continue; - } - - if (((mif_flags & IFF_UP) == 0) && !opt_a) continue; - /*ife_print(&ife);*/ - } - } else { - if (if_getconfig(ifname) < 0) { - fprintf(stderr, - "%s: unknown interface.\n", ifname); - } - } -} - -static int get_drv_info(char *master_ifname) -{ - struct ifreq ifr; - struct ethtool_drvinfo info; - char *endptr; - - memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - ifr.ifr_data = (caddr_t)&info; - - info.cmd = ETHTOOL_GDRVINFO; - strncpy(info.driver, "ifenslave", 32); - snprintf(info.fw_version, 32, "%d", BOND_ABI_VERSION); - - if (ioctl(skfd, SIOCETHTOOL, &ifr) < 0) { - if (errno == EOPNOTSUPP) { - goto out; - } - - saved_errno = errno; - v_print("Master '%s': Error: get bonding info failed %s\n", - master_ifname, strerror(saved_errno)); - return 1; - } - - abi_ver = strtoul(info.fw_version, &endptr, 0); - if (*endptr) { - v_print("Master '%s': Error: got invalid string as an ABI " - "version from the bonding module\n", - master_ifname); - return 1; - } - -out: - v_print("ABI ver is %d\n", abi_ver); - - return 0; -} - -static int change_active(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res = 0; - - if (!(slave_flags.ifr_flags & IFF_SLAVE)) { - fprintf(stderr, - "Illegal operation: The specified slave interface " - "'%s' is not a slave\n", - slave_ifname); - return 1; - } - - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); - if ((ioctl(skfd, SIOCBONDCHANGEACTIVE, &ifr) < 0) && - (ioctl(skfd, BOND_CHANGE_ACTIVE_OLD, &ifr) < 0)) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCBONDCHANGEACTIVE failed: " - "%s\n", - master_ifname, strerror(saved_errno)); - res = 1; - } - - return res; -} - -static int enslave(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res = 0; - - if (slave_flags.ifr_flags & IFF_SLAVE) { - fprintf(stderr, - "Illegal operation: The specified slave interface " - "'%s' is already a slave\n", - slave_ifname); - return 1; - } - - res = set_if_down(slave_ifname, slave_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Slave '%s': Error: bring interface down failed\n", - slave_ifname); - return res; - } - - if (abi_ver < 2) { - /* Older bonding versions would panic if the slave has no IP - * address, so get the IP setting from the master. - */ - set_if_addr(master_ifname, slave_ifname); - } else { - res = clear_if_addr(slave_ifname); - if (res) { - fprintf(stderr, - "Slave '%s': Error: clear address failed\n", - slave_ifname); - return res; - } - } - - if (master_mtu.ifr_mtu != slave_mtu.ifr_mtu) { - res = set_slave_mtu(slave_ifname, master_mtu.ifr_mtu); - if (res) { - fprintf(stderr, - "Slave '%s': Error: set MTU failed\n", - slave_ifname); - return res; - } - } - - if (hwaddr_set) { - /* Master already has an hwaddr - * so set it's hwaddr to the slave - */ - if (abi_ver < 1) { - /* The driver is using an old ABI, so - * the application sets the slave's - * hwaddr - */ - res = set_slave_hwaddr(slave_ifname, - &(master_hwaddr.ifr_hwaddr)); - if (res) { - fprintf(stderr, - "Slave '%s': Error: set hw address " - "failed\n", - slave_ifname); - goto undo_mtu; - } - - /* For old ABI the application needs to bring the - * slave back up - */ - res = set_if_up(slave_ifname, slave_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Slave '%s': Error: bring interface " - "down failed\n", - slave_ifname); - goto undo_slave_mac; - } - } - /* The driver is using a new ABI, - * so the driver takes care of setting - * the slave's hwaddr and bringing - * it up again - */ - } else { - /* No hwaddr for master yet, so - * set the slave's hwaddr to it - */ - if (abi_ver < 1) { - /* For old ABI, the master needs to be - * down before setting it's hwaddr - */ - res = set_if_down(master_ifname, master_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Master '%s': Error: bring interface " - "down failed\n", - master_ifname); - goto undo_mtu; - } - } - - res = set_master_hwaddr(master_ifname, - &(slave_hwaddr.ifr_hwaddr)); - if (res) { - fprintf(stderr, - "Master '%s': Error: set hw address " - "failed\n", - master_ifname); - goto undo_mtu; - } - - if (abi_ver < 1) { - /* For old ABI, bring the master - * back up - */ - res = set_if_up(master_ifname, master_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Master '%s': Error: bring interface " - "up failed\n", - master_ifname); - goto undo_master_mac; - } - } - - hwaddr_set = 1; - } - - /* Do the real thing */ - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); - if ((ioctl(skfd, SIOCBONDENSLAVE, &ifr) < 0) && - (ioctl(skfd, BOND_ENSLAVE_OLD, &ifr) < 0)) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCBONDENSLAVE failed: %s\n", - master_ifname, strerror(saved_errno)); - res = 1; - } - - if (res) { - goto undo_master_mac; - } - - return 0; - -/* rollback (best effort) */ -undo_master_mac: - set_master_hwaddr(master_ifname, &(master_hwaddr.ifr_hwaddr)); - hwaddr_set = 0; - goto undo_mtu; -undo_slave_mac: - set_slave_hwaddr(slave_ifname, &(slave_hwaddr.ifr_hwaddr)); -undo_mtu: - set_slave_mtu(slave_ifname, slave_mtu.ifr_mtu); - return res; -} - -static int release(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res = 0; - - if (!(slave_flags.ifr_flags & IFF_SLAVE)) { - fprintf(stderr, - "Illegal operation: The specified slave interface " - "'%s' is not a slave\n", - slave_ifname); - return 1; - } - - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); - if ((ioctl(skfd, SIOCBONDRELEASE, &ifr) < 0) && - (ioctl(skfd, BOND_RELEASE_OLD, &ifr) < 0)) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCBONDRELEASE failed: %s\n", - master_ifname, strerror(saved_errno)); - return 1; - } else if (abi_ver < 1) { - /* The driver is using an old ABI, so we'll set the interface - * down to avoid any conflicts due to same MAC/IP - */ - res = set_if_down(slave_ifname, slave_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Slave '%s': Error: bring interface " - "down failed\n", - slave_ifname); - } - } - - /* set to default mtu */ - set_slave_mtu(slave_ifname, 1500); - - return res; -} - -static int get_if_settings(char *ifname, struct dev_ifr ifra[]) -{ - int i; - int res = 0; - - for (i = 0; ifra[i].req_ifr; i++) { - strncpy(ifra[i].req_ifr->ifr_name, ifname, IFNAMSIZ); - res = ioctl(skfd, ifra[i].req_type, ifra[i].req_ifr); - if (res < 0) { - saved_errno = errno; - v_print("Interface '%s': Error: %s failed: %s\n", - ifname, ifra[i].req_name, - strerror(saved_errno)); - - return saved_errno; - } - } - - return 0; -} - -static int get_slave_flags(char *slave_ifname) -{ - int res = 0; - - strncpy(slave_flags.ifr_name, slave_ifname, IFNAMSIZ); - res = ioctl(skfd, SIOCGIFFLAGS, &slave_flags); - if (res < 0) { - saved_errno = errno; - v_print("Slave '%s': Error: SIOCGIFFLAGS failed: %s\n", - slave_ifname, strerror(saved_errno)); - } else { - v_print("Slave %s: flags %04X.\n", - slave_ifname, slave_flags.ifr_flags); - } - - return res; -} - -static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr) -{ - unsigned char *addr = (unsigned char *)hwaddr->sa_data; - struct ifreq ifr; - int res = 0; - - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr)); - res = ioctl(skfd, SIOCSIFHWADDR, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCSIFHWADDR failed: %s\n", - master_ifname, strerror(saved_errno)); - return res; - } else { - v_print("Master '%s': hardware address set to " - "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", - master_ifname, addr[0], addr[1], addr[2], - addr[3], addr[4], addr[5]); - } - - return res; -} - -static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr) -{ - unsigned char *addr = (unsigned char *)hwaddr->sa_data; - struct ifreq ifr; - int res = 0; - - strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); - memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr)); - res = ioctl(skfd, SIOCSIFHWADDR, &ifr); - if (res < 0) { - saved_errno = errno; - - v_print("Slave '%s': Error: SIOCSIFHWADDR failed: %s\n", - slave_ifname, strerror(saved_errno)); - - if (saved_errno == EBUSY) { - v_print(" The device is busy: it must be idle " - "before running this command.\n"); - } else if (saved_errno == EOPNOTSUPP) { - v_print(" The device does not support setting " - "the MAC address.\n" - " Your kernel likely does not support slave " - "devices.\n"); - } else if (saved_errno == EINVAL) { - v_print(" The device's address type does not match " - "the master's address type.\n"); - } - return res; - } else { - v_print("Slave '%s': hardware address set to " - "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", - slave_ifname, addr[0], addr[1], addr[2], - addr[3], addr[4], addr[5]); - } - - return res; -} - -static int set_slave_mtu(char *slave_ifname, int mtu) -{ - struct ifreq ifr; - int res = 0; - - ifr.ifr_mtu = mtu; - strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); - - res = ioctl(skfd, SIOCSIFMTU, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Slave '%s': Error: SIOCSIFMTU failed: %s\n", - slave_ifname, strerror(saved_errno)); - } else { - v_print("Slave '%s': MTU set to %d.\n", slave_ifname, mtu); - } - - return res; -} - -static int set_if_flags(char *ifname, short flags) -{ - struct ifreq ifr; - int res = 0; - - ifr.ifr_flags = flags; - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - - res = ioctl(skfd, SIOCSIFFLAGS, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Interface '%s': Error: SIOCSIFFLAGS failed: %s\n", - ifname, strerror(saved_errno)); - } else { - v_print("Interface '%s': flags set to %04X.\n", ifname, flags); - } - - return res; -} - -static int set_if_up(char *ifname, short flags) -{ - return set_if_flags(ifname, flags | IFF_UP); -} - -static int set_if_down(char *ifname, short flags) -{ - return set_if_flags(ifname, flags & ~IFF_UP); -} - -static int clear_if_addr(char *ifname) -{ - struct ifreq ifr; - int res = 0; - - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - ifr.ifr_addr.sa_family = AF_INET; - memset(ifr.ifr_addr.sa_data, 0, sizeof(ifr.ifr_addr.sa_data)); - - res = ioctl(skfd, SIOCSIFADDR, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Interface '%s': Error: SIOCSIFADDR failed: %s\n", - ifname, strerror(saved_errno)); - } else { - v_print("Interface '%s': address cleared\n", ifname); - } - - return res; -} - -static int set_if_addr(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res; - unsigned char *ipaddr; - int i; - struct { - char *req_name; - char *desc; - int g_ioctl; - int s_ioctl; - } ifra[] = { - {"IFADDR", "addr", SIOCGIFADDR, SIOCSIFADDR}, - {"DSTADDR", "destination addr", SIOCGIFDSTADDR, SIOCSIFDSTADDR}, - {"BRDADDR", "broadcast addr", SIOCGIFBRDADDR, SIOCSIFBRDADDR}, - {"NETMASK", "netmask", SIOCGIFNETMASK, SIOCSIFNETMASK}, - {NULL, NULL, 0, 0}, - }; - - for (i = 0; ifra[i].req_name; i++) { - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - res = ioctl(skfd, ifra[i].g_ioctl, &ifr); - if (res < 0) { - int saved_errno = errno; - - v_print("Interface '%s': Error: SIOCG%s failed: %s\n", - master_ifname, ifra[i].req_name, - strerror(saved_errno)); - - ifr.ifr_addr.sa_family = AF_INET; - memset(ifr.ifr_addr.sa_data, 0, - sizeof(ifr.ifr_addr.sa_data)); - } - - strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); - res = ioctl(skfd, ifra[i].s_ioctl, &ifr); - if (res < 0) { - int saved_errno = errno; - - v_print("Interface '%s': Error: SIOCS%s failed: %s\n", - slave_ifname, ifra[i].req_name, - strerror(saved_errno)); - - } - - ipaddr = (unsigned char *)ifr.ifr_addr.sa_data; - v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n", - slave_ifname, ifra[i].desc, - ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]); - } - - return 0; -} - -/* - * Local variables: - * version-control: t - * kept-new-versions: 5 - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * compile-command: "gcc -Wall -Wstrict-prototypes -O -I/usr/src/linux/include ifenslave.c -o ifenslave" - * End: - */ - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libqt4 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Jul 30 15:20:18 CEST 2010. -------- --- libqt4/libqt4-devel-doc-data.changes 2010-06-08 16:28:56.000000000 +0200 +++ libqt4/libqt4-devel-doc-data.changes 2010-07-21 13:01:22.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Jul 21 12:59:20 CEST 2010 - dmueller(a)suse.de + +- fix crash of QtWebKit with flash player 10.1 (bnc#613818) + +------------------------------------------------------------------- +Wed Jul 14 14:09:13 CEST 2010 - dmueller(a)suse.de + +- fix endless loop in SSL code on error conditions (bnc#619089) + +------------------------------------------------------------------- +Thu Jul 8 17:19:15 UTC 2010 - jengelh(a)medozas.de + +- SPARC64 compile fixes + +------------------------------------------------------------------- +Thu Jul 1 13:23:23 CEST 2010 - dmueller(a)suse.de + +- remove 3rd party fonts (unused, bnc#616249) + +------------------------------------------------------------------- +Fri Jun 18 22:45:04 CEST 2010 - dmueller(a)suse.de + +- fix fileconflicts + +------------------------------------------------------------------- +Fri Jun 11 06:53:08 UTC 2010 - bg(a)novell.com + +- apply patches from debian to fix build for hppa + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 New: ---- SSL-error-endless-loop.diff hppa_ldcw_fix.diff hppa_unaligned_access_fix_458133.diff qtwebkit-initialize-gtk.diff webkit-sparc64.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.ILhX3F/_old 2010-07-30 14:57:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ILhX3F/_new 2010-07-30 14:57:30.000000000 +0200 @@ -28,7 +28,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.6.3 -Release: 1 +Release: 4 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion 4.6.3 @@ -78,6 +78,11 @@ Patch115: qgtkstyle-no-gtk-crash.diff Patch117: bnc610578.diff Patch118: rcc-stable-dirlisting.diff +Patch119: hppa_ldcw_fix.diff +Patch120: hppa_unaligned_access_fix_458133.diff +Patch121: webkit-sparc64.diff +Patch122: SSL-error-endless-loop.diff +Patch123: qtwebkit-initialize-gtk.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ @@ -130,8 +135,15 @@ %patch115 %patch117 -p1 %patch118 -p1 +%ifarch hppa +%patch119 +%patch120 +%endif +%patch121 -p1 +%patch122 -p1 +%patch123 # be sure not to use them -rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} +rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-END # COMMON-END libqt4-devel-doc.spec: same change libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.ILhX3F/_old 2010-07-30 14:57:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ILhX3F/_new 2010-07-30 14:57:30.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.6.3 -Release: 1 +Release: 4 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion 4.6.3 @@ -95,6 +95,11 @@ Patch115: qgtkstyle-no-gtk-crash.diff Patch117: bnc610578.diff Patch118: rcc-stable-dirlisting.diff +Patch119: hppa_ldcw_fix.diff +Patch120: hppa_unaligned_access_fix_458133.diff +Patch121: webkit-sparc64.diff +Patch122: SSL-error-endless-loop.diff +Patch123: qtwebkit-initialize-gtk.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ @@ -147,8 +152,15 @@ %patch115 %patch117 -p1 %patch118 -p1 +%ifarch hppa +%patch119 +%patch120 +%endif +%patch121 -p1 +%patch122 -p1 +%patch123 # be sure not to use them -rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} +rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-END %package devel @@ -604,8 +616,15 @@ %files devel %defattr(-,root,root,755) +%exclude %_libdir/libQtWebKit.la %exclude %_libdir/libQtWebKit.prl +%exclude %_libdir/libQtWebKit.so +%exclude %_libdir/libQtXmlPatterns.la %exclude %_libdir/libQtXmlPatterns.prl +%exclude %_libdir/libQtXmlPatterns.prl +%exclude %_libdir/libQtXmlPatterns.so +%exclude %_libdir/pkgconfig/QtWebKit.pc +%exclude %_libdir/pkgconfig/QtXmlPatterns.pc /usr/bin/rcc /usr/bin/uic %if %with_qt3support ++++++ SSL-error-endless-loop.diff ++++++ commit f7fe575bc5f628533aeeca3eb564af89a1a1426b Author: Peter Hartmann <peter.hartmann(a)nokia.com> Date: Mon Jul 12 18:32:06 2010 +0200 QSslSocket: Improve error handling Reviewed-by: Markus Goetz Task-number: QT-3567 diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index ce2aee1..6f77600 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -680,8 +680,20 @@ void QSslSocketBackendPrivate::transmit() #endif plainSocket->disconnectFromHost(); break; + case SSL_ERROR_SYSCALL: // some IO error + case SSL_ERROR_SSL: // error in the SSL library + // we do not know exactly what the error is, nor whether we can recover from it, + // so just return to prevent an endless loop in the outer "while" statement + q->setErrorString(QSslSocket::tr("Error while reading: %1").arg(SSL_ERRORSTR())); + q->setSocketError(QAbstractSocket::UnknownSocketError); + emit q->error(QAbstractSocket::UnknownSocketError); + return; default: - // ### Handle errors better. + // SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT: can only happen with a + // BIO_s_connect() or BIO_s_accept(), which we do not call. + // SSL_ERROR_WANT_X509_LOOKUP: can only happen with a + // SSL_CTX_set_client_cert_cb(), which we do not call. + // So this default case should never be triggered. q->setErrorString(QSslSocket::tr("Error while reading: %1").arg(SSL_ERRORSTR())); q->setSocketError(QAbstractSocket::UnknownSocketError); emit q->error(QAbstractSocket::UnknownSocketError); ++++++ hppa_ldcw_fix.diff ++++++ author: LaMont Jones <lamont(a)bld-4.mmjgroup.com> patch from Ubuntu to properly support hppa. --- src/corelib/arch/parisc/q_ldcw.s +++ src/corelib/arch/parisc/q_ldcw.s @@ -38,20 +38,10 @@ ;** $QT_END_LICENSE$ ;** ;****************************************************************************/ - .SPACE $PRIVATE$ - .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 - .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 - .SPACE $TEXT$ - .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44 - .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY - .IMPORT $global$,DATA - .IMPORT $$dyncall,MILLICODE - .SPACE $TEXT$ - .SUBSPA $CODE$ - + .text .align 4 .EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR -q_ldcw + .label q_ldcw .PROC .CALLINFO FRAME=0,CALLS,SAVE_RP .ENTRY ++++++ hppa_unaligned_access_fix_458133.diff ++++++ author: Bernhard R. Link <brlink(a)debian.org> Fix unaligned access on hppa --- src/3rdparty/sha1/sha1.cpp +++ src/3rdparty/sha1/sha1.cpp @@ -149,10 +149,10 @@ static inline void sha1ProcessChunk(Sha1 quint32 d = state->h3; quint32 e = state->h4; - quint8 chunkBuffer[64]; - memcpy(chunkBuffer, buffer, 64); + Sha1Chunk chunkBuffer; + memcpy(chunkBuffer.bytes, buffer, 64); - Sha1Chunk *chunk = reinterpret_cast<Sha1Chunk*>(&chunkBuffer); + Sha1Chunk *chunk = &chunkBuffer; for (int i = 0; i < 16; ++i) chunk->words[i] = qFromBigEndian(chunk->words[i]); @@ -188,7 +188,7 @@ static inline void sha1ProcessChunk(Sha1 // Wipe variables #ifdef SHA1_WIPE_VARIABLES a = b = c = d = e = 0; - memset(chunkBuffer, 0, 64); + memset(chunkBuffer.bytes, 0, 64); #endif } ++++++ qtwebkit-initialize-gtk.diff ++++++ --- src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp +++ src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp @@ -35,6 +35,8 @@ namespace WebCore { +typedef void gtkInitFunc(int *argc, char ***argv); + bool PluginPackage::fetchInfo() { if (!load()) @@ -109,6 +111,7 @@ NP_InitializeFuncPtr NP_Initialize; NPError npErr; + gtkInitFunc* gtkInit; NP_Initialize = (NP_InitializeFuncPtr)m_module->resolve("NP_Initialize"); m_NPP_Shutdown = (NPP_ShutdownProcPtr)m_module->resolve("NP_Shutdown"); @@ -127,6 +130,26 @@ m_browserFuncs.getvalue = staticPluginQuirkRequiresGtkToolKit_NPN_GetValue; } + // WORKAROUND: Prevent gtk based plugin crashes such as BR# 40567 by + // explicitly forcing the initializing of Gtk, i.e. calling gtk_init, + // whenver the symbol is present in the plugin library loaded above. + // Note that this workaround is based on code from the NSPluginClass ctor + // in KDE's kdebase/apps/nsplugins/viewer/nsplugin.cpp file. + gtkInit = (gtkInitFunc*)m_module->resolve("gtk_init"); + if (gtkInit) { + // Prevent gtk_init() from replacing the X error handlers, since the Gtk + // handlers abort when they receive an X error, thus killing the viewer. +#ifdef Q_WS_X11 + int (*old_error_handler)(Display*, XErrorEvent*) = XSetErrorHandler(0); + int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0); +#endif + gtkInit(0, 0); +#ifdef Q_WS_X11 + XSetErrorHandler(old_error_handler); + XSetIOErrorHandler(old_io_error_handler); +#endif + } + #if defined(XP_UNIX) npErr = NP_Initialize(&m_browserFuncs, &m_pluginFuncs); #else ++++++ webkit-sparc64.diff ++++++ Select JSVALUE64 for 64-bit sparc to avoid compile errors ("conversion from JSVALUE32 to void* loses precision" or something it was). Similar to webkit-ia64_s390x.patch. --- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h =================================================================== --- qt-everywhere-opensource-src-4.6.3.orig/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -734,7 +734,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) || PLATFORM(S390X) +#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) || PLATFORM(S390X) || PLATFORM(SPARC64) #define WTF_USE_JSVALUE64 1 #elif PLATFORM(ARM) || PLATFORM(PPC64) #define WTF_USE_JSVALUE32 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 sysfsutils for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package sysfsutils for openSUSE:Factory checked in at Fri Jul 30 14:56:18 CEST 2010. -------- --- sysfsutils/sysfsutils.changes 2009-12-19 14:17:58.000000000 +0100 +++ sysfsutils/sysfsutils.changes 2010-06-28 08:51:20.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysfsutils.spec ++++++ --- /var/tmp/diff_new_pack.8tVu1a/_old 2010-07-30 14:56:04.000000000 +0200 +++ /var/tmp/diff_new_pack.8tVu1a/_new 2010-07-30 14:56:04.000000000 +0200 @@ -21,8 +21,8 @@ Name: sysfsutils Summary: System Utilities Package / Libsysfs Version: 2.1.0 -Release: 130 -License: LGPL v2.1 or later +Release: 137 +License: LGPLv2.1+ Group: System/Libraries Url: http://linux-diag.sourceforge.net Source: http://aleron.dl.sourceforge.net/sourceforge/linux-diag/%{name}-%{version}.… @@ -54,7 +54,7 @@ %build %configure --disable-static --with-pic --libdir=/%{_lib} -%{__make} %{?jobs:-j%jobs} +%{__make} %{?_smp_mflags} %install make install DESTDIR=%{buildroot} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gstreamer-0_10 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '10

30 Jul '10

Hello community, here is the log from the commit of package gstreamer-0_10 for openSUSE:Factory checked in at Fri Jul 30 14:55:54 CEST 2010. -------- --- GNOME/gstreamer-0_10/gstreamer-0_10.changes 2010-05-17 23:36:57.000000000 +0200 +++ gstreamer-0_10/gstreamer-0_10.changes 2010-07-29 14:26:21.000000000 +0200 @@ -1,0 +2,53 @@ +Thu Jul 29 12:21:35 UTC 2010 - dimstar(a)opensuse.org + +- Update to version 0.10.30: + + bgo#623586: gst/tagsetter check fails + + bgo#463435: Skip #include < libxml/parser.h > in gstconfig.h.in + when not needed + + bgo#505770: gst_element_get_state() should unblock if element + posts an error + + bgo#615820: implement percentage position and duration queries + + bgo#615941: [tags] Add GST_TAG_DEVICE_MANUFACTURER and + GST_TAG_DEVICE_MODEL + + bgo#616586: Use GObject's boxed type for GError + + bgo#617223: [tags] Add tags for direction of capture and + movement + + bgo#617625: Commandline utility wrappers (gst-run) don't work + on Windows + + bgo#618644: gst_pad_get_caps() Return pad template if parent + element is in GST_STATE_NULL + + bgo#619508: [tag] Add image orientation tag + + bgo#619815: GST_PLUGIN_LOADING_WHITELIST env var for unit tests + + bgo#619828: [API] adapter: add masked_scan_uint32_peek + + bgo#620460: info: add new TRACE log level and move refcounting + there from LOG level + + bgo#620490: [basesink] segment query unconditionally returns + FALSE + + bgo#621006: Deprecate unused gst_object_{get|set}_name_prefix() + + bgo#621282: Display of short fourccs is in hex instead of text + + bgo#621332: BaseTransform should disable proxy alloc if + downstream changes caps + + bgo#621334: GstBaseTransform should not require a + transform_size function + + bgo#621505: Disable memory poisoning by default for releases + + bgo#621527: gstcaps: New gst_caps_steal_structure() method + + bgo#621530: filesink ignores sync=true + + bgo#621595: --quiet doesnt make gst-launch be completely quiet, + also messages should not go to stdout + + bgo#621773: Add introspection annotations + + bgo#621867: gst-launch: rename new --no-play command line + option + + bgo#621896: [API][taglist] Add gst_tag_list_peek_string_index + + bgo#622504: [GstPad] Provide more fine-grained linking methods + + bgo#622546: distcheck fails in docs/plugins/ + + bgo#622685: [GstXml] Deprecate GstXml + + bgo#622967: [queue2] Problems with progressive downloading + + bgo#623301: gst_caps_normalize: doesn't normalize completely + + bgo#623589: Fix races/refcounting bugs with slave clocks + + bgo#624113: [tags] wrong behaviour in merge function for + strings + + bgo#622025: Can't build gstreamer due to Gst-0.10.gir: error: + Can't resolve type 'PadIntLinkFunction' for field + Gst.Pad.intlinkfunc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gstreamer-0.10.29.tar.bz2 New: ---- gstreamer-0.10.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-doc.spec ++++++ --- /var/tmp/diff_new_pack.jjNQzS/_old 2010-07-30 14:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.jjNQzS/_new 2010-07-30 14:53:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gstreamer-0_10-doc (Version 0.10.29) +# spec file for package gstreamer-0_10-doc (Version 0.10.30) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: gstreamer-0_10-doc %define build_doc 1 %define _name gstreamer -Version: 0.10.29 +Version: 0.10.30 Release: 1 %define gst_branch 0.10 BuildRequires: bison check-devel fdupes flex glib2-devel libxml2-devel pyxml translation-update-upstream ++++++ gstreamer-0_10.spec ++++++ --- /var/tmp/diff_new_pack.jjNQzS/_old 2010-07-30 14:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.jjNQzS/_new 2010-07-30 14:53:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gstreamer-0_10 (Version 0.10.29) +# spec file for package gstreamer-0_10 (Version 0.10.30) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: gstreamer-0_10 %define build_doc 0 %define _name gstreamer -Version: 0.10.29 +Version: 0.10.30 Release: 1 %define gst_branch 0.10 BuildRequires: bison check-devel fdupes flex glib2-devel libxml2-devel pyxml translation-update-upstream ++++++ gstreamer-0.10.29.tar.bz2 -> gstreamer-0.10.30.tar.bz2 ++++++ ++++ 28049 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